aboutsummaryrefslogtreecommitdiff
path: root/src/TestData
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-03-08 16:06:01 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-03-08 16:11:57 -0600
commit99d7440134d0f33683d1150a770a2bc594be41de (patch)
tree9a38c1df21c0022516bdfeca0d30f235acd3b46a /src/TestData
parent23e3978430ec3ae4f1ea808af0b590b71b2fec9a (diff)
downloadwix-99d7440134d0f33683d1150a770a2bc594be41de.tar.gz
wix-99d7440134d0f33683d1150a770a2bc594be41de.tar.bz2
wix-99d7440134d0f33683d1150a770a2bc594be41de.zip
Port dependency tests from old repo.
Diffstat (limited to 'src/TestData')
-rw-r--r--src/TestData/DependencyTests/BundleAv1/BundleA.props11
-rw-r--r--src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj16
-rw-r--r--src/TestData/DependencyTests/BundleAv1/BundleAv1.wxs21
-rw-r--r--src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj16
-rw-r--r--src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs21
-rw-r--r--src/TestData/DependencyTests/BundleB/Bundle.wxs40
-rw-r--r--src/TestData/DependencyTests/BundleB/BundleB.wixproj18
-rw-r--r--src/TestData/DependencyTests/BundleB/BundleB.wxs22
-rw-r--r--src/TestData/DependencyTests/BundleC/BundleC.wixproj22
-rw-r--r--src/TestData/DependencyTests/BundleC/BundleC.wxs12
-rw-r--r--src/TestData/DependencyTests/BundleD/BundleD.wixproj22
-rw-r--r--src/TestData/DependencyTests/BundleD/BundleD.wxs12
-rw-r--r--src/TestData/DependencyTests/BundleE/BundleE.wixproj21
-rw-r--r--src/TestData/DependencyTests/BundleE/BundleE.wxs19
-rw-r--r--src/TestData/DependencyTests/BundleF/BundleF.wixproj21
-rw-r--r--src/TestData/DependencyTests/BundleF/BundleF.wxs12
-rw-r--r--src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs22
-rw-r--r--src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj20
-rw-r--r--src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj21
-rw-r--r--src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchA.props11
-rw-r--r--src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj16
-rw-r--r--src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs13
-rw-r--r--src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj17
-rw-r--r--src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs16
-rw-r--r--src/TestData/DependencyTests/BundleHv1/BundleH.props10
-rw-r--r--src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj13
-rw-r--r--src/TestData/DependencyTests/BundleHv1/BundleHv1.wxs11
-rw-r--r--src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj16
-rw-r--r--src/TestData/DependencyTests/BundleHv2/BundleHv2.wxs11
-rw-r--r--src/TestData/DependencyTests/BundleJ/BundleJ.wixproj21
-rw-r--r--src/TestData/DependencyTests/BundleJ/BundleJ.wxs12
-rw-r--r--src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj21
-rw-r--r--src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs16
-rw-r--r--src/TestData/DependencyTests/BundleL/BundleL.wixproj20
-rw-r--r--src/TestData/DependencyTests/BundleL/BundleL.wxs10
-rw-r--r--src/TestData/DependencyTests/PackageAv1/PackageA.props12
-rw-r--r--src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj7
-rw-r--r--src/TestData/DependencyTests/PackageAv1/ProductComponents.wxs16
-rw-r--r--src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj13
-rw-r--r--src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj13
-rw-r--r--src/TestData/DependencyTests/PackageB/PackageB.wixproj13
-rw-r--r--src/TestData/DependencyTests/PackageB/ProductComponents.wxs18
-rw-r--r--src/TestData/DependencyTests/PackageC/PackageC.wixproj13
-rw-r--r--src/TestData/DependencyTests/PackageDv1/Package.wxs66
-rw-r--r--src/TestData/DependencyTests/PackageDv1/PackageD.props7
-rw-r--r--src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj7
-rw-r--r--src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj13
-rw-r--r--src/TestData/DependencyTests/PackageEv1/PackageE.props12
-rw-r--r--src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj7
-rw-r--r--src/TestData/DependencyTests/PackageEv1/ProductComponents.wxs16
-rw-r--r--src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj13
-rw-r--r--src/TestData/DependencyTests/PatchA/PatchA.wixproj15
-rw-r--r--src/TestData/DependencyTests/PatchA/PatchA.wxs22
-rw-r--r--src/TestData/DependencyTests/PatchB/PatchB.wixproj15
-rw-r--r--src/TestData/DependencyTests/PatchB/PatchB.wxs21
-rw-r--r--src/TestData/Templates/PackageFail.wxs2
-rw-r--r--src/TestData/TestBA/TestBAWixlib/TestExe.wxs9
-rw-r--r--src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj1
-rw-r--r--src/TestData/TestData.proj8
59 files changed, 941 insertions, 1 deletions
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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <BundleName>BundleA</BundleName>
6 <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleA.props" />
4 <PropertyGroup>
5 <Version>1.0.0.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
13 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15 </ItemGroup>
16</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 <Fragment>
7 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
8
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
12 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
13 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
16 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage>
19 </PackageGroup>
20 </Fragment>
21</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 <Version>1.0.1.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
13 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15 </ItemGroup>
16</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 <Fragment>
7 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
8
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
12 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
13 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
16 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage>
19 </PackageGroup>
20 </Fragment>
21</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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- ProviderKey should be the only thing different from the template -->
9 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="WiX.$(var.TestGroupName).$(var.BundleName).B">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
13
14 <?ifdef SoftwareTag?>
15 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
16 <?endif?>
17
18 <?ifndef BA?>
19 <!-- pulled in through the PackageGroupRef below -->
20 <?elseif $(var.BA) = "TestBAdnc"?>
21 <!-- pulled in through the PackageGroupRef below -->
22 <?elseif $(var.BA) = "hyperlinkLicense"?>
23 <BootstrapperApplication>
24 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
25 </BootstrapperApplication>
26 <?else?>
27 <BootstrapperApplicationRef Id="$(var.BA)" />
28 <?endif?>
29
30 <Chain>
31 <?ifndef BA?>
32 <PackageGroupRef Id="TestBA" />
33 <?elseif $(var.BA) = "TestBAdnc"?>
34 <PackageGroupRef Id="TestBAdnc" />
35 <?endif?>
36
37 <PackageGroupRef Id="BundlePackages" />
38 </Chain>
39 </Bundle>
40</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{228859BB-F917-4F43-A1E0-50C8DCCA92EF}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
10 <ProjectReference Include="..\PackageB\PackageB.wixproj" />
11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
16 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
17 </ItemGroup>
18</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 <Fragment>
7 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
8
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
12 <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
13 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
14 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
15 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
16 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
17 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
18 <PayloadGroupRef Id="TestExePayloads" />
19 </ExePackage>
20 </PackageGroup>
21 </Fragment>
22</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <!-- Same as BundleA -->
6 <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
7 <Version>1.0.1.0</Version>
8 </PropertyGroup>
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup>
12 <ItemGroup>
13 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
14 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16 </ItemGroup>
17 <ItemGroup>
18 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
19 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
20 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
21 </ItemGroup>
22</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)">
7 <SlipstreamMsp Id="PatchA"/>
8 </MsiPackage>
9 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" />
10 </PackageGroup>
11 </Fragment>
12</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <!-- Same as BundleA -->
6 <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
7 <Version>1.0.1.0</Version>
8 <SuppressSpecificWarnings>1153</SuppressSpecificWarnings>
9 </PropertyGroup>
10 <ItemGroup>
11 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
12 </ItemGroup>
13 <ItemGroup>
14 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16 </ItemGroup>
17 <ItemGroup>
18 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
19 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
20 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
21 </ItemGroup>
22</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
7 <ExePackage Id="TestExe" Cache="no" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
8 <PayloadGroupRef Id="TestExePayloads" />
9 </ExePackage>
10 </PackageGroup>
11 </Fragment>
12</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\PackageC\PackageC.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20 </ItemGroup>
21</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 <Fragment>
7 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
8
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
12 <ExePackage Id="ExeA" Cache="no" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
13 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
14 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
15 <PayloadGroupRef Id="TestExePayloads" />
16 </ExePackage>
17 </PackageGroup>
18 </Fragment>
19</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\PackageB\PackageB.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20 </ItemGroup>
21</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Detect" />
6
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
9 <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
10 </PackageGroup>
11 </Fragment>
12</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 <Fragment>
7 <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="Addon" />
8 <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
9
10 <PackageGroup Id="BundlePackages">
11 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
12 <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
13 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
14 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
15 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
16 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
17 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
18 <PayloadGroupRef Id="TestExePayloads" />
19 </ExePackage>
20 </PackageGroup>
21 </Fragment>
22</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{022D0F5D-D140-47E1-A19A-5B2CEEE52668}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </ItemGroup>
15 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
17 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
19 </ItemGroup>
20</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{8AB16F34-CA65-46E1-BDC0-08F157B4781C}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\BundleF_AddOnA\BundleF_AddOn.wxs" Link="BundleF_AddOn.wxs" />
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup>
12 <ItemGroup>
13 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20 </ItemGroup>
21</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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <BundleName>BundleF_PatchA</BundleName>
6 <UpgradeCode>{90F41437-BEF8-4ED8-8902-C5DED74E4F6C}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleF_PatchA.props" />
4 <PropertyGroup>
5 <Version>1.0.1.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
13 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15 </ItemGroup>
16</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
6
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
9 <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
10 </MspPackage>
11 </PackageGroup>
12 </Fragment>
13</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleF_PatchAv1_0_1\BundleF_PatchA.props" />
4 <PropertyGroup>
5 <Version>1.0.2.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
9 <ProjectReference Include="..\PatchB\PatchB.wixproj" />
10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
14 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
15 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
16 </ItemGroup>
17</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="Patch" />
6
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
9 <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
10 </MspPackage>
11 <MspPackage Id="PatchB" SourceFile="$(var.PatchB.TargetPath)" PerMachine="yes">
12 <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.Version)" />
13 </MspPackage>
14 </PackageGroup>
15 </Fragment>
16</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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{C5EA6B61-EF32-48E0-A6F9-08EB6D096843}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
9 </ItemGroup>
10</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleH.props" />
4 <ItemGroup>
5 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
6 <ProjectReference Include="..\PackageDv1\PackageDv1.wixproj" />
7 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
8 </ItemGroup>
9 <ItemGroup>
10 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
11 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" Visible="yes" Permanent="yes" />
8 <MsiPackage Id="PackageD" SourceFile="$(var.PackageDv1.TargetPath)" Visible="yes" />
9 </PackageGroup>
10 </Fragment>
11</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleHv1\BundleH.props" />
4 <PropertyGroup>
5 <Version>2.0.0.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
9 <ProjectReference Include="..\PackageDv2\PackageDv2.wixproj" />
10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
14 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
15 </ItemGroup>
16</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 @@
1<!-- 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. -->
2
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" Visible="yes" Permanent="yes" />
8 <MsiPackage Id="PackageD" SourceFile="$(var.PackageDv2.TargetPath)" Visible="yes" />
9 </PackageGroup>
10 </Fragment>
11</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{37BDF884-C24A-4C12-9D0C-421FC30747F2}</UpgradeCode>
6 <Version>1.0.0.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
13 <ProjectReference Include="..\PackageEv1\PackageEv1.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20 </ItemGroup>
21</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Detect" />
6
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
9 <MsiPackage Id="PackageE" SourceFile="$(var.PackageEv1.TargetPath)" />
10 </PackageGroup>
11 </Fragment>
12</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode>
6 <Version>1.0.1.0</Version>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <ProjectReference Include="..\PackageEv1_0_1\PackageEv1_0_1.wixproj" />
13 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </ItemGroup>
16 <ItemGroup>
17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
18 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20 </ItemGroup>
21</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 @@
1<!-- 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. -->
2
3<?define TestExeRegistryKey = Software\WiX\Tests\$(var.TestGroupName)\ExeA?>
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment>
7 <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="Patch" />
8
9 <PackageGroup Id="BundlePackages">
10 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
11 <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
12 </MspPackage>
13 <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" />
14 </PackageGroup>
15 </Fragment>
16</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{2EDB07DC-DCCD-419F-AD25-52ABF36B53AE}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
12 <ProjectReference Include="..\PackageC\PackageC.wixproj" />
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </ItemGroup>
15 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
17 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
19 </ItemGroup>
20</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4 <Fragment>
5 <PackageGroup Id="BundlePackages">
6 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
7 <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
8 </PackageGroup>
9 </Fragment>
10</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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <PackageName>PackageA</PackageName>
5 <ProductComponentsRef>true</ProductComponentsRef>
6 <ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
7 <UpgradeCode>{45E933B7-B56A-44D5-8EEC-625EC199085E}</UpgradeCode>
8 </PropertyGroup>
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
11 </ItemGroup>
12</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="PackageA.props" />
4 <ItemGroup>
5 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
6 </ItemGroup>
7</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents">
6 <ComponentRef Id="FileComponent2" />
7 </ComponentGroup>
8 </Fragment>
9
10 <Fragment>
11 <Component Id="FileComponent2" Guid="BB609407-F2F4-458D-95F8-BF184D6E8496" Directory="INSTALLFOLDER">
12 <File Source="$(sys.SOURCEFILEPATH)" />
13 <Provides Key="WiX.$(var.TestGroupName).A,v1.0" dep:Check="yes" />
14 </Component>
15 </Fragment>
16</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 <Version>1.0.1.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 <Version>1.0.2.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <ProductComponentsRef>true</ProductComponentsRef>
5 <UpgradeCode>{E26243B0-F1A2-4E74-A82D-25B306908E78}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents">
6 <ComponentRef Id="FileComponent2" />
7 </ComponentGroup>
8 </Fragment>
9
10 <Fragment>
11 <Component Id="FileComponent2" Guid="A1866388-65B4-4215-A8FB-9A7AADBE4E8E" Directory="INSTALLFOLDER">
12 <File Source="$(sys.SOURCEFILEPATH)" />
13 <Provides>
14 <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0.0" IncludeMinimum="yes" dep:Enforce="yes" />
15 </Provides>
16 </Component>
17 </Fragment>
18</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <UpgradeCode>{F21201D4-4782-4658-99C9-2E75D51FCFA6}</UpgradeCode>
5 </PropertyGroup>
6 <ItemGroup>
7 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
8 </ItemGroup>
9 <ItemGroup>
10 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
11 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2
3
4
5<?ifndef Version?>
6<?define Version = 1.0.0.0?>
7<?endif?>
8
9<?ifndef ProductCode?>
10<?define ProductCode = *?>
11<?endif?>
12
13<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
14 <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15 <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <?ifndef CabPrefix?>
17 <MediaTemplate EmbedCab="yes" />
18 <?else?>
19 <MediaTemplate CabinetTemplate="{0}$(var.CabPrefix).cab" />
20 <?endif?>
21
22 <?ifdef SoftwareTag?>
23 <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="LocalAppDataFolder" />
24 <?endif?>
25
26 <PropertyRef Id="TestVersion" />
27
28 <Feature Id="Complete" Level="1">
29 <ComponentRef Id="FileComponent" />
30 <ComponentRef Id="RegistryComponent" />
31 <?ifdef var.ProductComponents?>
32 <ComponentGroupRef Id="ProductComponents" />
33 <?endif?>
34 </Feature>
35 </Package>
36
37 <Fragment>
38 <Directory Id="TARGETDIR" Name="SourceDir">
39 <Directory Id="LocalAppDataFolder" />
40 <Directory Id="ProgramFilesFolder">
41 <Directory Id="WixDir" Name="~Test WiX">
42 <Directory Id="TestDir" Name="$(var.TestGroupName)">
43 <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
44 </Directory>
45 </Directory>
46 </Directory>
47 </Directory>
48 </Fragment>
49
50 <Fragment>
51 <Component Id="FileComponent" Guid="8AEF758B-5890-4490-8485-46BD65616A2B" Directory="INSTALLFOLDER">
52 <File Source="$(sys.SOURCEFILEPATH)" />
53 <Provides Key="WiX.$(var.TestGroupName).D,v1.0" dep:Check="yes" />
54 </Component>
55 </Fragment>
56
57 <Fragment>
58 <Component Id="RegistryComponent" Directory="INSTALLFOLDER">
59 <RegistryValue Root="HKCU" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)" Value="!(bind.Property.TestVersion)" Type="string" />
60 </Component>
61 </Fragment>
62
63 <Fragment>
64 <Property Id="TestVersion" Value="$(var.Version)" />
65 </Fragment>
66</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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <PackageName>PackageD</PackageName>
5 <UpgradeCode>{AD82A938-2F54-45B8-A637-B14D8405A959}</UpgradeCode>
6 </PropertyGroup>
7</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="PackageD.props" />
4 <ItemGroup>
5 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
6 </ItemGroup>
7</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageDv1\PackageD.props" />
4 <PropertyGroup>
5 <Version>2.0.0.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <PackageName>PackageE</PackageName>
5 <ProductComponentsRef>true</ProductComponentsRef>
6 <ProductCode>{70FA13C7-0338-483F-A256-E5C83750BDE5}</ProductCode>
7 <UpgradeCode>{212A5698-457E-440F-88CC-98FC49A17378}</UpgradeCode>
8 </PropertyGroup>
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
11 </ItemGroup>
12</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="PackageE.props" />
4 <ItemGroup>
5 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
6 </ItemGroup>
7</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 @@
1<!-- 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. -->
2
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents">
6 <ComponentRef Id="FileComponent2" />
7 </ComponentGroup>
8 </Fragment>
9
10 <Fragment>
11 <Component Id="FileComponent2" Guid="BB609407-F2F4-458D-95F8-BF184D6E8496" Directory="INSTALLFOLDER">
12 <File Source="$(sys.SOURCEFILEPATH)" />
13 <Provides Key="WiX.$(var.TestGroupName).E,v1.0" dep:Check="yes" />
14 </Component>
15 </Fragment>
16</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageEv1\PackageE.props" />
4 <PropertyGroup>
5 <Version>1.0.1.0</Version>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
12 </ItemGroup>
13</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>PatchCreation</OutputType>
5 <TargetExt>.msp</TargetExt>
6 <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
10 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
14 </ItemGroup>
15</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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Patch AllowRemoval="yes" Classification="Update" Description="Patch A in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
9 <Media Id="100" Cabinet="PatchA" EmbedCab="yes">
10 <PatchBaseline
11 Id="PatchA"
12 BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
13 UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb"
14 />
15 </Media>
16
17 <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
18 <ComponentRef Id="RegistryComponent"/>
19 <PropertyRef Id="TestVersion"/>
20 </PatchFamily>
21 </Patch>
22</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 @@
1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>PatchCreation</OutputType>
5 <TargetExt>.msp</TargetExt>
6 <SuppressSpecificWarnings>1079</SuppressSpecificWarnings>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
10 <ProjectReference Include="..\PackageAv1_0_2\PackageAv1_0_2.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.24" />
14 </ItemGroup>
15</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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Patch AllowRemoval="yes" Classification="Update" Description="Patch B in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch B" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
9 <Media Id="100" Cabinet="PatchB" EmbedCab="yes">
10 <PatchBaseline
11 Id="PatchB"
12 BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb"
13 UpdateFile="$(var.PackageAv1_0_2.TargetDir)$(var.PackageAv1_0_2.TargetName).wixpdb"
14 />
15 </Media>
16
17 <PatchFamily Id="B" Version="$(var.Version)" Supersede="yes">
18 <PropertyRef Id="TestVersion"/>
19 </PatchFamily>
20 </Patch>
21</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 @@
19 </Feature> 19 </Feature>
20 20
21 <util:FailWhenDeferred /> 21 <util:FailWhenDeferred />
22 <Property Id="WIXFAILWHENDEFERRED" Value="1" /> 22 <Property Id="WIXFAILWHENDEFERRED" Secure="yes" Value="1" />
23 </Package> 23 </Package>
24 24
25 <Fragment> 25 <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 @@
1<!-- 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. -->
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <PayloadGroup Id="TestExePayloads">
5 <ExePackagePayload SourceFile="!(bindpath.net2x86)\TestExe.exe" />
6 <Payload SourceFile="!(bindpath.net2x86)\TestExe.exe.config" />
7 </PayloadGroup>
8 </Fragment>
9</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 @@
11 </ItemGroup> 11 </ItemGroup>
12 <ItemGroup> 12 <ItemGroup>
13 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" /> 13 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
14 <ProjectReference Include="..\..\..\TestExe\TestExe.csproj" />
14 </ItemGroup> 15 </ItemGroup>
15 <ItemGroup> 16 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" /> 17 <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 @@
5<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 5<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <ItemGroup> 6 <ItemGroup>
7 <TestDataProject Include="**\*.wixproj" /> 7 <TestDataProject Include="**\*.wixproj" />
8
9 <!-- https://github.com/wixtoolset/issues/issues/6387 -->
10 <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" />
11 <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" />
12 <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_2\BundleF_PatchAv1_0_2.wixproj" />
13 <TestDataProject Remove="DependencyTests\BundleJ_Patch\BundleJ_Patch.wixproj" />
14 <TestDataProject Remove="DependencyTests\PatchA\PatchA.wixproj" />
15 <TestDataProject Remove="DependencyTests\PatchB\PatchB.wixproj" />
8 </ItemGroup> 16 </ItemGroup>
9 17
10 <Target Name="Build"> 18 <Target Name="Build">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-31 14:34:08 +0000