From 613fe40c487e1cbec118167939c13546a3ce9e80 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 21 Jan 2022 13:34:45 -0600
Subject: Use IgnoreLanguage as workaround 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 +++
 4 files changed, 12 insertions(+)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
index e3089c7c..48e78191 100644
--- a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
+++ b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
@@ -12,7 +12,10 @@
 
 <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" />
     <?else?>
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index c7597131..3d4f308c 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -12,7 +12,10 @@
 
 <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 b3e59540..7f2ba55c 100644
--- a/src/test/burn/TestData/Templates/PackageFail.wxs
+++ b/src/test/burn/TestData/Templates/PackageFail.wxs
@@ -8,7 +8,10 @@
 
 <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 daac7658..36dc8069 100644
--- a/src/test/burn/TestData/Templates/PackagePerUser.wxs
+++ b/src/test/burn/TestData/Templates/PackagePerUser.wxs
@@ -12,7 +12,10 @@
 
 <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?>
-- 
cgit v1.2.3-55-g6feb