Lock upgrade bundles to original bundle's scope.bob/BundleLockUpgradeScope

Fixes https://github.com/wixtoolset/issues/issues/9236

5 files changed, 59 insertions, 1 deletions

diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj
index 30d850d4..258d7b42 100644
--- a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj
@@ -1,6 +1,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <BA>TestBA</BA>
+    <DefineConstants>$(DefineConstants);Version=1.0.0.0</DefineConstants>
   </PropertyGroup>
 
   <Import Project="Bundle.props" />
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBAv2.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBAv2.wixproj
new file mode 100644
index 00000000..0daacca8
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBAv2.wixproj
@@ -0,0 +1,8 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+    <DefineConstants>$(DefineConstants);Version=2.0.0.0</DefineConstants>
+  </PropertyGroup>
+
+  <Import Project="Bundle.props" />
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj
index 56db1fdc..9ca5f8a3 100644
--- a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj
@@ -1,6 +1,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <BA>WixStdBA</BA>
+    <DefineConstants>$(DefineConstants);Version=1.0.0.0</DefineConstants>
   </PropertyGroup>
 
   <Import Project="Bundle.props" />
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs
index 4cb11a98..8e1a881a 100644
--- a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Id="AllPuomBundle$(BA)" Name="AllPuomBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+  <Bundle Id="AllPuomBundle$(BA)" Name="AllPuomBundle$(BA)" Manufacturer="Acme" Version="$(Version)">
     <?if $(BA) = "WixStdBA"?>
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs
index 8b31ac00..bb1381b3 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs
@@ -96,6 +96,54 @@ namespace WixToolsetTest.BurnE2E
         }
 
         [RuntimeFact]
+        public void BundleUpgradeIsLockedToFirstBundlesScope()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var log = bundle.Install();
+
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+
+            log = bundle.Repair();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Bundle was already installed with scope: PerUser. Scope cannot change during maintenance."));
+
+            var bundleV2 = this.CreateBundleInstaller("AllPuomBundleTestBAv2");
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            log = bundleV2.Install();
+            Assert.True(LogVerifier.MessageInLogFileRegex(log, @"Upgraded bundle [{][0-9A-Fa-f\-]{36}[}] was already installed with scope: PerUser\. Scope cannot change during upgrade\."));
+
+            bundleV2.Uninstall();
+            bundleV2.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+        }
+
+        [RuntimeFact]
+        public void BundleUpgradeWithSameScopeSucceeds()
+        {
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var log = bundle.Install();
+
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+
+            log = bundle.Repair();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Bundle was already installed with scope: PerUser. Scope cannot change during maintenance."));
+
+            var bundleV2 = this.CreateBundleInstaller("AllPuomBundleTestBAv2");
+            log = bundleV2.Install();
+            Assert.True(LogVerifier.MessageInLogFileRegex(log, @"Upgraded bundle [{][0-9A-Fa-f\-]{36}[}] was already installed with scope: PerUser\. Scope cannot change during upgrade\."));
+
+            bundleV2.Uninstall();
+            bundleV2.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+        }
+
+        [RuntimeFact]
         public void PMOU_Bundle_Default_Plan_Installs_PerMachine()
         {
             var testBAController = this.CreateTestBAController();