Run wix.exe out of proc

"wix build" will load assemblies to read metadata which can cause
the assemblies to get locked in the process. Since MSBuild keeps
build processes alive this can cause work done by in-proc MSBuild
tasks (like the WixBuild) to get stuck. Moving the "wix build" out
of proc avoids any of those issues.

Moving out of proc also allows the WiX tasks to be AnyCPU which
simplifies the wix.targets (although did need to add code to find
the .NET Framework wix.exe).

Fixes 6595

2 files changed, 4 insertions, 5 deletions

diff --git a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
index ddc75c69..21fb419c 100644
--- a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
+++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
@@ -7,7 +7,6 @@
     <Title>WiX Toolset Heat MSBuild Tasks</Title>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <!-- https://github.com/Microsoft/msbuild/issues/2360 -->
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs b/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs
index d54da457..a0a98578 100644
--- a/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs
@@ -43,7 +43,7 @@ namespace WixToolsetTest.Sdk
                 });
                 result.AssertSuccess();
 
-                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
+                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem);
                 Assert.Single(heatCommandLines);
 
                 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -99,7 +99,7 @@ namespace WixToolsetTest.Sdk
                 });
                 result.AssertSuccess();
 
-                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
+                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem);
                 Assert.Equal(2, heatCommandLines.Count());
 
                 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -185,7 +185,7 @@ namespace WixToolsetTest.Sdk
                  });
                 result.AssertSuccess();
 
-                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true);
+                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem);
                 var heatCommandLine = Assert.Single(heatCommandLines);
 
                 if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk)
@@ -306,7 +306,7 @@ namespace WixToolsetTest.Sdk
                  });
                 result.AssertSuccess();
 
-                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true);
+                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem);
                 var heatCommandLine = Assert.Single(heatCommandLines);
 
                 if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk)