31 files changed, 197 insertions, 201 deletions
diff --git a/devbuild.cmd b/devbuild.cmd
index 06239807..d27822da 100644
--- a/devbuild.cmd
+++ b/devbuild.cmd
@@ -12,7 +12,7 @@ if not "%1"=="" shift & goto parse_args
 if not "%_INCREMENTAL%"=="1" call src\clean.cmd
 if not "%_CLEAN%"=="" goto end
-src\build_all.cmd %_C%
+call src\build_all.cmd %_C%
 :end
 popd
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index d06990fe..e1df6f8e 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -8,6 +8,7 @@
    <PackageVersion Include="WixBuildTools.TestSupport" Version="{packageversion}" />
    <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.BaseBuildTasks.Sources" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />
    <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />
diff --git a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs
index 3eee7625..d9e3b5e8 100644
--- a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs
+++ b/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs
@@ -1,13 +1,13 @@
 // 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.BaseBuildTasks
 {
    using System;
    using System.IO;
    using System.Runtime.InteropServices;
    using Microsoft.Build.Utilities;
-    public abstract class ToolsetTask : ToolTask
+    public abstract class BaseToolsetTask : ToolTask
    {
        /// <summary>
        /// Gets or sets additional options that are appended the the tool command-line.
@@ -88,6 +88,7 @@ namespace WixToolset.BuildTasks
            commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput);
            commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors);
            commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors);
+            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
        }
        protected sealed override string GenerateResponseFileCommands()
@@ -152,11 +153,11 @@ namespace WixToolset.BuildTasks
        private string GetDefaultToolFullPath()
        {
 #if NETCOREAPP
-                var thisTaskFolder = Path.GetDirectoryName(typeof(ToolsetTask).Assembly.Location);
+                var thisTaskFolder = Path.GetDirectoryName(typeof(BaseToolsetTask).Assembly.Location);
                return Path.Combine(thisTaskFolder, this.ToolExe);
 #else
-                var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(ToolsetTask).Assembly.CodeBase).AbsolutePath);
+                var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).AbsolutePath);
                var archFolder = GetArchitectureFolder(thisTaskFolder);
diff --git a/src/wix/WixToolset.BuildTasks/FileSearchHelperMethods.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs
index 94ff8c67..442fedd6 100644
--- a/src/wix/WixToolset.BuildTasks/FileSearchHelperMethods.cs
+++ b/src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.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.BaseBuildTasks
 {
    using System;
    using System.IO;
diff --git a/src/wix/WixToolset.BuildTasks/WixCommandLineBuilder.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
index a979dbb0..152992dd 100644
--- a/src/wix/WixToolset.BuildTasks/WixCommandLineBuilder.cs
+++ b/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.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.BaseBuildTasks
 {
    using System;
    using System.Collections.Generic;
diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/WixToolset.BaseBuildTasks.Sources.csproj b/src/internal/WixToolset.BaseBuildTasks.Sources/WixToolset.BaseBuildTasks.Sources.csproj
new file mode 100644
index 00000000..6ae5165e
--- /dev/null
+++ b/src/internal/WixToolset.BaseBuildTasks.Sources/WixToolset.BaseBuildTasks.Sources.csproj
@@ -0,0 +1,36 @@
+<?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="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>WiX Toolset BuildTasks Foundation Sources</PackageDescription>
+    <IsPackable>true</IsPackable>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>contentFiles</ContentTargetFolders>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoWarn>CS8021</NoWarn>
+    <NoBuild>true</NoBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="*.cs" Pack="true" PackagePath="$(ContentTargetFolders)\cs\netstandard2.0\$(PackageId)\%(RecursiveDir)" />
+    <EmbeddedResource Include="*.resx" Pack="true" PackagePath="$(ContentTargetFolders)\any\any\$(PackageId)\%(RecursiveDir)" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Remove="@(PackageReference)" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Target Name="Compile" />
+  <Target Name="CopyFilesToOutputDirectory" />
+</Project>
diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd
index 9380ce4e..32df26e9 100644
--- a/src/internal/internal.cmd
+++ b/src/internal/internal.cmd
@@ -33,8 +33,10 @@ msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\inte
 @rd /s/q "..\..\build\internal" 2> nul
 @del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul
 @del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.BaseBuildTasks.Sources.*.nupkg" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.basebuildtasks.sources" 2> nul
 @exit /b
 :end
diff --git a/src/internal/internal.sln b/src/internal/internal.sln
index 9d4fe69f..fe36efbe 100644
--- a/src/internal/internal.sln
+++ b/src/internal/internal.sln
@@ -1,12 +1,14 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.6.30114.105
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BaseBuildTasks.Sources", "WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,22 @@ Global
                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|x64.Build.0 = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Debug|x86.Build.0 = Debug|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|ARM64.Build.0 = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|x64.ActiveCfg = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|x64.Build.0 = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|x86.ActiveCfg = Release|Any CPU
+                {6B654490-AB0D-4F94-B564-DAA80044D5A3}.Release|x86.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/src/internal/internal_t.proj b/src/internal/internal_t.proj
index fda67786..fc4956d2 100644
--- a/src/internal/internal_t.proj
+++ b/src/internal/internal_t.proj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.Build.Traversal">
  <ItemGroup>
+    <ProjectReference Include="WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj" Targets="Pack" />
    <ProjectReference Include="WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" Targets="Pack" />
    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x86" />
    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x64" />
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs b/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
new file mode 100644
index 00000000..cea86733
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
+    <StandardDirectory Id='ProgramFiles6432Folder'>
+      <Directory Id='ApplicationFolder' Name='Test App' />
+    </StandardDirectory>
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='HarvestedComponents' />
+    </Feature>
+  </Package>
+</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj b/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
new file mode 100644
index 00000000..c4255246
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
@@ -0,0 +1,21 @@
+<!-- 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='WixToolset.Sdk'> 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <SuppressValidation>true</SuppressValidation>
+  </PropertyGroup>
+  <ItemGroup>
+    <HarvestDirectory Include="_data">
+      <ComponentGroupName>HarvestedComponents</ComponentGroupName>
+      <DirectoryRefId>ApplicationFolder</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+    <BindInputPaths Include="_data" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Wixtoolset.Heat" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
new file mode 100644
index 00000000..71b864af
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
@@ -0,0 +1 @@
+This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
new file mode 100644
index 00000000..78eb1cc6
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
@@ -0,0 +1 @@
+This is b.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs b/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
new file mode 100644
index 00000000..cea86733
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
+    <StandardDirectory Id='ProgramFiles6432Folder'>
+      <Directory Id='ApplicationFolder' Name='Test App' />
+    </StandardDirectory>
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='HarvestedComponents' />
+    </Feature>
+  </Package>
+</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj b/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
new file mode 100644
index 00000000..3df9c9d4
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
@@ -0,0 +1,30 @@
+<!-- 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='WixToolset.Sdk'> 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <SuppressValidation>true</SuppressValidation>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="_data" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Wixtoolset.Heat" />
+  </ItemGroup>
+  <Target Name="ManualHarvest" BeforeTargets="BeforeBuild">
+    <HeatDirectory
+      Directory="_data"
+      AutogenerateGuids="true"
+      ComponentGroupName="HarvestedComponents"
+      DirectoryRefId="ApplicationFolder"
+      OutputFile="obj\_g.wxs"
+      />
+    <ItemGroup>
+      <Compile Include="obj\_g.wxs" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
new file mode 100644
index 00000000..71b864af
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
@@ -0,0 +1 @@
+This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
new file mode 100644
index 00000000..78eb1cc6
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
@@ -0,0 +1 @@
+This is b.txt.
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index b1c6b2de..5574680f 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -115,6 +115,32 @@ namespace WixE2E
            Assert.NotEqual(firstHashes, secondHashes);
        }
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CanBuildPackageWithHarvesting(bool x64)
+        {
+            var projectPath = TestData.Get("TestData", "WixprojPackageHarvesting", "WixprojPackageHarvesting.wixproj");
+            CleanEverything();
+            var result = RestoreAndBuild(projectPath, x64);
+            result.AssertSuccess();
+        }
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CanBuildPackageWithHeatDir(bool x64)
+        {
+            var projectPath = TestData.Get("TestData", "WixprojPackageHeatDir", "WixprojPackageHeatDir.wixproj");
+            CleanEverything();
+            var result = RestoreAndBuild(projectPath, x64);
+            result.AssertSuccess();
+        }
        [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
        public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
        {
@@ -161,6 +187,11 @@ namespace WixE2E
                    }
                }
            }
+            foreach (var logFile in Directory.GetFiles(rootFolder, "*.binlog", SearchOption.AllDirectories))
+            {
+                File.Delete(logFile);
+            }
        }
        private static string GetFileHash(string path)
diff --git a/src/tools/WixToolset.HeatTasks/HeatDirectory.cs b/src/tools/WixToolset.HeatTasks/HeatDirectory.cs
index 8a169055..14a8acfa 100644
--- a/src/tools/WixToolset.HeatTasks/HeatDirectory.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatDirectory.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.HeatTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    public sealed class HeatDirectory : HeatTask
    {
diff --git a/src/tools/WixToolset.HeatTasks/HeatFile.cs b/src/tools/WixToolset.HeatTasks/HeatFile.cs
index 83cbc4d1..b39de7da 100644
--- a/src/tools/WixToolset.HeatTasks/HeatFile.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatFile.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.HeatTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    public sealed class HeatFile : HeatTask
    {
diff --git a/src/tools/WixToolset.HeatTasks/HeatProject.cs b/src/tools/WixToolset.HeatTasks/HeatProject.cs
index d54f6ad1..998c14ab 100644
--- a/src/tools/WixToolset.HeatTasks/HeatProject.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatProject.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.HeatTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    public sealed class HeatProject : HeatTask
    {
diff --git a/src/tools/WixToolset.HeatTasks/HeatTask.cs b/src/tools/WixToolset.HeatTasks/HeatTask.cs
index 6b7b9399..cad6635b 100644
--- a/src/tools/WixToolset.HeatTasks/HeatTask.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatTask.cs
@@ -2,64 +2,15 @@
 namespace WixToolset.HeatTasks
 {
-    using System;
-    using System.IO;
-    using System.Runtime.InteropServices;
    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// A base MSBuild task to run the WiX harvester.
    /// Specific harvester tasks should extend this class.
    /// </summary>
-    public abstract partial class HeatTask : ToolTask
+    public abstract partial class HeatTask : BaseToolsetTask
    {
-#if NETFRAMEWORK
-        private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath;
-#else
-        private static readonly string ThisDllPath = typeof(HeatTask).Assembly.Location;
-#endif
-        /// <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; }
@@ -74,8 +25,6 @@ namespace WixToolset.HeatTasks
        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>
@@ -83,99 +32,21 @@ namespace WixToolset.HeatTasks
        /// <value>The name of the heat operation performed by the task.</value>
        protected abstract string OperationName { get; }
-        private string ToolFullPath
+        protected sealed override string ToolName => "heat.exe";
-        {
-            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)
+        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
        {
-            commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
+            base.BuildCommandLine(commandLineBuilder);
-            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/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs b/src/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs
deleted file mode 100644
index c3989902..00000000
--- a/src/tools/WixToolset.HeatTasks/WixCommandLineBuilder.cs
+++ /dev/null
@@ -1,56 +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.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
index 21fb419c..a8538d9e 100644
--- a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
+++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
@@ -12,5 +12,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Build.Tasks.Core" />
+    <PackageReference Include="WixToolset.BaseBuildTasks.Sources" />
  </ItemGroup>
 </Project>
diff --git a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
index 5fcd1def..27d4436b 100644
--- a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
+++ b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.BuildTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run WiX to detach bundle engine to be signed.
diff --git a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
index 9f78caa5..72d9e872 100644
--- a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
+++ b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.BuildTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run WiX to update cabinet signatures in a MSI.
diff --git a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
index c07c12b9..d131402d 100644
--- a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
+++ b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.BuildTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run WiX to reattach a (signed) bundle engine to its bundle.
diff --git a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
index ae708c0e..cfa6ed85 100644
--- a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
+++ b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.BuildTasks
 {
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run WiX to detach bundle engine to be signed.
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 5c3b9a48..8990d0b7 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -5,6 +5,7 @@ namespace WixToolset.BuildTasks
    using System;
    using System.Collections.Generic;
    using Microsoft.Build.Framework;
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run the WiX compiler.
diff --git a/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
index 5583f64e..72be2fe6 100644
--- a/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
+++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.BuildTasks
 {
+    using WixToolset.BaseBuildTasks;
    /// <summary>
    /// An MSBuild task to run WiX to update cabinet signatures in a MSI.
    /// </summary>
-    public abstract class WixExeBaseTask : ToolsetTask
+    public abstract class WixExeBaseTask : BaseToolsetTask
    {
        protected override string ToolName => "wix.exe";
    }
diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 92651ed2..8088462f 100644
--- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -12,7 +12,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
    <PackageReference Include="Microsoft.Build.Tasks.Core" />
+    <PackageReference Include="WixToolset.BaseBuildTasks.Sources" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
  </ItemGroup>
 </Project>