From 3b842aeea892c9dae01e5167e5f2e35c448f5bda Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 18 Mar 2024 10:49:20 -0400
Subject: Use WixBA in an upgrade.

---
 .../BundleD_x64_v2/BundleD_x64_v2.wixproj           | 21 +++++++++++++++++++++
 .../BundleD_x64_v2/BundleD_x64_v2.wxs               | 10 ++++++++++
 .../BundleD_x64_v3/BundleD_x64_v3.wixproj           | 21 +++++++++++++++++++++
 .../BundleD_x64_v3/BundleD_x64_v3.wxs               | 10 ++++++++++
 .../UpgradeRelatedBundleTests.cs                    | 19 +++++++++++++++++--
 5 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
 create mode 100644 src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wxs
 create mode 100644 src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
 create mode 100644 src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wxs

diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
new file mode 100644
index 00000000..b124ba5d
--- /dev/null
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.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>
+    <BA>WixBAdnc_x64</BA>
+    <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <Version>2.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wxs b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wxs
new file mode 100644
index 00000000..5cbee5a8
--- /dev/null
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv2.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
new file mode 100644
index 00000000..55c89060
--- /dev/null
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.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>
+    <BA>WixBAdnc_x64</BA>
+    <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <Version>3.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv3\PackageAv3.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wxs b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wxs
new file mode 100644
index 00000000..7b3b1dc8
--- /dev/null
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv3.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
index d5d01c9c..331a23f1 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
@@ -102,7 +102,7 @@ namespace WixToolsetTest.BurnE2E
             bundleAv2x64.VerifyRegisteredAndInPackageCache();
 
             bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
-            
+
             Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2x64InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerMachine, version: 1.0.0.0, language: 1033 operation: MajorUpgrade"));
         }
 
@@ -119,8 +119,23 @@ namespace WixToolsetTest.BurnE2E
 
             bundleAv2.Install();
             bundleAv2.VerifyRegisteredAndInPackageCache();
-             
+
             bundleAv1x64.VerifyUnregisteredAndRemovedFromPackageCache();
         }
+
+        [RuntimeFact]
+        public void DncBABundleUpgradesDncBABundle()
+        {
+            var bundleDv2 = this.CreateBundleInstaller("BundleD_x64_v2");
+            var bundleDv3 = this.CreateBundleInstaller("BundleD_x64_v3");
+
+            bundleDv2.Install();
+            bundleDv2.VerifyRegisteredAndInPackageCache();
+
+            bundleDv3.Install();
+            bundleDv3.VerifyRegisteredAndInPackageCache();
+
+            bundleDv2.VerifyUnregisteredAndRemovedFromPackageCache();
+        }
     }
 }
-- 
cgit v1.2.3-55-g6feb