1 files changed, 17 insertions, 12 deletions

diff --git a/src/wix/WixToolset.Sdk/tools/wix.harvest.targets b/src/tools/WixToolset.Heat/WixToolset.Heat.targets
index 23e4a68e..ba854459 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.harvest.targets
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.targets
@@ -5,16 +5,27 @@
 <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>
+    <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\</WixHeatBinDir>
+    <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir>
+    <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath>
+
+    <!--
+      For backwards compatibility, the MSBuild tasks always default to the x86 heat.exe even though a x64 heat.exe is available.
+      For "dotnet.exe build" the Heat tasks calculate the command-line to start heat.dll in .NET Core.
+    -->
+    <HeatToolDir Condition=" '$(HeatToolDir)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)..\tools\net472\x86\</HeatToolDir>
+
+    <HeatExe Condition=" '$(HeatExe)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\x86\heat.exe</HeatExe>
+    <HeatExe64 Condition=" '$(HeatExe64)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\x64\heat.exe</HeatExe64>
   </PropertyGroup>
 
   <!-- These tasks are extensions for harvesting WiX source code from other sources. -->
-  <UsingTask TaskName="HeatFile" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="HeatProject" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="HeatFile" AssemblyFile="$(WixHeatTasksPath)" />
+  <UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixHeatTasksPath)" />
+  <UsingTask TaskName="HeatProject" AssemblyFile="$(WixHeatTasksPath)" />
 
-  <UsingTask TaskName="RefreshGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
-  <UsingTask TaskName="RefreshBundleGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
+  <UsingTask TaskName="RefreshGeneratedFile" AssemblyFile="$(WixHeatTasksPath)"/>
+  <UsingTask TaskName="RefreshBundleGeneratedFile" AssemblyFile="$(WixHeatTasksPath)"/>
 
   <!-- Default Harvester properties-->
   <PropertyGroup>
@@ -278,8 +289,6 @@
       GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)"
       UseToolsVersion="$(HarvestProjectsUseToolsVersion)"
       AdditionalOptions="$(HarvestProjectsAdditionalOptions)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      ToolExe="$(HeatToolExe)"
       ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />
@@ -366,8 +375,6 @@
       SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)"
       SuppressRegistry="%(HarvestDirectory.SuppressRegistry)"
       AdditionalOptions="$(HarvestDirectoryAdditionalOptions)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      ToolExe="$(HeatToolExe)"
       ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />
@@ -442,8 +449,6 @@
       SuppressRegistry="%(HarvestFile.SuppressRegistry)"
       SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)"
       AdditionalOptions="$(HarvestFileAdditionalOptions)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      ToolExe="$(HeatToolExe)"
       ToolPath="$(HeatToolDir)">
 
       <Output TaskParameter="OutputFile" ItemName="Compile" />