aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-04-20 15:30:08 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-04-20 16:34:16 -0500
commitb82c6a2b7d451212fb0b2e32ca4d5d86c953d81a (patch)
tree6405c7522555b8ba404b84a6d187c0f8f95d42d8 /src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
parent96ce05107d0e01014a3264e91ecb5731a9f28cc5 (diff)
downloadwix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.tar.gz
wix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.tar.bz2
wix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.zip
Upgrade dnchost's nethost dependency to .NET 6.0.4.
Diffstat (limited to 'src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs')
-rw-r--r--src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
index 4df52e87..0ca2b40f 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -12,18 +12,19 @@ namespace WixToolsetTest.ManagedHost
12 public class TestEngine 12 public class TestEngine
13 { 13 {
14 private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe"); 14 private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe");
15 private static readonly string TestEngineFileX86 = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe");
15 16
16 public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) 17 public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
17 { 18 {
18 return this.RunTestEngine("reload", bundleFilePath, tempFolderPath); 19 return this.RunTestEngine("reload", bundleFilePath, tempFolderPath, x86);
19 } 20 }
20 21
21 public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) 22 public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
22 { 23 {
23 return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath); 24 return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath, x86);
24 } 25 }
25 26
26 private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath) 27 private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath, bool x86 = false)
27 { 28 {
28 var baFolderPath = Path.Combine(tempFolderPath, "ba"); 29 var baFolderPath = Path.Combine(tempFolderPath, "ba");
29 var extractFolderPath = Path.Combine(tempFolderPath, "extract"); 30 var extractFolderPath = Path.Combine(tempFolderPath, "extract");
@@ -35,7 +36,7 @@ namespace WixToolsetTest.ManagedHost
35 '"' + bundleFilePath + '"', 36 '"' + bundleFilePath + '"',
36 '"' + extractResult.GetBAFilePath(baFolderPath) + '"', 37 '"' + extractResult.GetBAFilePath(baFolderPath) + '"',
37 }; 38 };
38 return RunProcessCaptureOutput(TestEngineFile, args); 39 return RunProcessCaptureOutput(x86 ? TestEngineFileX86 : TestEngineFile, args);
39 } 40 }
40 41
41 private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null) 42 private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null)