Remove orphan compatible MSI packages.

Reimplements #3190
author: Sean Hall <r.sean.hall@gmail.com> 2022-01-14 21:37:24 -0600
committer: Sean Hall <r.sean.hall@gmail.com> 2022-01-16 10:30:28 -0600
commit: da1d1376953ef1c9afb32d5eee02b785e52e372e (patch)
tree: 0df8550960259d7b13f5cd90f04d21b5576f16b7 /src/test/burn/TestData
parent: abe316b80fae80eba54b0b79e76b6362105fa098 (diff)
download: wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.tar.gz
wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.tar.bz2
wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.zip
8 files changed, 60 insertions, 4 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
new file mode 100644
index 00000000..eab737f8
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.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>2.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs
new file mode 100644
index 00000000..570f633f
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.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.PackageAv2.TargetPath)" />
+      <ExePackage Id="ExeA" Cache="remove" 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/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props
index 8cbe9aa9..d6778261 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <PackageName>PackageA</PackageName>
    <ProductComponentsRef>true</ProductComponentsRef>
-    <ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
    <UpgradeCode>{45E933B7-B56A-44D5-8EEC-625EC199085E}</UpgradeCode>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.props b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.props
new file mode 100644
index 00000000..e83247c0
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.props
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <Import Project="PackageA.props" />
+  <PropertyGroup>
+    <ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
+  </PropertyGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
index 5ebce845..add55d60 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
@@ -1,6 +1,6 @@
 <!-- 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" />
+  <Import Project="PackageAv1.props" />
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
index 73a7cb6f..e1081745 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -1,6 +1,6 @@
 <!-- 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" />
+  <Import Project="..\PackageAv1\PackageAv1.props" />
  <PropertyGroup>
    <Version>1.0.1.0</Version>
  </PropertyGroup>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
index 37e88de9..60b64c9f 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
@@ -1,6 +1,6 @@
 <!-- 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" />
+  <Import Project="..\PackageAv1\PackageAv1.props" />
  <PropertyGroup>
    <Version>1.0.2.0</Version>
  </PropertyGroup>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj
new file mode 100644
index 00000000..b61d09f5
--- /dev/null
+++ b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.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>2.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
author	Sean Hall <r.sean.hall@gmail.com>	2022-01-14 21:37:24 -0600
committer	Sean Hall <r.sean.hall@gmail.com>	2022-01-16 10:30:28 -0600
commit	da1d1376953ef1c9afb32d5eee02b785e52e372e (patch)
tree	0df8550960259d7b13f5cd90f04d21b5576f16b7 /src/test/burn/TestData
parent	abe316b80fae80eba54b0b79e76b6362105fa098 (diff)
download	wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.tar.gz wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.tar.bz2 wix-da1d1376953ef1c9afb32d5eee02b785e52e372e.zip

diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj new file mode 100644 index 00000000..eab737f8 --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.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>2.0.0.0</Version>
		6	</PropertyGroup>
		7	<ItemGroup>
		8	<ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
		9	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
		10	</ItemGroup>
		11	<ItemGroup>
		12	<PackageReference Include="WixToolset.Bal.wixext" />
		13	<PackageReference Include="WixToolset.NetFx.wixext" />
		14	<PackageReference Include="WixToolset.Util.wixext" />
		15	</ItemGroup>
		16	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs new file mode 100644 index 00000000..570f633f --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.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.PackageAv2.TargetPath)" />
		11	<ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
		12	DetectCondition="ExeA_Version AND ExeA_Version >= v$(var.Version)"
		13	InstallArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
		14	RepairArguments="/regw "HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)""
		15	UninstallArguments="/regd "HKLM\$(var.TestExeRegistryKey),Version"">
		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/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props index 8cbe9aa9..d6778261 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props +++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageA.props
@@ -3,7 +3,6 @@
3	<PropertyGroup>	3	<PropertyGroup>
4	<PackageName>PackageA</PackageName>	4	<PackageName>PackageA</PackageName>
5	<ProductComponentsRef>true</ProductComponentsRef>	5	<ProductComponentsRef>true</ProductComponentsRef>
6	<ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
7	<UpgradeCode>{45E933B7-B56A-44D5-8EEC-625EC199085E}</UpgradeCode>	6	<UpgradeCode>{45E933B7-B56A-44D5-8EEC-625EC199085E}</UpgradeCode>
8	</PropertyGroup>	7	</PropertyGroup>
9	<ItemGroup>	8	<ItemGroup>


diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.props b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.props new file mode 100644 index 00000000..e83247c0 --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.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	<Import Project="PackageA.props" />
		4	<PropertyGroup>
		5	<ProductCode>{6F171EC9-0774-4974-A8D1-493EF53CAB74}</ProductCode>
		6	</PropertyGroup>
		7	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj index 5ebce845..add55d60 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
@@ -1,6 +1,6 @@
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. -->	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">	2	<Project Sdk="WixToolset.Sdk">
3	<Import Project="PackageA.props" />	3	<Import Project="PackageAv1.props" />
4	<ItemGroup>	4	<ItemGroup>
5	<PackageReference Include="WixToolset.Dependency.wixext" />	5	<PackageReference Include="WixToolset.Dependency.wixext" />
6	</ItemGroup>	6	</ItemGroup>


diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj index 73a7cb6f..e1081745 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -1,6 +1,6 @@
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. -->	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">	2	<Project Sdk="WixToolset.Sdk">
3	<Import Project="..\PackageAv1\PackageA.props" />	3	<Import Project="..\PackageAv1\PackageAv1.props" />
4	<PropertyGroup>	4	<PropertyGroup>
5	<Version>1.0.1.0</Version>	5	<Version>1.0.1.0</Version>
6	</PropertyGroup>	6	</PropertyGroup>


diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj index 37e88de9..60b64c9f 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
@@ -1,6 +1,6 @@
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. -->	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">	2	<Project Sdk="WixToolset.Sdk">
3	<Import Project="..\PackageAv1\PackageA.props" />	3	<Import Project="..\PackageAv1\PackageAv1.props" />
4	<PropertyGroup>	4	<PropertyGroup>
5	<Version>1.0.2.0</Version>	5	<Version>1.0.2.0</Version>
6	</PropertyGroup>	6	</PropertyGroup>


diff --git a/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj new file mode 100644 index 00000000..b61d09f5 --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.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>2.0.0.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" />
		12	</ItemGroup>
		13	</Project> \ No newline at end of file