From 82a26a321bae36e38743f50f38887387a392ce24 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 1 Jun 2020 21:58:44 +1000
Subject: Add ability for net461 tasks to run the tool out of proc.

---
 src/WixToolset.MSBuild/tools/wix.harvest.targets | 19 ++++++++++++++++---
 src/WixToolset.MSBuild/tools/wix.targets         | 11 +++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'src/WixToolset.MSBuild/tools')

diff --git a/src/WixToolset.MSBuild/tools/wix.harvest.targets b/src/WixToolset.MSBuild/tools/wix.harvest.targets
index e4d866ea..dea44469 100644
--- a/src/WixToolset.MSBuild/tools/wix.harvest.targets
+++ b/src/WixToolset.MSBuild/tools/wix.harvest.targets
@@ -3,6 +3,10 @@
 
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- These properties can be overridden to support non-default installations. -->
+  <PropertyGroup>
+    <HeatToolDir Condition=" '$(HeatToolDir)' == '' ">$(WixToolDir)</HeatToolDir>
+  </PropertyGroup>
 
   <!-- These tasks are extensions for harvesting WiX source code from other sources. -->
   <UsingTask TaskName="HeatFile" AssemblyFile="$(WixTasksPath)" />
@@ -274,7 +278,10 @@
       Configuration="%(_AllHeatProjects.Configuration)"
       Platform="%(_AllHeatProjects.Platform)"
       GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)"
-      AdditionalOptions="$(HarvestProjectsAdditionalOptions)">
+      AdditionalOptions="$(HarvestProjectsAdditionalOptions)"
+      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+      ToolExe="$(HeatToolExe)"
+      ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />
       <Output TaskParameter="OutputFile" ItemName="FileWrites" />
@@ -359,7 +366,10 @@
       SuppressCom="%(HarvestDirectory.SuppressCom)"
       SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)"
       SuppressRegistry="%(HarvestDirectory.SuppressRegistry)"
-      AdditionalOptions="$(HarvestDirectoryAdditionalOptions)">
+      AdditionalOptions="$(HarvestDirectoryAdditionalOptions)"
+      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+      ToolExe="$(HeatToolExe)"
+      ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />
       <Output TaskParameter="OutputFile" ItemName="FileWrites" />
@@ -432,7 +442,10 @@
       SuppressCom="%(HarvestFile.SuppressCom)"
       SuppressRegistry="%(HarvestFile.SuppressRegistry)"
       SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)"
-      AdditionalOptions="$(HarvestFileAdditionalOptions)">
+      AdditionalOptions="$(HarvestFileAdditionalOptions)"
+      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+      ToolExe="$(HeatToolExe)"
+      ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />
       <Output TaskParameter="OutputFile" ItemName="FileWrites" />
diff --git a/src/WixToolset.MSBuild/tools/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets
index 62414017..6914d03e 100644
--- a/src/WixToolset.MSBuild/tools/wix.targets
+++ b/src/WixToolset.MSBuild/tools/wix.targets
@@ -249,11 +249,6 @@
 
     <Error
       Code="WIX102"
-      Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' &lt; '4.0' "
-      Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. You must use MSBuild v4.0 or later." />
-
-    <Error
-      Code="WIX103"
       Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' "
       Text="The WixPdbType property '$(WixPdbType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. Supported values are: 'full', 'none'" />
 
@@ -695,7 +690,11 @@
 
         SuppressValidation="$(SuppressValidation)"
         SuppressIces="$(SuppressIces)"
-        AdditionalCub="$(AdditionalCub)" />
+        AdditionalCub="$(AdditionalCub)"
+
+        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+        ToolExe="$(WixToolExe)"
+        ToolPath="$(WixToolDir)" />
 
     <!--
     SuppressAllWarnings="$(CompilerSuppressAllWarnings);$(LinkerSuppressAllWarnings)"
-- 
cgit v1.2.3-55-g6feb