Add runtime testing for #6705.
Sean Hall committed
Feb 8, 2022 at 13:29 UTC
652719fc9d4a6afc9fb016d2d379a04c0bf40e04
6 files changed
+4
-13
src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
-3
@@ -12,9 +12,6 @@
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
- -->
15
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
16
<?ifndef CabPrefix?>
17
<MediaTemplate EmbedCab="yes" />
src/test/burn/TestData/Templates/Package.wxs
-3
@@ -12,10 +12,7 @@
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
15
<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?>
17
<MediaTemplate EmbedCab="yes" />
18
<?else?>
src/test/burn/TestData/Templates/PackageFail.wxs
-3
@@ -8,10 +8,7 @@
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
11
<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" />
13
14
<PropertyRef Id="TestVersion" />
src/test/burn/TestData/Templates/PackagePerUser.wxs
-3
@@ -12,10 +12,7 @@
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
15
<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?>
17
<MediaTemplate EmbedCab="yes" />
18
<?else?>
src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+1
@@ -1077,6 +1077,7 @@ namespace WixToolsetTest.BurnE2E
1077
1078
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
1079
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes"));
1080
+ Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerUser, version: 1.0.0.0, language: 0 operation: MajorUpgrade"));
1081
1082
bundleHv2.Uninstall();
1083
bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+3
-1
@@ -44,10 +44,12 @@ namespace WixToolsetTest.BurnE2E
44
bundleAv1.Install();
45
bundleAv1.VerifyRegisteredAndInPackageCache();
46
47
- bundleAv2x64.Install();
47
+ var bundleAv2x64InstallLogFilePath = bundleAv2x64.Install();
48
bundleAv2x64.VerifyRegisteredAndInPackageCache();
49
50
bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
51
+
52
+ Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2x64InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerMachine, version: 1.0.0.0, language: 1033 operation: MajorUpgrade"));
53
}
54
55
[Fact]