Use IgnoreLanguage as workaround for #6705.
Sean Hall committed
Jan 21, 2022 at 13:34 UTC
613fe40c487e1cbec118167939c13546a3ce9e80
5 files changed
+14
-2
src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
+3
@@ -12,7 +12,10 @@
12
13
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
14
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15
+ <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
16
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
17
+ -->
18
+ <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
19
<?ifndef CabPrefix?>
20
<MediaTemplate EmbedCab="yes" />
21
<?else?>
src/test/burn/TestData/Templates/Package.wxs
+3
@@ -12,7 +12,10 @@
12
13
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15
+ <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
16
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
17
+ -->
18
+ <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
19
<?ifndef CabPrefix?>
20
<MediaTemplate EmbedCab="yes" />
21
<?else?>
src/test/burn/TestData/Templates/PackageFail.wxs
+3
@@ -8,7 +8,10 @@
8
9
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
10
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11
+ <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
12
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
13
+ -->
14
+ <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
15
<MediaTemplate EmbedCab="yes" />
16
17
<PropertyRef Id="TestVersion" />
src/test/burn/TestData/Templates/PackagePerUser.wxs
+3
@@ -12,7 +12,10 @@
12
13
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15
+ <!-- Temporary workaround for https://github.com/wixtoolset/issues/issues/6705
16
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
17
+ -->
18
+ <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
19
<?ifndef CabPrefix?>
20
<MediaTemplate EmbedCab="yes" />
21
<?else?>
src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+2
-2
@@ -538,9 +538,9 @@ namespace WixToolset.Core.Burn.Bundles
538
}
539
writer.WriteAttributeString("OnlyDetect", related.OnlyDetect ? "yes" : "no");
540
541
- var relatedLanguages = related.Languages.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
541
+ var relatedLanguages = related.Languages?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
542
543
- if (0 < relatedLanguages.Length)
543
+ if (null != relatedLanguages && 0 < relatedLanguages.Length)
544
{
545
writer.WriteAttributeString("LangInclusive", related.LangInclusive ? "yes" : "no");
546
foreach (string language in relatedLanguages)