aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-04-18 12:24:37 -0700
committerRob Mensching <rob@firegiant.com>2023-04-18 13:19:32 -0700
commitbe3e3294cc62b622a67acfc206d1a98b1a41a0cc (patch)
tree51a7404f989017329744d5da4957e65014337481
parent3b617d74241cb54fcbb85989538a681f7134349b (diff)
downloadwix-be3e3294cc62b622a67acfc206d1a98b1a41a0cc.tar.gz
wix-be3e3294cc62b622a67acfc206d1a98b1a41a0cc.tar.bz2
wix-be3e3294cc62b622a67acfc206d1a98b1a41a0cc.zip
Catch a few left over references to v4
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--.github/workflows/test-report.yml4
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs4
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13792747..466cc796 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
1name: Build WiX Toolset v4 1name: Build WiX Toolset v5
2 2
3on: 3on:
4 push: 4 push:
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
index 62ebbfe2..8780851a 100644
--- a/.github/workflows/test-report.yml
+++ b/.github/workflows/test-report.yml
@@ -1,8 +1,8 @@
1name: Build WiX Toolset v4 Test Report 1name: Build WiX Toolset v5 Test Report
2 2
3on: 3on:
4 workflow_run: 4 workflow_run:
5 workflows: [ 'Build WiX Toolset v4' ] 5 workflows: [ 'Build WiX Toolset v5' ]
6 types: [ completed ] 6 types: [ completed ]
7 branches-ignore: 7 branches-ignore:
8 - master 8 - master
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
index 16623ffb..a086d430 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
@@ -244,7 +244,7 @@ namespace WixToolsetTest.BurnE2E
244 { 244 {
245 var baseTempPath = dfs.GetFolder(true); 245 var baseTempPath = dfs.GetFolder(true);
246 var logPath = bundleA.Install(0, $"-burn.engine.working.directory=\"{baseTempPath}\""); 246 var logPath = bundleA.Install(0, $"-burn.engine.working.directory=\"{baseTempPath}\"");
247 Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v4.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe")); 247 Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v5.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe"));
248 } 248 }
249 } 249 }
250 250
@@ -280,7 +280,7 @@ namespace WixToolsetTest.BurnE2E
280 } 280 }
281 281
282 var logPath = bundleA.Install(); 282 var logPath = bundleA.Install();
283 Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v4.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe")); 283 Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v5.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe"));
284 } 284 }
285 } 285 }
286 finally 286 finally