diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-21 13:34:45 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-21 17:29:12 -0600 |
| commit | 613fe40c487e1cbec118167939c13546a3ce9e80 (patch) | |
| tree | 133d7039b82eebd36740b808e346bbf7947fceab /src/test/burn | |
| parent | cab989dad7b3cc5006d6684ed9d5733db337020f (diff) | |
| download | wix-613fe40c487e1cbec118167939c13546a3ce9e80.tar.gz wix-613fe40c487e1cbec118167939c13546a3ce9e80.tar.bz2 wix-613fe40c487e1cbec118167939c13546a3ce9e80.zip | |
Use IgnoreLanguage as workaround for #6705.
Diffstat (limited to 'src/test/burn')
4 files changed, 12 insertions, 0 deletions
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 @@ | |||
| 12 | 12 | ||
| 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency"> | 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"> | 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 | ||
| 15 | <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 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" /> | ||
| 16 | <?ifndef CabPrefix?> | 19 | <?ifndef CabPrefix?> |
| 17 | <MediaTemplate EmbedCab="yes" /> | 20 | <MediaTemplate EmbedCab="yes" /> |
| 18 | <?else?> | 21 | <?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 @@ | |||
| 12 | 12 | ||
| 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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)"> | 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 | ||
| 15 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 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" /> | ||
| 16 | <?ifndef CabPrefix?> | 19 | <?ifndef CabPrefix?> |
| 17 | <MediaTemplate EmbedCab="yes" /> | 20 | <MediaTemplate EmbedCab="yes" /> |
| 18 | <?else?> | 21 | <?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 @@ | |||
| 8 | 8 | ||
| 9 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 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"> | 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 | ||
| 11 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 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" /> | ||
| 12 | <MediaTemplate EmbedCab="yes" /> | 15 | <MediaTemplate EmbedCab="yes" /> |
| 13 | 16 | ||
| 14 | <PropertyRef Id="TestVersion" /> | 17 | <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 @@ | |||
| 12 | 12 | ||
| 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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"> | 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 | ||
| 15 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 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" /> | ||
| 16 | <?ifndef CabPrefix?> | 19 | <?ifndef CabPrefix?> |
| 17 | <MediaTemplate EmbedCab="yes" /> | 20 | <MediaTemplate EmbedCab="yes" /> |
| 18 | <?else?> | 21 | <?else?> |