From 82a26a321bae36e38743f50f38887387a392ce24 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 1 Jun 2020 21:58:44 +1000 Subject: Add ability for net461 tasks to run the tool out of proc. --- src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs') diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs index 210473fa..6862f2a8 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs @@ -28,9 +28,6 @@ namespace WixToolsetTest.MSBuild var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); result.AssertSuccess(); - var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86")); - Assert.Single(platformSwitches); - var warnings = result.Output.Where(line => line.Contains(": warning")); Assert.Empty(warnings); @@ -63,9 +60,6 @@ namespace WixToolsetTest.MSBuild var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); result.AssertSuccess(); - var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86")); - Assert.Single(platformSwitches); - var warnings = result.Output.Where(line => line.Contains(": warning")); Assert.Empty(warnings); @@ -98,7 +92,7 @@ namespace WixToolsetTest.MSBuild var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); result.AssertSuccess(); - var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86")); + var platformSwitches = result.Output.Where(line => line.Contains("-platform x86")); Assert.Single(platformSwitches); var warnings = result.Output.Where(line => line.Contains(": warning")); @@ -223,7 +217,7 @@ namespace WixToolsetTest.MSBuild }); result.AssertSuccess(); - var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x64")); + var platformSwitches = result.Output.Where(line => line.Contains("-platform x64")); Assert.Single(platformSwitches); var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) @@ -287,9 +281,11 @@ namespace WixToolsetTest.MSBuild } [Theory] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem) + [InlineData(BuildSystem.MSBuild, null)] + [InlineData(BuildSystem.MSBuild, true)] + [InlineData(BuildSystem.MSBuild64, null)] + [InlineData(BuildSystem.MSBuild64, true)] + public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) { var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); @@ -303,9 +299,14 @@ namespace WixToolsetTest.MSBuild var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { "-p:OutputType=IntermediatePostLink", - }); + }, outOfProc: outOfProc); result.AssertSuccess(); + var expectedOutOfProc = outOfProc.HasValue && outOfProc.Value; + var expectedWixCommand = $"{(expectedOutOfProc ? "wix.exe" : "(wix.exe)")} build"; + var buildCommands = result.Output.Where(line => line.TrimStart().Contains(expectedWixCommand)); + Assert.Single(buildCommands); + var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) .Select(s => s.Substring(baseFolder.Length + 1)) .Single(); -- cgit v1.2.3-55-g6feb