From 652719fc9d4a6afc9fb016d2d379a04c0bf40e04 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 8 Feb 2022 13:29:34 -0600
Subject: Add runtime testing for #6705.

---
 src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs     | 3 ---
 src/test/burn/TestData/Templates/Package.wxs                      | 3 ---
 src/test/burn/TestData/Templates/PackageFail.wxs                  | 3 ---
 src/test/burn/TestData/Templates/PackagePerUser.wxs               | 3 ---
 src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs           | 1 +
 src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs | 4 +++-
 6 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
index 48e78191..d22f2449 100644
--- a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
+++ b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
@@ -12,9 +12,6 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
-    <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
-    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    -->
     <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index 3d4f308c..c7597131 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -12,10 +12,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
-    <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    -->
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
     <?else?>
diff --git a/src/test/burn/TestData/Templates/PackageFail.wxs b/src/test/burn/TestData/Templates/PackageFail.wxs
index 7f2ba55c..b3e59540 100644
--- a/src/test/burn/TestData/Templates/PackageFail.wxs
+++ b/src/test/burn/TestData/Templates/PackageFail.wxs
@@ -8,10 +8,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
-    <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    -->
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
     <MediaTemplate EmbedCab="yes" />
 
     <PropertyRef Id="TestVersion" />
diff --git a/src/test/burn/TestData/Templates/PackagePerUser.wxs b/src/test/burn/TestData/Templates/PackagePerUser.wxs
index 36dc8069..daac7658 100644
--- a/src/test/burn/TestData/Templates/PackagePerUser.wxs
+++ b/src/test/burn/TestData/Templates/PackagePerUser.wxs
@@ -12,10 +12,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
-    <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    -->
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
     <?else?>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 7e3e28c1..69a1fa68 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -1077,6 +1077,7 @@ namespace WixToolsetTest.BurnE2E
 
             Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
             Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes"));
+            Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerUser, version: 1.0.0.0, language: 0 operation: MajorUpgrade"));
 
             bundleHv2.Uninstall();
             bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
index 6d81252e..9eb5081e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
@@ -44,10 +44,12 @@ namespace WixToolsetTest.BurnE2E
             bundleAv1.Install();
             bundleAv1.VerifyRegisteredAndInPackageCache();
 
-            bundleAv2x64.Install();
+            var bundleAv2x64InstallLogFilePath = bundleAv2x64.Install();
             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"));
         }
 
         [Fact]
-- 
cgit v1.2.3-55-g6feb