124 files changed, 991 insertions, 777 deletions
diff --git a/src/build_all.cmd b/src/build_all.cmd
index 60502cdc..ce1c08f0 100644
--- a/src/build_all.cmd
+++ b/src/build_all.cmd
@@ -44,14 +44,14 @@ call burn\burn.cmd %_C% || exit /b
 call wix\wix.cmd %_C% || exit /b
-:: ext
+:: tools
-call ext\ext.cmd %_C% || exit /b
+call tools\tools.cmd %_C% || exit /b
-:: tools
+:: ext
-call tools\tools.cmd %_C% || exit /b
+call ext\ext.cmd %_C% || exit /b
 :: integration tests
diff --git a/src/clean.cmd b/src/clean.cmd
index 9eccf22a..2bbc2a78 100644
--- a/src/clean.cmd
+++ b/src/clean.cmd
@@ -39,6 +39,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.dtf.resources" rd /s/q "%_NUGET_CACHE%\wixto
 if exist "%_NUGET_CACHE%\wixtoolset.dtf.windowsinstaller" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.windowsinstaller"
 if exist "%_NUGET_CACHE%\wixtoolset.dutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.dutil"
 if exist "%_NUGET_CACHE%\wixtoolset.extensibility" rd /s/q "%_NUGET_CACHE%\wixtoolset.extensibility"
+if exist "%_NUGET_CACHE%\wixtoolset.heat" rd /s/q "%_NUGET_CACHE%\wixtoolset.heat"
 if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.mba.core"
 if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.sdk" rd /s/q "%_NUGET_CACHE%\wixtoolset.sdk"
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index aedf9b64..060f8ee0 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -22,7 +22,7 @@ msbuild -p:Configuration=%_C% || exit /b
 dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b
-msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b
+msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl || exit /b
 :: Test
 dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
index ebeebff2..3f81710e 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
index a6b56460..f9926550 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
index 30a860ab..048e3c97 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
index 5ce89b64..056bf2bb 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 82a5e3c1..855f0ef5 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -2,8 +2,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+<Project Sdk="Microsoft.Build.Traversal">
-  <Import Project="..\..\Directory.Build.props" />
  <PropertyGroup>
    <EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
@@ -28,14 +27,12 @@
      <SkipFDDx86>true</SkipFDDx86>
      <SkipSCD>true</SkipSCD>
    </CoreMBAProject>
-    
    <FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
    <FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
-    
-    <ExampleBundleProject Include="**\*.wixproj" />
  </ItemGroup>
-  <Target Name="PublishCoreExamples">
+  <Target Name="PublishCoreExamples" BeforeTargets="Build">
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
          Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
@@ -46,9 +43,7 @@
          Condition="'%(CoreMBAProject.TrimMode)'!=''" />
  </Target>
-  <Target Name="Build" DependsOnTargets="PublishCoreExamples">
+  <ItemGroup>
-    <MSBuild Projects="%(ExampleBundleProject.Identity)" />
+    <ProjectReference Include="**\*.wixproj" />
-  </Target>
+  </ItemGroup>
-  
+</Project>
-  <Import Project="..\..\..\..\Directory.Build.targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 8cf4be1f..91337de7 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -28,6 +28,8 @@
    <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.Core.TestPackage" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.Dependency.wixext" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.NetFx.wixext" Version="{packageversion}" />
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
index 028ea0cf..32680e5d 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
@@ -17,9 +17,6 @@ namespace WixToolsetTest.Sdk
    public static class MsbuildUtilities
    {
-        public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "..", "..", "publish", "WixToolset.Sdk");
-        public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true)
        {
            var allArgs = new List<string>
@@ -27,7 +24,6 @@ namespace WixToolsetTest.Sdk
                $"-verbosity:{verbosityLevel}",
                $"-p:Configuration={configuration}",
                $"-p:SuppressValidation={suppressValidation}",
-                GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath),
                // Node reuse means that child msbuild processes can stay around after the build completes.
                // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.
                "-nr:false",
@@ -74,11 +70,23 @@ namespace WixToolsetTest.Sdk
            {
                case BuildSystem.DotNetCoreSdk:
                    {
+                        // If the value ends with a backslash, double-escape it (it should end up with four backslashes).
+                        if (valueToQuote?.EndsWith("\\") == true)
+                        {
+                            valueToQuote += @"\\\";
+                        }
                        return $"-p:{propertyName}=\\\"{valueToQuote}\\\"";
                    }
                case BuildSystem.MSBuild:
                case BuildSystem.MSBuild64:
                    {
+                        // If the value ends with a backslash, escape it.
+                        if (valueToQuote?.EndsWith("\\") == true)
+                        {
+                            valueToQuote += @"\";
+                        }
                        return $"-p:{propertyName}=\"{valueToQuote}\"";
                    }
                default:
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index 35c92246..bd6e222a 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -22,6 +22,7 @@
    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" />
    <PackageReference Include="WixToolset.Bal.wixext" />
  </ItemGroup>
  <!-- We do this dynamically to avoid committing so many files to source control. -->
diff --git a/src/testresultfilelist.txt b/src/testresultfilelist.txt
index fa3a0734..cdf6b00e 100644
--- a/src/testresultfilelist.txt
+++ b/src/testresultfilelist.txt
@@ -15,7 +15,7 @@ build/logs/TestResults/WixToolsetTest.Core.Burn.trx
 build/logs/TestResults/WixToolsetTest.Core.Native.trx
 build/logs/TestResults/WixToolsetTest.CoreIntegration.trx
 build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx
-build/logs/TestResults/WixToolsetTest.Heat.trx
+build/logs/TestResults/WixToolsetTest.HeatTasks.trx
 build/logs/TestResults/WixToolsetTest.ManagedHost.trx
 build/logs/TestResults/WixToolsetTest.Mba.Core.trx
 build/logs/TestResults/WixToolsetTest.MsiE2E.trx
diff --git a/src/tools/Directory.Build.props b/src/tools/Directory.Build.props
index 3fdc6553..bfa668d6 100644
--- a/src/tools/Directory.Build.props
+++ b/src/tools/Directory.Build.props
@@ -7,4 +7,8 @@
  </PropertyGroup>
  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <PublishRoot>$(OutputPath)publish\</PublishRoot>
+  </PropertyGroup>
 </Project>
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj
new file mode 100644
index 00000000..a3e0eb41
--- /dev/null
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <Description>WiX Toolset Heat MSBuild integration</Description>
+    <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <NuspecBasePath>$(PublishDir)</NuspecBasePath>
+  </PropertyGroup>
+</Project>
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
new file mode 100644
index 00000000..5242773b
--- /dev/null
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+  </metadata>
+  <files>
+    <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="tools\**\*" target="tools" />
+  </files>
+</package>
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="HeatFile" AssemblyFile="$(WixHeatTasksPath)" />
-  <UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixHeatTasksPath)" />
-  <UsingTask TaskName="HeatProject" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="HeatProject" AssemblyFile="$(WixHeatTasksPath)" />
-  <UsingTask TaskName="RefreshGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
+  <UsingTask TaskName="RefreshGeneratedFile" AssemblyFile="$(WixHeatTasksPath)"/>
-  <UsingTask TaskName="RefreshBundleGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
+  <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" />
diff --git a/src/tools/WixToolset.HeatTasks/HeatDirectory.cs b/src/tools/WixToolset.HeatTasks/HeatDirectory.cs
new file mode 100644
index 00000000..8a169055
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/HeatDirectory.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.HeatTasks
+{
+    using Microsoft.Build.Framework;
+    public sealed class HeatDirectory : HeatTask
+    {
+        public string ComponentGroupName { get; set; }
+        [Required]
+        public string Directory { get; set; }
+        public string DirectoryRefId { get; set; }
+        public bool KeepEmptyDirectories { get; set; }
+        public string PreprocessorVariable { get; set; }
+        public bool SuppressCom { get; set; }
+        public bool SuppressRootDirectory { get; set; }
+        public bool SuppressRegistry { get; set; }
+        public string Template { get; set; }
+        protected override string OperationName => "dir";
+        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
+        {
+            commandLineBuilder.AppendSwitch(this.OperationName);
+            commandLineBuilder.AppendFileNameIfNotNull(this.Directory);
+            commandLineBuilder.AppendSwitchIfNotNull("-cg ", this.ComponentGroupName);
+            commandLineBuilder.AppendSwitchIfNotNull("-dr ", this.DirectoryRefId);
+            commandLineBuilder.AppendIfTrue("-ke", this.KeepEmptyDirectories);
+            commandLineBuilder.AppendIfTrue("-scom", this.SuppressCom);
+            commandLineBuilder.AppendIfTrue("-sreg", this.SuppressRegistry);
+            commandLineBuilder.AppendIfTrue("-srd", this.SuppressRootDirectory);
+            commandLineBuilder.AppendSwitchIfNotNull("-template ", this.Template);
+            commandLineBuilder.AppendSwitchIfNotNull("-var ", this.PreprocessorVariable);
+            base.BuildCommandLine(commandLineBuilder);
+        }
+    }
+}
diff --git a/src/tools/WixToolset.HeatTasks/HeatFile.cs b/src/tools/WixToolset.HeatTasks/HeatFile.cs
new file mode 100644
index 00000000..83cbc4d1
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/HeatFile.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.HeatTasks
+{
+    using Microsoft.Build.Framework;
+    public sealed class HeatFile : HeatTask
+    {
+        public string ComponentGroupName { get; set; }
+        public string DirectoryRefId { get; set; }
+        [Required]
+        public string File { get; set; }
+        public string PreprocessorVariable { get; set; }
+        public bool SuppressCom { get; set; }
+        public bool SuppressRegistry { get; set; }
+        public bool SuppressRootDirectory { get; set; }
+        public string Template { get; set; }
+        protected override string OperationName => "file";
+        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
+        {
+            commandLineBuilder.AppendSwitch(this.OperationName);
+            commandLineBuilder.AppendFileNameIfNotNull(this.File);
+            commandLineBuilder.AppendSwitchIfNotNull("-cg ", this.ComponentGroupName);
+            commandLineBuilder.AppendSwitchIfNotNull("-dr ", this.DirectoryRefId);
+            commandLineBuilder.AppendIfTrue("-scom", this.SuppressCom);
+            commandLineBuilder.AppendIfTrue("-srd", this.SuppressRootDirectory);
+            commandLineBuilder.AppendIfTrue("-sreg", this.SuppressRegistry);
+            commandLineBuilder.AppendSwitchIfNotNull("-template ", this.Template);
+            commandLineBuilder.AppendSwitchIfNotNull("-var ", this.PreprocessorVariable);
+            base.BuildCommandLine(commandLineBuilder);
+        }
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/HeatProject.cs b/src/tools/WixToolset.HeatTasks/HeatProject.cs
index 3833a754..d54f6ad1 100644
--- a/src/wix/WixToolset.BuildTasks/HeatProject.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatProject.cs
@@ -1,64 +1,29 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
+namespace WixToolset.HeatTasks
 {
    using Microsoft.Build.Framework;
    public sealed class HeatProject : HeatTask
    {
-        private string configuration;
-        private string directoryIds;
-        private string generateType;
-        private bool generateWixVariables;
-        private string platform;
-        private string project;
-        private string projectName;
        private string[] projectOutputGroups;
-        public string Configuration
+        public string Configuration { get; set; }
-        {
-            get { return this.configuration; }
-            set { this.configuration = value; }
-        }
-        public string DirectoryIds
+        public string DirectoryIds { get; set; }
-        {
-            get { return this.directoryIds; }
-            set { this.directoryIds = value; }
-        }
-        public bool GenerateWixVariables
+        public bool GenerateWixVariables { get; set; }
-        {
-            get { return this.generateWixVariables; }
-            set { this.generateWixVariables = value; }
-        }
-        public string GenerateType
+        public string GenerateType { get; set; }
-        {
-            get { return this.generateType; }
-            set { this.generateType = value; }
-        }
        public string MsbuildBinPath { get; set; }
-        public string Platform
+        public string Platform { get; set; }
-        {
-            get { return this.platform; }
-            set { this.platform = value; }
-        }
        [Required]
-        public string Project
+        public string Project { get; set; }
-        {
-            get { return this.project; }
-            set { this.project = value; }
-        }
-        public string ProjectName
+        public string ProjectName { get; set; }
-        {
-            get { return this.projectName; }
-            set { this.projectName = value; }
-        }
        public string[] ProjectOutputGroups
        {
@@ -81,10 +46,7 @@ namespace WixToolset.BuildTasks
        public bool UseToolsVersion { get; set; }
-        protected override string OperationName
+        protected override string OperationName => "project";
-        {
-            get { return "project"; }
-        }
        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
        {
diff --git a/src/tools/WixToolset.HeatTasks/HeatTask.cs b/src/tools/WixToolset.HeatTasks/HeatTask.cs
new file mode 100644
index 00000000..8942a7e1
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/HeatTask.cs
@@ -0,0 +1,176 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.HeatTasks
+{
+    using System;
+    using System.IO;
+    using System.Runtime.InteropServices;
+    using Microsoft.Build.Framework;
+    using Microsoft.Build.Utilities;
+    /// <summary>
+    /// A base MSBuild task to run the WiX harvester.
+    /// Specific harvester tasks should extend this class.
+    /// </summary>
+    public abstract partial class HeatTask : ToolTask
+    {
+        private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath;
+        /// <summary>
+        /// Gets or sets additional options that are appended the the tool command-line.
+        /// </summary>
+        /// <remarks>
+        /// This allows the task to support extended options in the tool which are not
+        /// explicitly implemented as properties on the task.
+        /// </remarks>
+        public string AdditionalOptions { get; set; }
+        /// <summary>
+        /// Gets or sets whether to display the logo.
+        /// </summary>
+        public bool NoLogo { get; set; }
+        /// <summary>
+        /// Gets or sets whether all warnings should be suppressed.
+        /// </summary>
+        public bool SuppressAllWarnings { get; set; }
+        /// <summary>
+        /// Gets or sets a list of specific warnings to be suppressed.
+        /// </summary>
+        public string[] SuppressSpecificWarnings { get; set; }
+        /// <summary>
+        /// Gets or sets whether all warnings should be treated as errors.
+        /// </summary>
+        public bool TreatWarningsAsErrors { get; set; }
+        /// <summary>
+        /// Gets or sets a list of specific warnings to treat as errors.
+        /// </summary>
+        public string[] TreatSpecificWarningsAsErrors { get; set; }
+        /// <summary>
+        /// Gets or sets whether to display verbose output.
+        /// </summary>
+        public bool VerboseOutput { get; set; }
+        public bool AutogenerateGuids { get; set; }
+        public bool GenerateGuidsNow { get; set; }
+        [Required]
+        [Output]
+        public ITaskItem OutputFile { get; set; }
+        public bool SuppressFragments { get; set; }
+        public bool SuppressUniqueIds { get; set; }
+        public string[] Transforms { get; set; }
+        protected sealed override string ToolName => "heat.exe";
+        /// <summary>
+        /// Gets the name of the heat operation performed by the task.
+        /// </summary>
+        /// <remarks>This is the first parameter passed on the heat.exe command-line.</remarks>
+        /// <value>The name of the heat operation performed by the task.</value>
+        protected abstract string OperationName { get; }
+        private string ToolFullPath
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(this.ToolPath))
+                {
+                    return Path.Combine(Path.GetDirectoryName(ThisDllPath), this.ToolExe);
+                }
+                return Path.Combine(this.ToolPath, this.ToolExe);
+            }
+        }
+        /// <summary>
+        /// Get the path to the executable.
+        /// </summary>
+        /// <remarks>
+        /// ToolTask only calls GenerateFullPathToTool when the ToolPath property is not set.
+        /// WiX never sets the ToolPath property, but the user can through $(HeatToolDir).
+        /// If we return only a file name, ToolTask will search the system paths for it.
+        /// </remarks>
+        protected sealed override string GenerateFullPathToTool()
+        {
+#if NETCOREAPP
+            // If we're not using heat.exe, use dotnet.exe to exec heat.dll.
+            // See this.GenerateCommandLine() where "exec heat.dll" is added.
+            if (!IsSelfExecutable(this.ToolFullPath, out var toolFullPath))
+            {
+                return DotnetFullPath;
+            }
+            return toolFullPath;
+#else
+            return this.ToolFullPath;
+#endif
+        }
+        protected sealed override string GenerateCommandLineCommands()
+        {
+            var commandLineBuilder = new WixCommandLineBuilder();
+#if NETCOREAPP
+            // If we're using dotnet.exe as the target executable, see this.GenerateFullPathToTool(),
+            // then add "exec heat.dll" to the beginning of the command-line.
+            if (!IsSelfExecutable(this.ToolFullPath, out var toolFullPath))
+            {
+                //commandLineBuilder.AppendSwitchIfNotNull("exec ", toolFullPath);
+                commandLineBuilder.AppendSwitch($"exec \"{toolFullPath}\"");
+            }
+#endif
+            this.BuildCommandLine(commandLineBuilder);
+            return commandLineBuilder.ToString();
+        }
+        /// <summary>
+        /// Builds a command line from options in this task.
+        /// </summary>
+        protected virtual void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
+        {
+            commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
+            commandLineBuilder.AppendArrayIfNotNull("-sw", this.SuppressSpecificWarnings);
+            commandLineBuilder.AppendIfTrue("-sw", this.SuppressAllWarnings);
+            commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput);
+            commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors);
+            commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors);
+            commandLineBuilder.AppendIfTrue("-ag", this.AutogenerateGuids);
+            commandLineBuilder.AppendIfTrue("-gg", this.GenerateGuidsNow);
+            commandLineBuilder.AppendIfTrue("-sfrag", this.SuppressFragments);
+            commandLineBuilder.AppendIfTrue("-suid", this.SuppressUniqueIds);
+            commandLineBuilder.AppendArrayIfNotNull("-t ", this.Transforms);
+            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
+            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
+        }
+#if NETCOREAPP
+        private static readonly string DotnetFullPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH") ?? "dotnet";
+        private static bool IsSelfExecutable(string proposedToolFullPath, out string toolFullPath)
+        {
+            var toolFullPathWithoutExtension = Path.Combine(Path.GetDirectoryName(proposedToolFullPath), Path.GetFileNameWithoutExtension(proposedToolFullPath));
+            var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : String.Empty;
+            var exeToolFullPath = $"{toolFullPathWithoutExtension}{exeExtension}";
+            if (File.Exists(exeToolFullPath))
+            {
+                toolFullPath = exeToolFullPath;
+                return true;
+            }
+            toolFullPath = $"{toolFullPathWithoutExtension}.dll";
+            return false;
+        }
+#endif
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/tools/WixToolset.HeatTasks/RefreshBundleGeneratedFile.cs
index 983695c9..8f1ad167 100644
--- a/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ b/src/tools/WixToolset.HeatTasks/RefreshBundleGeneratedFile.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
+namespace WixToolset.HeatTasks
 {
    using System;
    using System.Collections;
@@ -8,48 +8,35 @@ namespace WixToolset.BuildTasks
    using System.IO;
    using System.Xml;
    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
    /// <summary>
    /// This task refreshes the generated file for bundle projects.
    /// </summary>
-    public class RefreshBundleGeneratedFile : Task
+    public class RefreshBundleGeneratedFile : RefreshTask
    {
        /// <summary>
-        /// The list of files to generate.
-        /// </summary>
-        [Required]
-        public ITaskItem[] GeneratedFiles { get; set; }
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferencePaths { get; set; }
-        /// <summary>
        /// Gets a complete list of external cabs referenced by the given installer database file.
        /// </summary>
        /// <returns>True upon completion of the task execution.</returns>
        public override bool Execute()
        {
-            ArrayList payloadGroupRefs = new ArrayList();
+            var payloadGroupRefs = new ArrayList();
-            ArrayList packageGroupRefs = new ArrayList();
+            var packageGroupRefs = new ArrayList();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
+            for (var i = 0; i < this.ProjectReferencePaths.Length; i++)
            {
-                ITaskItem item = this.ProjectReferencePaths[i];
+                var item = this.ProjectReferencePaths[i];
-                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(DoNotHarvest)))
                {
                    continue;
                }
-                string projectPath = item.GetMetadata("MSBuildSourceProjectFile");
+                var projectPath = item.GetMetadata("MSBuildSourceProjectFile");
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
+                var projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = ToolsCommon.GetIdentifierFromName(ToolsCommon.GetMetadataOrDefault(item, "Name", projectName));
+                var referenceName = GetIdentifierFromName(GetMetadataOrDefault(item, "Name", projectName));
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
+                var pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
+                foreach (var pog in pogs)
                {
                    if (!String.IsNullOrEmpty(pog))
                    {
@@ -60,43 +47,43 @@ namespace WixToolset.BuildTasks
                }
            }
-            XmlDocument doc = new XmlDocument();
+            var doc = new XmlDocument();
-            XmlProcessingInstruction head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
+            var head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
            doc.AppendChild(head);
-            XmlElement rootElement = doc.CreateElement("Wix");
+            var rootElement = doc.CreateElement("Wix");
            rootElement.SetAttribute("xmlns", "http://wixtoolset.org/schemas/v4/wxs");
            doc.AppendChild(rootElement);
-            XmlElement fragment = doc.CreateElement("Fragment");
+            var fragment = doc.CreateElement("Fragment");
            rootElement.AppendChild(fragment);
-            XmlElement payloadGroup = doc.CreateElement("PayloadGroup");
+            var payloadGroup = doc.CreateElement("PayloadGroup");
            payloadGroup.SetAttribute("Id", "Bundle.Generated.Payloads");
            fragment.AppendChild(payloadGroup);
-            XmlElement packageGroup = doc.CreateElement("PackageGroup");
+            var packageGroup = doc.CreateElement("PackageGroup");
            packageGroup.SetAttribute("Id", "Bundle.Generated.Packages");
            fragment.AppendChild(packageGroup);
            foreach (string payloadGroupRef in payloadGroupRefs)
            {
-                XmlElement payloadGroupRefElement = doc.CreateElement("PayloadGroupRef");
+                var payloadGroupRefElement = doc.CreateElement("PayloadGroupRef");
                payloadGroupRefElement.SetAttribute("Id", payloadGroupRef);
                payloadGroup.AppendChild(payloadGroupRefElement);
            }
            foreach (string packageGroupRef in packageGroupRefs)
            {
-                XmlElement packageGroupRefElement = doc.CreateElement("PackageGroupRef");
+                var packageGroupRefElement = doc.CreateElement("PackageGroupRef");
                packageGroupRefElement.SetAttribute("Id", packageGroupRef);
                packageGroup.AppendChild(packageGroupRefElement);
            }
-            foreach (ITaskItem item in this.GeneratedFiles)
+            foreach (var item in this.GeneratedFiles)
            {
-                string fullPath = item.GetMetadata("FullPath");
+                var fullPath = item.GetMetadata("FullPath");
                payloadGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Payloads");
                packageGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Packages");
diff --git a/src/wix/WixToolset.BuildTasks/RefreshGeneratedFile.cs b/src/tools/WixToolset.HeatTasks/RefreshGeneratedFile.cs
index e18ae222..1e43cc1f 100644
--- a/src/wix/WixToolset.BuildTasks/RefreshGeneratedFile.cs
+++ b/src/tools/WixToolset.HeatTasks/RefreshGeneratedFile.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
+namespace WixToolset.HeatTasks
 {
    using System;
    using System.Collections;
@@ -8,48 +8,36 @@ namespace WixToolset.BuildTasks
    using System.IO;
    using System.Xml;
    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
    /// <summary>
    /// This task refreshes the generated file that contains ComponentGroupRefs
    /// to harvested output.
    /// </summary>
-    public class RefreshGeneratedFile : Task
+    public class RefreshGeneratedFile : RefreshTask
    {
        /// <summary>
-        /// The list of files to generate.
-        /// </summary>
-        [Required]
-        public ITaskItem[] GeneratedFiles { get; set; }
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferencePaths { get; set; }
-        /// <summary>
        /// Gets a complete list of external cabs referenced by the given installer database file.
        /// </summary>
        /// <returns>True upon completion of the task execution.</returns>
        public override bool Execute()
        {
-            ArrayList componentGroupRefs = new ArrayList();
+            var componentGroupRefs = new ArrayList();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
+            for (var i = 0; i < this.ProjectReferencePaths.Length; i++)
            {
-                ITaskItem item = this.ProjectReferencePaths[i];
+                var item = this.ProjectReferencePaths[i];
-                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(DoNotHarvest)))
                {
                    continue;
                }
-                string projectPath = item.GetMetadata("MSBuildSourceProjectFile");
+                var projectPath = item.GetMetadata("MSBuildSourceProjectFile");
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
+                var projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = ToolsCommon.GetIdentifierFromName(ToolsCommon.GetMetadataOrDefault(item, "Name", projectName));
+                var referenceName = GetIdentifierFromName(GetMetadataOrDefault(item, "Name", projectName));
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
+                var pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
+                foreach (var pog in pogs)
                {
                    if (!String.IsNullOrEmpty(pog))
                    {
@@ -58,32 +46,32 @@ namespace WixToolset.BuildTasks
                }
            }
-            XmlDocument doc = new XmlDocument();
+            var doc = new XmlDocument();
-            XmlProcessingInstruction head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
+            var head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
            doc.AppendChild(head);
-            XmlElement rootElement = doc.CreateElement("Wix");
+            var rootElement = doc.CreateElement("Wix");
            rootElement.SetAttribute("xmlns", "http://wixtoolset.org/schemas/v4/wxs");
            doc.AppendChild(rootElement);
-            XmlElement fragment = doc.CreateElement("Fragment");
+            var fragment = doc.CreateElement("Fragment");
            rootElement.AppendChild(fragment);
-            XmlElement componentGroup = doc.CreateElement("ComponentGroup");
+            var componentGroup = doc.CreateElement("ComponentGroup");
            componentGroup.SetAttribute("Id", "Product.Generated");
            fragment.AppendChild(componentGroup);
            foreach (string componentGroupRef in componentGroupRefs)
            {
-                XmlElement componentGroupRefElement = doc.CreateElement("ComponentGroupRef");
+                var componentGroupRefElement = doc.CreateElement("ComponentGroupRef");
                componentGroupRefElement.SetAttribute("Id", componentGroupRef);
                componentGroup.AppendChild(componentGroupRefElement);
            }
-            foreach (ITaskItem item in this.GeneratedFiles)
+            foreach (var item in this.GeneratedFiles)
            {
-                string fullPath = item.GetMetadata("FullPath");
+                var fullPath = item.GetMetadata("FullPath");
                componentGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath));
                try
diff --git a/src/tools/WixToolset.HeatTasks/RefreshTask.cs b/src/tools/WixToolset.HeatTasks/RefreshTask.cs
new file mode 100644
index 00000000..0b378272
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/RefreshTask.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.HeatTasks
+{
+    using System;
+    using System.Text.RegularExpressions;
+    using Microsoft.Build.Framework;
+    using Microsoft.Build.Utilities;
+    /// <summary>
+    /// A base MSBuild task to refresh generated files.
+    /// </summary>
+    public abstract class RefreshTask : Task
+    {
+        private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]");
+        private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}"); // non 'words' and assorted valid characters
+        /// <summary>Metadata key name to turn off harvesting of project references.</summary>
+        protected const string DoNotHarvest = "DoNotHarvest";
+        /// <summary>
+        /// The list of files to generate.
+        /// </summary>
+        [Required]
+        public ITaskItem[] GeneratedFiles { get; set; }
+        /// <summary>
+        /// All the project references in the project.
+        /// </summary>
+        [Required]
+        public ITaskItem[] ProjectReferencePaths { get; set; }
+        /// <summary>
+        /// Return an identifier based on passed file/directory name
+        /// </summary>
+        /// <param name="name">File/directory name to generate identifer from</param>
+        /// <returns>A version of the name that is a legal identifier.</returns>
+        /// <remarks>This is duplicated from WiX's Common class.</remarks>
+        protected static string GetIdentifierFromName(string name)
+        {
+            var result = IllegalIdentifierCharacters.Replace(name, "_"); // replace illegal characters with "_".
+            // MSI identifiers must begin with an alphabetic character or an
+            // underscore. Prefix all other values with an underscore.
+            if (AddPrefix.IsMatch(name))
+            {
+                result = String.Concat("_", result);
+            }
+            return result;
+        }
+        protected static string GetMetadataOrDefault(ITaskItem item, string metadataName, string defaultValue)
+        {
+            var value = item.GetMetadata(metadataName);
+            return String.IsNullOrWhiteSpace(value) ? defaultValue : value;
+        }
+    }
+}
diff --git a/src/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs b/src/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs
new file mode 100644
index 00000000..c3989902
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs
@@ -0,0 +1,56 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.HeatTasks
+{
+    using System;
+    using System.Collections.Generic;
+    using Microsoft.Build.Utilities;
+    /// <summary>
+    /// Helper class for appending the command line arguments.
+    /// </summary>
+    public class WixCommandLineBuilder : CommandLineBuilder
+    {
+        /// <summary>
+        /// Append a switch to the command line if the condition is true.
+        /// </summary>
+        /// <param name="switchName">Switch to append.</param>
+        /// <param name="condition">Condition specified by the user.</param>
+        public void AppendIfTrue(string switchName, bool condition)
+        {
+            if (condition)
+            {
+                this.AppendSwitch(switchName);
+            }
+        }
+        /// <summary>
+        /// Append a switch to the command line if any values in the array have been specified.
+        /// </summary>
+        /// <param name="switchName">Switch to append.</param>
+        /// <param name="values">Values specified by the user.</param>
+        public void AppendArrayIfNotNull(string switchName, IEnumerable<string> values)
+        {
+            if (values != null)
+            {
+                foreach (var value in values)
+                {
+                    this.AppendSwitchIfNotNull(switchName, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Append arbitrary text to the command-line if specified.
+        /// </summary>
+        /// <param name="textToAppend">Text to append.</param>
+        public void AppendTextIfNotNull(string textToAppend)
+        {
+            if (!String.IsNullOrWhiteSpace(textToAppend))
+            {
+                this.AppendSpaceIfNotEmpty();
+                this.AppendTextUnquoted(textToAppend);
+            }
+        }
+    }
+}
diff --git a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
new file mode 100644
index 00000000..ea52bdfa
--- /dev/null
+++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <Title>WiX Toolset Heat MSBuild Tasks</Title>
+    <DebugType>embedded</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- https://github.com/Microsoft/msbuild/issues/2360 -->
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Tasks.Core" />
+  </ItemGroup>
+</Project>
diff --git a/src/wix/heat/AssemblyHarvester.cs b/src/tools/heat/AssemblyHarvester.cs
index 2304d827..2304d827 100644
--- a/src/wix/heat/AssemblyHarvester.cs
+++ b/src/tools/heat/AssemblyHarvester.cs
diff --git a/src/tools/heat/ConsoleMessageListener.cs b/src/tools/heat/ConsoleMessageListener.cs
new file mode 100644
index 00000000..ebf1622b
--- /dev/null
+++ b/src/tools/heat/ConsoleMessageListener.cs
@@ -0,0 +1,90 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolset.Tools.Core
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Text;
+    using System.Threading;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
+    public sealed class ConsoleMessageListener : IMessageListener
+    {
+        public ConsoleMessageListener(string prefix, string appName)
+        {
+            this.Prefix = prefix;
+            this.AppName = appName;
+            PrepareConsoleForLocalization();
+        }
+        public string AppName { get; }
+        public string Prefix { get; }
+        public void Write(Message message)
+        {
+            var filename = message.SourceLineNumbers?.FileName ?? this.AppName;
+            var type = message.Level.ToString().ToLowerInvariant();
+            var output = message.Level >= MessageLevel.Warning ? Console.Out : Console.Error;
+            if (message.SourceLineNumbers?.LineNumber.HasValue == true)
+            {
+                filename = String.Concat(filename, "(", message.SourceLineNumbers?.LineNumber.Value, ")");
+            }
+            output.WriteLine("{0} : {1} {2}{3:0000}: {4}", filename, type, this.Prefix, message.Id, message.ToString());
+            var fileNames = GetFileNames(message.SourceLineNumbers);
+            if (fileNames.Count > 1)
+            {
+                foreach (var fileName in fileNames)
+                {
+                    output.WriteLine("Source trace: {0}", fileName);
+                }
+            }
+        }
+        public void Write(string message) => Console.Out.WriteLine(message);
+        public MessageLevel CalculateMessageLevel(IMessaging messaging, Message message, MessageLevel defaultMessageLevel) => defaultMessageLevel;
+        private static IList<string> GetFileNames(SourceLineNumber sourceLineNumbers)
+        {
+            var fileNames = new List<string>();
+            for (var sln = sourceLineNumbers; null != sln; sln = sln.Parent)
+            {
+                if (String.IsNullOrEmpty(sln.FileName))
+                {
+                    continue;
+                }
+                else if (sln.LineNumber.HasValue)
+                {
+                    fileNames.Add(String.Format(CultureInfo.CurrentUICulture, "{0}: line {1}", sln.FileName, sln.LineNumber));
+                }
+                else
+                {
+                    fileNames.Add(sln.FileName);
+                }
+            }
+            return fileNames;
+        }
+        private static void PrepareConsoleForLocalization()
+        {
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.CurrentUICulture.GetConsoleFallbackUICulture();
+            if (Console.OutputEncoding.CodePage != Encoding.UTF8.CodePage &&
+                Console.OutputEncoding.CodePage != Thread.CurrentThread.CurrentUICulture.TextInfo.OEMCodePage &&
+                Console.OutputEncoding.CodePage != Thread.CurrentThread.CurrentUICulture.TextInfo.ANSICodePage)
+            {
+                Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-US");
+            }
+        }
+    }
+}
diff --git a/src/wix/heat/Data/HarvesterErrors.cs b/src/tools/heat/Data/HarvesterErrors.cs
index a8a3055a..a8a3055a 100644
--- a/src/wix/heat/Data/HarvesterErrors.cs
+++ b/src/tools/heat/Data/HarvesterErrors.cs
diff --git a/src/wix/heat/Data/HarvesterVerboses.cs b/src/tools/heat/Data/HarvesterVerboses.cs
index 72de2351..72de2351 100644
--- a/src/wix/heat/Data/HarvesterVerboses.cs
+++ b/src/tools/heat/Data/HarvesterVerboses.cs
diff --git a/src/wix/heat/Data/HarvesterWarnings.cs b/src/tools/heat/Data/HarvesterWarnings.cs
index 80ee5c31..80ee5c31 100644
--- a/src/wix/heat/Data/HarvesterWarnings.cs
+++ b/src/tools/heat/Data/HarvesterWarnings.cs
diff --git a/src/wix/heat/Data/HeatCommandLineOption.cs b/src/tools/heat/Data/HeatCommandLineOption.cs
index 5815abf0..5815abf0 100644
--- a/src/wix/heat/Data/HeatCommandLineOption.cs
+++ b/src/tools/heat/Data/HeatCommandLineOption.cs
diff --git a/src/wix/heat/Data/IHeatCommandLine.cs b/src/tools/heat/Data/IHeatCommandLine.cs
index 9198468d..9198468d 100644
--- a/src/wix/heat/Data/IHeatCommandLine.cs
+++ b/src/tools/heat/Data/IHeatCommandLine.cs
diff --git a/src/wix/heat/DirectoryHarvester.cs b/src/tools/heat/DirectoryHarvester.cs
index c1cc3edb..c1cc3edb 100644
--- a/src/wix/heat/DirectoryHarvester.cs
+++ b/src/tools/heat/DirectoryHarvester.cs
diff --git a/src/wix/heat/DllHarvester.cs b/src/tools/heat/DllHarvester.cs
index e8c5ae40..e8c5ae40 100644
--- a/src/wix/heat/DllHarvester.cs
+++ b/src/tools/heat/DllHarvester.cs
diff --git a/src/wix/heat/Extensibility/BaseHarvesterExtension.cs b/src/tools/heat/Extensibility/BaseHarvesterExtension.cs
index 02696d5b..02696d5b 100644
--- a/src/wix/heat/Extensibility/BaseHarvesterExtension.cs
+++ b/src/tools/heat/Extensibility/BaseHarvesterExtension.cs
diff --git a/src/wix/heat/Extensibility/BaseHeatExtension.cs b/src/tools/heat/Extensibility/BaseHeatExtension.cs
index b76aaf62..b76aaf62 100644
--- a/src/wix/heat/Extensibility/BaseHeatExtension.cs
+++ b/src/tools/heat/Extensibility/BaseHeatExtension.cs
diff --git a/src/wix/heat/Extensibility/BaseMutatorExtension.cs b/src/tools/heat/Extensibility/BaseMutatorExtension.cs
index c36a8ed1..c36a8ed1 100644
--- a/src/wix/heat/Extensibility/BaseMutatorExtension.cs
+++ b/src/tools/heat/Extensibility/BaseMutatorExtension.cs
diff --git a/src/wix/heat/Extensibility/IHarvester.cs b/src/tools/heat/Extensibility/IHarvester.cs
index 6d363b50..6d363b50 100644
--- a/src/wix/heat/Extensibility/IHarvester.cs
+++ b/src/tools/heat/Extensibility/IHarvester.cs
diff --git a/src/wix/heat/Extensibility/IHarvesterCore.cs b/src/tools/heat/Extensibility/IHarvesterCore.cs
index 3c34b8a1..3c34b8a1 100644
--- a/src/wix/heat/Extensibility/IHarvesterCore.cs
+++ b/src/tools/heat/Extensibility/IHarvesterCore.cs
diff --git a/src/wix/heat/Extensibility/IHarvesterExtension.cs b/src/tools/heat/Extensibility/IHarvesterExtension.cs
index 5125ea32..5125ea32 100644
--- a/src/wix/heat/Extensibility/IHarvesterExtension.cs
+++ b/src/tools/heat/Extensibility/IHarvesterExtension.cs
diff --git a/src/wix/heat/Extensibility/IHeatCore.cs b/src/tools/heat/Extensibility/IHeatCore.cs
index 0aa01b62..0aa01b62 100644
--- a/src/wix/heat/Extensibility/IHeatCore.cs
+++ b/src/tools/heat/Extensibility/IHeatCore.cs
diff --git a/src/wix/heat/Extensibility/IHeatExtension.cs b/src/tools/heat/Extensibility/IHeatExtension.cs
index 8a00da37..8a00da37 100644
--- a/src/wix/heat/Extensibility/IHeatExtension.cs
+++ b/src/tools/heat/Extensibility/IHeatExtension.cs
diff --git a/src/wix/heat/Extensibility/IMutator.cs b/src/tools/heat/Extensibility/IMutator.cs
index c936339e..c936339e 100644
--- a/src/wix/heat/Extensibility/IMutator.cs
+++ b/src/tools/heat/Extensibility/IMutator.cs
diff --git a/src/wix/heat/Extensibility/IMutatorExtension.cs b/src/tools/heat/Extensibility/IMutatorExtension.cs
index b81f586e..b81f586e 100644
--- a/src/wix/heat/Extensibility/IMutatorExtension.cs
+++ b/src/tools/heat/Extensibility/IMutatorExtension.cs
diff --git a/src/wix/heat/FileHarvester.cs b/src/tools/heat/FileHarvester.cs
index 886b942a..886b942a 100644
--- a/src/wix/heat/FileHarvester.cs
+++ b/src/tools/heat/FileHarvester.cs
diff --git a/src/wix/heat/Harvester.cs b/src/tools/heat/Harvester.cs
index 791c1cb2..791c1cb2 100644
--- a/src/wix/heat/Harvester.cs
+++ b/src/tools/heat/Harvester.cs
diff --git a/src/wix/heat/HarvesterCore.cs b/src/tools/heat/HarvesterCore.cs
index 92b34ab0..92b34ab0 100644
--- a/src/wix/heat/HarvesterCore.cs
+++ b/src/tools/heat/HarvesterCore.cs
diff --git a/src/wix/heat/HeatCommand.cs b/src/tools/heat/HeatCommand.cs
index 56277004..56277004 100644
--- a/src/wix/heat/HeatCommand.cs
+++ b/src/tools/heat/HeatCommand.cs
diff --git a/src/wix/heat/HeatCommandLine.cs b/src/tools/heat/HeatCommandLine.cs
index b11dda4e..b11dda4e 100644
--- a/src/wix/heat/HeatCommandLine.cs
+++ b/src/tools/heat/HeatCommandLine.cs
diff --git a/src/wix/heat/HeatCommandLineFactory.cs b/src/tools/heat/HeatCommandLineFactory.cs
index 44291e48..44291e48 100644
--- a/src/wix/heat/HeatCommandLineFactory.cs
+++ b/src/tools/heat/HeatCommandLineFactory.cs
diff --git a/src/wix/heat/HeatCore.cs b/src/tools/heat/HeatCore.cs
index 578c4aab..578c4aab 100644
--- a/src/wix/heat/HeatCore.cs
+++ b/src/tools/heat/HeatCore.cs
diff --git a/src/wix/heat/HelpCommand.cs b/src/tools/heat/HelpCommand.cs
index d991b4fa..d991b4fa 100644
--- a/src/wix/heat/HelpCommand.cs
+++ b/src/tools/heat/HelpCommand.cs
diff --git a/src/wix/heat/IIsFinalizeHarvesterMutator.cs b/src/tools/heat/IIsFinalizeHarvesterMutator.cs
index cfe90272..cfe90272 100644
--- a/src/wix/heat/IIsFinalizeHarvesterMutator.cs
+++ b/src/tools/heat/IIsFinalizeHarvesterMutator.cs
diff --git a/src/wix/heat/IIsHarvesterMutator.cs b/src/tools/heat/IIsHarvesterMutator.cs
index a0147d0f..a0147d0f 100644
--- a/src/wix/heat/IIsHarvesterMutator.cs
+++ b/src/tools/heat/IIsHarvesterMutator.cs
diff --git a/src/wix/heat/IIsHeatExtension.cs b/src/tools/heat/IIsHeatExtension.cs
index be998370..be998370 100644
--- a/src/wix/heat/IIsHeatExtension.cs
+++ b/src/tools/heat/IIsHeatExtension.cs
diff --git a/src/wix/heat/IIsWebSiteHarvester.cs b/src/tools/heat/IIsWebSiteHarvester.cs
index 6e5e29c7..6e5e29c7 100644
--- a/src/wix/heat/IIsWebSiteHarvester.cs
+++ b/src/tools/heat/IIsWebSiteHarvester.cs
diff --git a/src/wix/heat/Mutator.cs b/src/tools/heat/Mutator.cs
index 8c63882d..8c63882d 100644
--- a/src/wix/heat/Mutator.cs
+++ b/src/tools/heat/Mutator.cs
diff --git a/src/wix/heat/PerformanceCategoryHarvester.cs b/src/tools/heat/PerformanceCategoryHarvester.cs
index 6be3401b..6be3401b 100644
--- a/src/wix/heat/PerformanceCategoryHarvester.cs
+++ b/src/tools/heat/PerformanceCategoryHarvester.cs
diff --git a/src/wix/heat/Program.cs b/src/tools/heat/Program.cs
index 0b602f76..f74def8f 100644
--- a/src/wix/heat/Program.cs
+++ b/src/tools/heat/Program.cs
@@ -7,7 +7,6 @@ namespace WixToolset.Tools.Heat
    using System.Threading;
    using System.Threading.Tasks;
    using WixToolset.Core;
-    using WixToolset.Core.Burn;
    using WixToolset.Data;
    using WixToolset.Extensibility;
    using WixToolset.Extensibility.Data;
@@ -29,8 +28,7 @@ namespace WixToolset.Tools.Heat
        [MTAThread]
        public static async Task<int> Main(string[] args)
        {
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider()
+            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-                                                                  .AddBundleBackend();
            var listener = new ConsoleMessageListener("HEAT", "heat.exe");
            try
diff --git a/src/wix/heat/RegFileHarvester.cs b/src/tools/heat/RegFileHarvester.cs
index b7ad8c7b..b7ad8c7b 100644
--- a/src/wix/heat/RegFileHarvester.cs
+++ b/src/tools/heat/RegFileHarvester.cs
diff --git a/src/wix/heat/RegistryHarvester.cs b/src/tools/heat/RegistryHarvester.cs
index 0dfd3a29..0dfd3a29 100644
--- a/src/wix/heat/RegistryHarvester.cs
+++ b/src/tools/heat/RegistryHarvester.cs
diff --git a/src/wix/heat/Serialize/CodeDomInterfaces.cs b/src/tools/heat/Serialize/CodeDomInterfaces.cs
index bd674db6..bd674db6 100644
--- a/src/wix/heat/Serialize/CodeDomInterfaces.cs
+++ b/src/tools/heat/Serialize/CodeDomInterfaces.cs
diff --git a/src/wix/heat/Serialize/CodeDomReader.cs b/src/tools/heat/Serialize/CodeDomReader.cs
index 0741bf68..0741bf68 100644
--- a/src/wix/heat/Serialize/CodeDomReader.cs
+++ b/src/tools/heat/Serialize/CodeDomReader.cs
diff --git a/src/wix/heat/Serialize/ElementCollection.cs b/src/tools/heat/Serialize/ElementCollection.cs
index bacbafbd..bacbafbd 100644
--- a/src/wix/heat/Serialize/ElementCollection.cs
+++ b/src/tools/heat/Serialize/ElementCollection.cs
diff --git a/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs b/src/tools/heat/Serialize/WixHarvesterStrings.Designer.cs
index cc16e57a..cc16e57a 100644
--- a/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs
+++ b/src/tools/heat/Serialize/WixHarvesterStrings.Designer.cs
diff --git a/src/wix/heat/Serialize/WixHarvesterStrings.resx b/src/tools/heat/Serialize/WixHarvesterStrings.resx
index 5894a190..5894a190 100644
--- a/src/wix/heat/Serialize/WixHarvesterStrings.resx
+++ b/src/tools/heat/Serialize/WixHarvesterStrings.resx
diff --git a/src/wix/heat/Serialize/iis.cs b/src/tools/heat/Serialize/iis.cs
index 3f2943f8..3f2943f8 100644
--- a/src/wix/heat/Serialize/iis.cs
+++ b/src/tools/heat/Serialize/iis.cs
diff --git a/src/wix/heat/Serialize/util.cs b/src/tools/heat/Serialize/util.cs
index 84f56eb0..84f56eb0 100644
--- a/src/wix/heat/Serialize/util.cs
+++ b/src/tools/heat/Serialize/util.cs
diff --git a/src/wix/heat/Serialize/vs.cs b/src/tools/heat/Serialize/vs.cs
index 8f926efc..8f926efc 100644
--- a/src/wix/heat/Serialize/vs.cs
+++ b/src/tools/heat/Serialize/vs.cs
diff --git a/src/wix/heat/Serialize/wix.cs b/src/tools/heat/Serialize/wix.cs
index b881fb92..b881fb92 100644
--- a/src/wix/heat/Serialize/wix.cs
+++ b/src/tools/heat/Serialize/wix.cs
diff --git a/src/wix/heat/TypeLibraryHarvester.cs b/src/tools/heat/TypeLibraryHarvester.cs
index b5c1cba6..b5c1cba6 100644
--- a/src/wix/heat/TypeLibraryHarvester.cs
+++ b/src/tools/heat/TypeLibraryHarvester.cs
diff --git a/src/wix/heat/UtilFinalizeHarvesterMutator.cs b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
index 5af56e89..5af56e89 100644
--- a/src/wix/heat/UtilFinalizeHarvesterMutator.cs
+++ b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
diff --git a/src/wix/heat/UtilHarvesterMutator.cs b/src/tools/heat/UtilHarvesterMutator.cs
index af2584e3..af2584e3 100644
--- a/src/wix/heat/UtilHarvesterMutator.cs
+++ b/src/tools/heat/UtilHarvesterMutator.cs
diff --git a/src/wix/heat/UtilHeatExtension.cs b/src/tools/heat/UtilHeatExtension.cs
index 5ad5ef8a..469e38b5 100644
--- a/src/wix/heat/UtilHeatExtension.cs
+++ b/src/tools/heat/UtilHeatExtension.cs
@@ -5,10 +5,7 @@ namespace WixToolset.Harvesters
    using System;
    using System.Collections.Generic;
    using System.IO;
-    using WixToolset.Core.Burn.Interfaces;
    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Services;
    using WixToolset.Harvesters.Data;
    using WixToolset.Harvesters.Extensibility;
@@ -19,11 +16,8 @@ namespace WixToolset.Harvesters
    {
        public UtilHeatExtension(IServiceProvider serviceProvider)
        {
-            this.PayloadHarvester = serviceProvider.GetService<IPayloadHarvester>();
        }
-        private IPayloadHarvester PayloadHarvester { get; }
        /// <summary>
        /// Gets the supported command line types for this extension.
        /// </summary>
@@ -36,8 +30,6 @@ namespace WixToolset.Harvesters
                {
                    new HeatCommandLineOption("dir", "harvest a directory"),
                    new HeatCommandLineOption("file", "harvest a file"),
-                    new HeatCommandLineOption("exepackagepayload", "harvest a bundle payload as ExePackagePayload"),
-                    new HeatCommandLineOption("msupackagepayload", "harvest a bundle payload as MsuPackagePayload"),
                    new HeatCommandLineOption("perf", "harvest performance counters"),
                    new HeatCommandLineOption("reg", "harvest a .reg file"),
                    new HeatCommandLineOption("-ag", "autogenerate component guids at compile time"),
diff --git a/src/wix/heat/UtilMutator.cs b/src/tools/heat/UtilMutator.cs
index 0bc15cd6..0bc15cd6 100644
--- a/src/wix/heat/UtilMutator.cs
+++ b/src/tools/heat/UtilMutator.cs
diff --git a/src/wix/heat/UtilTransformMutator.cs b/src/tools/heat/UtilTransformMutator.cs
index 2d3f2bb0..2d3f2bb0 100644
--- a/src/wix/heat/UtilTransformMutator.cs
+++ b/src/tools/heat/UtilTransformMutator.cs
diff --git a/src/wix/heat/VSHeatExtension.cs b/src/tools/heat/VSHeatExtension.cs
index d31cd25a..d31cd25a 100644
--- a/src/wix/heat/VSHeatExtension.cs
+++ b/src/tools/heat/VSHeatExtension.cs
diff --git a/src/wix/heat/VSProjectHarvester.cs b/src/tools/heat/VSProjectHarvester.cs
index 93b20cd8..93b20cd8 100644
--- a/src/wix/heat/VSProjectHarvester.cs
+++ b/src/tools/heat/VSProjectHarvester.cs
diff --git a/src/wix/heat/app.config b/src/tools/heat/app.config
index 65d3d6c3..65d3d6c3 100644
--- a/src/wix/heat/app.config
+++ b/src/tools/heat/app.config
diff --git a/src/wix/heat/heat.csproj b/src/tools/heat/heat.csproj
index 88fd2eb0..b3d38098 100644
--- a/src/wix/heat/heat.csproj
+++ b/src/tools/heat/heat.csproj
@@ -6,10 +6,9 @@
    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
    <OutputType>Exe</OutputType>
    <Description>Harvester</Description>
-    <Title>WiX Harvester</Title>
+    <Title>WiX Toolset Harvester</Title>
    <DebugType>embedded</DebugType>
    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <!-- <PackAsTool>true</PackAsTool> -->
    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers>
    <AppConfig>app.config</AppConfig>
    <ApplicationManifest>heat.exe.manifest</ApplicationManifest>
@@ -17,10 +16,6 @@
  </PropertyGroup>
  <ItemGroup>
-    <Compile Include="..\wix\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
-  </ItemGroup>
-  <ItemGroup>
    <Compile Update="Serialize\WixHarvesterStrings.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>
@@ -36,8 +31,8 @@
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
+    <PackageReference Include="WixToolset.Core" />
-    <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
+    <PackageReference Include="WixToolset.Core.Burn" />
  </ItemGroup>
  <ItemGroup>
diff --git a/src/wix/heat/heat.exe.manifest b/src/tools/heat/heat.exe.manifest
index b4adfbb7..b4adfbb7 100644
--- a/src/wix/heat/heat.exe.manifest
+++ b/src/tools/heat/heat.exe.manifest
diff --git a/src/wix/heat/heat.net461.v3.ncrunchproject b/src/tools/heat/heat.net461.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/wix/heat/heat.net461.v3.ncrunchproject
+++ b/src/tools/heat/heat.net461.v3.ncrunchproject
diff --git a/src/wix/heat/heat.netcoreapp2.1.v3.ncrunchproject b/src/tools/heat/heat.netcoreapp2.1.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/wix/heat/heat.netcoreapp2.1.v3.ncrunchproject
+++ b/src/tools/heat/heat.netcoreapp2.1.v3.ncrunchproject
diff --git a/src/tools/publish_t.proj b/src/tools/publish_t.proj
new file mode 100644
index 00000000..b23c3d84
--- /dev/null
+++ b/src/tools/publish_t.proj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <PropertyGroup>
+    <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86>
+    <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64>
+    <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\</StagePublishDnc>
+    <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder>
+    <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere>
+    <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86>
+    <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64>
+    <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\netcoreapp3.1\</PublishDnc>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" />
+    <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" />
+    <!-- heat.exe doesn't need to filter any files so publish it straight into its final location -->
+    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" />
+    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" />
+    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" />
+  </ItemGroup>
+  <Target Name="CopyToFinalPublishFolder" AfterTargets="Build">
+    <ItemGroup>
+      <From Include="WixToolset.Heat\WixToolset.Heat.targets" To="$(PublishBuildFolder)" />
+      <From Include="$(StagePublishX86)\WixToolset.HeatTasks\*.*" Exclude="$(StagePublishx86)\WixToolset.HeatTasks\Microsoft.Build.*.dll" To="$(PublishHere)" />
+      <From Include="$(StagePublishDnc)\WixToolset.HeatTasks\*.*" Exclude="$(StagePublishDnc)\WixToolset.HeatTasks\Microsoft.Build.*.dll" To="$(PublishDnc)" />
+    </ItemGroup>
+    <Copy SourceFiles="@(From)"
+      DestinationFiles="%(To)%(RecursiveDir)%(Filename)%(Extension)"
+      SkipUnchangedFiles="true"
+      UseHardlinksIfPossible="true" />
+  </Target>
+</Project>
diff --git a/src/tools/test/Directory.Build.props b/src/tools/test/Directory.Build.props
new file mode 100644
index 00000000..a0c9a659
--- /dev/null
+++ b/src/tools/test/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <OutputPath>$(OutputPath)test\$(ProjectName)</OutputPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Heat/HeatRunner.cs b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
index 287698a9..287698a9 100644
--- a/src/wix/test/WixToolsetTest.Heat/HeatRunner.cs
+++ b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
diff --git a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index 1ba62393..73eb078c 100644
--- a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -9,11 +9,6 @@
  </PropertyGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\heat\heat.csproj" />
-    <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
-  </ItemGroup>
-  <ItemGroup>
    <PackageReference Include="WixBuildTools.TestSupport" />
  </ItemGroup>
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs
index f1fa2453..d54da457 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs
@@ -3,7 +3,6 @@
 namespace WixToolsetTest.Sdk
 {
    using System;
-    using System.Collections.Generic;
    using System.IO;
    using System.Linq;
    using WixBuildTools.TestSupport;
@@ -14,23 +13,34 @@ namespace WixToolsetTest.Sdk
    public class MsbuildHeatFixture
    {
+        public static readonly string HeatTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath), "..", "..", "..", "publish", "WixToolset.Heat", "build", "WixToolset.Heat.targets");
+        public MsbuildHeatFixture()
+        {
+            EnsureWixSdkCached();
+        }
        [Theory]
        [InlineData(BuildSystem.DotNetCoreSdk)]
        [InlineData(BuildSystem.MSBuild)]
        [InlineData(BuildSystem.MSBuild64)]
        public void CanBuildHeatFilePackage(BuildSystem buildSystem)
        {
-            var sourceFolder = TestData.Get(@"TestData\HeatFilePackage");
+            var sourceFolder = TestData.Get("TestData", "HeatFilePackage");
-            using (var fs = new TestDataFolderFileSystem())
+            using (var fs = new DisposableFileSystem())
            {
-                fs.Initialize(sourceFolder);
+                var baseFolder = fs.GetFolder();
-                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin");
-                var binFolder = Path.Combine(baseFolder, @"bin\");
                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-                var projectPath = Path.Combine(baseFolder, "HeatFilePackage.wixproj");
+                var projectPath = Path.Combine(sourceFolder, "HeatFilePackage.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    "-Restore",
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath),
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "BaseIntermediateOutputPath", intermediateFolder),
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "OutputPath", binFolder),
+                });
                result.AssertSuccess();
                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
@@ -39,9 +49,7 @@ namespace WixToolsetTest.Sdk
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
                WixAssert.StringCollectionEmpty(warnings);
-                var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
+                var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
-                Assert.True(File.Exists(generatedFilePath));
                var generatedContents = File.ReadAllText(generatedFilePath);
                var testXml = generatedContents.GetTestXml();
                WixAssert.StringEqual(@"<Wix>" +
@@ -59,9 +67,7 @@ namespace WixToolsetTest.Sdk
                    "</Fragment>" +
                    "</Wix>", testXml);
-                var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFilePackage.wixpdb");
+                var pdbPath = Path.Combine(binFolder, "HeatFilePackage.wixpdb");
-                Assert.True(File.Exists(pdbPath));
                var intermediate = Intermediate.Load(pdbPath);
                var section = intermediate.Sections.Single();
@@ -76,17 +82,21 @@ namespace WixToolsetTest.Sdk
        [InlineData(BuildSystem.MSBuild64)]
        public void CanBuildHeatFileWithMultipleFilesPackage(BuildSystem buildSystem)
        {
-            var sourceFolder = TestData.Get(@"TestData\HeatFileMultipleFilesSameFileName");
+            var sourceFolder = TestData.Get(@"TestData", "HeatFileMultipleFilesSameFileName");
-            using (var fs = new TestDataFolderFileSystem())
+            using (var fs = new DisposableFileSystem())
            {
-                fs.Initialize(sourceFolder);
+                var baseFolder = fs.GetFolder();
-                var baseFolder = fs.BaseFolder;
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-                var projectPath = Path.Combine(baseFolder, "HeatFileMultipleFilesSameFileName.wixproj");
+                var projectPath = Path.Combine(sourceFolder, "HeatFileMultipleFilesSameFileName.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    "-Restore",
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath),
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "BaseIntermediateOutputPath", intermediateFolder),
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "OutputPath", binFolder),
+                });
                result.AssertSuccess();
                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
@@ -95,7 +105,7 @@ namespace WixToolsetTest.Sdk
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
                WixAssert.StringCollectionEmpty(warnings);
-                var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
+                var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
                Assert.True(File.Exists(generatedFilePath));
                var generatedContents = File.ReadAllText(generatedFilePath);
@@ -115,7 +125,7 @@ namespace WixToolsetTest.Sdk
                    "</Fragment>" +
                    "</Wix>", testXml);
-                generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs");
+                generatedFilePath = Path.Combine(intermediateFolder, "Release", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs");
                Assert.True(File.Exists(generatedFilePath));
                generatedContents = File.ReadAllText(generatedFilePath);
@@ -135,7 +145,7 @@ namespace WixToolsetTest.Sdk
                    "</Fragment>" +
                    "</Wix>", testXml);
-                var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFileMultipleFilesSameFileName.wixpdb");
+                var pdbPath = Path.Combine(binFolder, "HeatFileMultipleFilesSameFileName.wixpdb");
                Assert.True(File.Exists(pdbPath));
                var intermediate = Intermediate.Load(pdbPath);
@@ -156,11 +166,13 @@ namespace WixToolsetTest.Sdk
        [InlineData(BuildSystem.MSBuild64, false)]
        public void CanBuildHeatProjectPreSdkStyle(BuildSystem buildSystem, bool useToolsVersion)
        {
-            var sourceFolder = TestData.Get(@"TestData\HeatProject");
+            var sourceFolder = TestData.Get(@"TestData", "HeatProject");
            using (var fs = new TestDataFolderFileSystem())
            {
                fs.Initialize(sourceFolder);
+                File.Copy("global.json", Path.Combine(fs.BaseFolder, "global.json"));
                var baseFolder = Path.Combine(fs.BaseFolder, "HeatProjectPreSdkStyle");
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
@@ -168,8 +180,9 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
-                    useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty,
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath),
-                });
+                     useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty,
+                 });
                result.AssertSuccess();
                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true);
@@ -187,7 +200,7 @@ namespace WixToolsetTest.Sdk
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
                WixAssert.StringCollectionEmpty(warnings);
-                var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ToolsVersion4Cs.wxs");
+                var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_ToolsVersion4Cs.wxs");
                Assert.True(File.Exists(generatedFilePath));
                var generatedContents = File.ReadAllText(generatedFilePath);
@@ -246,7 +259,7 @@ namespace WixToolsetTest.Sdk
                    "</Fragment>" +
                    "</Wix>", testXml);
-                var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatProjectPreSdkStyle.wixpdb");
+                var pdbPath = Path.Combine(binFolder, "Release", "HeatProjectPreSdkStyle.wixpdb");
                Assert.True(File.Exists(pdbPath));
                var intermediate = Intermediate.Load(pdbPath);
@@ -271,22 +284,26 @@ namespace WixToolsetTest.Sdk
            using (var fs = new TestDataFolderFileSystem())
            {
                fs.Initialize(sourceFolder);
+                File.Copy("global.json", Path.Combine(fs.BaseFolder, "global.json"));
                var baseFolder = Path.Combine(fs.BaseFolder, "HeatProjectSdkStyle");
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-                var projectPath = Path.Combine(baseFolder, "HeatProjectSdkStyle.wixproj");
+                var projectPath = Path.Combine(fs.BaseFolder, "HeatProjectSdkStyle", "HeatProjectSdkStyle.wixproj");
                var referencedProjectPath = Path.Combine(fs.BaseFolder, "SdkStyleCs", "SdkStyleCs.csproj");
                var result = MsbuildUtilities.BuildProject(buildSystem, referencedProjectPath, new[]
                {
-                    "-t:restore",
+                     "-t:restore",
-                });
+                     MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath),
+                 });
                result.AssertSuccess();
                result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
-                    useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty,
+                     MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath),
-                });
+                     useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty,
+                 });
                result.AssertSuccess();
                var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true);
@@ -304,7 +321,7 @@ namespace WixToolsetTest.Sdk
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
                WixAssert.StringCollectionEmpty(warnings);
-                var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_SdkStyleCs.wxs");
+                var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_SdkStyleCs.wxs");
                Assert.True(File.Exists(generatedFilePath));
                var generatedContents = File.ReadAllText(generatedFilePath);
@@ -361,7 +378,7 @@ namespace WixToolsetTest.Sdk
                    "</Fragment>" +
                    "</Wix>", testXml);
-                var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatProjectSdkStyle.wixpdb");
+                var pdbPath = Path.Combine(binFolder, "Release", "HeatProjectSdkStyle.wixpdb");
                Assert.True(File.Exists(pdbPath));
                var intermediate = Intermediate.Load(pdbPath);
@@ -371,5 +388,23 @@ namespace WixToolsetTest.Sdk
                WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
            }
        }
+        /// <summary>
+        /// This method exists to get the WixToolset.Sdk.nupkg into the NuGet package cache using the global.json
+        /// and nuget.config in the root of the repository. By pre-caching the WiX SDK, the rest of the tests will
+        /// pull the binaries out of the cache instead of needing to find the original .nupkg in the build artifacts
+        /// folder (which requires use of nuget.config found in the root of the repo)
+        /// </summary>
+        private static void EnsureWixSdkCached()
+        {
+            // This EnsureWixSdkCached project exists only to pre-cache the WixToolset.Sdk for use by later projects.
+            var sourceFolder = TestData.Get("TestData", "EnsureWixSdkCached");
+            var result = MsbuildUtilities.BuildProject(BuildSystem.DotNetCoreSdk, Path.Combine(sourceFolder, "EnsureWixSdkCached.wixproj"), new[]
+            {
+                "-t:restore",
+            });
+            result.AssertSuccess();
+        }
    }
 }
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj
new file mode 100644
index 00000000..7730425f
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <!-- This project exists only to pre-cache the WixToolset.Sdk for use by the other test data projects. -->
+</Project>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
new file mode 100644
index 00000000..2aaf5c01
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <BindInputPaths Include="." />
+  </ItemGroup>
+  <PropertyGroup>
+    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
+  </PropertyGroup>
+  <ItemGroup>
+    <HarvestFile Include="MyProgram.txt">
+      <ComponentGroupName>TxtProductComponents</ComponentGroupName>
+      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestFile>
+    <HarvestFile Include="MyProgram.json">
+      <ComponentGroupName>JsonProductComponents</ComponentGroupName>
+      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestFile>
+  </ItemGroup>
+  <Import Project="$(HeatTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
index 5f282702..5f282702 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
index 5f282702..5f282702 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
index 5abcee9f..5abcee9f 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
new file mode 100644
index 00000000..345832cf
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <BindInputPaths Include="." />
+  </ItemGroup>
+  <PropertyGroup>
+    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
+  </PropertyGroup>
+  <ItemGroup>
+    <HarvestFile Include="HeatFilePackage.wixproj">
+      <ComponentGroupName>ProductComponents</ComponentGroupName>
+      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestFile>
+  </ItemGroup>
+  <Import Project="$(HeatTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs
index f5fa8cf6..f5fa8cf6 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
new file mode 100644
index 00000000..a05348a5
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <BindInputPaths Include="." />
+  </ItemGroup>
+  
+  <PropertyGroup>
+    <EnableProjectHarvesting>true</EnableProjectHarvesting>
+    <HarvestProjectsSuppressUniqueIds>true</HarvestProjectsSuppressUniqueIds>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ToolsVersion4Cs\ToolsVersion4Cs.csproj" />
+  </ItemGroup>
+  <Import Project="$(HeatTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
index 6c12861b..6c12861b 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
new file mode 100644
index 00000000..202921fe
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <BindInputPaths Include="." />
+  </ItemGroup>
+  
+  <PropertyGroup>
+    <EnableProjectHarvesting>true</EnableProjectHarvesting>
+    <HarvestProjectsSuppressUniqueIds>true</HarvestProjectsSuppressUniqueIds>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SdkStyleCs\SdkStyleCs.csproj" />
+  </ItemGroup>
+  <Import Project="$(HeatTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
index d30218f3..d30218f3 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs
index 2b2c5be2..2b2c5be2 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj
index 755976bc..755976bc 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs
index c29a2303..c29a2303 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
index e5723ea2..e5723ea2 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
new file mode 100644
index 00000000..c0c7c903
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <DebugType>embedded</DebugType>
+    <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
+    <SignOutput>false</SignOutput>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\..\..\global.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" /> 
+    <PackageReference Include="WixToolset.Core.TestPackage" /> 
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject
new file mode 100644
index 00000000..319cd523
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
+\ No newline at end of file
diff --git a/src/tools/thmviewer/thmviewer.v3.ncrunchproject b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
index 3cffd6ce..1d0a6a6c 100644
--- a/src/tools/thmviewer/thmviewer.v3.ncrunchproject
+++ b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
@@ -3,5 +3,6 @@
    <AdditionalFilesToIncludeForProject>
      <Value>thmviewer.manifest</Value>
    </AdditionalFilesToIncludeForProject>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
 \ No newline at end of file
diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd
index 4764a8fe..125bf298 100644
--- a/src/tools/tools.cmd
+++ b/src/tools/tools.cmd
@@ -2,17 +2,40 @@
 @pushd %~dp0
 @set _C=Debug
+@set _L=%~dp0..\..\build\logs
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="inc" set _INCREMENTAL=1
+@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1
 @if not "%1"=="" shift & goto parse_args
+:: Clean
+@if NOT "%_INCREMENTAL%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
 @echo Building tools %_C%
-:: tools
+:: Build
+msbuild -Restore tools.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
+:: Publish
+msbuild publish_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\tools_publish.binlog || exit /b
+:: Test
+dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.HeatTasks -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.HeatTasks.trx" || exit /b
+:: Pack
+msbuild -t:Pack WixToolset.Heat -p:Configuration=%_C% -p:NoBuild=true -nologo -m -warnaserror -bl:..\..\build\logs\tools_pack.binlog || exit /b
-nuget restore || exit /b
+@goto :end
-msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
+:clean
+@rd /s/q "..\..\build\tools" 2> nul
+@del "..\..\build\artifacts\WixToolset.Heat.*.nupkg" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.heat" 2> nul
+@exit /b
+:end
 @popd
 @endlocal
diff --git a/src/tools/tools.sln b/src/tools/tools.sln
index 4da1e8fd..4df8367e 100644
--- a/src/tools/tools.sln
+++ b/src/tools/tools.sln
@@ -1,11 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.30711.63
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Templates", "WixToolset.Templates\WixToolset.Templates.csproj", "{D1385232-CA10-4092-BAB5-4E5499FE144C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Templates", "WixToolset.Templates\WixToolset.Templates.csproj", "{D1385232-CA10-4092-BAB5-4E5499FE144C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Heat", "WixToolset.Heat\WixToolset.Heat.csproj", "{4B301D2D-43D3-4000-8132-36C5A1E9F8F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "heat\heat.csproj", "{6C747707-29DE-429E-87A4-F6F81DD146C6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F7A815A5-37AE-4EC4-A6D6-B29565055668}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.HeatTasks", "WixToolset.HeatTasks\WixToolset.HeatTasks.csproj", "{EBDCA232-17CD-40CE-B592-CD7230388BEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.HeatTasks", "test\WixToolsetTest.HeatTasks\WixToolsetTest.HeatTasks.csproj", "{3FB7F972-31A6-4929-B6BF-EACEC659A7D3}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,10 +39,45 @@ Global
                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|Any CPU.Build.0 = Release|Any CPU
                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|x86.ActiveCfg = Release|Any CPU
                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|x86.Build.0 = Release|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Debug|x86.Build.0 = Debug|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Release|x86.ActiveCfg = Release|Any CPU
+                {4B301D2D-43D3-4000-8132-36C5A1E9F8F0}.Release|x86.Build.0 = Release|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Debug|x86.Build.0 = Debug|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Release|x86.ActiveCfg = Release|Any CPU
+                {6C747707-29DE-429E-87A4-F6F81DD146C6}.Release|x86.Build.0 = Release|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Debug|x86.Build.0 = Debug|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Release|x86.ActiveCfg = Release|Any CPU
+                {EBDCA232-17CD-40CE-B592-CD7230388BEF}.Release|x86.Build.0 = Release|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Debug|x86.Build.0 = Debug|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Release|Any CPU.Build.0 = Release|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Release|x86.ActiveCfg = Release|Any CPU
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3}.Release|x86.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
+        GlobalSection(NestedProjects) = preSolution
+                {3FB7F972-31A6-4929-B6BF-EACEC659A7D3} = {F7A815A5-37AE-4EC4-A6D6-B29565055668}
+        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {537F1116-39FE-4AED-A9A2-35030E5750D5}
        EndGlobalSection
diff --git a/src/tools/tools.v3.ncrunchsolution b/src/tools/tools.v3.ncrunchsolution
new file mode 100644
index 00000000..10420ac9
--- /dev/null
+++ b/src/tools/tools.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
+\ No newline at end of file
diff --git a/src/wix/WixToolset.BuildTasks/HeatDirectory.cs b/src/wix/WixToolset.BuildTasks/HeatDirectory.cs
deleted file mode 100644
index 79da303a..00000000
--- a/src/wix/WixToolset.BuildTasks/HeatDirectory.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
-{
-    using Microsoft.Build.Framework;
-    public sealed class HeatDirectory : HeatTask
-    {
-        private string directory;
-        private bool keepEmptyDirectories;
-        private bool suppressCom;
-        private bool suppressRootDirectory;
-        private bool suppressRegistry;
-        private string template;
-        private string componentGroupName;
-        private string directoryRefId;
-        private string preprocessorVariable;
-        public string ComponentGroupName
-        {
-            get { return this.componentGroupName; }
-            set { this.componentGroupName = value; }
-        }
-        [Required]
-        public string Directory
-        {
-            get { return this.directory; }
-            set { this.directory = value; }
-        }
-        public string DirectoryRefId
-        {
-            get { return this.directoryRefId; }
-            set { this.directoryRefId = value; }
-        }
-        public bool KeepEmptyDirectories
-        {
-            get { return this.keepEmptyDirectories; }
-            set { this.keepEmptyDirectories = value; }
-        }
-        public string PreprocessorVariable
-        {
-            get { return this.preprocessorVariable; }
-            set { this.preprocessorVariable = value; }
-        }
-        public bool SuppressCom
-        {
-            get { return this.suppressCom; }
-            set { this.suppressCom = value; }
-        }
-        public bool SuppressRootDirectory
-        {
-            get { return this.suppressRootDirectory; }
-            set { this.suppressRootDirectory = value; }
-        }
-        public bool SuppressRegistry
-        {
-            get { return this.suppressRegistry; }
-            set { this.suppressRegistry = value; }
-        }
-        public string Template
-        {
-            get { return this.template; }
-            set { this.template = value; }
-        }
-        protected override string OperationName
-        {
-            get { return "dir"; }
-        }
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            commandLineBuilder.AppendSwitch(this.OperationName);
-            commandLineBuilder.AppendFileNameIfNotNull(this.Directory);
-            commandLineBuilder.AppendSwitchIfNotNull("-cg ", this.ComponentGroupName);
-            commandLineBuilder.AppendSwitchIfNotNull("-dr ", this.DirectoryRefId);
-            commandLineBuilder.AppendIfTrue("-ke", this.KeepEmptyDirectories);
-            commandLineBuilder.AppendIfTrue("-scom", this.SuppressCom);
-            commandLineBuilder.AppendIfTrue("-sreg", this.SuppressRegistry);
-            commandLineBuilder.AppendIfTrue("-srd", this.SuppressRootDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-template ", this.Template);
-            commandLineBuilder.AppendSwitchIfNotNull("-var ", this.PreprocessorVariable);
-            base.BuildCommandLine(commandLineBuilder);
-        }
-    }
-}
diff --git a/src/wix/WixToolset.BuildTasks/HeatFile.cs b/src/wix/WixToolset.BuildTasks/HeatFile.cs
deleted file mode 100644
index 57fe579d..00000000
--- a/src/wix/WixToolset.BuildTasks/HeatFile.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
-{
-    using Microsoft.Build.Framework;
-    public sealed class HeatFile : HeatTask
-    {
-        private string file;
-        private bool suppressCom;
-        private bool suppressRegistry;
-        private bool suppressRootDirectory;
-        private string template;
-        private string componentGroupName;
-        private string directoryRefId;
-        private string preprocessorVariable;
-        public string ComponentGroupName
-        {
-            get { return this.componentGroupName; }
-            set { this.componentGroupName = value; }
-        }
-        public string DirectoryRefId
-        {
-            get { return this.directoryRefId; }
-            set { this.directoryRefId = value; }
-        }
-        [Required]
-        public string File
-        {
-            get { return this.file; }
-            set { this.file = value; }
-        }
-        public string PreprocessorVariable
-        {
-            get { return this.preprocessorVariable; }
-            set { this.preprocessorVariable = value; }
-        }
-        public bool SuppressCom
-        {
-            get { return this.suppressCom; }
-            set { this.suppressCom = value; }
-        }
-        public bool SuppressRegistry
-        {
-            get { return this.suppressRegistry; }
-            set { this.suppressRegistry = value; }
-        }
-        public bool SuppressRootDirectory
-        {
-            get { return this.suppressRootDirectory; }
-            set { this.suppressRootDirectory = value; }
-        }
-        public string Template
-        {
-            get { return this.template; }
-            set { this.template = value; }
-        }
-        protected override string OperationName
-        {
-            get { return "file"; }
-        }
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            commandLineBuilder.AppendSwitch(this.OperationName);
-            commandLineBuilder.AppendFileNameIfNotNull(this.File);
-            commandLineBuilder.AppendSwitchIfNotNull("-cg ", this.ComponentGroupName);
-            commandLineBuilder.AppendSwitchIfNotNull("-dr ", this.DirectoryRefId);
-            commandLineBuilder.AppendIfTrue("-scom", this.SuppressCom);
-            commandLineBuilder.AppendIfTrue("-srd", this.SuppressRootDirectory);
-            commandLineBuilder.AppendIfTrue("-sreg", this.SuppressRegistry);
-            commandLineBuilder.AppendSwitchIfNotNull("-template ", this.Template);
-            commandLineBuilder.AppendSwitchIfNotNull("-var ", this.PreprocessorVariable);
-            base.BuildCommandLine(commandLineBuilder);
-        }
-    }
-}
diff --git a/src/wix/WixToolset.BuildTasks/HeatTask.cs b/src/wix/WixToolset.BuildTasks/HeatTask.cs
deleted file mode 100644
index 18c08342..00000000
--- a/src/wix/WixToolset.BuildTasks/HeatTask.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace WixToolset.BuildTasks
-{
-    using Microsoft.Build.Framework;
-    /// <summary>
-    /// A base MSBuild task to run the WiX harvester.
-    /// Specific harvester tasks should extend this class.
-    /// </summary>
-    public abstract partial class HeatTask : ToolsetTask
-    {
-        private bool autogenerageGuids;
-        private bool generateGuidsNow;
-        private ITaskItem outputFile;
-        private bool suppressFragments;
-        private bool suppressUniqueIds;
-        private string[] transforms;
-        public HeatTask()
-        {
-            this.RunAsSeparateProcess = true;
-        }
-        public bool AutogenerateGuids
-        {
-            get { return this.autogenerageGuids; }
-            set { this.autogenerageGuids = value; }
-        }
-        public bool GenerateGuidsNow
-        {
-            get { return this.generateGuidsNow; }
-            set { this.generateGuidsNow = value; }
-        }
-        [Required]
-        [Output]
-        public ITaskItem OutputFile
-        {
-            get { return this.outputFile; }
-            set { this.outputFile = value; }
-        }
-        public bool SuppressFragments
-        {
-            get { return this.suppressFragments; }
-            set { this.suppressFragments = value; }
-        }
-        public bool SuppressUniqueIds
-        {
-            get { return this.suppressUniqueIds; }
-            set { this.suppressUniqueIds = value; }
-        }
-        public string[] Transforms
-        {
-            get { return this.transforms; }
-            set { this.transforms = value; }
-        }
-        protected sealed override string ToolName => "heat.exe";
-        /// <summary>
-        /// Gets the name of the heat operation performed by the task.
-        /// </summary>
-        /// <remarks>This is the first parameter passed on the heat.exe command-line.</remarks>
-        /// <value>The name of the heat operation performed by the task.</value>
-        protected abstract string OperationName
-        {
-            get;
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendIfTrue("-ag", this.AutogenerateGuids);
-            commandLineBuilder.AppendIfTrue("-gg", this.GenerateGuidsNow);
-            commandLineBuilder.AppendIfTrue("-sfrag", this.SuppressFragments);
-            commandLineBuilder.AppendIfTrue("-suid", this.SuppressUniqueIds);
-            commandLineBuilder.AppendArrayIfNotNull("-t ", this.Transforms);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-        }
-    }
-}
diff --git a/src/wix/WixToolset.BuildTasks/HeatTask_InProc.cs b/src/wix/WixToolset.BuildTasks/HeatTask_InProc.cs
deleted file mode 100644
index 48ee9e02..00000000
--- a/src/wix/WixToolset.BuildTasks/HeatTask_InProc.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-#if !NETCOREAPP
-namespace WixToolset.BuildTasks
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using WixToolset.Extensibility.Services;
-    public partial class HeatTask
-    {
-        public override bool RunAsSeparateProcess { get => true; }
-        protected sealed override string TaskShortName => "HEAT";
-        protected sealed override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken) => throw new NotImplementedException();
-    }
-}
-#endif
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index b6751ed9..4af6c522 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -13,7 +13,6 @@
  <ItemGroup>
    <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="tools\WixToolset.Signing.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="tools\wix.props" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 87dfab33..752753b6 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -34,7 +34,6 @@
  </PropertyGroup>
  <PropertyGroup>
-    <WixHarvestTargetsPath Condition=" '$(WixHarvestTargetsPath)' == '' ">$(MSBuildThisFileDirectory)wix.harvest.targets</WixHarvestTargetsPath>
    <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(MSBuildThisFileDirectory)WixToolset.Signing.targets</WixSigningTargetsPath>
  </PropertyGroup>
@@ -966,7 +965,6 @@
    -->
  </Target>
-  <Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" />
  <Import Project="$(WixSigningTargetsPath)"  />
  <!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj
index 55b5216c..160cba83 100644
--- a/src/wix/publish_t.proj
+++ b/src/wix/publish_t.proj
@@ -3,15 +3,12 @@
    <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;PublishDir=$(BaseOutputPath)$(Configuration)\publish\wix\" Targets="Publish" />
    <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\buildtasks\" Targets="Publish" />
-    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\heat\" Targets="Publish" />
    <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\wix\" Targets="Publish" />
    <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\buildtasks\" Targets="Publish" />
-    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\heat\" Targets="Publish" />
    <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\wix\" Targets="Publish" />
    <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\" Targets="Publish" />
-    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\heat\" Targets="Publish" />
    <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\wix\" Targets="Publish" />
  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 4ae0f4a8..fe8a78e9 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -32,7 +32,5 @@
    <PackageReference Include="Microsoft.NET.Test.Sdk" />
    <PackageReference Include="xunit" />
    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="GitInfo" PrivateAssets="All" />
  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index f9a13312..40ebad5b 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -11,6 +11,9 @@ namespace WixToolsetTest.Sdk
    public class MsbuildFixture
    {
+        public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath), "..", "..", "..", "publish", "WixToolset.Sdk");
+        public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
        [Theory]
        [InlineData(BuildSystem.DotNetCoreSdk)]
        [InlineData(BuildSystem.MSBuild)]
@@ -26,7 +29,10 @@ namespace WixToolsetTest.Sdk
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var projectPath = Path.Combine(baseFolder, "SimpleBundle.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { "-p:SignOutput=true" });
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { 
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                    "-p:SignOutput=true",
+                    });
                result.AssertSuccess();
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -66,7 +72,10 @@ namespace WixToolsetTest.Sdk
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var projectPath = Path.Combine(baseFolder, "UncompressedBundle.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { "-p:SignOutput=true" });
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                    "-p:SignOutput=true"
+                });
                result.AssertSuccess();
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -106,7 +115,9 @@ namespace WixToolsetTest.Sdk
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var projectPath = Path.Combine(baseFolder, "SimpleMergeModule.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
+                });
                result.AssertSuccess();
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -142,7 +153,10 @@ namespace WixToolsetTest.Sdk
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { "-p:SignOutput=true" });
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                    "-p:SignOutput=true"
+                });
                result.AssertSuccess();
                var platformSwitches = result.Output.Where(line => line.Contains("-platform x86"));
@@ -208,7 +222,9 @@ namespace WixToolsetTest.Sdk
                var binFolder = Path.Combine(baseFolder, @"bin\");
                var projectPath = Path.Combine(baseFolder, "MergeMsiPackage.wixproj");
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
+                });
                result.AssertSuccess();
                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
@@ -270,6 +286,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
                    "-p:SuppressValidation=true"
                });
@@ -300,6 +317,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    $"-p:Platform=x64",
                });
                result.AssertSuccess();
@@ -337,6 +355,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressIces", "ICE12"),
                }, suppressValidation: false);
                result.AssertSuccess();
@@ -360,6 +379,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressSpecificWarnings", "1118;1102"),
                });
                result.AssertSuccess();
@@ -389,6 +409,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    "-p:OutputType=IntermediatePostLink",
                }, outOfProc: outOfProc);
                result.AssertSuccess();
@@ -418,7 +439,9 @@ namespace WixToolsetTest.Sdk
                var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
                // Build
-                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, verbosityLevel: "diag");
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
+                }, verbosityLevel: "diag");
                result.AssertSuccess();
                var buildOutput = String.Join("\r\n", result.Output);
@@ -432,6 +455,7 @@ namespace WixToolsetTest.Sdk
                // Clean
                result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
                    "-t:Clean",
                }, verbosityLevel: "diag");
                result.AssertSuccess();
@@ -477,7 +501,7 @@ namespace WixToolsetTest.Sdk
                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                {
-                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixToolDir", Path.Combine(MsbuildUtilities.WixMsbuildPath, "broken", "net461")),
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixToolDir", Path.Combine(MsbuildFixture.WixMsbuildPath, "broken", "net461")),
                }, outOfProc: true);
                Assert.Equal(1, result.ExitCode);
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
deleted file mode 100644
index 7d751319..00000000
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(WixMSBuildProps)" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
-  </PropertyGroup>
-  <ItemGroup>
-    <HarvestFile Include="MyProgram.txt">
-      <ComponentGroupName>TxtProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-    <HarvestFile Include="MyProgram.json">
-      <ComponentGroupName>JsonProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
-</Project>
-\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj
deleted file mode 100644
index 3988acaf..00000000
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(WixMSBuildProps)" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
-  </PropertyGroup>
-  <ItemGroup>
-    <HarvestFile Include="HeatFilePackage.wixproj">
-      <ComponentGroupName>ProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
-</Project>
-\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
deleted file mode 100644
index c569e8ac..00000000
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(WixMSBuildProps)" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectGuid>BB919765-DD69-41E7-91C5-415A69BE923E</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <EnableProjectHarvesting>true</EnableProjectHarvesting>
-    <HarvestProjectsSuppressUniqueIds>true</HarvestProjectsSuppressUniqueIds>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ToolsVersion4Cs\ToolsVersion4Cs.csproj" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
-</Project>
-\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
deleted file mode 100644
index 907f0bb0..00000000
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(WixMSBuildProps)" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectGuid>CE998A54-9BEC-4268-BFA2-8E3DAE5831C8</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <EnableProjectHarvesting>true</EnableProjectHarvesting>
-    <HarvestProjectsSuppressUniqueIds>true</HarvestProjectsSuppressUniqueIds>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SdkStyleCs\SdkStyleCs.csproj" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
-</Project>
-\ No newline at end of file
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd
index 281f7f68..17c1ab6f 100644
--- a/src/wix/wix.cmd
+++ b/src/wix/wix.cmd
@@ -30,22 +30,18 @@ dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Core -l "trx;LogFile
 dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Core.Burn -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Core.Burn.trx" || exit /b
 dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Core.Native -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Core.Native.trx" || exit /b
 dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.CoreIntegration -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.CoreIntegration.trx" || exit /b
-dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Heat -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Heat.trx" || exit /b
 :: Publish
 msbuild publish_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\wix_publish.binlog || exit /b
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
-robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll
-robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
-robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
 msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
@@ -59,7 +55,7 @@ dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.BuildTasks -l "trx;L
 dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Sdk -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Sdk.trx" || exit /b
 :: Pack
-msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\wix_pack.binlog || exit /b
+msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_pack.binlog || exit /b
 @popd
 @endlocal
diff --git a/src/wix/wix.sln b/src/wix/wix.sln
index 81faf8be..13ca8785 100644
--- a/src/wix/wix.sln
+++ b/src/wix/wix.sln
@@ -34,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixnative", "wixnative\wixn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Native", "WixToolset.Core.Native\WixToolset.Core.Native.csproj", "{81533C6A-E145-4EB5-9658-3ACA8A2A6323}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "heat\heat.csproj", "{E08BCE70-7D77-4B70-83F1-F08A7B58FC16}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wix", "wix\wix.csproj", "{C933FB6B-074C-4ED2-B961-7639A7877B3A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BuildTasks", "WixToolset.BuildTasks\WixToolset.BuildTasks.csproj", "{D04EE8DF-85E5-42E5-B7B4-D064818F32C5}"
@@ -44,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sdk", "WixToolse
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sdk", "test\WixToolsetTest.Sdk\WixToolsetTest.Sdk.csproj", "{C44BB95F-5020-4876-933C-B73A24C488FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Heat", "test\WixToolsetTest.Heat\WixToolsetTest.Heat.csproj", "{9D788104-2636-4E4C-891C-08FF05FEC31E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Native", "test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj", "{93645356-5D5F-45DE-AC7F-252D35E1ACE5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{A05698E0-30D9-4B36-8F3B-585A99D67118}"
@@ -306,22 +302,6 @@ Global
                {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x64.Build.0 = Release|Any CPU
                {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x86.ActiveCfg = Release|Any CPU
                {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x86.Build.0 = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|ARM64.Build.0 = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x64.Build.0 = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x86.Build.0 = Debug|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|ARM64.ActiveCfg = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|ARM64.Build.0 = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x64.ActiveCfg = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x64.Build.0 = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x86.ActiveCfg = Release|Any CPU
-                {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x86.Build.0 = Release|Any CPU
                {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -386,22 +366,6 @@ Global
                {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x64.Build.0 = Release|Any CPU
                {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x86.ActiveCfg = Release|Any CPU
                {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x86.Build.0 = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|ARM64.Build.0 = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x64.Build.0 = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x86.Build.0 = Debug|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|Any CPU.Build.0 = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|ARM64.ActiveCfg = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|ARM64.Build.0 = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x64.ActiveCfg = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x64.Build.0 = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x86.ActiveCfg = Release|Any CPU
-                {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x86.Build.0 = Release|Any CPU
                {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -478,7 +442,6 @@ Global
                {DF63F589-028E-45A1-A212-948FACF1FDCD} = {1284331E-BC6C-426D-AAAF-140C0174F875}
                {23FC60D7-B101-42F8-9786-DB7A9CD964A2} = {1284331E-BC6C-426D-AAAF-140C0174F875}
                {C44BB95F-5020-4876-933C-B73A24C488FD} = {1284331E-BC6C-426D-AAAF-140C0174F875}
-                {9D788104-2636-4E4C-891C-08FF05FEC31E} = {1284331E-BC6C-426D-AAAF-140C0174F875}
                {93645356-5D5F-45DE-AC7F-252D35E1ACE5} = {1284331E-BC6C-426D-AAAF-140C0174F875}
                {A05698E0-30D9-4B36-8F3B-585A99D67118} = {1284331E-BC6C-426D-AAAF-140C0174F875}
                {392817AE-4493-4BED-A7FD-2399379E1B1C} = {1284331E-BC6C-426D-AAAF-140C0174F875}