summaryrefslogtreecommitdiff
path: root/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs')
-rw-r--r--src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
index 32680e5d..3271cc20 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Sdk
17 17
18 public static class MsbuildUtilities 18 public static class MsbuildUtilities
19 { 19 {
20 public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true) 20 public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", string verbosityLevel = "normal", bool suppressValidation = true)
21 { 21 {
22 var allArgs = new List<string> 22 var allArgs = new List<string>
23 { 23 {
@@ -30,11 +30,6 @@ namespace WixToolsetTest.Sdk
30 $"-bl:{Path.ChangeExtension(projectPath, ".binlog")}" 30 $"-bl:{Path.ChangeExtension(projectPath, ".binlog")}"
31 }; 31 };
32 32
33 if (outOfProc.HasValue)
34 {
35 allArgs.Add($"-p:RunWixToolsOutOfProc={outOfProc.Value}");
36 }
37
38 if (arguments != null) 33 if (arguments != null)
39 { 34 {
40 allArgs.AddRange(arguments); 35 allArgs.AddRange(arguments);
@@ -96,11 +91,9 @@ namespace WixToolsetTest.Sdk
96 } 91 }
97 } 92 }
98 93
99 public static IEnumerable<string> GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem, bool? outOfProc = null) 94 public static IEnumerable<string> GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem)
100 { 95 {
101 var expectedOutOfProc = buildSystem == BuildSystem.DotNetCoreSdk || outOfProc.HasValue && outOfProc.Value; 96 var expectedToolExe = buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe";
102 var expectedToolExe = !expectedOutOfProc ? $"({toolName}.exe)" :
103 buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe";
104 var expectedToolCommand = $"{expectedToolExe} {operation}"; 97 var expectedToolCommand = $"{expectedToolExe} {operation}";
105 return result.Output.Where(line => line.Contains(expectedToolCommand)); 98 return result.Output.Where(line => line.Contains(expectedToolCommand));
106 } 99 }