diff options
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs')
-rw-r--r-- | src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs index 038da241..b5c71f86 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs | |||
@@ -31,7 +31,9 @@ namespace WixToolsetTest.MSBuild | |||
31 | var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); | 31 | var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); |
32 | result.AssertSuccess(); | 32 | result.AssertSuccess(); |
33 | 33 | ||
34 | var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file")); | 34 | var expectedOutOfProc = false; |
35 | var expectedHeatCommand = $"{(expectedOutOfProc ? "heat.exe" : "(heat.exe)")} file"; | ||
36 | var heatCommandLines = result.Output.Where(line => line.Contains(expectedHeatCommand)); | ||
35 | Assert.Single(heatCommandLines); | 37 | Assert.Single(heatCommandLines); |
36 | 38 | ||
37 | var warnings = result.Output.Where(line => line.Contains(": warning")); | 39 | var warnings = result.Output.Where(line => line.Contains(": warning")); |
@@ -86,7 +88,9 @@ namespace WixToolsetTest.MSBuild | |||
86 | var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); | 88 | var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); |
87 | result.AssertSuccess(); | 89 | result.AssertSuccess(); |
88 | 90 | ||
89 | var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file")); | 91 | var expectedOutOfProc = false; |
92 | var expectedHeatCommand = $"{(expectedOutOfProc ? "heat.exe" : "(heat.exe)")} file"; | ||
93 | var heatCommandLines = result.Output.Where(line => line.Contains(expectedHeatCommand)); | ||
90 | Assert.Equal(2, heatCommandLines.Count()); | 94 | Assert.Equal(2, heatCommandLines.Count()); |
91 | 95 | ||
92 | var warnings = result.Output.Where(line => line.Contains(": warning")); | 96 | var warnings = result.Output.Where(line => line.Contains(": warning")); |