From 99d7440134d0f33683d1150a770a2bc594be41de Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 8 Mar 2021 16:06:01 -0600
Subject: Port dependency tests from old repo.

---
 .../DependencyTests/BundleAv1/BundleA.props        | 11 ++++
 .../DependencyTests/BundleAv1/BundleAv1.wixproj    | 16 ++++++
 .../DependencyTests/BundleAv1/BundleAv1.wxs        | 21 +++++++
 .../BundleAv1_0_1/BundleAv1_0_1.wixproj            | 16 ++++++
 .../BundleAv1_0_1/BundleAv1_0_1.wxs                | 21 +++++++
 src/TestData/DependencyTests/BundleB/Bundle.wxs    | 40 +++++++++++++
 .../DependencyTests/BundleB/BundleB.wixproj        | 18 ++++++
 src/TestData/DependencyTests/BundleB/BundleB.wxs   | 22 ++++++++
 .../DependencyTests/BundleC/BundleC.wixproj        | 22 ++++++++
 src/TestData/DependencyTests/BundleC/BundleC.wxs   | 12 ++++
 .../DependencyTests/BundleD/BundleD.wixproj        | 22 ++++++++
 src/TestData/DependencyTests/BundleD/BundleD.wxs   | 12 ++++
 .../DependencyTests/BundleE/BundleE.wixproj        | 21 +++++++
 src/TestData/DependencyTests/BundleE/BundleE.wxs   | 19 +++++++
 .../DependencyTests/BundleF/BundleF.wixproj        | 21 +++++++
 src/TestData/DependencyTests/BundleF/BundleF.wxs   | 12 ++++
 .../BundleF_AddOnA/BundleF_AddOn.wxs               | 22 ++++++++
 .../BundleF_AddOnA/BundleF_AddOnA.wixproj          | 20 +++++++
 .../BundleF_AddOnB/BundleF_AddOnB.wixproj          | 21 +++++++
 .../BundleF_PatchAv1_0_1/BundleF_PatchA.props      | 11 ++++
 .../BundleF_PatchAv1_0_1.wixproj                   | 16 ++++++
 .../BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs  | 13 +++++
 .../BundleF_PatchAv1_0_2.wixproj                   | 17 ++++++
 .../BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs  | 16 ++++++
 .../DependencyTests/BundleHv1/BundleH.props        | 10 ++++
 .../DependencyTests/BundleHv1/BundleHv1.wixproj    | 13 +++++
 .../DependencyTests/BundleHv1/BundleHv1.wxs        | 11 ++++
 .../DependencyTests/BundleHv2/BundleHv2.wixproj    | 16 ++++++
 .../DependencyTests/BundleHv2/BundleHv2.wxs        | 11 ++++
 .../DependencyTests/BundleJ/BundleJ.wixproj        | 21 +++++++
 src/TestData/DependencyTests/BundleJ/BundleJ.wxs   | 12 ++++
 .../BundleJ_Patch/BundleJ_Patch.wixproj            | 21 +++++++
 .../BundleJ_Patch/BundleJ_Patch.wxs                | 16 ++++++
 .../DependencyTests/BundleL/BundleL.wixproj        | 20 +++++++
 src/TestData/DependencyTests/BundleL/BundleL.wxs   | 10 ++++
 .../DependencyTests/PackageAv1/PackageA.props      | 12 ++++
 .../DependencyTests/PackageAv1/PackageAv1.wixproj  |  7 +++
 .../PackageAv1/ProductComponents.wxs               | 16 ++++++
 .../PackageAv1_0_1/PackageAv1_0_1.wixproj          | 13 +++++
 .../PackageAv1_0_2/PackageAv1_0_2.wixproj          | 13 +++++
 .../DependencyTests/PackageB/PackageB.wixproj      | 13 +++++
 .../DependencyTests/PackageB/ProductComponents.wxs | 18 ++++++
 .../DependencyTests/PackageC/PackageC.wixproj      | 13 +++++
 .../DependencyTests/PackageDv1/Package.wxs         | 66 ++++++++++++++++++++++
 .../DependencyTests/PackageDv1/PackageD.props      |  7 +++
 .../DependencyTests/PackageDv1/PackageDv1.wixproj  |  7 +++
 .../DependencyTests/PackageDv2/PackageDv2.wixproj  | 13 +++++
 .../DependencyTests/PackageEv1/PackageE.props      | 12 ++++
 .../DependencyTests/PackageEv1/PackageEv1.wixproj  |  7 +++
 .../PackageEv1/ProductComponents.wxs               | 16 ++++++
 .../PackageEv1_0_1/PackageEv1_0_1.wixproj          | 13 +++++
 src/TestData/DependencyTests/PatchA/PatchA.wixproj | 15 +++++
 src/TestData/DependencyTests/PatchA/PatchA.wxs     | 22 ++++++++
 src/TestData/DependencyTests/PatchB/PatchB.wixproj | 15 +++++
 src/TestData/DependencyTests/PatchB/PatchB.wxs     | 21 +++++++
 src/TestData/Templates/PackageFail.wxs             |  2 +-
 src/TestData/TestBA/TestBAWixlib/TestExe.wxs       |  9 +++
 .../TestBA/TestBAWixlib/testbawixlib.wixproj       |  1 +
 src/TestData/TestData.proj                         |  8 +++
 59 files changed, 941 insertions(+), 1 deletion(-)
 create mode 100644 src/TestData/DependencyTests/BundleAv1/BundleA.props
 create mode 100644 src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
 create mode 100644 src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
 create mode 100644 src/TestData/DependencyTests/BundleB/Bundle.wxs
 create mode 100644 src/TestData/DependencyTests/BundleB/BundleB.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleB/BundleB.wxs
 create mode 100644 src/TestData/DependencyTests/BundleC/BundleC.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleC/BundleC.wxs
 create mode 100644 src/TestData/DependencyTests/BundleD/BundleD.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleD/BundleD.wxs
 create mode 100644 src/TestData/DependencyTests/BundleE/BundleE.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleE/BundleE.wxs
 create mode 100644 src/TestData/DependencyTests/BundleF/BundleF.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleF/BundleF.wxs
 create mode 100644 src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
 create mode 100644 src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchA.props
 create mode 100644 src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
 create mode 100644 src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
 create mode 100644 src/TestData/DependencyTests/BundleHv1/BundleH.props
 create mode 100644 src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleHv1/BundleHv1.wxs
 create mode 100644 src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleHv2/BundleHv2.wxs
 create mode 100644 src/TestData/DependencyTests/BundleJ/BundleJ.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleJ/BundleJ.wxs
 create mode 100644 src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
 create mode 100644 src/TestData/DependencyTests/BundleL/BundleL.wixproj
 create mode 100644 src/TestData/DependencyTests/BundleL/BundleL.wxs
 create mode 100644 src/TestData/DependencyTests/PackageAv1/PackageA.props
 create mode 100644 src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageAv1/ProductComponents.wxs
 create mode 100644 src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageB/PackageB.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageB/ProductComponents.wxs
 create mode 100644 src/TestData/DependencyTests/PackageC/PackageC.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageDv1/Package.wxs
 create mode 100644 src/TestData/DependencyTests/PackageDv1/PackageD.props
 create mode 100644 src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageEv1/PackageE.props
 create mode 100644 src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj
 create mode 100644 src/TestData/DependencyTests/PackageEv1/ProductComponents.wxs
 create mode 100644 src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
 create mode 100644 src/TestData/DependencyTests/PatchA/PatchA.wixproj
 create mode 100644 src/TestData/DependencyTests/PatchA/PatchA.wxs
 create mode 100644 src/TestData/DependencyTests/PatchB/PatchB.wixproj
 create mode 100644 src/TestData/DependencyTests/PatchB/PatchB.wxs
 create mode 100644 src/TestData/TestBA/TestBAWixlib/TestExe.wxs

(limited to 'src/TestData')

diff --git a/src/TestData/DependencyTests/BundleAv1/BundleA.props b/src/TestData/DependencyTests/BundleAv1/BundleA.props
new file mode 100644
index 00000000..256501c7
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleAv1/BundleA.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>
+    <OutputType>Bundle</OutputType>
+    <BundleName>BundleA</BundleName>
+    <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
new file mode 100644
index 00000000..ede63892
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
@@ -0,0 +1,16 @@
+<!-- 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="BundleA.props" />
+  <PropertyGroup>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleAv1/BundleAv1.wxs b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
new file mode 100644
index 00000000..9218e823
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
@@ -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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
new file mode 100644
index 00000000..26a61a70
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
@@ -0,0 +1,16 @@
+<!-- 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="..\BundleAv1\BundleA.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
new file mode 100644
index 00000000..1590574f
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
@@ -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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
+      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleB/Bundle.wxs b/src/TestData/DependencyTests/BundleB/Bundle.wxs
new file mode 100644
index 00000000..8d2dce60
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleB/Bundle.wxs
@@ -0,0 +1,40 @@
+<!-- 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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <!-- ProviderKey should be the only thing different from the template -->
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="WiX.$(var.TestGroupName).$(var.BundleName).B">
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
+    <?endif?>
+
+    <?ifndef BA?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBAdnc"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "hyperlinkLicense"?>
+      <BootstrapperApplication>
+        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+      </BootstrapperApplication>
+    <?else?>
+      <BootstrapperApplicationRef Id="$(var.BA)" />
+    <?endif?>
+
+    <Chain>
+      <?ifndef BA?>
+        <PackageGroupRef Id="TestBA" />
+      <?elseif $(var.BA) = "TestBAdnc"?>
+        <PackageGroupRef Id="TestBAdnc" />
+      <?endif?>
+
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/TestData/DependencyTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..34c76ccb
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleB/BundleB.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>{228859BB-F917-4F43-A1E0-50C8DCCA92EF}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleB/BundleB.wxs b/src/TestData/DependencyTests/BundleB/BundleB.wxs
new file mode 100644
index 00000000..026100fa
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleB/BundleB.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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/TestData/DependencyTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..f77e772f
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleC/BundleC.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <!-- Same as BundleA -->
+    <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
+    <Version>1.0.1.0</Version>
+  </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.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleC/BundleC.wxs b/src/TestData/DependencyTests/BundleC/BundleC.wxs
new file mode 100644
index 00000000..2ce8ed44
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleC/BundleC.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:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)">
+        <SlipstreamMsp Id="PatchA"/>
+      </MsiPackage>
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/TestData/DependencyTests/BundleD/BundleD.wixproj
new file mode 100644
index 00000000..6f2f098e
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleD/BundleD.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <!-- Same as BundleA -->
+    <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
+    <Version>1.0.1.0</Version>
+    <SuppressSpecificWarnings>1153</SuppressSpecificWarnings>
+  </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.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleD/BundleD.wxs b/src/TestData/DependencyTests/BundleD/BundleD.wxs
new file mode 100644
index 00000000..8ee40558
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleD/BundleD.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:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <ExePackage Id="TestExe" Cache="no" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/TestData/DependencyTests/BundleE/BundleE.wixproj
new file mode 100644
index 00000000..e43ffceb
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleE/BundleE.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>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageC\PackageC.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleE/BundleE.wxs b/src/TestData/DependencyTests/BundleE/BundleE.wxs
new file mode 100644
index 00000000..204e66ab
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleE/BundleE.wxs
@@ -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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
+      <ExePackage Id="ExeA" Cache="no" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/TestData/DependencyTests/BundleF/BundleF.wixproj
new file mode 100644
index 00000000..0bbe9ae6
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF/BundleF.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>{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleF/BundleF.wxs b/src/TestData/DependencyTests/BundleF/BundleF.wxs
new file mode 100644
index 00000000..1347836a
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF/BundleF.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>
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
new file mode 100644
index 00000000..c8ca4a3f
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
+    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
new file mode 100644
index 00000000..31994fb1
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.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>{022D0F5D-D140-47E1-A19A-5B2CEEE52668}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </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.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
new file mode 100644
index 00000000..056f8a1b
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.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>{8AB16F34-CA65-46E1-BDC0-08F157B4781C}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\BundleF_AddOnA\BundleF_AddOn.wxs" Link="BundleF_AddOn.wxs" />
+    <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.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchA.props b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchA.props
new file mode 100644
index 00000000..cbc025ef
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchA.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>
+    <OutputType>Bundle</OutputType>
+    <BundleName>BundleF_PatchA</BundleName>
+    <UpgradeCode>{90F41437-BEF8-4ED8-8902-C5DED74E4F6C}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
new file mode 100644
index 00000000..3c113acd
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
@@ -0,0 +1,16 @@
+<!-- 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="BundleF_PatchA.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
new file mode 100644
index 00000000..8ef8a351
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.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>
+    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
+    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+      </MspPackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
new file mode 100644
index 00000000..cd88b4bf
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
@@ -0,0 +1,17 @@
+<!-- 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="..\BundleF_PatchAv1_0_1\BundleF_PatchA.props" />
+  <PropertyGroup>
+    <Version>1.0.2.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\PatchB\PatchB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
new file mode 100644
index 00000000..2b47d5ed
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -0,0 +1,16 @@
+<!-- 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>
+    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
+    
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+      </MspPackage>
+      <MspPackage Id="PatchB" SourceFile="$(var.PatchB.TargetPath)" PerMachine="yes">
+        <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.Version)" />
+      </MspPackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleHv1/BundleH.props b/src/TestData/DependencyTests/BundleHv1/BundleH.props
new file mode 100644
index 00000000..14801ec3
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleHv1/BundleH.props
@@ -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>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{C5EA6B61-EF32-48E0-A6F9-08EB6D096843}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
new file mode 100644
index 00000000..7c3d87f2
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="BundleH.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageDv1\PackageDv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleHv1/BundleHv1.wxs b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wxs
new file mode 100644
index 00000000..b553d829
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wxs
@@ -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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" Visible="yes" Permanent="yes" />
+      <MsiPackage Id="PackageD" SourceFile="$(var.PackageDv1.TargetPath)" Visible="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
new file mode 100644
index 00000000..4cf14238
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
@@ -0,0 +1,16 @@
+<!-- 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="..\BundleHv1\BundleH.props" />
+  <PropertyGroup>
+    <Version>2.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageDv2\PackageDv2.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleHv2/BundleHv2.wxs b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wxs
new file mode 100644
index 00000000..690f8e7a
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wxs
@@ -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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" Visible="yes" Permanent="yes" />
+      <MsiPackage Id="PackageD" SourceFile="$(var.PackageDv2.TargetPath)" Visible="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj
new file mode 100644
index 00000000..004b2d6a
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleJ/BundleJ.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>{37BDF884-C24A-4C12-9D0C-421FC30747F2}</UpgradeCode>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageEv1\PackageEv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/TestData/DependencyTests/BundleJ/BundleJ.wxs
new file mode 100644
index 00000000..422b4b22
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleJ/BundleJ.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>
+    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Detect" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <MsiPackage Id="PackageE" SourceFile="$(var.PackageEv1.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
new file mode 100644
index 00000000..b7dbd86a
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.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>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageEv1_0_1\PackageEv1_0_1.wixproj" />
+    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
new file mode 100644
index 00000000..ddd4d8db
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -0,0 +1,16 @@
+<!-- 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. -->
+
+<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Patch" />
+
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+      </MspPackage>
+      <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/BundleL/BundleL.wixproj b/src/TestData/DependencyTests/BundleL/BundleL.wixproj
new file mode 100644
index 00000000..f25af7f9
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleL/BundleL.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>{2EDB07DC-DCCD-419F-AD25-52ABF36B53AE}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\PackageC\PackageC.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/BundleL/BundleL.wxs b/src/TestData/DependencyTests/BundleL/BundleL.wxs
new file mode 100644
index 00000000..d3789e63
--- /dev/null
+++ b/src/TestData/DependencyTests/BundleL/BundleL.wxs
@@ -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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
+      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/PackageAv1/PackageA.props b/src/TestData/DependencyTests/PackageAv1/PackageA.props
new file mode 100644
index 00000000..8cbe9aa9
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageAv1/PackageA.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>PackageA</PackageName>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
+    <UpgradeCode>{45E933B7-B56A-44D5-8EEC-625EC199085E}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
new file mode 100644
index 00000000..561f181a
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
@@ -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 Sdk="WixToolset.Sdk">
+  <Import Project="PackageA.props" />
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageAv1/ProductComponents.wxs b/src/TestData/DependencyTests/PackageAv1/ProductComponents.wxs
new file mode 100644
index 00000000..eca7f6b4
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageAv1/ProductComponents.wxs
@@ -0,0 +1,16 @@
+<!-- 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:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="FileComponent2" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="FileComponent2" Guid="BB609407-F2F4-458D-95F8-BF184D6E8496" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" />
+      <Provides Key="WiX.$(var.TestGroupName).A,v1.0" dep:Check="yes" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
new file mode 100644
index 00000000..41917a56
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageAv1\PackageA.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
new file mode 100644
index 00000000..8cf6dcd1
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageAv1\PackageA.props" />
+  <PropertyGroup>
+    <Version>1.0.2.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageB/PackageB.wixproj b/src/TestData/DependencyTests/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..2e6b9ffb
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageB/PackageB.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <UpgradeCode>{E26243B0-F1A2-4E74-A82D-25B306908E78}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageB/ProductComponents.wxs b/src/TestData/DependencyTests/PackageB/ProductComponents.wxs
new file mode 100644
index 00000000..b59e53e1
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageB/ProductComponents.wxs
@@ -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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="FileComponent2" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="FileComponent2" Guid="A1866388-65B4-4215-A8FB-9A7AADBE4E8E" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" />
+      <Provides>
+        <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0.0" IncludeMinimum="yes" dep:Enforce="yes" />
+      </Provides>
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/PackageC/PackageC.wixproj b/src/TestData/DependencyTests/PackageC/PackageC.wixproj
new file mode 100644
index 00000000..0e7fe0ea
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageC/PackageC.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{F21201D4-4782-4658-99C9-2E75D51FCFA6}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageDv1/Package.wxs b/src/TestData/DependencyTests/PackageDv1/Package.wxs
new file mode 100644
index 00000000..348f8ebb
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageDv1/Package.wxs
@@ -0,0 +1,66 @@
+<!-- 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?>
+
+<?ifndef ProductCode?>
+<?define ProductCode = *?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
+    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <?ifndef CabPrefix?>
+    <MediaTemplate EmbedCab="yes" />
+    <?else?>
+    <MediaTemplate CabinetTemplate="{0}$(var.CabPrefix).cab" />
+    <?endif?>
+
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="LocalAppDataFolder" />
+    <?endif?>
+
+    <PropertyRef Id="TestVersion" />
+
+    <Feature Id="Complete" Level="1">
+      <ComponentRef Id="FileComponent" />
+      <ComponentRef Id="RegistryComponent" />
+      <?ifdef var.ProductComponents?>
+      <ComponentGroupRef Id="ProductComponents" />
+      <?endif?>
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="LocalAppDataFolder" />
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="WixDir" Name="~Test WiX">
+          <Directory Id="TestDir" Name="$(var.TestGroupName)">
+            <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="FileComponent" Guid="8AEF758B-5890-4490-8485-46BD65616A2B" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" />
+      <Provides Key="WiX.$(var.TestGroupName).D,v1.0" dep:Check="yes" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKCU" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Property Id="TestVersion" Value="$(var.Version)" />
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/PackageDv1/PackageD.props b/src/TestData/DependencyTests/PackageDv1/PackageD.props
new file mode 100644
index 00000000..999de0de
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageDv1/PackageD.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>
+  <PropertyGroup>
+    <PackageName>PackageD</PackageName>
+    <UpgradeCode>{AD82A938-2F54-45B8-A637-B14D8405A959}</UpgradeCode>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj b/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj
new file mode 100644
index 00000000..8094c897
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj
@@ -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 Sdk="WixToolset.Sdk">
+  <Import Project="PackageD.props" />
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj b/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
new file mode 100644
index 00000000..e0e27fe5
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageDv1\PackageD.props" />
+  <PropertyGroup>
+    <Version>2.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageEv1/PackageE.props b/src/TestData/DependencyTests/PackageEv1/PackageE.props
new file mode 100644
index 00000000..96f07b8c
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageEv1/PackageE.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>PackageE</PackageName>
+    <ProductComponentsRef>true</ProductComponentsRef>
+    <ProductCode>{70FA13C7-0338-483F-A256-E5C83750BDE5}</ProductCode>
+    <UpgradeCode>{212A5698-457E-440F-88CC-98FC49A17378}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj b/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj
new file mode 100644
index 00000000..7d59cdbe
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj
@@ -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 Sdk="WixToolset.Sdk">
+  <Import Project="PackageE.props" />
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PackageEv1/ProductComponents.wxs b/src/TestData/DependencyTests/PackageEv1/ProductComponents.wxs
new file mode 100644
index 00000000..d388d2a3
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageEv1/ProductComponents.wxs
@@ -0,0 +1,16 @@
+<!-- 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:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="FileComponent2" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="FileComponent2" Guid="BB609407-F2F4-458D-95F8-BF184D6E8496" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" />
+      <Provides Key="WiX.$(var.TestGroupName).E,v1.0" dep:Check="yes" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj b/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
new file mode 100644
index 00000000..4d2ef922
--- /dev/null
+++ b/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <Import Project="..\PackageEv1\PackageE.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/TestData/DependencyTests/PatchA/PatchA.wixproj
new file mode 100644
index 00000000..1c90b6f4
--- /dev/null
+++ b/src/TestData/DependencyTests/PatchA/PatchA.wixproj
@@ -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. -->
+<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>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PatchA/PatchA.wxs b/src/TestData/DependencyTests/PatchA/PatchA.wxs
new file mode 100644
index 00000000..acb6f887
--- /dev/null
+++ b/src/TestData/DependencyTests/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/DependencyTests/PatchB/PatchB.wixproj b/src/TestData/DependencyTests/PatchB/PatchB.wixproj
new file mode 100644
index 00000000..5efc2350
--- /dev/null
+++ b/src/TestData/DependencyTests/PatchB/PatchB.wixproj
@@ -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. -->
+<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_2\PackageAv1_0_2.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/DependencyTests/PatchB/PatchB.wxs b/src/TestData/DependencyTests/PatchB/PatchB.wxs
new file mode 100644
index 00000000..a906dbc8
--- /dev/null
+++ b/src/TestData/DependencyTests/PatchB/PatchB.wxs
@@ -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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" Description="Patch B in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch B" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="PatchB" EmbedCab="yes">
+            <PatchBaseline
+              Id="PatchB"
+              BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
+              UpdateFile="$(var.PackageAv1_0_2.TargetDir)$(var.PackageAv1_0_2.TargetName).wixpdb"
+            />
+        </Media>
+
+        <PatchFamily Id="B" Version="$(var.Version)" Supersede="yes">
+          <PropertyRef Id="TestVersion"/>
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/TestData/Templates/PackageFail.wxs b/src/TestData/Templates/PackageFail.wxs
index 73858fde..54921ec6 100644
--- a/src/TestData/Templates/PackageFail.wxs
+++ b/src/TestData/Templates/PackageFail.wxs
@@ -19,7 +19,7 @@
     </Feature>
 
     <util:FailWhenDeferred />
-    <Property Id="WIXFAILWHENDEFERRED" Value="1" />
+    <Property Id="WIXFAILWHENDEFERRED" Secure="yes" Value="1" />
   </Package>
 
   <Fragment>
diff --git a/src/TestData/TestBA/TestBAWixlib/TestExe.wxs b/src/TestData/TestBA/TestBAWixlib/TestExe.wxs
new file mode 100644
index 00000000..f27275b0
--- /dev/null
+++ b/src/TestData/TestBA/TestBAWixlib/TestExe.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">
+  <Fragment>
+    <PayloadGroup Id="TestExePayloads">
+      <ExePackagePayload SourceFile="!(bindpath.net2x86)\TestExe.exe" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestExe.exe.config" />
+    </PayloadGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 83d947cd..33b1379e 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -11,6 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
+    <ProjectReference Include="..\..\..\TestExe\TestExe.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
diff --git a/src/TestData/TestData.proj b/src/TestData/TestData.proj
index e8e61a94..c5682fc7 100644
--- a/src/TestData/TestData.proj
+++ b/src/TestData/TestData.proj
@@ -5,6 +5,14 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <TestDataProject Include="**\*.wixproj" />
+    
+    <!-- https://github.com/wixtoolset/issues/issues/6387 -->
+    <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" />
+    <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" />
+    <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_2\BundleF_PatchAv1_0_2.wixproj" />
+    <TestDataProject Remove="DependencyTests\BundleJ_Patch\BundleJ_Patch.wixproj" />
+    <TestDataProject Remove="DependencyTests\PatchA\PatchA.wixproj" />
+    <TestDataProject Remove="DependencyTests\PatchB\PatchB.wixproj" />
   </ItemGroup>
 
   <Target Name="Build">
-- 
cgit v1.2.3-55-g6feb