9 files changed, 450 insertions, 114 deletions

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
-        {
-            get { return this.configuration; }
-            set { this.configuration = value; }
-        }
+        public string Configuration { get; set; }
 
-        public string DirectoryIds
-        {
-            get { return this.directoryIds; }
-            set { this.directoryIds = value; }
-        }
+        public string DirectoryIds { get; set; }
 
-        public bool GenerateWixVariables
-        {
-            get { return this.generateWixVariables; }
-            set { this.generateWixVariables = value; }
-        }
+        public bool GenerateWixVariables { get; set; }
 
-        public string GenerateType
-        {
-            get { return this.generateType; }
-            set { this.generateType = value; }
-        }
+        public string GenerateType { get; set; }
 
         public string MsbuildBinPath { get; set; }
 
-        public string Platform
-        {
-            get { return this.platform; }
-            set { this.platform = value; }
-        }
+        public string Platform { get; set; }
 
         [Required]
-        public string Project
-        {
-            get { return this.project; }
-            set { this.project = value; }
-        }
+        public string Project { get; set; }
 
-        public string ProjectName
-        {
-            get { return this.projectName; }
-            set { this.projectName = value; }
-        }
+        public string ProjectName { get; set; }
 
         public string[] ProjectOutputGroups
         {
@@ -81,10 +46,7 @@ namespace WixToolset.BuildTasks
 
         public bool UseToolsVersion { get; set; }
 
-        protected override string OperationName
-        {
-            get { return "project"; }
-        }
+        protected override string OperationName => "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();
-            ArrayList packageGroupRefs = new ArrayList();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
+            var payloadGroupRefs = new ArrayList();
+            var packageGroupRefs = new ArrayList();
+            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");
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = ToolsCommon.GetIdentifierFromName(ToolsCommon.GetMetadataOrDefault(item, "Name", projectName));
+                var projectPath = item.GetMetadata("MSBuildSourceProjectFile");
+                var projectName = Path.GetFileNameWithoutExtension(projectPath);
+                var referenceName = GetIdentifierFromName(GetMetadataOrDefault(item, "Name", projectName));
 
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
+                var pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
+                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();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
+            var componentGroupRefs = new ArrayList();
+
+            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");
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = ToolsCommon.GetIdentifierFromName(ToolsCommon.GetMetadataOrDefault(item, "Name", projectName));
+                var projectPath = item.GetMetadata("MSBuildSourceProjectFile");
+                var projectName = Path.GetFileNameWithoutExtension(projectPath);
+                var referenceName = GetIdentifierFromName(GetMetadataOrDefault(item, "Name", projectName));
 
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
+                var pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
+                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>