From b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 20 Apr 2022 15:30:08 -0500 Subject: Upgrade dnchost's nethost dependency to .NET 6.0.4. --- src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs') 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 public class TestEngine { private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe"); + private static readonly string TestEngineFileX86 = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe"); - public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) + public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath, bool x86 = false) { - return this.RunTestEngine("reload", bundleFilePath, tempFolderPath); + return this.RunTestEngine("reload", bundleFilePath, tempFolderPath, x86); } - public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) + public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath, bool x86 = false) { - return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath); + return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath, x86); } - private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath) + private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath, bool x86 = false) { var baFolderPath = Path.Combine(tempFolderPath, "ba"); var extractFolderPath = Path.Combine(tempFolderPath, "extract"); @@ -35,7 +36,7 @@ namespace WixToolsetTest.ManagedHost '"' + bundleFilePath + '"', '"' + extractResult.GetBAFilePath(baFolderPath) + '"', }; - return RunProcessCaptureOutput(TestEngineFile, args); + return RunProcessCaptureOutput(x86 ? TestEngineFileX86 : TestEngineFile, args); } private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null) -- cgit v1.2.3-55-g6feb