Port the slipstream tests from the old repo.

30 files changed, 736 insertions, 0 deletions

diff --git a/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj b/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..926f46df
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj
@@ -0,0 +1,19 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{62C28DAF-A13E-4F55-ACA1-FB843630789C}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleA/BundleA.wxs b/src/TestData/SlipstreamTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..17dc6c05
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleA/BundleA.wxs
@@ -0,0 +1,12 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" Compressed="no">
+        <SlipstreamMsp Id="PatchA" />
+      </MsiPackage>
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" Compressed="no" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
new file mode 100644
index 00000000..662defd3
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
@@ -0,0 +1,19 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{F6BB4AE2-F7D4-4768-8314-3AF694C400E9}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs
new file mode 100644
index 00000000..3de10a91
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wxs
@@ -0,0 +1,12 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)">
+        <SlipstreamMsp Id="PatchA" />
+      </MsiPackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj b/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..e2ca2e78
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj
@@ -0,0 +1,20 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{604878DE-F0EB-4FE1-B11E-DC19F07F82F5}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleB/BundleB.wxs b/src/TestData/SlipstreamTests/BundleB/BundleB.wxs
new file mode 100644
index 00000000..90ddd258
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleB/BundleB.wxs
@@ -0,0 +1,13 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)">
+        <SlipstreamMsp Id="PatchA" />
+      </MsiPackage>
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj b/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..f3fee0c1
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj
@@ -0,0 +1,21 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{16B551B5-6EBE-417F-8CB2-50936F079301}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
+    <ProjectReference Include="..\PatchAB\PatchAB.wixproj" />
+    <ProjectReference Include="..\PatchAB2\PatchAB2.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleC/BundleC.wxs b/src/TestData/SlipstreamTests/BundleC/BundleC.wxs
new file mode 100644
index 00000000..4702d845
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleC/BundleC.wxs
@@ -0,0 +1,14 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)">
+        <SlipstreamMsp Id="PatchAB" />
+      </MsiPackage>
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
+      <MspPackage Id="PatchAB" SourceFile="$(var.PatchAB.TargetPath)" />
+      <MspPackage Id="PatchAB2" SourceFile="$(var.PatchAB2.TargetPath)" PerMachine="default" Slipstream="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
new file mode 100644
index 00000000..acb12a3a
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
@@ -0,0 +1,18 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{80A9925A-2EC1-4BD5-BB69-2553BF7FCED9}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs
new file mode 100644
index 00000000..59fdd0c9
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wxs
@@ -0,0 +1,9 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
new file mode 100644
index 00000000..72d48b74
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
@@ -0,0 +1,18 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{9B026C22-924C-4CEA-8726-FD07C1706A9F}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs
new file mode 100644
index 00000000..27fed68e
--- /dev/null
+++ b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wxs
@@ -0,0 +1,9 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag">
+  <Fragment>    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj b/src/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
new file mode 100644
index 00000000..50aa6ec6
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
@@ -0,0 +1,10 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageAv1\PackageA.props" />
+  <PropertyGroup>
+    <Version>0.9.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageAv1/PackageA.props b/src/TestData/SlipstreamTests/PackageAv1/PackageA.props
new file mode 100644
index 00000000..734e0d6d
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv1/PackageA.props
@@ -0,0 +1,11 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <PropertyGroup>
+    <PackageName>PackageA</PackageName>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <UpgradeCode>{DB87BB66-FE5D-4293-81AC-EE313D3F864B}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.props b/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.props
new file mode 100644
index 00000000..2936f349
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.props
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <Import Project="PackageA.props" />
+  <PropertyGroup>
+    <ProductCode>{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}</ProductCode>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.wixproj b/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.wixproj
new file mode 100644
index 00000000..e85be384
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv1/PackageAv1.wixproj
@@ -0,0 +1,4 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="PackageAv1.props" />
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageAv1/ProductComponents.wxs b/src/TestData/SlipstreamTests/PackageAv1/ProductComponents.wxs
new file mode 100644
index 00000000..72b5d4bd
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv1/ProductComponents.wxs
@@ -0,0 +1,15 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="RegistryComponent2" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
new file mode 100644
index 00000000..dbce9cfe
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -0,0 +1,10 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageAv1\PackageAv1.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageBv1/PackageB.props b/src/TestData/SlipstreamTests/PackageBv1/PackageB.props
new file mode 100644
index 00000000..920088fb
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageBv1/PackageB.props
@@ -0,0 +1,12 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <PropertyGroup>
+    <PackageName>PackageB</PackageName>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <ProductCode>{83B1ADF3-A8DD-41D3-9114-57703DA17754}</ProductCode>
+    <UpgradeCode>{552F8D3B-99E1-4772-8E8C-CC47E5ED5F71}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageBv1/PackageBv1.wixproj b/src/TestData/SlipstreamTests/PackageBv1/PackageBv1.wixproj
new file mode 100644
index 00000000..7b6f83a3
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageBv1/PackageBv1.wixproj
@@ -0,0 +1,4 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="PackageB.props" />
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PackageBv1/ProductComponents.wxs b/src/TestData/SlipstreamTests/PackageBv1/ProductComponents.wxs
new file mode 100644
index 00000000..72b5d4bd
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageBv1/ProductComponents.wxs
@@ -0,0 +1,15 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="RegistryComponent2" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj b/src/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
new file mode 100644
index 00000000..3ec790ad
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
@@ -0,0 +1,10 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageBv1\PackageB.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageBv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PatchA/PatchA.wixproj b/src/TestData/SlipstreamTests/PatchA/PatchA.wixproj
new file mode 100644
index 00000000..da9acb5e
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchA/PatchA.wixproj
@@ -0,0 +1,12 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>PatchCreation</OutputType>
+    <TargetExt>.msp</TargetExt>
+    <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PatchA/PatchA.wxs b/src/TestData/SlipstreamTests/PatchA/PatchA.wxs
new file mode 100644
index 00000000..7c3818b0
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchA/PatchA.wxs
@@ -0,0 +1,22 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch A in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchA" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchA"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent" />
+          <PropertyRef Id="TestVersion" />
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj b/src/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj
new file mode 100644
index 00000000..81fa9e12
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj
@@ -0,0 +1,14 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>PatchCreation</OutputType>
+    <TargetExt>.msp</TargetExt>
+    <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+    <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
+    <ProjectReference Include="..\PackageBv1_0_1\PackageBv1_0_1.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PatchAB/PatchAB.wxs b/src/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
new file mode 100644
index 00000000..f700f35c
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
@@ -0,0 +1,27 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch AB in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch AB" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchAB" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchA"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
+            />
+            <PatchBaseline
+              Id="PatchB"
+              BaselineFile="$(var.PackageBv1.TargetDir)$(var.PackageBv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageBv1_0_1.TargetDir)$(var.PackageBv1_0_1.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="AB" Version="$(var.Version)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent" />
+          <PropertyRef Id="TestVersion" />
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj b/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj
new file mode 100644
index 00000000..81fa9e12
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj
@@ -0,0 +1,14 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>PatchCreation</OutputType>
+    <TargetExt>.msp</TargetExt>
+    <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+    <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
+    <ProjectReference Include="..\PackageBv1_0_1\PackageBv1_0_1.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs b/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
new file mode 100644
index 00000000..ebd5bed0
--- /dev/null
+++ b/src/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
@@ -0,0 +1,26 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch AB2 in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch AB2" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchAB2" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchA"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
+            />
+            <PatchBaseline
+              Id="PatchB"
+              BaselineFile="$(var.PackageBv1.TargetDir)$(var.PackageBv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageBv1_0_1.TargetDir)$(var.PackageBv1_0_1.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="AB2" Version="$(var.Version)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent2" />
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/WixTestTools/PackageVerifier.cs b/src/WixTestTools/PackageVerifier.cs
index 77946c91..b4289032 100644
--- a/src/WixTestTools/PackageVerifier.cs
+++ b/src/WixTestTools/PackageVerifier.cs
@@ -58,6 +58,15 @@ namespace WixTestTools
             Assert.Equal(installed, MsiUtilities.IsProductInstalled(productCode));
         }
 
+        public void DeleteTestRegistryValue(string name)
+        {
+            using (var root = this.TestContext.GetTestRegistryRoot())
+            {
+                Assert.NotNull(root);
+                root.DeleteValue(name);
+            }
+        }
+
         public void VerifyTestRegistryRootDeleted()
         {
             using var testRegistryRoot = this.TestContext.GetTestRegistryRoot();
diff --git a/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs b/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs
new file mode 100644
index 00000000..9d53f999
--- /dev/null
+++ b/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs
@@ -0,0 +1,330 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BurnE2E
+{
+    using System;
+    using System.IO;
+    using WixTestTools;
+    using WixToolset.Mba.Core;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class SlipstreamTests : BurnE2ETests
+    {
+        public SlipstreamTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        private const string V090 = "0.9.0.0";
+        private const string V100 = "1.0.0.0";
+        private const string V101 = "1.0.1.0";
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
+        public void CanInstallBundleWithSlipstreamedPatchThenRemoveIt()
+        {
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        /// <summary>
+        /// BundleA installs PackageA with slipstreamed PatchA.
+        /// BundleOnlyPatchA is installed which contains PatchA (which should be a no-op).
+        /// BundleOnlyPatchA in uninstalled which should do nothing since BundleA has a dependency on it.
+        /// Bundle is installed which should remove everything.
+        /// </summary>
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
+        public void ReferenceCountsSlipstreamedPatch()
+        {
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleOnlyPatchA = this.CreateBundleInstaller("BundleOnlyPatchA");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleOnlyPatchA.Install();
+            bundleOnlyPatchA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleOnlyPatchA.Uninstall();
+            bundleOnlyPatchA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6350")]
+        public void CanInstallBundleWithSlipstreamedPatchThenRepairIt()
+        {
+            this.InstallBundleWithSlipstreamedPatchThenRepairIt(false);
+        }
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6350")]
+        public void CanInstallReversedBundleWithSlipstreamedPatchThenRepairIt()
+        {
+            this.InstallBundleWithSlipstreamedPatchThenRepairIt(true);
+        }
+
+        private void InstallBundleWithSlipstreamedPatchThenRepairIt(bool isReversed)
+        {
+            var bundleName = isReversed ? "BundleAReverse" : "BundleA";
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller(bundleName);
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            // Delete the installed file and registry key so we have something to repair.
+            File.Delete(packageAv1SourceCodeInstalled);
+            packageAv1.DeleteTestRegistryValue(testRegistryValue);
+
+            bundleA.Repair();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact]
+        public void CanInstallSlipstreamedPatchThroughForcedRepair()
+        {
+            this.InstallSlipstreamedPatchThroughForcedRepair(false);
+        }
+
+        [Fact]
+        public void CanInstallSlipstreamedPatchThroughReversedForcedRepair()
+        {
+            this.InstallSlipstreamedPatchThroughForcedRepair(true);
+        }
+
+        private void InstallSlipstreamedPatchThroughForcedRepair(bool isReversed)
+        {
+            var bundleName = isReversed ? "BundleAReverse" : "BundleA";
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller(bundleName);
+            var bundleOnlyA = this.CreateBundleInstaller("BundleOnlyA");
+            var testBAController = this.CreateTestBAController();
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+
+            bundleOnlyA.Install();
+            bundleOnlyA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V100);
+
+            // Delete the installed file and registry key so we have something to repair.
+            File.Delete(packageAv1SourceCodeInstalled);
+            packageAv1.DeleteTestRegistryValue(testRegistryValue);
+
+            testBAController.SetPackageRequestedState("PackageA", RequestState.Repair);
+            testBAController.SetPackageRequestedState("PatchA", RequestState.Repair);
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            testBAController.ResetPackageStates("PackageA");
+            testBAController.ResetPackageStates("PatchA");
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V100);
+
+            bundleOnlyA.Uninstall();
+            bundleOnlyA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact]
+        public void CanUninstallSlipstreamedPatchAlone()
+        {
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+            var testBAController = this.CreateTestBAController();
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            testBAController.SetPackageRequestedState("PatchA", RequestState.Absent);
+
+            bundleA.Modify();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V100);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact]
+        public void CanModifyToUninstallPackageWithSlipstreamedPatch()
+        {
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var packageBv1 = this.CreatePackageInstaller("PackageBv1");
+            var bundleB = this.CreateBundleInstaller("BundleB");
+            var testBAController = this.CreateTestBAController();
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            var packageBv1SourceCodeInstalled = packageBv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), $"PackageBv1 payload should not be there on test start: {packageBv1SourceCodeInstalled}");
+
+            bundleB.Install();
+            bundleB.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+            Assert.True(File.Exists(packageBv1SourceCodeInstalled), String.Concat("Should have found PackageBv1 payload installed at: ", packageBv1SourceCodeInstalled));
+
+            testBAController.SetPackageRequestedState("PackageA", RequestState.Absent);
+            testBAController.SetPackageRequestedState("PatchA", RequestState.Absent);
+
+            bundleB.Modify();
+            bundleB.VerifyRegisteredAndInPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should have been removed by modify from: {packageAv1SourceCodeInstalled}");
+
+            testBAController.ResetPackageStates("PackageA");
+            testBAController.ResetPackageStates("PatchA");
+
+            bundleB.Uninstall();
+            bundleB.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), String.Concat("PackageBv1 payload should have been removed by uninstall from: ", packageBv1SourceCodeInstalled));
+            packageBv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact]
+        public void UninstallsPackageWithSlipstreamedPatchDuringRollback()
+        {
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var packageBv1 = this.CreatePackageInstaller("PackageBv1");
+            var bundleB = this.CreateBundleInstaller("BundleB");
+            var testBAController = this.CreateTestBAController();
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            var packageBv1SourceCodeInstalled = packageBv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), $"PackageBv1 payload should not be there on test start: {packageBv1SourceCodeInstalled}");
+
+            testBAController.SetPackageCancelExecuteAtProgress("PackageB", 50);
+
+            bundleB.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_USEREXIT);
+            bundleB.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should have been removed by rollback from: {packageAv1SourceCodeInstalled}");
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), String.Concat("PackageBv1 payload should not have been installed from: ", packageBv1SourceCodeInstalled));
+            packageBv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact(Skip = "The bundle is slipstreaming the patches correctly, need to research why testRegistryValueB is getting patched because patch AB2 is not supposed to change it")]
+        public void CanAutomaticallyPredetermineSlipstreamPatchesAtBuildTime()
+        {
+            var testRegistryValueA = "PackageA";
+            var testRegistryValueA2 = "PackageA2";
+            var testRegistryValueB = "PackageB";
+            var testRegistryValueB2 = "PackageB2";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var packageBv1 = this.CreatePackageInstaller("PackageBv1");
+            var bundleC = this.CreateBundleInstaller("BundleC");
+
+            var packageAv1SourceCodeInstalled = packageAv1.GetInstalledFilePath("Package.wxs");
+            var packageBv1SourceCodeInstalled = packageBv1.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), $"PackageAv1 payload should not be there on test start: {packageAv1SourceCodeInstalled}");
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), $"PackageBv1 payload should not be there on test start: {packageBv1SourceCodeInstalled}");
+
+            bundleC.Install();
+            bundleC.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageAv1SourceCodeInstalled), String.Concat("Should have found PackageAv1 payload installed at: ", packageAv1SourceCodeInstalled));
+            // Product A should've slipstreamed both patches.
+            packageAv1.VerifyTestRegistryValue(testRegistryValueA, V101);
+            packageAv1.VerifyTestRegistryValue(testRegistryValueA2, V101);
+            // Product B should've only slipstreamed patch AB2.
+            packageBv1.VerifyTestRegistryValue(testRegistryValueB, V100);
+            packageBv1.VerifyTestRegistryValue(testRegistryValueB2, V101);
+
+            bundleC.Uninstall();
+            bundleC.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageAv1SourceCodeInstalled), String.Concat("PackageAv1 payload should have been removed by uninstall from: ", packageAv1SourceCodeInstalled));
+            Assert.False(File.Exists(packageBv1SourceCodeInstalled), String.Concat("PackageBv1 payload should have been removed by uninstall from: ", packageBv1SourceCodeInstalled));
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
+        public void CanInstallSlipstreamedPatchWithPackageDuringMajorUpgrade()
+        {
+            var testRegistryValue = "PackageA";
+
+            var packageAv0 = this.CreatePackageInstaller("PackageAv0_9_0");
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            packageAv1.VerifyInstalled(false);
+
+            packageAv0.InstallProduct();
+            packageAv0.VerifyInstalled(true);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V090);
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            packageAv0.VerifyInstalled(false);
+            packageAv1.VerifyInstalled(true);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, V101);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            packageAv1.VerifyInstalled(false);
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+    }
+}