105 files changed, 77 insertions, 10159 deletions
diff --git a/src/WixToolset.BuildTasks/AssemblyInfo.cs b/src/WixToolset.BuildTasks/AssemblyInfo.cs
deleted file mode 100644
index ae52fce8..00000000
--- a/src/WixToolset.BuildTasks/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +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.
-using System.Reflection;
-using System.Runtime.InteropServices;
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
diff --git a/src/WixToolset.BuildTasks/BuildException.cs b/src/WixToolset.BuildTasks/BuildException.cs
deleted file mode 100644
index 953134ba..00000000
--- a/src/WixToolset.BuildTasks/BuildException.cs
+++ /dev/null
@@ -1,26 +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 System;
-    using System.Globalization;
-    class BuildException : Exception
-    {
-        public BuildException()
-        {
-        }
-        public BuildException(string message) : base(message)
-        {
-        }
-        public BuildException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-        public BuildException(string format, params string[] args) : this(String.Format(CultureInfo.CurrentCulture, format, args))
-        {
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Candle.cs b/src/WixToolset.BuildTasks/Candle.cs
deleted file mode 100644
index 82b15838..00000000
--- a/src/WixToolset.BuildTasks/Candle.cs
+++ /dev/null
@@ -1,199 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to run the WiX compiler.
-    /// </summary>
-    public sealed class CandleOld : WixToolTask
-    {
-        private const string CandleToolName = "candle.exe";
-        private string[] defineConstants;
-        private ITaskItem[] extensions;
-        private string[] includeSearchPaths;
-        private ITaskItem outputFile;
-        private bool pedantic;
-        private string installerPlatform;
-        private string preprocessToFile;
-        private bool preprocessToStdOut;
-        private ITaskItem[] sourceFiles;
-        private string extensionDirectory;
-        private string[] referencePaths;
-        public string[] DefineConstants
-        {
-            get { return this.defineConstants; }
-            set { this.defineConstants = value; }
-        }
-        public ITaskItem[] Extensions
-        {
-            get { return this.extensions; }
-            set { this.extensions = value; }
-        }
-        public string[] IncludeSearchPaths
-        {
-            get { return this.includeSearchPaths; }
-            set { this.includeSearchPaths = value; }
-        }
-        public string InstallerPlatform
-        {
-            get { return this.installerPlatform; }
-            set { this.installerPlatform = value; }
-        }
-        [Output]
-        [Required]
-        public ITaskItem OutputFile
-        {
-            get { return this.outputFile; }
-            set { this.outputFile = value; }
-        }
-        public bool Pedantic
-        {
-            get { return this.pedantic; }
-            set { this.pedantic = value; }
-        }
-        public string PreprocessToFile
-        {
-            get { return this.preprocessToFile; }
-            set { this.preprocessToFile = value; }
-        }
-        public bool PreprocessToStdOut
-        {
-            get { return this.preprocessToStdOut; }
-            set { this.preprocessToStdOut = value; }
-        }
-        [Required]
-        public ITaskItem[] SourceFiles
-        {
-            get { return this.sourceFiles; }
-            set { this.sourceFiles = value; }
-        }
-        public string ExtensionDirectory
-        {
-            get { return this.extensionDirectory; }
-            set { this.extensionDirectory = value; }
-        }
-        public string[] ReferencePaths
-        {
-            get { return this.referencePaths; }
-            set { this.referencePaths = value; }
-        }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of candle.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return CandleToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable.
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply candle.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return CandleToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), CandleToolName);
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendIfTrue("-p", this.PreprocessToStdOut);
-            commandLineBuilder.AppendSwitchIfNotNull("-p", this.PreprocessToFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendArrayIfNotNull("-d", this.DefineConstants);
-            commandLineBuilder.AppendArrayIfNotNull("-I", this.IncludeSearchPaths);
-            commandLineBuilder.AppendIfTrue("-pedantic", this.Pedantic);
-            commandLineBuilder.AppendSwitchIfNotNull("-arch ", this.InstallerPlatform);
-            commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.referencePaths);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            // Support per-source-file output by looking at the SourceFiles items to
-            // see if there is any "CandleOutput" metadata.  If there is, we do our own
-            // appending, otherwise we fall back to the built-in "append file names" code.
-            // Note also that the wix.targets "Compile" target does *not* automagically
-            // fix the "@(CompileObjOutput)" list to include these new output names.
-            // If you really want to use this, you're going to have to clone the target
-            // in your own .targets file and create the output list yourself.
-            bool usePerSourceOutput = false;
-            if (this.SourceFiles != null)
-            {
-                foreach (ITaskItem item in this.SourceFiles)
-                {
-                    if (!String.IsNullOrEmpty(item.GetMetadata("CandleOutput")))
-                    {
-                        usePerSourceOutput = true;
-                        break;
-                    }
-                }
-            }
-            if (usePerSourceOutput)
-            {
-                string[] newSourceNames = new string[this.SourceFiles.Length];
-                for (int iSource = 0; iSource < this.SourceFiles.Length; ++iSource)
-                {
-                    ITaskItem item = this.SourceFiles[iSource];
-                    if (null == item)
-                    {
-                        newSourceNames[iSource] = null;
-                    }
-                    else
-                    {
-                        string output = item.GetMetadata("CandleOutput");
-                        if (!String.IsNullOrEmpty(output))
-                        {
-                            newSourceNames[iSource] = String.Concat(item.ItemSpec, ";", output);
-                        }
-                        else
-                        {
-                            newSourceNames[iSource] = item.ItemSpec;
-                        }
-                    }
-                }
-                commandLineBuilder.AppendFileNamesIfNotNull(newSourceNames, " ");
-            }
-            else
-            {
-                commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Common.cs b/src/WixToolset.BuildTasks/Common.cs
deleted file mode 100644
index 803e9d14..00000000
--- a/src/WixToolset.BuildTasks/Common.cs
+++ /dev/null
@@ -1,41 +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
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    /// <summary>
-    /// Common WixTasks utility methods and types.
-    /// </summary>
-    internal static class Common
-    {
-        /// <summary>Metadata key name to turn off harvesting of project references.</summary>
-        public const string DoNotHarvest = "DoNotHarvest";
-        private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
-        private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
-        /// <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>
-        internal static string GetIdentifierFromName(string name)
-        {
-            string 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;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/ConvertReferences.cs b/src/WixToolset.BuildTasks/ConvertReferences.cs
deleted file mode 100644
index fe137633..00000000
--- a/src/WixToolset.BuildTasks/ConvertReferences.cs
+++ /dev/null
@@ -1,93 +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 System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
-    /// WixLocalization element inside the file.
-    /// </summary>
-    public class ConvertReferences : Task
-    {
-        private string projectOutputGroups;
-        private ITaskItem[] projectReferences;
-        private ITaskItem[] harvestItems;
-        /// <summary>
-        /// The total list of cabs in this database
-        /// </summary>
-        [Output]
-        public ITaskItem[] HarvestItems
-        {
-            get { return this.harvestItems; }
-        }
-        /// <summary>
-        /// The project output groups to harvest.
-        /// </summary>
-        [Required]
-        public string ProjectOutputGroups
-        {
-            get { return this.projectOutputGroups; }
-            set { this.projectOutputGroups = value; }
-        }
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferences
-        {
-            get { return this.projectReferences; }
-            set { this.projectReferences = value; }
-        }
-        /// <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()
-        {
-            List<ITaskItem> newItems = new List<ITaskItem>();
-            foreach(ITaskItem item in this.ProjectReferences)
-            {
-                Dictionary<string, string> newItemMetadeta = new Dictionary<string, string>();
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
-                {
-                    continue;
-                }
-                string refTargetDir = item.GetMetadata("RefTargetDir");
-                if (!String.IsNullOrEmpty(refTargetDir))
-                {
-                    newItemMetadeta.Add("DirectoryIds", refTargetDir);
-                }
-                string refName = item.GetMetadata("Name");
-                if (!String.IsNullOrEmpty(refName))
-                {
-                    newItemMetadeta.Add("ProjectName", refName);
-                }
-                newItemMetadeta.Add("ProjectOutputGroups", this.ProjectOutputGroups);
-                ITaskItem newItem = new TaskItem(item.ItemSpec, newItemMetadeta);
-                newItems.Add(newItem);
-            }
-            this.harvestItems = newItems.ToArray();
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/CreateItemAvoidingInference.cs b/src/WixToolset.BuildTasks/CreateItemAvoidingInference.cs
deleted file mode 100644
index 84816cac..00000000
--- a/src/WixToolset.BuildTasks/CreateItemAvoidingInference.cs
+++ /dev/null
@@ -1,60 +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 System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
-    /// WixLocalization element inside the file.
-    /// </summary>
-    public class CreateItemAvoidingInference : Task
-    {
-        private string inputProperties;
-        private ITaskItem[] outputItems;
-        /// <summary>
-        /// The output items.
-        /// </summary>
-        [Output]
-        public ITaskItem[] OuputItems
-        {
-            get { return this.outputItems; }
-        }
-        /// <summary>
-        /// The properties to converty to items.
-        /// </summary>
-        [Required]
-        public string InputProperties
-        {
-            get { return this.inputProperties; }
-            set { this.inputProperties = value; }
-        }
-        /// <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()
-        {
-            List<ITaskItem> newItems = new List<ITaskItem>();
-            foreach (string property in this.inputProperties.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                newItems.Add(new TaskItem(property));
-            }
-            this.outputItems = newItems.ToArray();
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs b/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
deleted file mode 100644
index 7cda6b01..00000000
--- a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
+++ /dev/null
@@ -1,271 +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 System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to create a list of preprocessor defines to be passed to candle from the
-    /// list of referenced projects.
-    /// </summary>
-    public sealed class CreateProjectReferenceDefineConstants : Task
-    {
-        private ITaskItem[] defineConstants;
-        private ITaskItem[] projectConfigurations;
-        private ITaskItem[] projectReferencePaths;
-        [Output]
-        public ITaskItem[] DefineConstants
-        {
-            get { return this.defineConstants; }
-        }
-        [Required]
-        public ITaskItem[] ProjectReferencePaths
-        {
-            get { return this.projectReferencePaths; }
-            set { this.projectReferencePaths = value; }
-        }
-        public ITaskItem[] ProjectConfigurations
-        {
-            get { return this.projectConfigurations; }
-            set { this.projectConfigurations = value; }
-        }
-        public override bool Execute()
-        {
-            List<ITaskItem> outputItems = new List<ITaskItem>();
-            Dictionary<string, string> defineConstants = new Dictionary<string, string>();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
-            {
-                ITaskItem item = this.ProjectReferencePaths[i];
-                string configuration = item.GetMetadata("Configuration");
-                string fullConfiguration = item.GetMetadata("FullConfiguration");
-                string platform = item.GetMetadata("Platform");
-                string projectPath = CreateProjectReferenceDefineConstants.GetProjectPath(this.ProjectReferencePaths, i);
-                string projectDir = Path.GetDirectoryName(projectPath) + Path.DirectorySeparatorChar;
-                string projectExt = Path.GetExtension(projectPath);
-                string projectFileName = Path.GetFileName(projectPath);
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName);
-                string targetPath = item.GetMetadata("FullPath");
-                string targetDir = Path.GetDirectoryName(targetPath) + Path.DirectorySeparatorChar;
-                string targetExt = Path.GetExtension(targetPath);
-                string targetFileName = Path.GetFileName(targetPath);
-                string targetName = Path.GetFileNameWithoutExtension(targetPath);
-                // If there is no configuration metadata on the project reference task item,
-                // check for any additional configuration data provided in the optional task property.
-                if (String.IsNullOrEmpty(fullConfiguration))
-                {
-                    fullConfiguration = this.FindProjectConfiguration(projectName);
-                    if (!String.IsNullOrEmpty(fullConfiguration))
-                    {
-                        string[] typeAndPlatform = fullConfiguration.Split('|');
-                        configuration = typeAndPlatform[0];
-                        platform = (typeAndPlatform.Length > 1 ? typeAndPlatform[1] : String.Empty);
-                    }
-                }
-                // write out the platform/configuration defines
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.Configuration", referenceName)] = configuration;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.FullConfiguration", referenceName)] = fullConfiguration;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.Platform", referenceName)] = platform;
-                // write out the ProjectX defines
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.ProjectDir", referenceName)] = projectDir;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.ProjectExt", referenceName)] = projectExt;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.ProjectFileName", referenceName)] = projectFileName;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.ProjectName", referenceName)] = projectName;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.ProjectPath", referenceName)] = projectPath;
-                // write out the TargetX defines
-                string targetDirDefine = String.Format(CultureInfo.InvariantCulture, "{0}.TargetDir", referenceName);
-                if (defineConstants.ContainsKey(targetDirDefine))
-                {
-                    //if target dir was already defined, redefine it as the common root shared by multiple references from the same project
-                    string commonDir = FindCommonRoot(targetDir, defineConstants[targetDirDefine]);
-                    if (!String.IsNullOrEmpty(commonDir))
-                    {
-                        targetDir = commonDir;
-                    }
-                }
-                defineConstants[targetDirDefine] = CreateProjectReferenceDefineConstants.EnsureEndsWithBackslash(targetDir);
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.TargetExt", referenceName)] = targetExt;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.TargetFileName", referenceName)] = targetFileName;
-                defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.TargetName", referenceName)] = targetName;
-                //if target path was already defined, append to it creating a list of multiple references from the same project
-                string targetPathDefine = String.Format(CultureInfo.InvariantCulture, "{0}.TargetPath", referenceName);
-                if (defineConstants.ContainsKey(targetPathDefine))
-                {
-                    string oldTargetPath = defineConstants[targetPathDefine];
-                    if (!targetPath.Equals(oldTargetPath, StringComparison.OrdinalIgnoreCase))
-                    {
-                        defineConstants[targetPathDefine] += ";" + targetPath;
-                    }
-                    //If there was only one targetpath we need to create its culture specific define
-                    if (!oldTargetPath.Contains(";"))
-                    {
-                        string oldSubFolder = FindSubfolder(oldTargetPath, targetDir, targetFileName);
-                        if (!String.IsNullOrEmpty(oldSubFolder))
-                        {
-                            defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.{1}.TargetPath", referenceName, oldSubFolder.Replace('\\', '_'))] = oldTargetPath;
-                        }
-                    }
-                    // Create a culture specific define
-                    string subFolder = FindSubfolder(targetPath, targetDir, targetFileName);
-                    if (!String.IsNullOrEmpty(subFolder))
-                    {
-                        defineConstants[String.Format(CultureInfo.InvariantCulture, "{0}.{1}.TargetPath", referenceName, subFolder.Replace('\\', '_'))] = targetPath;
-                    }
-                }
-                else
-                {
-                    defineConstants[targetPathDefine] = targetPath;
-                }
-            }
-            foreach (KeyValuePair<string, string> define in defineConstants)
-            {
-                outputItems.Add(new TaskItem(String.Format(CultureInfo.InvariantCulture, "{0}={1}", define.Key, define.Value)));
-            }
-            this.defineConstants = outputItems.ToArray();
-            return true;
-        }
-        public static string GetProjectPath(ITaskItem[] projectReferencePaths, int i)
-        {
-            return projectReferencePaths[i].GetMetadata("MSBuildSourceProjectFile");
-        }
-        public static string GetReferenceName(ITaskItem item, string projectName)
-        {
-            string referenceName = item.GetMetadata("Name");
-            if (String.IsNullOrEmpty(referenceName))
-            {
-                referenceName = projectName;
-            }
-            // We cannot have an equals sign in the variable name because it
-            // messes with the preprocessor definitions on the command line.
-            referenceName = referenceName.Replace('=', '_');
-            // We cannot have a double quote on the command line because it
-            // there is no way to escape it on the command line.
-            referenceName = referenceName.Replace('\"', '_');
-            // We cannot have parens in the variable name because the WiX
-            // preprocessor will not be able to parse it.
-            referenceName = referenceName.Replace('(', '_');
-            referenceName = referenceName.Replace(')', '_');
-            return referenceName;
-        }
-        /// <summary>
-        /// Look through the configuration data in the ProjectConfigurations property
-        /// to find the configuration for a project, if available.
-        /// </summary>
-        /// <param name="projectName">Name of the project that is being searched for.</param>
-        /// <returns>Full configuration spec, for example "Release|Win32".</returns>
-        private string FindProjectConfiguration(string projectName)
-        {
-            string configuration = String.Empty;
-            if (this.ProjectConfigurations != null)
-            {
-                foreach (ITaskItem configItem in this.ProjectConfigurations)
-                {
-                    string configProject = configItem.ItemSpec;
-                    if (configProject.Length > projectName.Length &&
-                        configProject.StartsWith(projectName) &&
-                        configProject[projectName.Length] == '=')
-                    {
-                        configuration = configProject.Substring(projectName.Length + 1);
-                        break;
-                    }
-                }
-            }
-            return configuration;
-        }
-        /// <summary>
-        /// Finds the common root between two paths
-        /// </summary>
-        /// <param name="path1"></param>
-        /// <param name="path2"></param>
-        /// <returns>common root on success, empty string on failure</returns>
-        private static string FindCommonRoot(string path1, string path2)
-        {
-            path1 = path1.TrimEnd(Path.DirectorySeparatorChar);
-            path2 = path2.TrimEnd(Path.DirectorySeparatorChar);
-            while (!String.IsNullOrEmpty(path1))
-            {
-                for (string searchPath = path2; !String.IsNullOrEmpty(searchPath); searchPath = Path.GetDirectoryName(searchPath))
-                {
-                    if (path1.Equals(searchPath, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return searchPath;
-                    }
-                }
-                path1 = Path.GetDirectoryName(path1);
-            }
-            return path1;
-        }
-        /// <summary>
-        /// Finds the subfolder of a path, excluding a root and filename.
-        /// </summary>
-        /// <param name="path">Path to examine</param>
-        /// <param name="rootPath">Root that must be present </param>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        private static string FindSubfolder(string path, string rootPath, string fileName)
-        {
-            if (Path.GetFileName(path).Equals(fileName, StringComparison.OrdinalIgnoreCase))
-            {
-                path = Path.GetDirectoryName(path);
-            }
-            if (path.StartsWith(rootPath, StringComparison.OrdinalIgnoreCase))
-            {
-                // cut out the root and return the subpath
-                return path.Substring(rootPath.Length).Trim(Path.DirectorySeparatorChar);
-            }
-            return String.Empty;
-        }
-        private static string EnsureEndsWithBackslash(string dir)
-        {
-            if (dir[dir.Length - 1] != Path.DirectorySeparatorChar)
-            {
-                dir += Path.DirectorySeparatorChar;
-            }
-            return dir;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/DoIt-Compile.cs b/src/WixToolset.BuildTasks/DoIt-Compile.cs
deleted file mode 100644
index f89078fe..00000000
--- a/src/WixToolset.BuildTasks/DoIt-Compile.cs
+++ /dev/null
@@ -1,192 +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 false
-namespace WixToolset.BuildTasks
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Microsoft.Build.Framework;
-    using WixToolset.Data;
-    /// <summary>
-    /// An MSBuild task to run the WiX compiler.
-    /// </summary>
-    public sealed class Candle : TaskBase
-    {
-        public string[] DefineConstants { get; set; }
-        public ITaskItem[] Extensions { get; set; }
-        public string[] IncludeSearchPaths { get; set; }
-        public string InstallerPlatform { get; set; }
-        [Output]
-        [Required]
-        public ITaskItem OutputFile { get; set; }
-        public bool Pedantic { get; set; }
-        public string PreprocessToFile { get; set; }
-        public bool PreprocessToStdOut { get; set; }
-        [Required]
-        public ITaskItem IntermediateDirectory { get; set; }
-        [Required]
-        public ITaskItem[] SourceFiles { get; set; }
-        public string ExtensionDirectory { get; set; }
-        public string[] ReferencePaths { get; set; }
-        protected override void ExecuteCore()
-        {
-            Messaging.Instance.InitializeAppName("WIX", "wix.exe");
-            Messaging.Instance.Display += this.DisplayMessage;
-            var preprocessor = new Preprocessor();
-            var compiler = new Compiler();
-            var sourceFiles = this.GatherSourceFiles();
-            var preprocessorVariables = this.GatherPreprocessorVariables();
-            foreach (var sourceFile in sourceFiles)
-            {
-                var document = preprocessor.Process(sourceFile.SourcePath, preprocessorVariables);
-                var intermediate = compiler.Compile(document);
-                intermediate.Save(sourceFile.OutputPath);
-            }
-        }
-        private void DisplayMessage(object sender, DisplayEventArgs e)
-        {
-            this.Log.LogMessageFromText(e.Message, MessageImportance.Normal);
-        }
-        private IEnumerable<SourceFile> GatherSourceFiles()
-        {
-            var files = new List<SourceFile>();
-            foreach (var item in this.SourceFiles)
-            {
-                var sourcePath = item.ItemSpec;
-                var outputPath = item.GetMetadata("CandleOutput") ?? this.OutputFile?.ItemSpec;
-                if (String.IsNullOrEmpty(outputPath))
-                {
-                    outputPath = Path.Combine(this.IntermediateDirectory.ItemSpec, Path.GetFileNameWithoutExtension(sourcePath) + ".wir");
-                }
-                files.Add(new SourceFile(sourcePath, outputPath));
-            }
-            return files;
-        }
-        private IDictionary<string, string> GatherPreprocessorVariables()
-        {
-            var variables = new Dictionary<string, string>();
-            foreach (var pair in this.DefineConstants)
-            {
-                string[] value = pair.Split(new[] { '=' }, 2);
-                if (variables.ContainsKey(value[0]))
-                {
-                    //Messaging.Instance.OnMessage(WixErrors.DuplicateVariableDefinition(value[0], (1 == value.Length) ? String.Empty : value[1], this.PreprocessorVariables[value[0]]));
-                    break;
-                }
-                if (1 == value.Length)
-                {
-                    variables.Add(value[0], String.Empty);
-                }
-                else
-                {
-                    variables.Add(value[0], value[1]);
-                }
-            }
-            return variables;
-        }
-        ///// <summary>
-        ///// Builds a command line from options in this task.
-        ///// </summary>
-        //protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        //{
-        //    base.BuildCommandLine(commandLineBuilder);
-        //    commandLineBuilder.AppendIfTrue("-p", this.PreprocessToStdOut);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-p", this.PreprocessToFile);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-        //    commandLineBuilder.AppendArrayIfNotNull("-d", this.DefineConstants);
-        //    commandLineBuilder.AppendArrayIfNotNull("-I", this.IncludeSearchPaths);
-        //    commandLineBuilder.AppendIfTrue("-pedantic", this.Pedantic);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-arch ", this.InstallerPlatform);
-        //    commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.referencePaths);
-        //    commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-        //    // Support per-source-file output by looking at the SourceFiles items to
-        //    // see if there is any "CandleOutput" metadata.  If there is, we do our own
-        //    // appending, otherwise we fall back to the built-in "append file names" code.
-        //    // Note also that the wix.targets "Compile" target does *not* automagically
-        //    // fix the "@(CompileObjOutput)" list to include these new output names.
-        //    // If you really want to use this, you're going to have to clone the target
-        //    // in your own .targets file and create the output list yourself.
-        //    bool usePerSourceOutput = false;
-        //    if (this.SourceFiles != null)
-        //    {
-        //        foreach (ITaskItem item in this.SourceFiles)
-        //        {
-        //            if (!String.IsNullOrEmpty(item.GetMetadata("CandleOutput")))
-        //            {
-        //                usePerSourceOutput = true;
-        //                break;
-        //            }
-        //        }
-        //    }
-        //    if (usePerSourceOutput)
-        //    {
-        //        string[] newSourceNames = new string[this.SourceFiles.Length];
-        //        for (int iSource = 0; iSource < this.SourceFiles.Length; ++iSource)
-        //        {
-        //            ITaskItem item = this.SourceFiles[iSource];
-        //            if (null == item)
-        //            {
-        //                newSourceNames[iSource] = null;
-        //            }
-        //            else
-        //            {
-        //                string output = item.GetMetadata("CandleOutput");
-        //                if (!String.IsNullOrEmpty(output))
-        //                {
-        //                    newSourceNames[iSource] = String.Concat(item.ItemSpec, ";", output);
-        //                }
-        //                else
-        //                {
-        //                    newSourceNames[iSource] = item.ItemSpec;
-        //                }
-        //            }
-        //        }
-        //        commandLineBuilder.AppendFileNamesIfNotNull(newSourceNames, " ");
-        //    }
-        //    else
-        //    {
-        //        commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
-        //    }
-        //}
-    }
-}
-#endif
diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
deleted file mode 100644
index 02b33522..00000000
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ /dev/null
@@ -1,342 +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 System;
-    using System.Collections.Generic;
-    using System.Runtime.InteropServices;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using WixToolset.Core;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-    /// <summary>
-    /// An MSBuild task to run the WiX compiler.
-    /// </summary>
-    public sealed class DoIt : Task
-    {
-        public string AdditionalOptions { get; set; }
-        public string[] Cultures { get; set; }
-        public string[] DefineConstants { get; set; }
-        public ITaskItem[] Extensions { get; set; }
-        public string ExtensionDirectory { get; set; }
-        public string[] IncludeSearchPaths { get; set; }
-        public string InstallerPlatform { get; set; }
-        [Required]
-        public ITaskItem IntermediateDirectory { get; set; }
-        public ITaskItem[] LocalizationFiles { get; set; }
-        public bool NoLogo { get; set; }
-        public ITaskItem[] LibraryFiles { get; set; }
-        [Output]
-        [Required]
-        public ITaskItem OutputFile { get; set; }
-        public string OutputType { get; set; }
-        public string PdbOutputFile { get; set; }
-        public bool Pedantic { get; set; }
-        [Required]
-        public ITaskItem[] SourceFiles { get; set; }
-        public string[] ReferencePaths { 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 ITaskItem[] BindInputPaths { get; set; }
-        public bool BindFiles { get; set; }
-        public ITaskItem BindContentsFile { get; set; }
-        public ITaskItem BindOutputsFile { get; set; }
-        public ITaskItem BindBuiltOutputsFile { get; set; }
-        public string CabinetCachePath { get; set; }
-        public int CabinetCreationThreadCount { get; set; }
-        public string DefaultCompressionLevel { get; set; }
-        [Output]
-        public ITaskItem UnreferencedSymbolsFile { get; set; }
-        public ITaskItem WixProjectFile { get; set; }
-        public string[] WixVariables { get; set; }
-        public bool SuppressValidation { get; set; }
-        public string[] SuppressIces { get; set; }
-        public string AdditionalCub { get; set; }
-        public override bool Execute()
-        {
-            try
-            {
-                this.ExecuteCore();
-            }
-            catch (Exception e)
-            {
-                this.Log.LogErrorFromException(e);
-                if (e is NullReferenceException || e is SEHException)
-                {
-                    throw;
-                }
-            }
-            return !this.Log.HasLoggedErrors;
-        }
-        private void ExecuteCore()
-        {
-            var listener = new MsbuildMessageListener(this.Log, "WIX", this.BuildEngine.ProjectFileOfTaskNode);
-            var commandLineBuilder = new WixCommandLineBuilder();
-            commandLineBuilder.AppendTextUnquoted("build");
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType);
-            commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
-            commandLineBuilder.AppendArrayIfNotNull("-culture ", this.Cultures);
-            commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants);
-            commandLineBuilder.AppendArrayIfNotNull("-I ", this.IncludeSearchPaths);
-            commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.ReferencePaths);
-            commandLineBuilder.AppendIfTrue("-sval", this.SuppressValidation);
-            commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces);
-            commandLineBuilder.AppendSwitchIfNotNull("-usf ", this.UnreferencedSymbolsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-cc ", this.CabinetCachePath);
-            commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile);
-            commandLineBuilder.AppendIfTrue("-bindFiles", this.BindFiles);
-            commandLineBuilder.AppendArrayIfNotNull("-bindPath ", this.CalculateBindPathStrings());
-            commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles);
-            commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles);
-            commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
-            commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
-            var commandLineString = commandLineBuilder.ToString();
-            this.Log.LogMessage(MessageImportance.Normal, "wix.exe " + commandLineString);
-            var serviceProvider = new WixToolsetServiceProvider();
-            var messaging = serviceProvider.GetService<IMessaging>();
-            messaging.SetListener(listener);
-            var arguments = serviceProvider.GetService<ICommandLineArguments>();
-            arguments.Populate(commandLineString);
-            var context = serviceProvider.GetService<ICommandLineContext>();
-            context.Messaging = messaging;
-            context.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
-            context.Arguments = arguments;
-            var commandLine = serviceProvider.GetService<ICommandLine>();
-            var command = commandLine.ParseStandardCommandLine(context);
-            command?.Execute();
-        }
-        private IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, string[] extensions)
-        {
-            var extensionManager = serviceProvider.GetService<IExtensionManager>();
-            foreach (var type in new[] { typeof(WixToolset.Core.Burn.WixToolsetStandardBackend), typeof(WixToolset.Core.WindowsInstaller.WixToolsetStandardBackend) })
-            {
-                extensionManager.Add(type.Assembly);
-            }
-            foreach (var extension in extensions)
-            {
-                extensionManager.Load(extension);
-            }
-            return extensionManager;
-        }
-        private void DisplayMessage(object sender, DisplayEventArgs e)
-        {
-            this.Log.LogMessageFromText(e.Message, MessageImportance.Normal);
-        }
-        private IEnumerable<string> CalculateBindPathStrings()
-        {
-            if (null != this.BindInputPaths)
-            {
-                foreach (var item in this.BindInputPaths)
-                {
-                    var path = item.GetMetadata("FullPath");
-                    var bindName = item.GetMetadata("BindName");
-                    if (!String.IsNullOrEmpty(bindName))
-                    {
-                        yield return String.Concat(bindName, "=", path);
-                    }
-                    else
-                    {
-                        yield return path;
-                    }
-                }
-            }
-        }
-        ///// <summary>
-        ///// Builds a command line from options in this task.
-        ///// </summary>
-        //protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        //{
-        //    base.BuildCommandLine(commandLineBuilder);
-        //    commandLineBuilder.AppendIfTrue("-p", this.PreprocessToStdOut);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-p", this.PreprocessToFile);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-        //    commandLineBuilder.AppendArrayIfNotNull("-d", this.DefineConstants);
-        //    commandLineBuilder.AppendArrayIfNotNull("-I", this.IncludeSearchPaths);
-        //    commandLineBuilder.AppendIfTrue("-pedantic", this.Pedantic);
-        //    commandLineBuilder.AppendSwitchIfNotNull("-arch ", this.InstallerPlatform);
-        //    commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.referencePaths);
-        //    commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-        //    // Support per-source-file output by looking at the SourceFiles items to
-        //    // see if there is any "CandleOutput" metadata.  If there is, we do our own
-        //    // appending, otherwise we fall back to the built-in "append file names" code.
-        //    // Note also that the wix.targets "Compile" target does *not* automagically
-        //    // fix the "@(CompileObjOutput)" list to include these new output names.
-        //    // If you really want to use this, you're going to have to clone the target
-        //    // in your own .targets file and create the output list yourself.
-        //    bool usePerSourceOutput = false;
-        //    if (this.SourceFiles != null)
-        //    {
-        //        foreach (ITaskItem item in this.SourceFiles)
-        //        {
-        //            if (!String.IsNullOrEmpty(item.GetMetadata("CandleOutput")))
-        //            {
-        //                usePerSourceOutput = true;
-        //                break;
-        //            }
-        //        }
-        //    }
-        //    if (usePerSourceOutput)
-        //    {
-        //        string[] newSourceNames = new string[this.SourceFiles.Length];
-        //        for (int iSource = 0; iSource < this.SourceFiles.Length; ++iSource)
-        //        {
-        //            ITaskItem item = this.SourceFiles[iSource];
-        //            if (null == item)
-        //            {
-        //                newSourceNames[iSource] = null;
-        //            }
-        //            else
-        //            {
-        //                string output = item.GetMetadata("CandleOutput");
-        //                if (!String.IsNullOrEmpty(output))
-        //                {
-        //                    newSourceNames[iSource] = String.Concat(item.ItemSpec, ";", output);
-        //                }
-        //                else
-        //                {
-        //                    newSourceNames[iSource] = item.ItemSpec;
-        //                }
-        //            }
-        //        }
-        //        commandLineBuilder.AppendFileNamesIfNotNull(newSourceNames, " ");
-        //    }
-        //    else
-        //    {
-        //        commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
-        //    }
-        //}
-        private class MsbuildMessageListener : IMessageListener
-        {
-            public MsbuildMessageListener(TaskLoggingHelper logger, string shortName, string longName)
-            {
-                this.Logger = logger;
-                this.ShortAppName = shortName;
-                this.LongAppName = longName;
-            }
-            public string ShortAppName { get; }
-            public string LongAppName { get; }
-            private TaskLoggingHelper Logger { get; }
-            public void Write(Message message)
-            {
-                switch (message.Level)
-                {
-                    case MessageLevel.Error:
-                        this.Logger.LogError(null, this.ShortAppName + message.Id.ToString(), null, message.SourceLineNumbers?.FileName ?? this.LongAppName, message.SourceLineNumbers?.LineNumber ?? 0, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
-                        break;
-                    case MessageLevel.Warning:
-                        this.Logger.LogWarning(null, this.ShortAppName + message.Id.ToString(), null, message.SourceLineNumbers?.FileName ?? this.LongAppName, message.SourceLineNumbers?.LineNumber ?? 0, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
-                        break;
-                    default:
-                        // TODO: Revisit this because something is going horribly awry. The commented out LogMessage call is crashing saying that the "message" parameter is null. When you look at the call stack, the code
-                        //       is in the wrong LogMessage override and the "null" subcategory was passed in as the message. Not clear why it is picking the wrong overload.
-                        //if (message.Id > 0)
-                        //{
-                        //    this.Logger.LogMessage(null, code, null, message.SourceLineNumber?.FileName, message.SourceLineNumber?.LineNumber ?? 0, 0, 0, 0, MessageImportance.Normal, message.Format, message.FormatData);
-                        //}
-                        //else
-                        //{
-                        this.Logger.LogMessage(MessageImportance.Normal, message.ResourceNameOrFormat, message.MessageArgs);
-                        //}
-                        break;
-                }
-            }
-            public void Write(string message)
-            {
-                this.Logger.LogMessage(MessageImportance.Low, message);
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/FileSearchHelperMethods.cs b/src/WixToolset.BuildTasks/FileSearchHelperMethods.cs
deleted file mode 100644
index 6cc804eb..00000000
--- a/src/WixToolset.BuildTasks/FileSearchHelperMethods.cs
+++ /dev/null
@@ -1,60 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    /// <summary>
-    /// Contains helper methods on searching for files
-    /// </summary>
-    public static class FileSearchHelperMethods
-    {
-        /// <summary>
-        /// Searches for the existence of a file in multiple directories. 
-        /// Search is satisfied if default file path is valid and exists. If not,
-        /// file name is extracted from default path and combined with each of the directories
-        /// looking to see if it exists. If not found, input default path is returned.
-        /// </summary>
-        /// <param name="directories">Array of directories to look in, without filenames in them</param>
-        /// <param name="defaultFullPath">Default path - to use if not found</param>
-        /// <returns>File path if file found. Empty string if not found</returns>
-        public static string SearchFilePaths(string[] directories, string defaultFullPath)
-        {
-            if (String.IsNullOrEmpty(defaultFullPath))
-            {
-                return String.Empty;
-            }
-            if (File.Exists(defaultFullPath))
-            {
-                return defaultFullPath;
-            }
-            if (directories == null)
-            {
-                return string.Empty;
-            }
-            string fileName = Path.GetFileName(defaultFullPath);
-            foreach (string currentPath in directories)
-            {
-                if (String.IsNullOrEmpty(currentPath) || String.IsNullOrEmpty(currentPath.Trim()))
-                {
-                    continue;
-                }
-                if (File.Exists(Path.Combine(currentPath, fileName)))
-                {
-                    return Path.Combine(currentPath, fileName);
-                }
-            }
-            return String.Empty;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs b/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
deleted file mode 100644
index 06c8b98a..00000000
--- a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
+++ /dev/null
@@ -1,146 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Security.Cryptography;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// This task generates metadata on the for compile output objects.
-    /// </summary>
-    public class GenerateCompileWithObjectPath : Task
-    {
-        /// <summary>
-        /// The list of files to generate outputs for.
-        /// </summary>
-        [Required]
-        public ITaskItem[] Compile
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// The list of files with ObjectPath metadata.
-        /// </summary>
-        [Output]
-        public ITaskItem[] CompileWithObjectPath
-        {
-            get;
-            private set;
-        }
-        /// <summary>
-        /// The folder under which all ObjectPaths should reside.
-        /// </summary>
-        [Required]
-        public string IntermediateOutputPath
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// Generate an identifier by hashing data from the row.
-        /// </summary>
-        /// <param name="prefix">Three letter or less prefix for generated row identifier.</param>
-        /// <param name="args">Information to hash.</param>
-        /// <returns>The generated identifier.</returns>
-        [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.InvalidOperationException.#ctor(System.String)")]
-        public static string GenerateIdentifier(string prefix, params string[] args)
-        {
-            string stringData = String.Join("|", args);
-            byte[] data = Encoding.Unicode.GetBytes(stringData);
-            // hash the data
-            byte[] hash;
-            using (MD5 md5 = new MD5CryptoServiceProvider())
-            {
-                hash = md5.ComputeHash(data);
-            }
-            // build up the identifier
-            StringBuilder identifier = new StringBuilder(35, 35);
-            identifier.Append(prefix);
-            // hard coded to 16 as that is the most bytes that can be used to meet the length requirements. SHA1 is 20 bytes.
-            for (int i = 0; i < 16; i++)
-            {
-                identifier.Append(hash[i].ToString("X2", CultureInfo.InvariantCulture.NumberFormat));
-            }
-            return identifier.ToString();
-        }
-        /// <summary>
-        /// Gets the full path of the directory in which the file is found.
-        /// </summary>
-        /// <param name='file'>The file from which to extract the directory.</param>
-        /// <returns>The generated identifier.</returns>
-        private static string GetDirectory(ITaskItem file)
-        {
-            return file.GetMetadata("RootDir") + file.GetMetadata("Directory");
-        }
-        /// <summary>
-        /// Sets the object path to use for the file.
-        /// </summary>
-        /// <param name='file'>The file on which to set the ObjectPath metadata.</param>
-        /// <remarks>
-        /// For the same input path it will return the same ObjectPath. Case is not ignored, however that isn't a problem.
-        /// </remarks>
-        private void SetObjectPath(ITaskItem file)
-        {
-            // If the source file is in the project directory or in the intermediate directory, use the intermediate directory.
-            if (string.IsNullOrEmpty(file.GetMetadata("RelativeDir")) || string.Compare(file.GetMetadata("RelativeDir"), this.IntermediateOutputPath, StringComparison.OrdinalIgnoreCase) == 0)
-            {
-                file.SetMetadata("ObjectPath", this.IntermediateOutputPath);
-            }
-            // Otherwise use a subdirectory of the intermediate directory. The subfolder's name is based on the full path of the folder containing the source file.
-            else
-            {
-                file.SetMetadata("ObjectPath", Path.Combine(this.IntermediateOutputPath, GenerateIdentifier("pth", GetDirectory(file))) + Path.DirectorySeparatorChar);
-            }
-        }
-        /// <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()
-        {
-            if (string.IsNullOrEmpty(this.IntermediateOutputPath))
-            {
-                this.Log.LogError("IntermediateOutputPath parameter is required and cannot be empty");
-                return false;
-            }
-            if (this.Compile == null || this.Compile.Length == 0)
-            {
-                return true;
-            }
-            this.CompileWithObjectPath = new ITaskItem[this.Compile.Length];
-            for (int i = 0; i < this.Compile.Length; ++i)
-            {
-                this.CompileWithObjectPath[i] = new TaskItem(this.Compile[i].ItemSpec, this.Compile[i].CloneCustomMetadata());
-                // Do not overwrite the ObjectPath metadata if it already was set.
-                if (string.IsNullOrEmpty(this.CompileWithObjectPath[i].GetMetadata("ObjectPath")))
-                {
-                    SetObjectPath(this.CompileWithObjectPath[i]);
-                }
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/GetCabList.cs b/src/WixToolset.BuildTasks/GetCabList.cs
deleted file mode 100644
index e97538af..00000000
--- a/src/WixToolset.BuildTasks/GetCabList.cs
+++ /dev/null
@@ -1,87 +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 System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using WixToolset.Dtf.WindowsInstaller;
-    using Microsoft.Win32;
-    /// <summary>
-    /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
-    /// WixLocalization element inside the file.
-    /// </summary>
-    public class GetCabList : Task
-    {
-        private ITaskItem database;
-        private ITaskItem[] cabList;
-        /// <summary>
-        /// The list of database files to find cabs in
-        /// </summary>
-        [Required]
-        public ITaskItem Database
-        {
-            get { return this.database; }
-            set { this.database = value; }
-        }
-        /// <summary>
-        /// The total list of cabs in this database
-        /// </summary>
-        [Output]
-        public ITaskItem[] CabList
-        {
-            get { return this.cabList; }
-        }
-        /// <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()
-        {
-            string databaseFile = this.database.ItemSpec;
-            Object []args = { };
-            System.Collections.Generic.List<ITaskItem> cabNames = new System.Collections.Generic.List<ITaskItem>();
-            // If the file doesn't exist, no cabs to return, so exit now
-            if (!File.Exists(databaseFile))
-            {
-                return true;
-            }
-            using (Database database = new Database(databaseFile))
-            {
-                // If the media table doesn't exist, no cabs to return, so exit now
-                if (null == database.Tables["Media"])
-                {
-                    return true;
-                }
-                System.Collections.IList records = database.ExecuteQuery("SELECT `Cabinet` FROM `Media`", args);
-                foreach (string cabName in records)
-                {
-                    if (String.IsNullOrEmpty(cabName) || cabName.StartsWith("#", StringComparison.Ordinal))
-                    {
-                        continue;
-                    }
-                    cabNames.Add(new TaskItem(Path.Combine(Path.GetDirectoryName(databaseFile), cabName)));
-                }
-            }
-            this.cabList = cabNames.ToArray();
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/GetLooseFileList.cs b/src/WixToolset.BuildTasks/GetLooseFileList.cs
deleted file mode 100644
index bd403426..00000000
--- a/src/WixToolset.BuildTasks/GetLooseFileList.cs
+++ /dev/null
@@ -1,230 +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 System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using WixToolset.Dtf.WindowsInstaller;
-    using Microsoft.Win32;
-    /// <summary>
-    /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
-    /// WixLocalization element inside the file.
-    /// </summary>
-    public class GetLooseFileList : Task
-    {
-        private ITaskItem database;
-        private ITaskItem[] looseFileList;
-        internal const int MsidbFileAttributesNoncompressed = 8192;
-        internal const int MsidbFileAttributesCompressed = 16384;
-        /// <summary>
-        /// The list of database files to find Loose Files in
-        /// </summary>
-        [Required]
-        public ITaskItem Database
-        {
-            get { return this.database; }
-            set { this.database = value; }
-        }
-        /// <summary>
-        /// The total list of Loose Files in this database
-        /// </summary>
-        [Output]
-        public ITaskItem[] LooseFileList
-        {
-            get { return this.looseFileList; }
-        }
-        /// <summary>
-        /// Takes the "defaultDir" column
-        /// </summary>
-        /// <returns>Returns the corresponding sourceDir.</returns>
-        public string SourceDirFromDefaultDir(string defaultDir)
-        {
-            string sourceDir;
-            string[] splitted = defaultDir.Split(':');
-            if (1 == splitted.Length)
-            {
-                sourceDir = splitted[0];
-            }
-            else
-            {
-                sourceDir = splitted[1];
-            }
-            splitted = sourceDir.Split('|');
-            if (1 == splitted.Length)
-            {
-                sourceDir = splitted[0];
-            }
-            else
-            {
-                sourceDir = splitted[1];
-            }
-            return sourceDir;
-        }
-        /// <summary>
-        /// Takes the "FileName" column
-        /// </summary>
-        /// <returns>Returns the corresponding source file name.</returns>
-        public string SourceFileFromFileName(string fileName)
-        {
-            string sourceFile;
-            string[] splitted = fileName.Split('|');
-            if (1 == splitted.Length)
-            {
-                sourceFile = splitted[0];
-            }
-            else
-            {
-                sourceFile = splitted[1];
-            }
-            return sourceFile;
-        }
-        /// <summary>
-        /// Gets a complete list of external Loose Files referenced by the given installer database file.
-        /// </summary>
-        /// <returns>True upon completion of the task execution.</returns>
-        public override bool Execute()
-        {
-            string databaseFile = this.database.ItemSpec;
-            Object []emptyArgs = { };
-            System.Collections.Generic.List<ITaskItem> looseFileNames = new System.Collections.Generic.List<ITaskItem>();
-            Dictionary<string, string> ComponentFullDirectory = new Dictionary<string, string>();
-            Dictionary<string, string> DirectoryIdDefaultDir = new Dictionary<string, string>();
-            Dictionary<string, string> DirectoryIdParent = new Dictionary<string, string>();
-            Dictionary<string, string> DirectoryIdFullSource = new Dictionary<string, string>();
-            int i;
-            string databaseDir = Path.GetDirectoryName(databaseFile);
-            // If the file doesn't exist, no Loose Files to return, so exit now
-            if (!File.Exists(databaseFile))
-            {
-                return true;
-            }
-            using (Database database = new Database(databaseFile))
-            {
-                bool compressed = false;
-                if (2 == (database.SummaryInfo.WordCount & 2))
-                {
-                    compressed = true;
-                }
-                // If the media table doesn't exist, no Loose Files to return, so exit now
-                if (null == database.Tables["File"])
-                {
-                    return true;
-                }
-                // Only setup all these helpful indexes if the database is marked as uncompressed. If it's marked as compressed, files are stored at the root,
-                // so none of these indexes will be used
-                if (!compressed)
-                {
-                    if (null == database.Tables["Directory"] || null == database.Tables["Component"])
-                    {
-                        return true;
-                    }
-                    System.Collections.IList directoryRecords = database.ExecuteQuery("SELECT `Directory`,`Directory_Parent`,`DefaultDir` FROM `Directory`", emptyArgs);
-                    // First setup a simple index from DirectoryId to DefaultDir
-                    for (i = 0; i < directoryRecords.Count; i += 3)
-                    {
-                        string directoryId = (string)(directoryRecords[i]);
-                        string directoryParent = (string)(directoryRecords[i + 1]);
-                        string defaultDir = (string)(directoryRecords[i + 2]);
-                        string sourceDir = SourceDirFromDefaultDir(defaultDir);
-                        DirectoryIdDefaultDir[directoryId] = sourceDir;
-                        DirectoryIdParent[directoryId] = directoryParent;
-                    }
-                    // Setup an index from directory Id to the full source path
-                    for (i = 0; i < directoryRecords.Count; i += 3)
-                    {
-                        string directoryId = (string)(directoryRecords[i]);
-                        string directoryParent = (string)(directoryRecords[i + 1]);
-                        string defaultDir = (string)(directoryRecords[i + 2]);
-                        string sourceDir = DirectoryIdDefaultDir[directoryId];
-                        // The TARGETDIR case
-                        if (String.IsNullOrEmpty(directoryParent))
-                        {
-                            DirectoryIdFullSource[directoryId] = databaseDir;
-                        }
-                        else
-                        {
-                            string tempDirectoryParent = directoryParent;
-                            while (!String.IsNullOrEmpty(tempDirectoryParent) && !String.IsNullOrEmpty(DirectoryIdParent[tempDirectoryParent]))
-                            {
-                                sourceDir = Path.Combine(DirectoryIdDefaultDir[tempDirectoryParent], sourceDir);
-                                tempDirectoryParent = DirectoryIdParent[tempDirectoryParent];
-                            }
-                            DirectoryIdFullSource[directoryId] = Path.Combine(databaseDir, sourceDir);
-                        }
-                    }
-                    // Setup an index from component Id to full directory path
-                    System.Collections.IList componentRecords = database.ExecuteQuery("SELECT `Component`,`Directory_` FROM `Component`", emptyArgs);
-                    for (i = 0; i < componentRecords.Count; i += 2)
-                    {
-                        string componentId = (string)(componentRecords[i]);
-                        string componentDir = (string)(componentRecords[i + 1]);
-                        ComponentFullDirectory[componentId] = DirectoryIdFullSource[componentDir];
-                    }
-                }
-                System.Collections.IList fileRecords = database.ExecuteQuery("SELECT `Component_`,`FileName`,`Attributes` FROM `File`", emptyArgs);
-                for (i = 0; i < fileRecords.Count; i += 3)
-                {
-                    string componentId = (string)(fileRecords[i]);
-                    string fileName = SourceFileFromFileName((string)(fileRecords[i + 1]));
-                    int attributes = (int)(fileRecords[i + 2]);
-                    // If the whole database is marked uncompressed, use the directory layout made above
-                    if ((!compressed && MsidbFileAttributesCompressed != (attributes & MsidbFileAttributesCompressed)))
-                    {
-                        looseFileNames.Add(new TaskItem(Path.GetFullPath(Path.Combine(ComponentFullDirectory[componentId], fileName))));
-                    }
-                    // If the database is marked as compressed, put files at the root
-                    else if (compressed && (MsidbFileAttributesNoncompressed == (attributes & MsidbFileAttributesNoncompressed)))
-                    {
-                        looseFileNames.Add(new TaskItem(Path.GetFullPath(Path.Combine(databaseDir, fileName))));
-                    }
-                }
-            }
-            this.looseFileList = looseFileNames.ToArray();
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/GlobalSuppressions.cs b/src/WixToolset.BuildTasks/GlobalSuppressions.cs
deleted file mode 100644
index 65c34c13..00000000
--- a/src/WixToolset.BuildTasks/GlobalSuppressions.cs
+++ /dev/null
@@ -1,8 +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.
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "WixToolset")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Msi", Scope = "namespace", Target = "WixToolset.BuildTasks")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "wix")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Wix")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "wix")]
diff --git a/src/WixToolset.BuildTasks/Insignia.cs b/src/WixToolset.BuildTasks/Insignia.cs
deleted file mode 100644
index ba30963a..00000000
--- a/src/WixToolset.BuildTasks/Insignia.cs
+++ /dev/null
@@ -1,118 +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 System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to run the WiX transform generator.
-    /// </summary>
-    public sealed class Insignia : WixToolTask
-    {
-        private const string InsigniaToolName = "insignia.exe";
-        /// <summary>
-        /// Gets or sets the path to the database to inscribe.
-        /// </summary>
-        public ITaskItem DatabaseFile { get; set; }
-        /// <summary>
-        /// Gets or sets the path to the bundle to inscribe.
-        /// </summary>
-        public ITaskItem BundleFile { get; set; }
-        /// <summary>
-        /// Gets or sets the path to the original bundle that contains the attached container.
-        /// </summary>
-        public ITaskItem OriginalBundleFile { get; set; }
-        /// <summary>
-        /// Gets or sets the path to output the inscribed result.
-        /// </summary>
-        [Required]
-        public ITaskItem OutputFile { get; set; }
-        /// <summary>
-        /// Gets or sets the output. Only set if insignia does work.
-        /// </summary>
-        [Output]
-        public ITaskItem Output { get; set; }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of Insignia.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return InsigniaToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply Insignia.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return InsigniaToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), InsigniaToolName);
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendSwitchIfNotNull("-im ", this.DatabaseFile);
-            if (null != this.OriginalBundleFile)
-            {
-                commandLineBuilder.AppendSwitchIfNotNull("-ab ", this.BundleFile);
-                commandLineBuilder.AppendFileNameIfNotNull(this.OriginalBundleFile);
-            }
-            else
-            {
-                commandLineBuilder.AppendSwitchIfNotNull("-ib ", this.BundleFile);
-            }
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-        }
-        /// <summary>
-        /// Executes a tool in-process by loading the tool assembly and invoking its entrypoint.
-        /// </summary>
-        /// <param name="pathToTool">Path to the tool to be executed; must be a managed executable.</param>
-        /// <param name="responseFileCommands">Commands to be written to a response file.</param>
-        /// <param name="commandLineCommands">Commands to be passed directly on the command-line.</param>
-        /// <returns>The tool exit code.</returns>
-        protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
-        {
-            int returnCode = base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);
-            if (0 == returnCode) // successfully did work.
-            {
-                this.Output = this.OutputFile;
-            }
-            else if (-1 == returnCode) // no work done.
-            {
-                returnCode = 0;
-            }
-            return returnCode;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Light.cs b/src/WixToolset.BuildTasks/Light.cs
deleted file mode 100644
index b7d0b4f7..00000000
--- a/src/WixToolset.BuildTasks/Light.cs
+++ /dev/null
@@ -1,488 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to run the WiX linker.
-    /// </summary>
-    public sealed class Light : WixToolTask
-    {
-        private const string LightToolName = "Light.exe";
-        private string additionalCub;
-        private bool allowIdenticalRows;
-        private bool allowUnresolvedReferences;
-        private string[] baseInputPaths;
-        private ITaskItem[] bindInputPaths;
-        private bool backwardsCompatibleGuidGeneration;
-        private bool bindFiles;
-        private ITaskItem builtOutputsFile;
-        private string cabinetCachePath;
-        private int cabinetCreationThreadCount = WixCommandLineBuilder.Unspecified;
-        private ITaskItem contentsFile;
-        private string cultures;
-        private string customBinder;
-        private string defaultCompressionLevel;
-        private ITaskItem[] extensions;
-        private string[] ices;
-        private bool leaveTemporaryFiles;
-        private ITaskItem[] localizationFiles;
-        private ITaskItem[] objectFiles;
-        private bool outputAsXml;
-        private ITaskItem outputsFile;
-        private ITaskItem outputFile;
-        private ITaskItem pdbOutputFile;
-        private ITaskItem wixProjectFile;
-        private bool pedantic;
-        private bool reuseCabinetCache;
-        private bool suppressAclReset;
-        private bool suppressAssemblies;
-        private bool suppressDefaultAdminSequenceActions;
-        private bool suppressDefaultAdvSequenceActions;
-        private bool suppressDefaultUISequenceActions;
-        private bool dropUnrealTables;
-        private bool exactAssemblyVersions;
-        private bool suppressFileHashAndInfo;
-        private bool suppressFiles;
-        private bool suppressIntermediateFileVersionMatching;
-        private string[] suppressIces;
-        private bool suppressLayout;
-        private bool suppressLocalization;
-        private bool suppressMsiAssemblyTableProcessing;
-        private bool suppressPdbOutput;
-        private bool suppressSchemaValidation;
-        private bool suppressValidation;
-        private bool suppressTagSectionIdAttributeOnTuples;
-        private ITaskItem unreferencedSymbolsFile;
-        private string[] wixVariables;
-        private string extensionDirectory;
-        private string[] referencePaths;
-        /// <summary>
-        /// Creates a new light task.
-        /// </summary>
-        /// <remarks>
-        /// Defaults to running the task as a separate process, instead of in-proc
-        /// which is the default for WixToolTasks. This allows the Win32 manifest file
-        /// embedded in light.exe to enable reg-free COM interop with mergemod.dll.
-        /// </remarks>
-        public Light()
-        {
-        }
-        public string AdditionalCub
-        {
-            get { return this.additionalCub; }
-            set { this.additionalCub = value; }
-        }
-        public bool AllowIdenticalRows
-        {
-            get { return this.allowIdenticalRows; }
-            set { this.allowIdenticalRows = value; }
-        }
-        public bool AllowUnresolvedReferences
-        {
-            get { return this.allowUnresolvedReferences; }
-            set { this.allowUnresolvedReferences = value; }
-        }
-        // TODO: remove this property entirely in v4.0
-        [Obsolete("Use BindInputPaths instead of BaseInputPaths.")]
-        public string[] BaseInputPaths
-        {
-            get { return this.baseInputPaths; }
-            set { this.baseInputPaths = value; }
-        }
-        public ITaskItem[] BindInputPaths
-        {
-            get { return this.bindInputPaths; }
-            set { this.bindInputPaths = value; }
-        }
-        public bool BackwardsCompatibleGuidGeneration
-        {
-            get { return this.backwardsCompatibleGuidGeneration; }
-            set { this.backwardsCompatibleGuidGeneration = value; }
-        }
-        public bool BindFiles
-        {
-            get { return this.bindFiles; }
-            set { this.bindFiles = value; }
-        }
-        public string CabinetCachePath
-        {
-            get { return this.cabinetCachePath; }
-            set { this.cabinetCachePath = value; }
-        }
-        public int CabinetCreationThreadCount
-        {
-            get { return this.cabinetCreationThreadCount; }
-            set { this.cabinetCreationThreadCount = value; }
-        }
-        public ITaskItem BindBuiltOutputsFile
-        {
-            get { return this.builtOutputsFile; }
-            set { this.builtOutputsFile = value; }
-        }
-        public ITaskItem BindContentsFile
-        {
-            get { return this.contentsFile; }
-            set { this.contentsFile = value; }
-        }
-        public ITaskItem BindOutputsFile
-        {
-            get { return this.outputsFile; }
-            set { this.outputsFile = value; }
-        }
-        public string Cultures
-        {
-            get { return this.cultures; }
-            set { this.cultures = value; }
-        }
-        public string CustomBinder
-        {
-            get { return this.customBinder; }
-            set { this.customBinder = value; }
-        }
-        public string DefaultCompressionLevel
-        {
-            get { return this.defaultCompressionLevel; }
-            set { this.defaultCompressionLevel = value; }
-        }
-        public bool DropUnrealTables
-        {
-            get { return this.dropUnrealTables; }
-            set { this.dropUnrealTables = value; }
-        }
-        public bool ExactAssemblyVersions
-        {
-            get { return this.exactAssemblyVersions; }
-            set { this.exactAssemblyVersions = value; }
-        }
-        public ITaskItem[] Extensions
-        {
-            get { return this.extensions; }
-            set { this.extensions = value; }
-        }
-        public string[] Ices
-        {
-            get { return this.ices; }
-            set { this.ices = value; }
-        }
-        public bool LeaveTemporaryFiles
-        {
-            get { return this.leaveTemporaryFiles; }
-            set { this.leaveTemporaryFiles = value; }
-        }
-        public ITaskItem[] LocalizationFiles
-        {
-            get { return this.localizationFiles; }
-            set { this.localizationFiles = value; }
-        }
-        [Required]
-        public ITaskItem[] ObjectFiles
-        {
-            get { return this.objectFiles; }
-            set { this.objectFiles = value; }
-        }
-        public bool OutputAsXml
-        {
-            get { return this.outputAsXml; }
-            set { this.outputAsXml = value; }
-        }
-        [Required]
-        [Output]
-        public ITaskItem OutputFile
-        {
-            get { return this.outputFile; }
-            set { this.outputFile = value; }
-        }
-        [Output]
-        public ITaskItem PdbOutputFile
-        {
-            get { return this.pdbOutputFile; }
-            set { this.pdbOutputFile = value; }
-        }
-        public bool Pedantic
-        {
-            get { return this.pedantic; }
-            set { this.pedantic = value; }
-        }
-        public bool ReuseCabinetCache
-        {
-            get { return this.reuseCabinetCache; }
-            set { this.reuseCabinetCache = value; }
-        }
-        public bool SuppressAclReset
-        {
-            get { return this.suppressAclReset; }
-            set { this.suppressAclReset = value; }
-        }
-        public bool SuppressAssemblies
-        {
-            get { return this.suppressAssemblies; }
-            set { this.suppressAssemblies = value; }
-        }
-        public bool SuppressDefaultAdminSequenceActions
-        {
-            get { return this.suppressDefaultAdminSequenceActions; }
-            set { this.suppressDefaultAdminSequenceActions = value; }
-        }
-        public bool SuppressDefaultAdvSequenceActions
-        {
-            get { return this.suppressDefaultAdvSequenceActions; }
-            set { this.suppressDefaultAdvSequenceActions = value; }
-        }
-        public bool SuppressDefaultUISequenceActions
-        {
-            get { return this.suppressDefaultUISequenceActions; }
-            set { this.suppressDefaultUISequenceActions = value; }
-        }
-        public bool SuppressFileHashAndInfo
-        {
-            get { return this.suppressFileHashAndInfo; }
-            set { this.suppressFileHashAndInfo = value; }
-        }
-        public bool SuppressFiles
-        {
-            get { return this.suppressFiles; }
-            set { this.suppressFiles = value; }
-        }
-        public bool SuppressIntermediateFileVersionMatching
-        {
-            get { return this.suppressIntermediateFileVersionMatching; }
-            set { this.suppressIntermediateFileVersionMatching = value; }
-        }
-        public string[] SuppressIces
-        {
-            get { return this.suppressIces; }
-            set { this.suppressIces = value; }
-        }
-        public bool SuppressLayout
-        {
-            get { return this.suppressLayout; }
-            set { this.suppressLayout = value; }
-        }
-        public bool SuppressLocalization
-        {
-            get { return this.suppressLocalization; }
-            set { this.suppressLocalization = value; }
-        }
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
-        public bool SuppressMsiAssemblyTableProcessing
-        {
-            get { return this.suppressMsiAssemblyTableProcessing; }
-            set { this.suppressMsiAssemblyTableProcessing = value; }
-        }
-        public bool SuppressPdbOutput
-        {
-            get { return this.suppressPdbOutput; }
-            set { this.suppressPdbOutput = value; }
-        }
-        public bool SuppressSchemaValidation
-        {
-            get { return this.suppressSchemaValidation; }
-            set { this.suppressSchemaValidation = value; }
-        }
-        public bool SuppressValidation
-        {
-            get { return this.suppressValidation; }
-            set { this.suppressValidation = value; }
-        }
-        public bool SuppressTagSectionIdAttributeOnTuples
-        {
-            get { return this.suppressTagSectionIdAttributeOnTuples; }
-            set { this.suppressTagSectionIdAttributeOnTuples = value; }
-        }
-        [Output]
-        public ITaskItem UnreferencedSymbolsFile
-        {
-            get { return this.unreferencedSymbolsFile; }
-            set { this.unreferencedSymbolsFile = value; }
-        }
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
-        public ITaskItem WixProjectFile
-        {
-            get { return this.wixProjectFile; }
-            set { this.wixProjectFile = value; }
-        }
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
-        public string[] WixVariables
-        {
-            get { return this.wixVariables; }
-            set { this.wixVariables = value; }
-        }
-        public string ExtensionDirectory
-        {
-            get { return this.extensionDirectory; }
-            set { this.extensionDirectory = value; }
-        }
-        public string[] ReferencePaths
-        {
-            get { return this.referencePaths; }
-            set { this.referencePaths = value; }
-        }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of light.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return LightToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply light.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return LightToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), LightToolName);
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            // Always put the output first so it is easy to find in the log.
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-pdbout ", this.PdbOutputFile);
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendIfTrue("-ai", this.AllowIdenticalRows);
-            commandLineBuilder.AppendIfTrue("-au", this.AllowUnresolvedReferences);
-            commandLineBuilder.AppendArrayIfNotNull("-b ", this.baseInputPaths);
-            if (null != this.BindInputPaths)
-            {
-                Queue<String> formattedBindInputPaths = new Queue<String>();
-                foreach (ITaskItem item in this.BindInputPaths)
-                {
-                    String formattedPath = string.Empty;
-                    String bindName = item.GetMetadata("BindName");
-                    if (!String.IsNullOrEmpty(bindName))
-                    {
-                        formattedPath = String.Concat(bindName, "=", item.GetMetadata("FullPath"));
-                    }
-                    else
-                    {
-                        formattedPath = item.GetMetadata("FullPath");
-                    }
-                    formattedBindInputPaths.Enqueue(formattedPath);
-                }
-                commandLineBuilder.AppendArrayIfNotNull("-b ", formattedBindInputPaths.ToArray());
-            }
-            commandLineBuilder.AppendIfTrue("-bcgg", this.BackwardsCompatibleGuidGeneration);
-            commandLineBuilder.AppendIfTrue("-bf", this.BindFiles);
-            commandLineBuilder.AppendSwitchIfNotNull("-cc ", this.CabinetCachePath);
-            commandLineBuilder.AppendIfSpecified("-ct ", this.CabinetCreationThreadCount);
-            commandLineBuilder.AppendSwitchIfNotNull("-cub ", this.AdditionalCub);
-            commandLineBuilder.AppendSwitchIfNotNull("-cultures:", this.Cultures);
-            commandLineBuilder.AppendSwitchIfNotNull("-binder ", this.CustomBinder);
-            commandLineBuilder.AppendArrayIfNotNull("-d", this.WixVariables);
-            commandLineBuilder.AppendSwitchIfNotNull("-dcl:", this.DefaultCompressionLevel);
-            commandLineBuilder.AppendIfTrue("-dut", this.DropUnrealTables);
-            commandLineBuilder.AppendIfTrue("-eav", this.ExactAssemblyVersions);
-            commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.referencePaths);
-            commandLineBuilder.AppendArrayIfNotNull("-ice:", this.Ices);
-            commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles);
-            commandLineBuilder.AppendIfTrue("-notidy", this.LeaveTemporaryFiles);
-            commandLineBuilder.AppendIfTrue("-pedantic", this.Pedantic);
-            commandLineBuilder.AppendIfTrue("-reusecab", this.ReuseCabinetCache);
-            commandLineBuilder.AppendIfTrue("-sa", this.SuppressAssemblies);
-            commandLineBuilder.AppendIfTrue("-sacl", this.SuppressAclReset);
-            commandLineBuilder.AppendIfTrue("-sadmin", this.SuppressDefaultAdminSequenceActions);
-            commandLineBuilder.AppendIfTrue("-sadv", this.SuppressDefaultAdvSequenceActions);
-            commandLineBuilder.AppendArrayIfNotNull("-sice:", this.SuppressIces);
-            commandLineBuilder.AppendIfTrue("-sma", this.SuppressMsiAssemblyTableProcessing);
-            commandLineBuilder.AppendIfTrue("-sf", this.SuppressFiles);
-            commandLineBuilder.AppendIfTrue("-sh", this.SuppressFileHashAndInfo);
-            commandLineBuilder.AppendIfTrue("-sl", this.SuppressLayout);
-            commandLineBuilder.AppendIfTrue("-sloc", this.SuppressLocalization);
-            commandLineBuilder.AppendIfTrue("-spdb", this.SuppressPdbOutput);
-            commandLineBuilder.AppendIfTrue("-ss", this.SuppressSchemaValidation);
-            commandLineBuilder.AppendIfTrue("-sts", this.SuppressTagSectionIdAttributeOnTuples);
-            commandLineBuilder.AppendIfTrue("-sui", this.SuppressDefaultUISequenceActions);
-            commandLineBuilder.AppendIfTrue("-sv", this.SuppressIntermediateFileVersionMatching);
-            commandLineBuilder.AppendIfTrue("-sval", this.SuppressValidation);
-            commandLineBuilder.AppendSwitchIfNotNull("-usf ", this.UnreferencedSymbolsFile);
-            commandLineBuilder.AppendIfTrue("-xo", this.OutputAsXml);
-            commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-wixprojectfile ", this.WixProjectFile);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            List<string> objectFilePaths = AdjustFilePaths(this.objectFiles, this.ReferencePaths);
-            commandLineBuilder.AppendFileNamesIfNotNull(objectFilePaths.ToArray(), " ");
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Lit.cs b/src/WixToolset.BuildTasks/Lit.cs
deleted file mode 100644
index 1df964ae..00000000
--- a/src/WixToolset.BuildTasks/Lit.cs
+++ /dev/null
@@ -1,178 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to run the WiX lib tool.
-    /// </summary>
-    public sealed class Lit : WixToolTask
-    {
-        private const string LitToolName = "lit.exe";
-        private string[] baseInputPaths;
-        private ITaskItem[] bindInputPaths;
-        private bool bindFiles;
-        private ITaskItem[] extensions;
-        private ITaskItem[] localizationFiles;
-        private ITaskItem[] objectFiles;
-        private ITaskItem outputFile;
-        private bool pedantic;
-        private bool suppressIntermediateFileVersionMatching;
-        private bool suppressSchemaValidation;
-        private string extensionDirectory;
-        private string[] referencePaths;
-        // TODO: remove this property entirely in v4.0
-        [Obsolete("Use BindInputPaths instead of BaseInputPaths.")]
-        public string[] BaseInputPaths
-        {
-            get { return this.baseInputPaths; }
-            set { this.baseInputPaths = value; }
-        }
-        public ITaskItem[] BindInputPaths
-        {
-            get { return this.bindInputPaths; }
-            set { this.bindInputPaths = value; }
-        }
-        public bool BindFiles
-        {
-            get { return this.bindFiles; }
-            set { this.bindFiles = value; }
-        }
-        public ITaskItem[] Extensions
-        {
-            get { return this.extensions; }
-            set { this.extensions = value; }
-        }
-        public ITaskItem[] LocalizationFiles
-        {
-            get { return this.localizationFiles; }
-            set { this.localizationFiles = value; }
-        }
-        [Required]
-        public ITaskItem[] ObjectFiles
-        {
-            get { return this.objectFiles; }
-            set { this.objectFiles = value; }
-        }
-        [Required]
-        [Output]
-        public ITaskItem OutputFile
-        {
-            get { return this.outputFile; }
-            set { this.outputFile = value; }
-        }
-        public bool Pedantic
-        {
-            get { return this.pedantic; }
-            set { this.pedantic = value; }
-        }
-        public bool SuppressIntermediateFileVersionMatching
-        {
-            get { return this.suppressIntermediateFileVersionMatching; }
-            set { this.suppressIntermediateFileVersionMatching = value; }
-        }
-        public bool SuppressSchemaValidation
-        {
-            get { return this.suppressSchemaValidation; }
-            set { this.suppressSchemaValidation = value; }
-        }
-        public string ExtensionDirectory
-        {
-            get { return this.extensionDirectory; }
-            set { this.extensionDirectory = value; }
-        }
-        public string[] ReferencePaths
-        {
-            get { return this.referencePaths; }
-            set { this.referencePaths = value; }
-        }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of lit.exe</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return LitToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply lit.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return LitToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), LitToolName);
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendArrayIfNotNull("-b ", this.baseInputPaths);
-            if (null != this.BindInputPaths)
-            {
-                Queue<String> formattedBindInputPaths = new Queue<String>();
-                foreach (ITaskItem item in this.BindInputPaths)
-                {
-                    String formattedPath = string.Empty;
-                    String bindName = item.GetMetadata("BindName");
-                    if (!String.IsNullOrEmpty(item.GetMetadata("BindName")))
-                    {
-                        formattedPath = String.Concat(bindName, "=", item.GetMetadata("FullPath"));
-                    }
-                    else
-                    {
-                        formattedPath = item.GetMetadata("FullPath");
-                    }
-                    formattedBindInputPaths.Enqueue(formattedPath);
-                }
-                commandLineBuilder.AppendArrayIfNotNull("-b ", formattedBindInputPaths.ToArray());
-            }
-            commandLineBuilder.AppendIfTrue("-bf", this.BindFiles);
-            commandLineBuilder.AppendExtensions(this.extensions, this.ExtensionDirectory, this.referencePaths);
-            commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles);
-            commandLineBuilder.AppendIfTrue("-pedantic", this.Pedantic);
-            commandLineBuilder.AppendIfTrue("-ss", this.SuppressSchemaValidation);
-            commandLineBuilder.AppendIfTrue("-sv", this.SuppressIntermediateFileVersionMatching);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            List<string> objectFilePaths = AdjustFilePaths(this.objectFiles, this.ReferencePaths);
-            commandLineBuilder.AppendFileNamesIfNotNull(objectFilePaths.ToArray(), " ");
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Pyro.cs b/src/WixToolset.BuildTasks/Pyro.cs
deleted file mode 100644
index f6b069da..00000000
--- a/src/WixToolset.BuildTasks/Pyro.cs
+++ /dev/null
@@ -1,140 +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 System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Microsoft.Build.Framework;
-    /// <summary>
-    /// An MSBuild task to run the WiX patch builder.
-    /// </summary>
-    public sealed class Pyro : WixToolTask
-    {
-        private const string PyroToolName = "pyro.exe";
-        public bool BinaryDeltaPatch { get; set; }
-        public string CabinetCachePath { get; set; }
-        public string ExtensionDirectory { get; set; }
-        public ITaskItem[] Extensions { get; set; }
-        public bool LeaveTemporaryFiles { get; set; }
-        public string[] ReferencePaths { get; set; }
-        public bool ReuseCabinetCache { get; set; }
-        public bool SuppressAssemblies { get; set; }
-        public bool SuppressFiles { get; set; }
-        public bool SuppressFileHashAndInfo { get; set; }
-        public bool SuppressPdbOutput { get; set; }
-        [Required]
-        public string DefaultBaselineId { get; set; }
-        public ITaskItem[] BindInputPathsForTarget { get; set; }
-        public ITaskItem[] BindInputPathsForUpdated { get; set; }
-        [Required]
-        public ITaskItem InputFile { get; set; }
-        [Required]
-        [Output]
-        public ITaskItem OutputFile { get; set; }
-        [Output]
-        public ITaskItem PdbOutputFile { get; set; }
-        [Required]
-        public ITaskItem[] Transforms { get; set; }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of pyro.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return PyroToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply torch.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return PyroToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), PyroToolName);
-        }
-        /// <summary>
-        /// Builds a command line for bind-input paths (-bt and -bu switches).
-        /// </summary>
-        private void AppendBindInputPaths(WixCommandLineBuilder commandLineBuilder, IEnumerable<ITaskItem> bindInputPaths, string switchName)
-        {
-            if (null != bindInputPaths)
-            {
-                Queue<String> formattedBindInputPaths = new Queue<String>();
-                foreach (ITaskItem item in bindInputPaths)
-                {
-                    String formattedPath = string.Empty;
-                    String bindName = item.GetMetadata("BindName");
-                    if (!String.IsNullOrEmpty(bindName))
-                    {
-                        formattedPath = String.Concat(bindName, "=", item.GetMetadata("FullPath"));
-                    }
-                    else
-                    {
-                        formattedPath = item.GetMetadata("FullPath");
-                    }
-                    formattedBindInputPaths.Enqueue(formattedPath);
-                }
-                commandLineBuilder.AppendArrayIfNotNull(switchName, formattedBindInputPaths.ToArray());
-            }
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            // Always put the output first so it is easy to find in the log.
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-pdbout ", this.PdbOutputFile);
-            base.BuildCommandLine(commandLineBuilder);
-            this.AppendBindInputPaths(commandLineBuilder, this.BindInputPathsForTarget, "-bt ");
-            this.AppendBindInputPaths(commandLineBuilder, this.BindInputPathsForUpdated, "-bu ");
-            commandLineBuilder.AppendFileNameIfNotNull(this.InputFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-cc ", this.CabinetCachePath);
-            commandLineBuilder.AppendIfTrue("-delta", this.BinaryDeltaPatch);
-            commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.ReferencePaths);
-            commandLineBuilder.AppendIfTrue("-notidy", this.LeaveTemporaryFiles);
-            commandLineBuilder.AppendIfTrue("-reusecab", this.ReuseCabinetCache);
-            commandLineBuilder.AppendIfTrue("-sa", this.SuppressAssemblies);
-            commandLineBuilder.AppendIfTrue("-sf", this.SuppressFiles);
-            commandLineBuilder.AppendIfTrue("-sh", this.SuppressFileHashAndInfo);
-            commandLineBuilder.AppendIfTrue("-spdb", this.SuppressPdbOutput);
-            foreach (ITaskItem transform in this.Transforms)
-            {
-                string transformPath = transform.ItemSpec;
-                string baselineId = transform.GetMetadata("OverrideBaselineId");
-                if (String.IsNullOrEmpty(baselineId))
-                {
-                    baselineId = this.DefaultBaselineId;
-                }
-                commandLineBuilder.AppendTextIfNotNull(String.Format("-t {0} {1}", baselineId, transformPath));
-            }
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
deleted file mode 100644
index 5445e0cd..00000000
--- a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ /dev/null
@@ -1,132 +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 System;
-    using System.Collections;
-    using System.Globalization;
-    using System.IO;
-    using System.Text.RegularExpressions;
-    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
-    {
-        private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
-        private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
-        private ITaskItem[] generatedFiles;
-        private ITaskItem[] projectReferencePaths;
-        /// <summary>
-        /// The list of files to generate.
-        /// </summary>
-        [Required]
-        public ITaskItem[] GeneratedFiles
-        {
-            get { return this.generatedFiles; }
-            set { this.generatedFiles = value; }
-        }
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferencePaths
-        {
-            get { return this.projectReferencePaths; }
-            set { this.projectReferencePaths = value; }
-        }
-        /// <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++)
-            {
-                ITaskItem item = this.ProjectReferencePaths[i];
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
-                {
-                    continue;
-                }
-                string projectPath = CreateProjectReferenceDefineConstants.GetProjectPath(this.ProjectReferencePaths, i);
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = Common.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
-                {
-                    if (!String.IsNullOrEmpty(pog))
-                    {
-                        // TODO: Add payload group references and package group references once heat is generating them
-                        ////payloadGroupRefs.Add(String.Format(CultureInfo.InvariantCulture, "{0}.{1}", referenceName, pog));
-                        packageGroupRefs.Add(String.Format(CultureInfo.InvariantCulture, "{0}.{1}", referenceName, pog));
-                    }
-                }
-            }
-            XmlDocument doc = new XmlDocument();
-            XmlProcessingInstruction head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
-            doc.AppendChild(head);
-            XmlElement rootElement = doc.CreateElement("Wix");
-            rootElement.SetAttribute("xmlns", "http://wixtoolset.org/schemas/v4/wxs");
-            doc.AppendChild(rootElement);
-            XmlElement fragment = doc.CreateElement("Fragment");
-            rootElement.AppendChild(fragment);
-            XmlElement payloadGroup = doc.CreateElement("PayloadGroup");
-            payloadGroup.SetAttribute("Id", "Bundle.Generated.Payloads");
-            fragment.AppendChild(payloadGroup);
-            XmlElement packageGroup = doc.CreateElement("PackageGroup");
-            packageGroup.SetAttribute("Id", "Bundle.Generated.Packages");
-            fragment.AppendChild(packageGroup);
-            foreach (string payloadGroupRef in payloadGroupRefs)
-            {
-                XmlElement payloadGroupRefElement = doc.CreateElement("PayloadGroupRef");
-                payloadGroupRefElement.SetAttribute("Id", payloadGroupRef);
-                payloadGroup.AppendChild(payloadGroupRefElement);
-            }
-            foreach (string packageGroupRef in packageGroupRefs)
-            {
-                XmlElement packageGroupRefElement = doc.CreateElement("PackageGroupRef");
-                packageGroupRefElement.SetAttribute("Id", packageGroupRef);
-                packageGroup.AppendChild(packageGroupRefElement);
-            }
-            foreach (ITaskItem item in this.GeneratedFiles)
-            {
-                string fullPath = item.GetMetadata("FullPath");
-                payloadGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Payloads");
-                packageGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Packages");
-                try
-                {
-                    doc.Save(fullPath);
-                }
-                catch (Exception e)
-                {
-                    // e.Message will be something like: "Access to the path 'fullPath' is denied."
-                    this.Log.LogMessage(MessageImportance.High, "Unable to save generated file to '{0}'. {1}", fullPath, e.Message);
-                }
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
deleted file mode 100644
index fdfc4774..00000000
--- a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
+++ /dev/null
@@ -1,118 +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 System;
-    using System.Collections;
-    using System.Globalization;
-    using System.IO;
-    using System.Text.RegularExpressions;
-    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
-    {
-        private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
-        private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
-        private ITaskItem[] generatedFiles;
-        private ITaskItem[] projectReferencePaths;
-        /// <summary>
-        /// The list of files to generate.
-        /// </summary>
-        [Required]
-        public ITaskItem[] GeneratedFiles
-        {
-            get { return this.generatedFiles; }
-            set { this.generatedFiles = value; }
-        }
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferencePaths
-        {
-            get { return this.projectReferencePaths; }
-            set { this.projectReferencePaths = value; }
-        }
-        /// <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++)
-            {
-                ITaskItem item = this.ProjectReferencePaths[i];
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
-                {
-                    continue;
-                }
-                string projectPath = CreateProjectReferenceDefineConstants.GetProjectPath(this.ProjectReferencePaths, i);
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = Common.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
-                {
-                    if (!String.IsNullOrEmpty(pog))
-                    {
-                        componentGroupRefs.Add(String.Format(CultureInfo.InvariantCulture, "{0}.{1}", referenceName, pog));
-                    }
-                }
-            }
-            XmlDocument doc = new XmlDocument();
-            XmlProcessingInstruction head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
-            doc.AppendChild(head);
-            XmlElement rootElement = doc.CreateElement("Wix");
-            rootElement.SetAttribute("xmlns", "http://wixtoolset.org/schemas/v4/wxs");
-            doc.AppendChild(rootElement);
-            XmlElement fragment = doc.CreateElement("Fragment");
-            rootElement.AppendChild(fragment);
-            XmlElement componentGroup = doc.CreateElement("ComponentGroup");
-            componentGroup.SetAttribute("Id", "Product.Generated");
-            fragment.AppendChild(componentGroup);
-            foreach (string componentGroupRef in componentGroupRefs)
-            {
-                XmlElement componentGroupRefElement = doc.CreateElement("ComponentGroupRef");
-                componentGroupRefElement.SetAttribute("Id", componentGroupRef);
-                componentGroup.AppendChild(componentGroupRefElement);
-            }
-            foreach (ITaskItem item in this.GeneratedFiles)
-            {
-                string fullPath = item.GetMetadata("FullPath");
-                componentGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath));
-                try
-                {
-                    doc.Save(fullPath);
-                }
-                catch (Exception e)
-                {
-                    // e.Message will be something like: "Access to the path 'fullPath' is denied."
-                    this.Log.LogMessage(MessageImportance.High, "Unable to save generated file to '{0}'. {1}", fullPath, e.Message);
-                }
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/ReplaceString.cs b/src/WixToolset.BuildTasks/ReplaceString.cs
deleted file mode 100644
index e5041923..00000000
--- a/src/WixToolset.BuildTasks/ReplaceString.cs
+++ /dev/null
@@ -1,54 +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 System;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// Replaces occurances of OldValues with NewValues in String.
-    /// </summary>
-    public class ReplaceString : Task
-    {
-        /// <summary>
-        /// Text to operate on.
-        /// </summary>
-        [Output]
-        [Required]
-        public string Text { get; set; }
-        /// <summary>
-        /// List of old values to replace.
-        /// </summary>
-        [Required]
-        public string OldValue { get; set; }
-        /// <summary>
-        /// List of new values to replace old values with.  If not specified, occurances of OldValue will be removed.
-        /// </summary>
-        public string NewValue { get; set; }
-        /// <summary>
-        /// Does the string replacement.
-        /// </summary>
-        /// <returns></returns>
-        public override bool Execute()
-        {
-            if (String.IsNullOrEmpty(this.Text))
-            {
-                return true;
-            }
-            if (String.IsNullOrEmpty(this.OldValue))
-            {
-                Log.LogError("OldValue must be specified");
-                return false;
-            }
-            this.Text = this.Text.Replace(this.OldValue, this.NewValue);
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/ResolveWixReferences.cs b/src/WixToolset.BuildTasks/ResolveWixReferences.cs
deleted file mode 100644
index 9b8cfe6f..00000000
--- a/src/WixToolset.BuildTasks/ResolveWixReferences.cs
+++ /dev/null
@@ -1,212 +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 System;
-    using System.Collections.Generic;
-    using Microsoft.Build.Utilities;
-    using Microsoft.Build.Framework;
-    using System.IO;
-    /// <summary>
-    /// This task searches for paths to references using the order specified in SearchPaths.
-    /// </summary>
-    public class ResolveWixReferences : Task
-    {
-        /// <summary>
-        /// Token value used in SearchPaths to indicate that the item's HintPath metadata should
-        /// be searched as a full file path to resolve the reference.  
-        /// Must match wix.targets, case sensitive.
-        /// </summary>
-        private const string HintPathToken = "{HintPathFromItem}";
-        /// <summary>
-        /// Token value used in SearchPaths to indicate that the item's Identity should
-        /// be searched as a full file path to resolve the reference.  
-        /// Must match wix.targets, case sensitive.
-        /// </summary>
-        private const string RawFileNameToken = "{RawFileName}";
-        /// <summary>
-        /// The list of references to resolve.
-        /// </summary>
-        [Required]
-        public ITaskItem[] WixReferences
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// The directories or special locations that are searched to find the files 
-        /// on disk that represent the references. The order in which the search paths are listed 
-        /// is important. For each reference, the list of paths is searched from left to right. 
-        /// When a file that represents the reference is found, that search stops and the search 
-        /// for the next reference starts. 
-        /// 
-        /// This parameter accepts the following types of values: 
-        ///     A directory path. 
-        ///     {HintPathFromItem}: Specifies that the task will examine the HintPath metadata 
-        ///                         of the base item. 
-        ///     TODO : {CandidateAssemblyFiles}: Specifies that the task will examine the files 
-        ///                                      passed in through the CandidateAssemblyFiles parameter. 
-        ///     TODO : {Registry:_AssemblyFoldersBase_, _RuntimeVersion_, _AssemblyFoldersSuffix_}: 
-        ///     TODO : {AssemblyFolders}: Specifies the task will use the Visual Studio.NET 2003 
-        ///                               finding-assemblies-from-registry scheme. 
-        ///     TODO : {GAC}: Specifies the task will search in the GAC. 
-        ///     {RawFileName}: Specifies the task will consider the Include value of the item to be 
-        ///                    an exact path and file name. 
-        /// </summary>
-        public string[] SearchPaths
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// The filename extension(s) to be checked when searching.
-        /// </summary>
-        public string[] SearchFilenameExtensions
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// Output items that contain the same metadata as input references and have been resolved to full paths.
-        /// </summary>
-        [Output]
-        public ITaskItem[] ResolvedWixReferences
-        {
-            get;
-            private set;
-        }
-        /// <summary>
-        /// Resolves reference paths by searching for referenced items using the specified SearchPaths.
-        /// </summary>
-        /// <returns>True on success, or throws an exception on failure.</returns>
-        public override bool Execute()
-        {
-            List<ITaskItem> resolvedReferences = new List<ITaskItem>();
-            foreach (ITaskItem reference in this.WixReferences)
-            {
-                ITaskItem resolvedReference = ResolveWixReferences.ResolveReference(reference, this.SearchPaths, this.SearchFilenameExtensions, this.Log);
-                this.Log.LogMessage(MessageImportance.Low, "Resolved path {0}", resolvedReference.ItemSpec);
-                resolvedReferences.Add(resolvedReference);
-            }
-            this.ResolvedWixReferences = resolvedReferences.ToArray();
-            return true;
-        }
-        /// <summary>
-        /// Resolves a single reference item by searcheing for referenced items using the specified SearchPaths.
-        /// This method is made public so the resolution logic can be reused by other tasks.
-        /// </summary>
-        /// <param name="reference">The referenced item.</param>
-        /// <param name="searchPaths">The paths to search.</param>
-        /// <param name="searchFilenameExtensions">Filename extensions to check.</param>
-        /// <param name="log">Logging helper.</param>
-        /// <returns>The resolved reference item, or the original reference if it could not be resolved.</returns>
-        public static ITaskItem ResolveReference(ITaskItem reference, string[] searchPaths, string[] searchFilenameExtensions, TaskLoggingHelper log)
-        {
-            if (reference == null)
-            {
-                throw new ArgumentNullException("reference");
-            }
-            if (searchPaths == null)
-            {
-                // Nothing to search, so just return the original reference item.
-                return reference;
-            }
-            if (searchFilenameExtensions == null)
-            {
-                searchFilenameExtensions = new string[] { };
-            }
-            // Copy all the metadata from the source
-            TaskItem resolvedReference = new TaskItem(reference);
-            log.LogMessage(MessageImportance.Low, "WixReference: {0}", reference.ItemSpec);
-            // Now find the resolved path based on our order of precedence
-            foreach (string searchPath in searchPaths)
-            {
-                log.LogMessage(MessageImportance.Low, "Trying {0}", searchPath);
-                if (searchPath.Equals(HintPathToken, StringComparison.Ordinal))
-                {
-                    string path = reference.GetMetadata("HintPath");
-                    log.LogMessage(MessageImportance.Low, "Trying path {0}", path);
-                    if (File.Exists(path))
-                    {
-                        resolvedReference.ItemSpec = path;
-                        break;
-                    }
-                }
-                else if (searchPath.Equals(RawFileNameToken, StringComparison.Ordinal))
-                {
-                    log.LogMessage(MessageImportance.Low, "Trying path {0}", resolvedReference.ItemSpec);
-                    if (File.Exists(resolvedReference.ItemSpec))
-                    {
-                        break;
-                    }
-                    if (ResolveWixReferences.ResolveFilenameExtensions(resolvedReference,
-                        resolvedReference.ItemSpec, searchFilenameExtensions, log))
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    string path = Path.Combine(searchPath, Path.GetFileName(reference.ItemSpec));
-                    log.LogMessage(MessageImportance.Low, "Trying path {0}", path);
-                    if (File.Exists(path))
-                    {
-                        resolvedReference.ItemSpec = path;
-                        break;
-                    }
-                    if (ResolveWixReferences.ResolveFilenameExtensions(resolvedReference,
-                        path, searchFilenameExtensions, log))
-                    {
-                        break;
-                    }
-                }
-            }
-            // Normalize the item path
-            resolvedReference.ItemSpec = resolvedReference.GetMetadata("FullPath");
-            return resolvedReference;
-        }
-        /// <summary>
-        /// Helper method for checking filename extensions when resolving references.
-        /// </summary>
-        /// <param name="reference">The reference being resolved.</param>
-        /// <param name="basePath">Full filename path without extension.</param>
-        /// <param name="filenameExtensions">Filename extensions to check.</param>
-        /// <param name="log">Logging helper.</param>
-        /// <returns>True if the item was resolved, else false.</returns>
-        private static bool ResolveFilenameExtensions(ITaskItem reference, string basePath, string[] filenameExtensions, TaskLoggingHelper log)
-        {
-            foreach (string filenameExtension in filenameExtensions)
-            {
-                string path = basePath + filenameExtension;
-                log.LogMessage(MessageImportance.Low, "Trying path {0}", path);
-                if (File.Exists(path))
-                {
-                    reference.ItemSpec = path;
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/TaskBase.cs b/src/WixToolset.BuildTasks/TaskBase.cs
deleted file mode 100644
index 3d58fc06..00000000
--- a/src/WixToolset.BuildTasks/TaskBase.cs
+++ /dev/null
@@ -1,65 +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.Utilities;
-    public abstract class TaskBase : Task
-    {
-        public string ToolPath { get; set; }
-        public string AdditionalOptions { get; set; }
-        public bool RunAsSeparateProcess { 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; }
-        /// <summary>
-        /// Gets or sets whether to display the logo.
-        /// </summary>
-        public bool NoLogo { get; set; }
-        public override bool Execute()
-        {
-            try
-            {
-                this.ExecuteCore();
-            }
-            catch (BuildException e)
-            {
-                this.Log.LogErrorFromException(e);
-            }
-            catch (Data.WixException e)
-            {
-                this.Log.LogErrorFromException(e);
-            }
-            return !this.Log.HasLoggedErrors;
-        }
-        protected abstract void ExecuteCore();
-    }
-}
diff --git a/src/WixToolset.BuildTasks/Torch.cs b/src/WixToolset.BuildTasks/Torch.cs
deleted file mode 100644
index e18ed315..00000000
--- a/src/WixToolset.BuildTasks/Torch.cs
+++ /dev/null
@@ -1,159 +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 System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// An MSBuild task to run the WiX transform generator.
-    /// </summary>
-    public sealed class Torch : WixToolTask
-    {
-        private const string TorchToolName = "Torch.exe";
-        private bool adminImage;
-        private ITaskItem baselineFile;
-        private string binaryExtractionPath;
-        private bool inputIsXml;
-        private bool leaveTemporaryFiles;
-        private bool outputAsXml;
-        private ITaskItem outputFile;
-        private bool preserveUnmodifiedContent;
-        private string suppressTransformErrorFlags;
-        private string transformValidationFlags;
-        private string transformValidationType;
-        private ITaskItem updateFile;
-        public bool AdminImage
-        {
-            get { return this.adminImage; }
-            set { this.adminImage = value; }
-        }
-        [Required]
-        public ITaskItem BaselineFile
-        {
-            get { return this.baselineFile; }
-            set { this.baselineFile = value; }
-        }
-        public string BinaryExtractionPath
-        {
-            get { return this.binaryExtractionPath; }
-            set { this.binaryExtractionPath = value; }
-        }
-        public bool LeaveTemporaryFiles
-        {
-            get { return this.leaveTemporaryFiles; }
-            set { this.leaveTemporaryFiles = value; }
-        }
-        public bool InputIsXml
-        {
-            get { return this.inputIsXml; }
-            set { this.inputIsXml = value; }
-        }
-        public bool OutputAsXml
-        {
-            get { return this.outputAsXml; }
-            set { this.outputAsXml = value; }
-        }
-        public bool PreserveUnmodifiedContent
-        {
-            get { return this.preserveUnmodifiedContent; }
-            set { this.preserveUnmodifiedContent = value; }
-        }
-        [Required]
-        [Output]
-        public ITaskItem OutputFile
-        {
-            get { return this.outputFile; }
-            set { this.outputFile = value; }
-        }
-        public string SuppressTransformErrorFlags
-        {
-            get { return this.suppressTransformErrorFlags; }
-            set { this.suppressTransformErrorFlags = value; }
-        }
-        public string TransformValidationType
-        {
-            get { return this.transformValidationType; }
-            set { this.transformValidationType = value; }
-        }
-        public string TransformValidationFlags
-        {
-            get { return this.transformValidationFlags; }
-            set { this.transformValidationFlags = value; }
-        }
-        [Required]
-        public ITaskItem UpdateFile
-        {
-            get { return this.updateFile; }
-            set { this.updateFile = value; }
-        }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of torch.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return TorchToolName; }
-        }
-        /// <summary>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply torch.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return TorchToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), TorchToolName);
-        }
-        /// <summary>
-        /// Builds a command line from options in this task.
-        /// </summary>
-        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
-        {
-            base.BuildCommandLine(commandLineBuilder);
-            commandLineBuilder.AppendIfTrue("-notidy", this.LeaveTemporaryFiles);
-            commandLineBuilder.AppendIfTrue("-xo", this.OutputAsXml);
-            commandLineBuilder.AppendIfTrue("-xi", this.InputIsXml);
-            commandLineBuilder.AppendIfTrue("-p", this.PreserveUnmodifiedContent);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            commandLineBuilder.AppendFileNameIfNotNull(this.BaselineFile);
-            commandLineBuilder.AppendFileNameIfNotNull(this.UpdateFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-            commandLineBuilder.AppendIfTrue("-a", this.adminImage);
-            commandLineBuilder.AppendSwitchIfNotNull("-x ", this.BinaryExtractionPath);
-            commandLineBuilder.AppendSwitchIfNotNull("-serr ", this.SuppressTransformErrorFlags);
-            commandLineBuilder.AppendSwitchIfNotNull("-t ", this.TransformValidationType);
-            commandLineBuilder.AppendSwitchIfNotNull("-val ", this.TransformValidationFlags);
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/WixAssignCulture.cs b/src/WixToolset.BuildTasks/WixAssignCulture.cs
deleted file mode 100644
index a8baa62f..00000000
--- a/src/WixToolset.BuildTasks/WixAssignCulture.cs
+++ /dev/null
@@ -1,229 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Xml;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
-    /// WixLocalization element inside the file.
-    /// </summary>
-    public class WixAssignCulture : Task
-    {
-        private const string CultureAttributeName = "Culture";
-        private const string OutputFolderMetadataName = "OutputFolder";
-        private const string InvariantCultureIdentifier = "neutral";
-        private const string NullCultureIdentifier = "null";
-        /// <summary>
-        /// The list of cultures to build.  Cultures are specified in the following form:
-        ///     primary culture,first fallback culture, second fallback culture;...
-        /// Culture groups are seperated by semi-colons 
-        /// Culture precedence within a culture group is evaluated from left to right where fallback cultures are 
-        /// separated with commas.
-        /// The first (primary) culture in a culture group will be used as the output sub-folder.
-        /// </summary>
-        public string Cultures { get; set; }
-        /// <summary>
-        /// The list of files to apply culture information to.
-        /// </summary>
-        [Required]
-        public ITaskItem[] Files
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// The files that had culture information applied
-        /// </summary>
-        [Output]
-        public ITaskItem[] CultureGroups
-        {
-            get;
-            private set;
-        }
-        /// <summary>
-        /// Applies culture information to the files specified by the Files property.
-        /// This task intentionally does not validate that strings are valid Cultures so that we can support
-        /// psuedo-loc.
-        /// </summary>
-        /// <returns>True upon completion of the task execution.</returns>
-        public override bool Execute()
-        {
-            // First, process the culture group list the user specified in the cultures property
-            List<CultureGroup> cultureGroups = new List<CultureGroup>();
-            if (!String.IsNullOrEmpty(this.Cultures))
-            {
-                // Get rid of extra quotes
-                this.Cultures = this.Cultures.Trim('\"');
-                foreach (string cultureGroupString in this.Cultures.Split(';'))
-                {
-                    if (0 == cultureGroupString.Length)
-                    {
-                        // MSBuild v2.0.50727 cannnot handle "" items
-                        // for the invariant culture we require the neutral keyword
-                        continue;
-                    }
-                    CultureGroup cultureGroup = new CultureGroup(cultureGroupString);
-                    cultureGroups.Add(cultureGroup);
-                }
-            }
-            else
-            {
-                // Only process the EmbeddedResource items if cultures was unspecified
-                foreach (ITaskItem file in this.Files)
-                {
-                    // Ignore non-wxls
-                    if (!String.Equals(file.GetMetadata("Extension"), ".wxl", StringComparison.OrdinalIgnoreCase))
-                    {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file type is not supported.", file.ItemSpec);
-                        return false;
-                    }
-                    XmlDocument wxlFile = new XmlDocument();
-                    try
-                    {
-                        wxlFile.Load(file.ItemSpec);
-                    }
-                    catch (FileNotFoundException)
-                    {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}. The file was not found.", file.ItemSpec);
-                        return false;
-                    }
-                    catch (Exception e)
-                    {
-                        Log.LogError("Unable to retrieve the culture for EmbeddedResource {0}: {1}", file.ItemSpec, e.Message);
-                        return false;
-                    }
-                    // Take the culture value and try using it to create a culture.
-                    XmlAttribute cultureAttr = wxlFile.DocumentElement.Attributes[WixAssignCulture.CultureAttributeName];
-                    string wxlCulture = null == cultureAttr ? String.Empty : cultureAttr.Value;
-                    if (0 == wxlCulture.Length)
-                    {
-                        // We use a keyword for the invariant culture because MSBuild v2.0.50727 cannnot handle "" items
-                        wxlCulture = InvariantCultureIdentifier;
-                    }
-                    // We found the culture for the WXL, we now need to determine if it maps to a culture group specified
-                    // in the Cultures property or if we need to create a new one.
-                    Log.LogMessage(MessageImportance.Low, "Culture \"{0}\" from EmbeddedResource {1}.", wxlCulture, file.ItemSpec);
-                    bool cultureGroupExists = false;
-                    foreach (CultureGroup cultureGroup in cultureGroups)
-                    {
-                        foreach (string culture in cultureGroup.Cultures)
-                        {
-                            if (String.Equals(wxlCulture, culture, StringComparison.OrdinalIgnoreCase))
-                            {
-                                cultureGroupExists = true;
-                                break;
-                            }
-                        }
-                    }
-                    // The WXL didn't match a culture group we already have so create a new one.
-                    if (!cultureGroupExists)
-                    {
-                        cultureGroups.Add(new CultureGroup(wxlCulture));
-                    }
-                }
-            }
-            // If we didn't create any culture groups the culture was unspecificed and no WXLs were included
-            // Build an unlocalized target in the output folder
-            if (cultureGroups.Count == 0)
-            {
-                cultureGroups.Add(new CultureGroup());
-            }
-            List<TaskItem> cultureGroupItems = new List<TaskItem>();
-            if (1 == cultureGroups.Count && 0 == this.Files.Length)
-            {
-                // Maintain old behavior, if only one culturegroup is specified and no WXL, output to the default folder
-                TaskItem cultureGroupItem = new TaskItem(cultureGroups[0].ToString());
-                cultureGroupItem.SetMetadata(OutputFolderMetadataName, CultureGroup.DefaultFolder);
-                cultureGroupItems.Add(cultureGroupItem);
-            }
-            else
-            {
-                foreach (CultureGroup cultureGroup in cultureGroups)
-                {
-                    TaskItem cultureGroupItem = new TaskItem(cultureGroup.ToString());
-                    cultureGroupItem.SetMetadata(OutputFolderMetadataName, cultureGroup.OutputFolder);
-                    cultureGroupItems.Add(cultureGroupItem);
-                    Log.LogMessage("Culture: {0}", cultureGroup.ToString());
-                }
-            }
-            this.CultureGroups = cultureGroupItems.ToArray();
-            return true;
-        }
-        private class CultureGroup
-        {
-            /// <summary>
-            /// TargetPath already has a '\', do not double it!
-            /// </summary>
-            public const string DefaultFolder = "";
-            /// <summary>
-            /// Initialize a null culture group
-            /// </summary>
-            public CultureGroup()
-            {
-            }
-            public CultureGroup(string cultureGroupString)
-            {
-                Debug.Assert(!String.IsNullOrEmpty(cultureGroupString));
-                foreach (string cultureString in cultureGroupString.Split(','))
-                {
-                    this.Cultures.Add(cultureString);
-                }
-            }
-            public List<string> Cultures { get; } = new List<string>();
-            public string OutputFolder
-            {
-                get
-                {
-                    string result = DefaultFolder;
-                    if (this.Cultures.Count > 0 && 
-                        !this.Cultures[0].Equals(InvariantCultureIdentifier, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result = this.Cultures[0] + "\\";
-                    }
-                    return result;
-                }
-            }
-            public override string ToString()
-            {
-                if (this.Cultures.Count > 0)
-                {
-                    return String.Join(";", this.Cultures);
-                }
-                // We use a keyword for a null culture because MSBuild cannnot handle "" items
-                // Null is different from neutral.  For neutral we still want to do WXL
-                // filtering in Light.
-                return NullCultureIdentifier;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs b/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs
deleted file mode 100644
index a979dbb0..00000000
--- a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs
+++ /dev/null
@@ -1,177 +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 System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    /// <summary>
-    /// Helper class for appending the command line arguments.
-    /// </summary>
-    public class WixCommandLineBuilder : CommandLineBuilder
-    {
-        internal const int Unspecified = -1;
-        /// <summary>
-        /// Append a switch to the command line if the value has been specified.
-        /// </summary>
-        /// <param name="switchName">Switch to append.</param>
-        /// <param name="value">Value specified by the user.</param>
-        public void AppendIfSpecified(string switchName, int value)
-        {
-            if (value != Unspecified)
-            {
-                this.AppendSwitchIfNotNull(switchName, value.ToString(CultureInfo.InvariantCulture));
-            }
-        }
-        /// <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<ITaskItem> values)
-        {
-            if (values != null)
-            {
-                foreach (ITaskItem value in values)
-                {
-                    this.AppendSwitchIfNotNull(switchName, value);
-                }
-            }
-        }
-        /// <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 (string value in values)
-                {
-                    this.AppendSwitchIfNotNull(switchName, value);
-                }
-            }
-        }
-        /// <summary>
-        /// Build the extensions argument. Each extension is searched in the current folder, user defined search
-        /// directories (ReferencePath), HintPath, and under Wix Extension Directory in that order.
-        /// The order of precedence is based off of that described in Microsoft.Common.Targets's SearchPaths
-        /// property for the ResolveAssemblyReferences task.
-        /// </summary>
-        /// <param name="extensions">The list of extensions to include.</param>
-        /// <param name="wixExtensionDirectory">Evaluated default folder for Wix Extensions</param>
-        /// <param name="referencePaths">User defined reference directories to search in</param>
-        public void AppendExtensions(ITaskItem[] extensions, string wixExtensionDirectory, string [] referencePaths)
-        {
-            if (extensions == null)
-            {
-                return;
-            }
-            foreach (ITaskItem extension in extensions)
-            {
-                string className = extension.GetMetadata("Class");
-                string fileName = Path.GetFileName(extension.ItemSpec);
-                if (String.IsNullOrEmpty(Path.GetExtension(fileName)))
-                {
-                    fileName += ".dll";
-                }
-                // First try reference paths
-                var resolvedPath = FileSearchHelperMethods.SearchFilePaths(referencePaths, fileName);
-                if (String.IsNullOrEmpty(resolvedPath))
-                {
-                    // Now try HintPath
-                    resolvedPath = extension.GetMetadata("HintPath");
-                    if (!File.Exists(resolvedPath))
-                    {
-                        // Now try the item itself
-                        resolvedPath = extension.ItemSpec;
-                        if (String.IsNullOrEmpty(Path.GetExtension(resolvedPath)))
-                        {
-                            resolvedPath += ".dll";
-                        }
-                        if (!File.Exists(resolvedPath))
-                        {
-                            if (!String.IsNullOrEmpty(wixExtensionDirectory))
-                            {
-                                // Now try the extension directory
-                                resolvedPath = Path.Combine(wixExtensionDirectory, Path.GetFileName(resolvedPath));
-                            }
-                            if (!File.Exists(resolvedPath))
-                            {
-                                // Extension wasn't found, just set it to the extension name passed in
-                                resolvedPath = extension.ItemSpec;
-                            }
-                        }
-                    }
-                }
-                if (String.IsNullOrEmpty(className))
-                {
-                    this.AppendSwitchIfNotNull("-ext ", resolvedPath);
-                }
-                else
-                {
-                    this.AppendSwitchIfNotNull("-ext ", className + ", " + resolvedPath);
-                }
-            }
-        }
-        /// <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.IsNullOrEmpty(textToAppend))
-            {
-                this.AppendSpaceIfNotEmpty();
-                this.AppendTextUnquoted(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Append arbitrary text to the command-line if specified.
-        /// </summary>
-        /// <param name="textToAppend">Text to append.</param>
-        public void AppendTextIfNotWhitespace(string textToAppend)
-        {
-            if (!String.IsNullOrWhiteSpace(textToAppend))
-            {
-                this.AppendSpaceIfNotEmpty();
-                this.AppendTextUnquoted(textToAppend);
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/WixToolTask.cs b/src/WixToolset.BuildTasks/WixToolTask.cs
deleted file mode 100644
index 60305e00..00000000
--- a/src/WixToolset.BuildTasks/WixToolTask.cs
+++ /dev/null
@@ -1,403 +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 System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Reflection;
-    using System.Text;
-    using System.Threading;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using WixToolset.Core.CommandLine;
-    /// <summary>
-    /// Base class for WiX tool tasks; executes tools in-process
-    /// so that repeated invocations are much faster.
-    /// </summary>
-    public abstract class WixToolTask : ToolTask, IDisposable
-    {
-        private string additionalOptions;
-        private bool disposed;
-        private bool noLogo;
-        private bool runAsSeparateProcess;
-        private bool suppressAllWarnings;
-        private string[] suppressSpecificWarnings;
-        private string[] treatSpecificWarningsAsErrors;
-        private bool treatWarningsAsErrors;
-        private bool verboseOutput;
-        private Queue<string> messageQueue;
-        private ManualResetEvent messagesAvailable;
-        private ManualResetEvent toolExited;
-        private int exitCode;
-        /// <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 { return this.additionalOptions; }
-            set { this.additionalOptions = value; }
-        }
-        /// <summary>
-        /// Gets or sets a flag indicating whether the task should be run as separate
-        /// process instead of in-proc with MSBuild which is the default.
-        /// </summary>
-        public bool RunAsSeparateProcess
-        {
-            get { return this.runAsSeparateProcess; }
-            set { this.runAsSeparateProcess = value; }
-        }
-#region Common Options
-        /// <summary>
-        /// Gets or sets whether all warnings should be suppressed.
-        /// </summary>
-        public bool SuppressAllWarnings
-        {
-            get { return this.suppressAllWarnings; }
-            set { this.suppressAllWarnings = value; }
-        }
-        /// <summary>
-        /// Gets or sets a list of specific warnings to be suppressed.
-        /// </summary>
-        public string[] SuppressSpecificWarnings
-        {
-            get { return this.suppressSpecificWarnings; }
-            set { this.suppressSpecificWarnings = value; }
-        }
-        /// <summary>
-        /// Gets or sets whether all warnings should be treated as errors.
-        /// </summary>
-        public bool TreatWarningsAsErrors
-        {
-            get { return this.treatWarningsAsErrors; }
-            set { this.treatWarningsAsErrors = value; }
-        }
-        /// <summary>
-        /// Gets or sets a list of specific warnings to treat as errors.
-        /// </summary>
-        public string[] TreatSpecificWarningsAsErrors
-        {
-            get { return this.treatSpecificWarningsAsErrors; }
-            set { this.treatSpecificWarningsAsErrors = value; }
-        }
-        /// <summary>
-        /// Gets or sets whether to display verbose output.
-        /// </summary>
-        public bool VerboseOutput
-        {
-            get { return this.verboseOutput; }
-            set { this.verboseOutput = value; }
-        }
-        /// <summary>
-        /// Gets or sets whether to display the logo.
-        /// </summary>
-        public bool NoLogo
-        {
-            get { return this.noLogo; }
-            set { this.noLogo = value; }
-        }
-#endregion
-        /// <summary>
-        /// Cleans up the ManualResetEvent members
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                this.Dispose(true);
-                GC.SuppressFinalize(this);
-                disposed = true;
-            }
-        }
-        /// <summary>
-        /// Cleans up the ManualResetEvent members
-        /// </summary>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                messagesAvailable.Close();
-                toolExited.Close();
-            }
-        }
-        /// <summary>
-        /// Generate the command line arguments to write to the response file from the properties.
-        /// </summary>
-        /// <returns>Command line string.</returns>
-        protected override string GenerateResponseFileCommands()
-        {
-            WixCommandLineBuilder commandLineBuilder = new WixCommandLineBuilder();
-            this.BuildCommandLine(commandLineBuilder);
-            return commandLineBuilder.ToString();
-        }
-        /// <summary>
-        /// Builds a command line from options in this and derivative tasks.
-        /// </summary>
-        /// <remarks>
-        /// Derivative classes should call BuildCommandLine() on the base class to ensure that common command line options are added to the command.
-        /// </remarks>
-        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);
-        }
-        /// <summary>
-        /// Executes a tool in-process by loading the tool assembly and invoking its entrypoint.
-        /// </summary>
-        /// <param name="pathToTool">Path to the tool to be executed; must be a managed executable.</param>
-        /// <param name="responseFileCommands">Commands to be written to a response file.</param>
-        /// <param name="commandLineCommands">Commands to be passed directly on the command-line.</param>
-        /// <returns>The tool exit code.</returns>
-        protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
-        {
-            if (this.RunAsSeparateProcess)
-            {
-                return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);
-            }
-            this.messageQueue = new Queue<string>();
-            this.messagesAvailable = new ManualResetEvent(false);
-            this.toolExited = new ManualResetEvent(false);
-            WixToolTaskLogger logger = new WixToolTaskLogger(this.messageQueue, this.messagesAvailable);
-            TextWriter saveConsoleOut = Console.Out;
-            TextWriter saveConsoleError = Console.Error;
-            Console.SetOut(logger);
-            Console.SetError(logger);
-            string responseFile = null;
-            try
-            {
-                responseFile = this.GetTemporaryResponseFile(responseFileCommands, out var responseFileSwitch);
-                if (!String.IsNullOrEmpty(responseFileSwitch))
-                {
-                    commandLineCommands = commandLineCommands + " " + responseFileSwitch;
-                }
-                string[] arguments = CommandLineResponseFile.ParseArgumentsToArray(commandLineCommands);
-                Thread toolThread = new Thread(new ParameterizedThreadStart(this.ExecuteToolThread));
-                toolThread.Start(new object[] { pathToTool, arguments });
-                this.HandleToolMessages();
-                if (this.exitCode == 0 && this.Log.HasLoggedErrors)
-                {
-                    this.exitCode = -1;
-                }
-                return this.exitCode;
-            }
-            finally
-            {
-                if (responseFile != null)
-                {
-                    File.Delete(responseFile);
-                }
-                Console.SetOut(saveConsoleOut);
-                Console.SetError(saveConsoleError);
-            }
-        }
-        /// <summary>
-        /// Called by a new thread to execute the tool in that thread.
-        /// </summary>
-        /// <param name="parameters">Tool path and arguments array.</param>
-        private void ExecuteToolThread(object parameters)
-        {
-            try
-            {
-                object[] pathAndArguments = (object[])parameters;
-                Assembly toolAssembly = Assembly.LoadFrom((string)pathAndArguments[0]);
-                this.exitCode = (int)toolAssembly.EntryPoint.Invoke(null, new object[] { pathAndArguments[1] });
-            }
-            catch (FileNotFoundException fnfe)
-            {
-                Log.LogError("Unable to load tool from path {0}.  Consider setting the ToolPath parameter to $(WixToolPath).", fnfe.FileName);
-                this.exitCode = -1;
-            }
-            catch (Exception ex)
-            {
-                this.exitCode = -1;
-                this.LogEventsFromTextOutput(ex.Message, MessageImportance.High);
-                foreach (string stackTraceLine in ex.StackTrace.Split('\n'))
-                {
-                    this.LogEventsFromTextOutput(stackTraceLine.TrimEnd(), MessageImportance.High);
-                }
-                throw;
-            }
-            finally
-            {
-                this.toolExited.Set();
-            }
-        }
-        /// <summary>
-        /// Waits for messages from the tool thread and sends them to the MSBuild logger on the original thread.
-        /// Returns when the tool thread exits.
-        /// </summary>
-        private void HandleToolMessages()
-        {
-            WaitHandle[] waitHandles = new WaitHandle[] { this.messagesAvailable, this.toolExited };
-            while (WaitHandle.WaitAny(waitHandles) == 0)
-            {
-                lock (this.messageQueue)
-                {
-                    while (this.messageQueue.Count > 0)
-                    {
-                        this.LogEventsFromTextOutput(messageQueue.Dequeue(), MessageImportance.Normal);
-                    }
-                    this.messagesAvailable.Reset();
-                }
-            }
-        }
-        /// <summary>
-        /// Creates a temporary response file for tool execution.
-        /// </summary>
-        /// <returns>Path to the response file.</returns>
-        /// <remarks>
-        /// The temporary file should be deleted after the tool execution is finished.
-        /// </remarks>
-        private string GetTemporaryResponseFile(string responseFileCommands, out string responseFileSwitch)
-        {
-            string responseFile = null;
-            responseFileSwitch = null;
-            if (!String.IsNullOrEmpty(responseFileCommands))
-            {
-                responseFile = Path.GetTempFileName();
-                using (StreamWriter writer = new StreamWriter(responseFile, false, this.ResponseFileEncoding))
-                {
-                    writer.Write(responseFileCommands);
-                }
-                responseFileSwitch = this.GetResponseFileSwitch(responseFile);
-            }
-            return responseFile;
-        }
-        /// <summary>
-        /// Cycles thru each task to find correct path of the file in question.
-        /// Looks at item spec, hintpath and then in user defined Reference Paths
-        /// </summary>
-        /// <param name="tasks">Input task array</param>
-        /// <param name="referencePaths">SemiColon delimited directories to search</param>
-        /// <returns>List of task item file paths</returns>
-        [SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists")]
-        protected static List<string> AdjustFilePaths(ITaskItem[] tasks, string[] referencePaths)
-        {
-            List<string> sourceFilePaths = new List<string>();
-            if (tasks == null)
-            {
-                return sourceFilePaths;
-            }
-            foreach (ITaskItem task in tasks)
-            {
-                string filePath = task.ItemSpec;
-                if (!File.Exists(filePath))
-                {
-                    filePath = task.GetMetadata("HintPath");
-                    if (!File.Exists(filePath))
-                    {
-                        string searchPath = FileSearchHelperMethods.SearchFilePaths(referencePaths, filePath);
-                        if (!String.IsNullOrEmpty(searchPath))
-                        {
-                            filePath = searchPath;
-                        }
-                    }
-                }
-                sourceFilePaths.Add(filePath);
-            }
-            return sourceFilePaths;
-        }
-        /// <summary>
-        /// Used as a replacement for Console.Out to capture output from a tool
-        /// and redirect it to the MSBuild logging system.
-        /// </summary>
-        private class WixToolTaskLogger : TextWriter
-        {
-            private StringBuilder buffer;
-            private Queue<string> messageQueue;
-            private ManualResetEvent messagesAvailable;
-            /// <summary>
-            /// Creates a new logger that sends tool output to the tool task's log handler.
-            /// </summary>
-            public WixToolTaskLogger(Queue<string> messageQueue, ManualResetEvent messagesAvailable) : base(CultureInfo.CurrentCulture)
-            {
-                this.messageQueue = messageQueue;
-                this.messagesAvailable = messagesAvailable;
-                this.buffer = new StringBuilder();
-            }
-            /// <summary>
-            /// Gets the encoding of the logger.
-            /// </summary>
-            public override Encoding Encoding
-            {
-                get { return Encoding.Unicode; }
-            }
-            /// <summary>
-            /// Redirects output to a buffer; watches for newlines and sends each line to the
-            /// MSBuild logging system.
-            /// </summary>
-            /// <param name="value">Character being written.</param>
-            /// <remarks>All other Write() variants eventually call into this one.</remarks>
-            public override void Write(char value)
-            {
-                lock (this.messageQueue)
-                {
-                    if (value == '\n')
-                    {
-                        if (this.buffer.Length > 0 && this.buffer[this.buffer.Length - 1] == '\r')
-                        {
-                            this.buffer.Length = this.buffer.Length - 1;
-                        }
-                        this.messageQueue.Enqueue(this.buffer.ToString());
-                        this.messagesAvailable.Set();
-                        this.buffer.Length = 0;
-                    }
-                    else
-                    {
-                        this.buffer.Append(value);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
deleted file mode 100644
index 9f7c8ce6..00000000
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>net461</TargetFramework>
-    <Description></Description>
-    <Title>WiX Toolset MSBuild Tasks</Title>
-    <DebugType>embedded</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> -->
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net461' " />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" PrivateAssets="all" Condition="'$(TargetFramework)'=='netstandard2.0' " />
-  </ItemGroup>
-</Project>
diff --git a/src/WixToolset.BuildTasks/heatdirectory.cs b/src/WixToolset.BuildTasks/heatdirectory.cs
deleted file mode 100644
index 1d5f104a..00000000
--- a/src/WixToolset.BuildTasks/heatdirectory.cs
+++ /dev/null
@@ -1,103 +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"; }
-        }
-        /// <summary>
-        /// Generate the command line arguments to write to the response file from the properties.
-        /// </summary>
-        /// <returns>Command line string.</returns>
-        protected override string GenerateResponseFileCommands()
-        {
-            WixCommandLineBuilder commandLineBuilder = new WixCommandLineBuilder();
-            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);
-            return commandLineBuilder.ToString();
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/heatfile.cs b/src/WixToolset.BuildTasks/heatfile.cs
deleted file mode 100644
index 69e11b88..00000000
--- a/src/WixToolset.BuildTasks/heatfile.cs
+++ /dev/null
@@ -1,95 +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"; }
-        }
-        /// <summary>
-        /// Generate the command line arguments to write to the response file from the properties.
-        /// </summary>
-        /// <returns>Command line string.</returns>
-        protected override string GenerateResponseFileCommands()
-        {
-            WixCommandLineBuilder commandLineBuilder = new WixCommandLineBuilder();
-            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);
-            return commandLineBuilder.ToString();
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/heatproject.cs b/src/WixToolset.BuildTasks/heatproject.cs
deleted file mode 100644
index 8620ffa3..00000000
--- a/src/WixToolset.BuildTasks/heatproject.cs
+++ /dev/null
@@ -1,108 +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 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 DirectoryIds
-        {
-            get { return this.directoryIds; }
-            set { this.directoryIds = value; }
-        }
-        public bool GenerateWixVariables
-        {
-            get { return this.generateWixVariables; }
-            set { this.generateWixVariables = value; }
-        }
-        public string GenerateType
-        {
-            get { return this.generateType; }
-            set { this.generateType = value; }
-        }
-        public string Platform
-        {
-            get { return this.platform; }
-            set { this.platform = value; }
-        }
-        [Required]
-        public string Project
-        {
-            get { return this.project; }
-            set { this.project = value; }
-        }
-        public string ProjectName
-        {
-            get { return this.projectName; }
-            set { this.projectName = value; }
-        }
-        public string[] ProjectOutputGroups
-        {
-            get
-            {
-                return this.projectOutputGroups;
-            }
-            set
-            {
-                this.projectOutputGroups = value;
-                // If it's just one string and it contains semicolons, let's
-                // split it into separate items.
-                if (this.projectOutputGroups.Length == 1)
-                {
-                    this.projectOutputGroups = this.projectOutputGroups[0].Split(new char[] { ';' });
-                }
-            }
-        }
-        protected override string OperationName
-        {
-            get { return "project"; }
-        }
-        /// <summary>
-        /// Generate the command line arguments to write to the response file from the properties.
-        /// </summary>
-        /// <returns>Command line string.</returns>
-        protected override string GenerateResponseFileCommands()
-        {
-            WixCommandLineBuilder commandLineBuilder = new WixCommandLineBuilder();
-            commandLineBuilder.AppendSwitch(this.OperationName);
-            commandLineBuilder.AppendFileNameIfNotNull(this.Project);
-            commandLineBuilder.AppendSwitchIfNotNull("-configuration ", this.Configuration);
-            commandLineBuilder.AppendSwitchIfNotNull("-directoryid ", this.DirectoryIds);
-            commandLineBuilder.AppendSwitchIfNotNull("-generate ", this.GenerateType);
-            commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.Platform);
-            commandLineBuilder.AppendArrayIfNotNull("-pog ", this.ProjectOutputGroups);
-            commandLineBuilder.AppendSwitchIfNotNull("-projectname ", this.ProjectName);
-            commandLineBuilder.AppendIfTrue("-wixvar", this.GenerateWixVariables);
-            base.BuildCommandLine(commandLineBuilder);
-            return commandLineBuilder.ToString();
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/heattask.cs b/src/WixToolset.BuildTasks/heattask.cs
deleted file mode 100644
index bf0a2ad3..00000000
--- a/src/WixToolset.BuildTasks/heattask.cs
+++ /dev/null
@@ -1,121 +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 System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    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 class HeatTask : WixToolTask
-    {
-        private const string HeatToolName = "Heat.exe";
-        private bool autogenerageGuids;
-        private bool generateGuidsNow;
-        private ITaskItem outputFile;
-        private bool suppressFragments;
-        private bool suppressUniqueIds;
-        private string[] transforms;
-        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; }
-        }
-        /// <summary>
-        /// Get the name of the executable.
-        /// </summary>
-        /// <remarks>The ToolName is used with the ToolPath to get the location of heat.exe.</remarks>
-        /// <value>The name of the executable.</value>
-        protected override string ToolName
-        {
-            get { return HeatToolName; }
-        }
-        /// <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>
-        /// Get the path to the executable. 
-        /// </summary>
-        /// <remarks>GetFullPathToTool is only called when the ToolPath property is not set (see the ToolName remarks above).</remarks>
-        /// <returns>The full path to the executable or simply heat.exe if it's expected to be in the system path.</returns>
-        protected override string GenerateFullPathToTool()
-        {
-            // If there's not a ToolPath specified, it has to be in the system path.
-            if (String.IsNullOrEmpty(this.ToolPath))
-            {
-                return HeatToolName;
-            }
-            return Path.Combine(Path.GetFullPath(this.ToolPath), HeatToolName);
-        }
-        /// <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("-nologo", this.NoLogo);
-            commandLineBuilder.AppendIfTrue("-sfrag", this.SuppressFragments);
-            commandLineBuilder.AppendIfTrue("-suid", this.SuppressUniqueIds);
-            commandLineBuilder.AppendArrayIfNotNull("-sw", this.SuppressSpecificWarnings);
-            commandLineBuilder.AppendArrayIfNotNull("-t ", this.Transforms);
-            commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions);
-            commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
-        }
-    }
-}
diff --git a/src/WixToolset.BuildTasks/redirects/wix.ca.targets b/src/WixToolset.BuildTasks/redirects/wix.ca.targets
deleted file mode 100644
index ecb6e09f..00000000
--- a/src/WixToolset.BuildTasks/redirects/wix.ca.targets
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
-  </PropertyGroup>
-  <Import Project="$(WixInstallFolder)sdk\wix.ca.targets" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/redirects/wix.targets b/src/WixToolset.BuildTasks/redirects/wix.targets
deleted file mode 100644
index ba354b65..00000000
--- a/src/WixToolset.BuildTasks/redirects/wix.targets
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
-  </PropertyGroup>
-  <Import Project="$(WixInstallFolder)bin\wix.targets" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/wix.ca.targets b/src/WixToolset.BuildTasks/wix.ca.targets
deleted file mode 100644
index 4578c2d8..00000000
--- a/src/WixToolset.BuildTasks/wix.ca.targets
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
-  <PropertyGroup>
-    <WixCATargetsImported>true</WixCATargetsImported>
-    <TargetCAFileName Condition=" '$(TargetCAFileName)' == '' ">$(TargetName).CA$(TargetExt)</TargetCAFileName>
-    <WixSdkPath Condition=" '$(WixSdkPath)' == '' ">$(MSBuildThisFileDirectory)</WixSdkPath>
-    <WixSdkX86Path Condition=" '$(WixSdkX86Path)' == '' ">$(WixSdkPath)x86\</WixSdkX86Path>
-    <WixSdkX64Path Condition=" '$(WixSdkX64Path)' == '' ">$(WixSdkPath)x64\</WixSdkX64Path>
-    <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(WixSdkPath)MakeSfxCA.exe</MakeSfxCA>
-    <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(WixSdkX64Path)SfxCA.dll</SfxCADll>
-    <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(WixSdkX86Path)SfxCA.dll</SfxCADll>
-  </PropertyGroup>
-  <!--
-  ==================================================================================================
-  PackCustomAction
-    Creates an MSI managed custom action package that includes the custom action assembly,
-    local assembly dependencies, and project content files.
-    [IN]
-    @(IntermediateAssembly) - Managed custom action assembly.
-    @(Content) - Project items of type Content will be included in the package.
-    $(CustomActionContents) - Optional space-delimited list of additional files to include.
-    
-    [OUT]
-    $(IntermediateOutputPath)$(TargetCAFileName) - Managed custom action package with unmanaged stub.
-  ==================================================================================================
-  -->
-  <Target Name="PackCustomAction"
-          Inputs="@(IntermediateAssembly);@(Content);$(CustomActionContents)"
-          Outputs="$(IntermediateOutputPath)$(TargetCAFileName)">
-    <!-- Find all referenced items marked CopyLocal, but exclude non-binary files. -->
-    <ItemGroup>
-      <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
-                                     Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
-      <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
-                                     Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
-    
-      <!-- include PDBs for Debug only -->
-      <CustomActionReferenceContents Include="@(IntermediateAssembly->'%(RootDir)%(Directory)%(Filename).pdb')"
-                                     Condition=" Exists('%(RootDir)%(Directory)%(Filename).pdb') and '$(Configuration)' == 'Debug' " />
-      <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
-                                     Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
-      <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
-                                     Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
-    </ItemGroup>
-    <!--
-      Items to include in the CA package:
-         - Reference assemblies marked CopyLocal
-         - Project items of type Content
-         - Additional items in the CustomActionContents property
-    -->
-    <PropertyGroup>
-      <CustomActionContents>@(CustomActionReferenceContents);@(Content->'%(FullPath)');$(CustomActionContents)</CustomActionContents>
-    </PropertyGroup>
-    <ItemGroup>
-      <IntermediateCAAssembly Include="@(IntermediateAssembly->'%(FullPath)')" />
-      <IntermediateCAPackage Include="@(IntermediateAssembly->'%(RootDir)%(Directory)$(TargetCAFileName)')" />
-    </ItemGroup>
-    <!-- Run the MakeSfxCA.exe CA packaging tool. -->
-    <Exec Command='"$(MakeSfxCA)" "@(IntermediateCAPackage)" "$(SfxCADll)" "@(IntermediateCAAssembly)" "$(CustomActionContents)"'
-          WorkingDirectory="$(ProjectDir)" />
-  
-    <!-- Add modules to be copied to output dir. -->
-    <ItemGroup>
-      <AddModules Include="@(IntermediateCAPackage)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ==================================================================================================
-  CleanCustomAction
-    Cleans the .CA.dll binary created by the PackCustomAction target.
-  ==================================================================================================
-  -->
-  <Target Name="CleanCustomAction">
-    <Delete Files="$(IntermediateOutputPath)$(TargetCAFileName)"
-            TreatErrorsAsWarnings="true" />
-  </Target>
-  <!--
-  ==================================================================================================
-  AfterCompile (redefinition)
-    Calls the PackCustomAction target after compiling.
-    Overrides the empty AfterCompile target from Microsoft.Common.targets.
-  ==================================================================================================
-  -->
-  <Target Name="AfterCompile"
-          DependsOnTargets="PackCustomAction" />
-  <!--
-  ==================================================================================================
-  BeforeClean (redefinition)
-    Calls the CleanCustomAction target before cleaning.
-    Overrides the empty AfterCompile target from Microsoft.Common.targets.
-  ==================================================================================================
-  -->
-  <Target Name="BeforeClean"
-          DependsOnTargets="CleanCustomAction" />
-  <Import Project="$(CustomAfterWixCATargets)" Condition=" '$(CustomAfterWixCATargets)' != '' and Exists('$(CustomAfterWixCATargets)')" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/wix.harvest.targets b/src/WixToolset.BuildTasks/wix.harvest.targets
deleted file mode 100644
index e94dfcea..00000000
--- a/src/WixToolset.BuildTasks/wix.harvest.targets
+++ /dev/null
@@ -1,511 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- These properties can be overridden to support non-default installations. -->
-  <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath>
-    <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixTasks.dll</WixTasksPath>
-  </PropertyGroup>
-  <!-- These tasks are extensions for harvesting WiX source code from other sources. -->
-  <UsingTask TaskName="HeatFile" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="HeatProject" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="RefreshGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
-  <UsingTask TaskName="RefreshBundleGeneratedFile" AssemblyFile="$(WixTasksPath)"/>
-  <!-- Default Harvester properties-->
-  <PropertyGroup>
-    <HarvestNoLogo Condition=" '$(HarvestNoLogo)' == '' ">$(NoLogo)</HarvestNoLogo>
-    <HarvestSuppressAllWarnings Condition=" '$(HarvestSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</HarvestSuppressAllWarnings>
-    <HarvestSuppressSpecificWarnings Condition=" '$(HarvestSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</HarvestSuppressSpecificWarnings>
-    <HarvestTreatWarningsAsErrors Condition=" '$(HarvestTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</HarvestTreatWarningsAsErrors>
-    <HarvestTreatSpecificWarningsAsErrors Condition=" '$(HarvestTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</HarvestTreatSpecificWarningsAsErrors>
-    <HarvestVerboseOutput Condition=" '$(HarvestVerboseOutput)' == '' ">$(VerboseOutput)</HarvestVerboseOutput>
-    <HarvestAutogenerateGuids Condition=" '$(HarvestAutogenerateGuids)' == '' ">true</HarvestAutogenerateGuids>
-    <HarvestGenerateGuidsNow Condition=" '$(HarvestGenerateGuidsNow)' == '' ">false</HarvestGenerateGuidsNow>
-    <HarvestSuppressFragments Condition=" '$(HarvestSuppressFragments)' == '' ">true</HarvestSuppressFragments>
-    <HarvestSuppressUniqueIds Condition=" '$(HarvestSuppressUniqueIds)' == '' ">false</HarvestSuppressUniqueIds>
-  </PropertyGroup>
-  <!-- Default HarvestProjects properties -->
-  <PropertyGroup>
-    <!-- Project harvesting is defaulted to off until it works more consistently. -->
-    <EnableProjectHarvesting Condition=" '$(EnableProjectHarvesting)'=='' ">false</EnableProjectHarvesting>
-    <HarvestProjectsNoLogo Condition=" '$(HarvestProjectsNoLogo)' == '' ">$(HarvestNoLogo)</HarvestProjectsNoLogo>
-    <HarvestProjectsSuppressAllWarnings Condition=" '$(HarvestProjectsSuppressAllWarnings)' == '' ">$(HarvestSuppressAllWarnings)</HarvestProjectsSuppressAllWarnings>
-    <HarvestProjectsSuppressSpecificWarnings Condition=" '$(HarvestProjectsSuppressSpecificWarnings)' == '' ">$(HarvestSuppressSpecificWarnings)</HarvestProjectsSuppressSpecificWarnings>
-    <HarvestProjectsTreatWarningsAsErrors Condition=" '$(HarvestProjectsTreatWarningsAsErrors)' == '' ">$(HarvestTreatWarningsAsErrors)</HarvestProjectsTreatWarningsAsErrors>
-    <HarvestProjectsTreatSpecificWarningsAsErrors Condition=" '$(HarvestProjectsTreatSpecificWarningsAsErrors)' == '' ">$(HarvestTreatSpecificWarningsAsErrors)</HarvestProjectsTreatSpecificWarningsAsErrors>
-    <HarvestProjectsVerboseOutput Condition=" '$(HarvestProjectsVerboseOutput)' == '' ">$(HarvestVerboseOutput)</HarvestProjectsVerboseOutput>
-    <HarvestProjectsAutogenerateGuids Condition=" '$(HarvestProjectsAutogenerateGuids)' == '' ">$(HarvestAutogenerateGuids)</HarvestProjectsAutogenerateGuids>
-    <HarvestProjectsGenerateGuidsNow Condition=" '$(HarvestProjectsGenerateGuidsNow)' == '' ">$(HarvestGenerateGuidsNow)</HarvestProjectsGenerateGuidsNow>
-    <HarvestProjectsSuppressFragments Condition=" '$(HarvestProjectsSuppressFragments)' == '' ">$(HarvestSuppressFragments)</HarvestProjectsSuppressFragments>
-    <HarvestProjectsSuppressUniqueIds Condition=" '$(HarvestProjectsSuppressUniqueIds)' == '' ">$(HarvestSuppressUniqueIds)</HarvestProjectsSuppressUniqueIds>
-    <HarvestProjectsTransforms Condition=" '$(HarvestProjectsTransforms)' == '' ">$(HarvestTransforms)</HarvestProjectsTransforms>
-    <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' != 'Bundle' ">$(IntermediateOutputPath)Product.Generated.wxs</HarvestProjectsGeneratedFile>
-    <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' == 'Bundle' ">$(IntermediateOutputPath)Bundle.Generated.wxs</HarvestProjectsGeneratedFile>
-  </PropertyGroup>
-  <!-- Default HarvestDirectory properties -->
-  <PropertyGroup>
-    <HarvestDirectoryNoLogo Condition=" '$(HarvestDirectoryNoLogo)' == '' ">$(HarvestNoLogo)</HarvestDirectoryNoLogo>
-    <HarvestDirectorySuppressAllWarnings Condition=" '$(HarvestDirectorySuppressAllWarnings)' == '' ">$(HarvestSuppressAllWarnings)</HarvestDirectorySuppressAllWarnings>
-    <HarvestDirectorySuppressSpecificWarnings Condition=" '$(HarvestDirectorySuppressSpecificWarnings)' == '' ">$(HarvestSuppressSpecificWarnings)</HarvestDirectorySuppressSpecificWarnings>
-    <HarvestDirectoryTreatWarningsAsErrors Condition=" '$(HarvestDirectoryTreatWarningsAsErrors)' == '' ">$(HarvestTreatWarningsAsErrors)</HarvestDirectoryTreatWarningsAsErrors>
-    <HarvestDirectoryTreatSpecificWarningsAsErrors Condition=" '$(HarvestDirectoryTreatSpecificWarningsAsErrors)' == '' ">$(HarvestTreatSpecificWarningsAsErrors)</HarvestDirectoryTreatSpecificWarningsAsErrors>
-    <HarvestDirectoryVerboseOutput Condition=" '$(HarvestDirectoryVerboseOutput)' == '' ">$(HarvestVerboseOutput)</HarvestDirectoryVerboseOutput>
-    <HarvestDirectoryAutogenerateGuids Condition=" '$(HarvestDirectoryAutogenerateGuids)' == '' ">$(HarvestAutogenerateGuids)</HarvestDirectoryAutogenerateGuids>
-    <HarvestDirectoryGenerateGuidsNow Condition=" '$(HarvestDirectoryGenerateGuidsNow)' == '' ">$(HarvestGenerateGuidsNow)</HarvestDirectoryGenerateGuidsNow>
-    <HarvestDirectorySuppressFragments Condition=" '$(HarvestDirectorySuppressFragments)' == '' ">$(HarvestSuppressFragments)</HarvestDirectorySuppressFragments>
-    <HarvestDirectorySuppressUniqueIds Condition=" '$(HarvestDirectorySuppressUniqueIds)' == '' ">$(HarvestSuppressUniqueIds)</HarvestDirectorySuppressUniqueIds>
-    <HarvestDirectoryTransforms Condition=" '$(HarvestDirectoryTransforms)' == '' ">$(HarvestTransforms)</HarvestDirectoryTransforms>
-  </PropertyGroup>
-  <!-- Default HarvestFile properties -->
-  <PropertyGroup>
-    <HarvestFileNoLogo Condition=" '$(HarvestFileNoLogo)' == '' ">$(HarvestNoLogo)</HarvestFileNoLogo>
-    <HarvestFileSuppressAllWarnings Condition=" '$(HarvestFileSuppressAllWarnings)' == '' ">$(HarvestSuppressAllWarnings)</HarvestFileSuppressAllWarnings>
-    <HarvestFileSuppressSpecificWarnings Condition=" '$(HarvestFileSuppressSpecificWarnings)' == '' ">$(HarvestSuppressSpecificWarnings)</HarvestFileSuppressSpecificWarnings>
-    <HarvestFileTreatWarningsAsErrors Condition=" '$(HarvestFileTreatWarningsAsErrors)' == '' ">$(HarvestTreatWarningsAsErrors)</HarvestFileTreatWarningsAsErrors>
-    <HarvestFileTreatSpecificWarningsAsErrors Condition=" '$(HarvestFileTreatSpecificWarningsAsErrors)' == '' ">$(HarvestTreatSpecificWarningsAsErrors)</HarvestFileTreatSpecificWarningsAsErrors>
-    <HarvestFileVerboseOutput Condition=" '$(HarvestFileVerboseOutput)' == '' ">$(HarvestVerboseOutput)</HarvestFileVerboseOutput>
-    <HarvestFileAutogenerateGuids Condition=" '$(HarvestFileAutogenerateGuids)' == '' ">$(HarvestAutogenerateGuids)</HarvestFileAutogenerateGuids>
-    <HarvestFileGenerateGuidsNow Condition=" '$(HarvestFileGenerateGuidsNow)' == '' ">$(HarvestGenerateGuidsNow)</HarvestFileGenerateGuidsNow>
-    <HarvestFileSuppressFragments Condition=" '$(HarvestFileSuppressFragments)' == '' ">$(HarvestSuppressFragments)</HarvestFileSuppressFragments>
-    <HarvestFileSuppressUniqueIds Condition=" '$(HarvestFileSuppressUniqueIds)' == '' ">$(HarvestSuppressUniqueIds)</HarvestFileSuppressUniqueIds>
-    <HarvestFileTransforms Condition=" '$(HarvestFileTransforms)' == '' ">$(HarvestTransforms)</HarvestFileTransforms>
-  </PropertyGroup>
-  <!--
-  ==================================================================================================
-  Harvest
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <HarvestDependsOn>
-      ConvertReferences;
-      ConvertBundleReferences;
-      HarvestProjects;
-      HarvestDirectory;
-      HarvestFile;
-      GenerateCode;
-    </HarvestDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="Harvest"
-    DependsOnTargets="$(HarvestDependsOn)" />
-  <!--
-  ==================================================================================================
-  GenerateCode
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <GenerateCodeDependsOn>
-      RefreshGeneratedFile;
-      RefreshBundleGeneratedFile
-    </GenerateCodeDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="GenerateCode"
-      DependsOnTargets="$(GenerateCodeDependsOn)" />
-  <!--
-  ================================================================================================
-  ConvertReferences
-    Converts project references to HeatProject items to auto generate authoring.
-  ================================================================================================
-  -->
-  <Target
-      Name="ConvertReferences"
-      Condition=" $(EnableProjectHarvesting) and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module') ">
-    <ItemGroup>
-      <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' ">
-        <DirectoryIds>%(_MSBuildProjectReferenceExistent.RefTargetDir)</DirectoryIds>
-        <ProjectOutputGroups>Binaries;Symbols;Sources;Content;Satellites;Documents</ProjectOutputGroups>
-        <ProjectName>%(_MSBuildProjectReferenceExistent.Name)</ProjectName>
-        <HeatOutput>$(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs</HeatOutput>
-      </_HeatProjectReference>
-      <HeatProject Include="@(_HeatProjectReference)" />
-    </ItemGroup>
-    <Error
-      Text="The following files are deprecated and should be removed from your project(s): @(Compile->'%(Identity)', ', ')"
-      Condition=" '%(Compile.GenerateComponentGroups)' != '' " />
-    <ItemGroup>
-      <!-- Unconditionally generate Compile items so they are always linked in. -->
-      <Compile Include="$(HarvestProjectsGeneratedFile)" />
-      <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ================================================================================================
-  ConvertBundleReferences
-    Converts project references in Bundle projects to HeatProject items to auto generate authoring.
-  ================================================================================================
-  -->
-  <Target
-    Name="ConvertBundleReferences"
-    Condition=" $(EnableProjectHarvesting) and ('$(OutputType)' == 'Bundle') ">
-    <ItemGroup>
-      <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' ">
-        <ProjectOutputGroups>Binaries;Symbols;Sources;Content;Satellites;Documents</ProjectOutputGroups>
-        <GenerateType>payloadgroup</GenerateType>
-        <HeatOutput>$(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs</HeatOutput>
-      </_HeatProjectReference>
-      <HeatProject Include="@(_HeatProjectReference)" />
-    </ItemGroup>
-    <Error
-      Text="The following files are deprecated and should be removed from your project(s): @(Compile->'%(Identity)', ', ')"
-      Condition=" '%(Compile.GenerateComponentGroups)' != '' " />
-    <ItemGroup>
-      <!-- Unconditionally generate Compile items so they are always linked in. -->
-      <Compile Include="$(HarvestProjectsGeneratedFile)" />
-      <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ================================================================================================
-  CombineHarvestProjects
-    Combines HeatProject and HarvestProject items together and ensures each has HeatOutput metadata.
-  ================================================================================================
-  -->
-  <Target
-      Name="CombineHarvestProjects"
-      Condition=" '@(HeatProject)' != '' or '@(HarvestProject)' != '' ">
-    <!-- Add default HeatOutputs for those without one specified -->
-    <CreateItem Include="@(HeatProject)" Condition= " '%(HeatProject.HeatOutput)' == '' "
-    AdditionalMetadata="HeatOutput=$(IntermediateOutputPath)_%(HeatProject.Filename).wxs">
-      <Output TaskParameter="Include" ItemName="_AllHeatProjects" />
-    </CreateItem>
-    <CreateItem Include="@(HarvestProject)" Condition= " '%(HarvestProject.HeatOutput)' == '' "
-    AdditionalMetadata="HeatOutput=$(IntermediateOutputPath)_%(HarvestProject.Filename).wxs">
-      <Output TaskParameter="Include" ItemName="_AllHeatProjects" />
-    </CreateItem>
-    <CreateItem Include="@(HeatProject)" Condition= " '%(HeatProject.HeatOutput)' != '' ">
-      <Output TaskParameter="Include" ItemName="_AllHeatProjects" />
-    </CreateItem>
-    <CreateItem Include="@(HarvestProject)" Condition= " '%(HarvestProject.HeatOutput)' != '' ">
-      <Output TaskParameter="Include" ItemName="_AllHeatProjects" />
-    </CreateItem>
-  </Target>
-  <!--
-  ================================================================================================
-  HarvestProjects
-    Harvests outputs of other MSBuild projects files using the VS project extension to heat.exe.
-    [IN]
-    @(HarvestProject)
-    @(HeatProject)
-        - The list of projects to harvest. HeatProject is provided for backward compatibility.
-          You should use HarvestProject instead.
-    %(HarvestProject.Transforms)
-    %(HeatProject.Transforms)
-        - XSL transforms to apply to the harvested WiX.
-    %(HarvestProject.ProjectOutputGroups)
-    %(HeatProjects.ProjectOutputGroups)
-        - The project output groups to harvest 
-    [OUT]
-    %(HeatOutput)
-        - The generated .wxs files which are added to the @(Compile) item list.
-  ================================================================================================
-  -->
-  <ItemDefinitionGroup>
-    <HeatProject>
-      <Transforms>$(HarvestProjectsTransforms)</Transforms>
-      <ProjectOutputGroups>$(HarvestProjectsProjectOutputGroups)</ProjectOutputGroups>
-      <DirectoryIds>$(HarvestProjectsDirectoryIds)</DirectoryIds>
-    </HeatProject>
-    <HarvestProject>
-      <Transforms>$(HarvestProjectsTransforms)</Transforms>
-      <ProjectOutputGroups>$(HarvestProjectsProjectOutputGroups)</ProjectOutputGroups>
-      <DirectoryIds>$(HarvestProjectsDirectoryIds)</DirectoryIds>
-    </HarvestProject>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <HarvestProjectsDependsOn>CombineHarvestProjects</HarvestProjectsDependsOn>
-  </PropertyGroup>
-  <Target Name="HarvestProjects"
-    DependsOnTargets="$(HarvestProjectsDependsOn)"
-    Inputs="@(_AllHeatProjects);%(_AllHeatProjects.Transforms);$(MSBuildAllProjects);$(ProjectPath)"
-    Outputs="@(_AllHeatProjects -> '%(HeatOutput)')"
-    Condition=" $(EnableProjectHarvesting) and ('@(HeatProject)' != '' or '@(HarvestProject)' != '') ">
-    <HeatProject
-      NoLogo="$(HarvestProjectsNoLogo)"
-      SuppressAllWarnings="$(HarvestProjectsSuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestProjectsSuppressSpecificWarnings)"
-      ToolPath="$(WixToolPath)"
-      TreatWarningsAsErrors="$(HarvestProjectsTreatWarningsAsErrors)"
-      TreatSpecificWarningsAsErrors="$(HarvestProjectsTreatSpecificWarningsAsErrors)"
-      VerboseOutput="$(HarvestProjectsVerboseOutput)"
-      AutogenerateGuids="$(HarvestProjectsAutogenerateGuids)"
-      GenerateGuidsNow="$(HarvestProjectsGenerateGuidsNow)"
-      OutputFile="%(_AllHeatProjects.HeatOutput)"
-      SuppressFragments="$(HarvestProjectsSuppressFragments)"
-      SuppressUniqueIds="$(HarvestProjectsSuppressUniqueIds)"
-      Transforms="%(_AllHeatProjects.Transforms)"
-      Project="%(_AllHeatProjects.FullPath)"
-      ProjectOutputGroups="%(_AllHeatProjects.ProjectOutputGroups)"
-      GenerateType="%(_AllHeatProjects.GenerateType)"
-      DirectoryIds="%(_AllHeatProjects.DirectoryIds)"
-      ProjectName="%(_AllHeatProjects.ProjectName)"
-      Configuration="%(_AllHeatProjects.Configuration)"
-      Platform="%(_AllHeatProjects.Platform)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)"
-      AdditionalOptions="$(HarvestProjectsAdditionalOptions)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </HeatProject>
-  </Target>
-  <!--
-  ================================================================================================
-  HarvestDirectory
-    Harvests directories using heat.exe.
-    [IN]
-    @(HarvestDirectory) - The list of directories to harvest.
-    %(HarvestDirectory.Transforms) - XSL transforms to apply to the harvested WiX.
-    %(HarvestDirectory.ComponentGroupName) -  The name of the ComponentGroup to create.
-    %(HarvestDirectory.DirectoryRefId) - The ID of the directory to reference instead of TARGETDIR.
-    %(HarvestDirectory.KeepEmptyDirectories) - Whether to create Directory entries for empty directories.
-    %(HarvestDirectory.PreprocessorVariable) - Substitute SourceDir for another variable name (ex: var.Dir).
-    %(HarvestDirectory.SuppressCom) - Suppress COM elements.
-    %(HarvestDirectory.SuppressRootDirectory) - Suppress a Directory element for the root directory.
-    $(HarvestDirectory.SuppressRegistry) - Suppress registry harvesting.
-    [OUT]
-    $(IntermediateOutputPath)_%(HarvestDirectory.ComponentGroupName)_dir.wxs
-        - The generated .wxs files which are added to the @(Compile) item list.
-  ================================================================================================
-  -->
-  <ItemDefinitionGroup>
-    <HarvestDirectory>
-      <Transforms>$(HarvestDirectoryTransforms)</Transforms>
-      <ComponentGroupName>$(HarvestDirectoryComponentGroupName)</ComponentGroupName>
-      <DirectoryRefId>$(HarvestDirectoryDirectoryRefId)</DirectoryRefId>
-      <KeepEmptyDirectories>$(HarvestDirectoryKeepEmptyDirectories)</KeepEmptyDirectories>
-      <PreprocessorVariable>$(HarvestDirectoryPreprocessorVariable)</PreprocessorVariable>
-      <SuppressCom>$(HarvestDirectorySuppressCom)</SuppressCom>
-      <SuppressRootDirectory>$(HarvestDirectorySuppressRootDirectory)</SuppressRootDirectory>
-      <SuppressRegistry>$(HarvestDirectorySuppressRegistry)</SuppressRegistry>
-    </HarvestDirectory>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <HarvestDirectoryDependsOn>
-      GetHarvestDirectoryContent
-    </HarvestDirectoryDependsOn>
-  </PropertyGroup>
-  <!-- Creates items to include content since wildcards will not work in Target/@Inputs. -->
-  <Target Name="GetHarvestDirectoryContent">
-    <CreateItem Include="@(HarvestDirectory->'%(FullPath)\**\*')">
-      <Output TaskParameter="Include" ItemName="_HarvestDirectoryContent" />
-    </CreateItem>
-  </Target>
-  <Target Name="HarvestDirectory"
-    DependsOnTargets="$(HarvestDirectoryDependsOn)"
-    Inputs="@(_HarvestDirectoryContent);%(HarvestDirectory.Transforms)"
-    Outputs="$(IntermediateOutputPath)_%(HarvestDirectory.ComponentGroupName)_dir.wxs"
-    Condition=" '@(HarvestDirectory)' != '' ">
-    <HeatDirectory
-      NoLogo="$(HarvestDirectoryNoLogo)"
-      SuppressAllWarnings="$(HarvestDirectorySuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestDirectorySuppressSpecificWarnings)"
-      ToolPath="$(WixToolPath)"
-      TreatWarningsAsErrors="$(HarvestDirectoryTreatWarningsAsErrors)"
-      TreatSpecificWarningsAsErrors="$(HarvestDirectoryTreatSpecificWarningsAsErrors)"
-      VerboseOutput="$(HarvestDirectoryVerboseOutput)"
-      AutogenerateGuids="$(HarvestDirectoryAutogenerateGuids)"
-      GenerateGuidsNow="$(HarvestDirectoryGenerateGuidsNow)"
-      OutputFile="$(IntermediateOutputPath)_%(HarvestDirectory.ComponentGroupName)_dir.wxs"
-      SuppressFragments="$(HarvestDirectorySuppressFragments)"
-      SuppressUniqueIds="$(HarvestDirectorySuppressUniqueIds)"
-      Transforms="%(HarvestDirectory.Transforms)"
-      Directory="@(HarvestDirectory)"
-      ComponentGroupName="%(HarvestDirectory.ComponentGroupName)"
-      DirectoryRefId="%(HarvestDirectory.DirectoryRefId)"
-      KeepEmptyDirectories="%(HarvestDirectory.KeepEmptyDirectories)"
-      PreprocessorVariable="%(HarvestDirectory.PreprocessorVariable)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      SuppressCom="%(HarvestDirectory.SuppressCom)"
-      SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)"
-      SuppressRegistry="%(HarvestDirectory.SuppressRegistry)"
-      AdditionalOptions="$(HarvestDirectoryAdditionalOptions)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </HeatDirectory>
-  </Target>
-  <!--
-  ================================================================================================
-  HarvestFile
-    Harvests files of different types using heat.exe. This can harvest registry from
-    self-registering files, files with typelibs, and more.
-    [IN]
-    @(HarvestFile) - The list of files to harvest.
-    %(HarvestFile.Transforms) - XSL transforms to apply to the harvested WiX.
-    %(HarvestFile.ComponentGroupName) - The name of the ComponentGroup to create.
-    %(HarvestFile.DirectoryRefId) - The ID of the directory to reference instead of TARGETDIR.
-    %(HarvestFile.PreprocessorVariable) - Substitute SourceDir for another variable name (ex: var.Dir).
-    %(HarvestFile.SuppressCom) - Suppress COM elements.
-    %(HarvestFile.SuppressRootDirectory) - Suppress a Directory element for the root directory.
-    $(HarvestFile.SuppressRegistry) - Suppress registry harvesting.
-    [OUT]
-    $(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs
-        - The generated .wxs files which are added to the @(Compile) item list.
-  ================================================================================================
-  -->
-  <ItemDefinitionGroup>
-    <HarvestFile>
-      <Transforms>$(HarvestFileTransforms)</Transforms>
-      <ComponentGroupName>$(HarvestFileComponentGroupName)</ComponentGroupName>
-      <DirectoryRefId>$(HarvestFileDirectoryRefId)</DirectoryRefId>
-      <PreprocessorVariable>$(HarvestFilePreprocessorVariable)</PreprocessorVariable>
-      <SuppressCom>$(HarvestFileSuppressCom)</SuppressCom>
-      <SuppressRegistry>$(HarvestFileSuppressRegistry)</SuppressRegistry>
-      <SuppressRootDirectory>$(HarvestFileSuppressRootDirectory)</SuppressRootDirectory>
-    </HarvestFile>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <HarvestFileDependsOn></HarvestFileDependsOn>
-  </PropertyGroup>
-  <Target Name="HarvestFile"
-    DependsOnTargets="$(HarvestFileDependsOn)"
-    Inputs="@(HarvestFile);%(HarvestFile.Transforms)"
-    Outputs="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"
-    Condition=" '@(HarvestFile)' != '' ">
-    <HeatFile
-      NoLogo="$(HarvestFileNoLogo)"
-      SuppressAllWarnings="$(HarvestFileSuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestFileSuppressSpecificWarnings)"
-      ToolPath="$(WixToolPath)"
-      TreatWarningsAsErrors="$(HarvestFileTreatWarningsAsErrors)"
-      TreatSpecificWarningsAsErrors="$(HarvestFileTreatSpecificWarningsAsErrors)"
-      VerboseOutput="$(HarvestFileVerboseOutput)"
-      AutogenerateGuids="$(HarvestFileAutogenerateGuids)"
-      GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)"
-      OutputFile="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"
-      SuppressFragments="$(HarvestFileSuppressFragments)"
-      SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)"
-      Transforms="%(HarvestFile.Transforms)"
-      File="@(HarvestFile)"
-      ComponentGroupName="%(HarvestFile.ComponentGroupName)"
-      DirectoryRefId="%(HarvestFile.DirectoryRefId)"
-      PreprocessorVariable="%(HarvestFile.PreprocessorVariable)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      SuppressCom="%(HarvestFile.SuppressCom)"
-      SuppressRegistry="%(HarvestFile.SuppressRegistry)"
-      SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)"
-      AdditionalOptions="$(HarvestFileAdditionalOptions)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </HeatFile>
-  </Target>
-  <!--
-  ================================================================================================
-  RefreshGeneratedFile
-    Generates code based on metadata defined in project references.
-    [IN]
-    @(_MSBuildResolvedProjectReferencePaths) - The list of MSBuildable project references.
-    [OUT]
-    @(_GeneratedFiles) - The generated source file.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <RefreshGeneratedFileDependsOn></RefreshGeneratedFileDependsOn>
-  </PropertyGroup>
-  <Target Name="RefreshGeneratedFile"
-    DependsOnTargets="$(RefreshGeneratedFileDependsOn)"
-    Inputs="@(_MSBuildResolvedProjectReferencePaths);@(Compile);$(ProjectPath)"
-    Outputs="@(_GeneratedFiles)"
-    Condition=" $(EnableProjectHarvesting) and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module') and '@(_GeneratedFiles)' != '' ">
-    <RefreshGeneratedFile
-      GeneratedFiles="@(_GeneratedFiles)"
-      ProjectReferencePaths="@(_MSBuildResolvedProjectReferencePaths)" />
-  </Target>
-  <!--
-  ================================================================================================
-  RefreshBundleGeneratedFile
-    Generates code for bundle projects based on metadata defined in project references.
-    [IN]
-    @(_MSBuildResolvedProjectReferencePaths) - The list of MSBuildable project references.
-    [OUT]
-    @(_GeneratedFiles) - The generated source file.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <RefreshBundleGeneratedFileDependsOn></RefreshBundleGeneratedFileDependsOn>
-  </PropertyGroup>
-  <Target Name="RefreshBundleGeneratedFile"
-    DependsOnTargets="$(RefreshBundleGeneratedFileDependsOn)"
-    Inputs="@(_MSBuildResolvedProjectReferencePaths);@(Compile);$(ProjectPath)"
-    Outputs="@(_GeneratedFiles)"
-    Condition=" $(EnableProjectHarvesting) and ('$(OutputType)' == 'Bundle' and '@(_GeneratedFiles)' != '') ">
-    <RefreshBundleGeneratedFile
-      GeneratedFiles="@(_GeneratedFiles)"
-      ProjectReferencePaths="@(_MSBuildResolvedProjectReferencePaths)" />
-  </Target>
-</Project>
diff --git a/src/WixToolset.BuildTasks/wix.signing.targets b/src/WixToolset.BuildTasks/wix.signing.targets
deleted file mode 100644
index 6351cc8b..00000000
--- a/src/WixToolset.BuildTasks/wix.signing.targets
+++ /dev/null
@@ -1,378 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- These properties can be overridden to support non-default installations. -->
-  <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath>
-    <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixTasks.dll</WixTasksPath>
-    <SignedFile Condition=" '$(SignedFile)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFile>
-  </PropertyGroup>
-  <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" />
-  <!-- Default Inscribe properties. -->
-  <PropertyGroup>
-    <InscribeNoLogo Condition=" '$(InscribeNoLogo)' == '' ">$(NoLogo)</InscribeNoLogo>
-    <InscribeSuppressAllWarnings Condition=" '$(InscribeSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</InscribeSuppressAllWarnings>
-    <InscribeSuppressSpecificWarnings Condition=" '$(InscribeSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</InscribeSuppressSpecificWarnings>
-    <InscribeTreatWarningsAsErrors Condition=" '$(InscribeTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</InscribeTreatWarningsAsErrors>
-    <InscribeTreatSpecificWarningsAsErrors Condition=" '$(InscribeTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</InscribeTreatSpecificWarningsAsErrors>
-    <InscribeVerboseOutput Condition=" '$(InscribeVerboseOutput)' == '' ">$(VerboseOutput)</InscribeVerboseOutput>
-  </PropertyGroup>
-  <!--
-  ==================================================================================================
-  Signing
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <InternalSignDependsOn Condition=" '$(OutputType)' == 'Module' ">
-      GetMsmsToSign;
-      InternalSignMsm;
-    </InternalSignDependsOn>
-    <InternalSignDependsOn Condition=" '$(OutputType)' == 'Package' ">
-      GetCabsToSign;
-      GetMsiToSign;
-      InternalSignCabs;
-      InscribeMsi;
-      InternalSignMsi;
-    </InternalSignDependsOn>
-    <InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' ">
-      GetContainersToSign;
-      InternalSignContainers;
-      InscribeBundleEngine;
-      InternalSignBundleEngine;
-      InscribeBundle;
-      InternalSignBundle;
-    </InternalSignDependsOn>
-    <SigningDependsOn>
-      CompileAndLink;
-      BeforeSigning;
-      $(InternalSignDependsOn);
-      AfterSigning
-    </SigningDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="Signing"
-    DependsOnTargets="$(SigningDependsOn)"
-    Inputs="@(SignTargetPath)"
-    Outputs="$(IntermediateOutputPath)$(SignedFile)"
-    Condition=" '@(SignTargetPath)' != '' ">
-    <CreateItem Include="$(IntermediateOutputPath)$(SignedFile)">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
-    <WriteLinesToFile
-        File="$(IntermediateOutputPath)$(SignedFile)"
-        Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
-        Overwrite="true" />
-  </Target>
-  <!-- Internal targets so correct signing targets are called. -->
-  <Target
-      Name="GetMsmsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <CreateItem Include="@(SignTargetPath)">
-      <Output TaskParameter="Include" ItemName="SignMsm" />
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
-  </Target>
-  <Target
-    Name="InternalSignMsm"
-    DependsOnTargets="SignMsm"
-    Condition=" '@(SignMsm)' != '' " />
-  <Target
-      Name="GetCabsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <GetCabList Database="%(SignTargetPath.FullPath)">
-      <Output TaskParameter="CabList" ItemName="SignCabs" />
-      <Output TaskParameter="CabList" ItemName="FileWrites" />
-    </GetCabList>
-  </Target>
-  <Target
-    Name="InternalSignCabs"
-    DependsOnTargets="SignCabs"
-    Condition=" '@(SignCabs)' != '' " />
-  <Target
-      Name="GetMsiToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <CreateItemAvoidingInference InputProperties="@(SignTargetPath)">
-      <Output TaskParameter="OuputItems" ItemName="SignMsi" />
-      <Output TaskParameter="OuputItems" ItemName="FileWrites" />
-    </CreateItemAvoidingInference>
-  </Target>
-  <Target
-    Name="InternalSignMsi"
-    DependsOnTargets="SignMsi"
-    Inputs="@(SignTargetPath)"
-    Outputs="$(IntermediateOutputPath)$(SignedFile)"
-    Condition=" '@(SignMsi)' != '' " />
-  <Target
-      Name="GetContainersToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <!-- TODO: implement signing detached containers -->
-  </Target>
-  <Target
-    Name="InternalSignContainers"
-    DependsOnTargets="SignContainers"
-    Condition=" '@(SignContainers)' != '' " />
-  <Target
-    Name="InternalSignBundleEngine"
-    DependsOnTargets="SignBundleEngine"
-    Condition=" '@(SignBundleEngine)' != '' " />
-  <Target
-    Name="InternalSignBundle"
-    DependsOnTargets="SignBundle"
-    Condition=" '@(SignBundle)' != '' " />
-  <!--
-  ================================================================================================
-  InscribeMsi
-    To be called after signing an MSI's cabs - inscribes an MSI with the digital signature of its
-      external cabs.
-    [IN/OUT]
-    @(SignTargetPath) - The database file to inscribe - database file will be modified in-place.
-    [OUT]
-    @(SignMsi) - The database file to sign.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeMsiDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignCabs
-    </InscribeMsiDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeMsi"
-      DependsOnTargets="$(InscribeMsiDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)"
-      Condition=" '@(SignCabs)' != '' ">
-    <Insignia
-        DatabaseFile="%(SignTargetPath.FullPath)"
-        OutputFile="%(SignTargetPath.FullPath)"
-        ToolPath="$(WixToolPath)"
-        NoLogo="$(InscribeNoLogo)"
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)" />
-  </Target>
-  <!--
-  ================================================================================================
-  InscribeBundleEngine
-    To be called after signing a bundle's detached containers. Also removes attached container
-    so engine can be signed without attached container.
-    [IN]
-    @(SignTargetPath) - The bundle to inscribe.
-    [OUT]
-    @(SignBundleEngine) - The bundle engine file to be signed.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeBundleEngineDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignContainers
-    </InscribeBundleEngineDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundleEngine"
-      DependsOnTargets="$(InscribeBundleEngineDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <Insignia
-        BundleFile="@(SignTargetPath)"
-        OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)"
-        ToolPath="$(WixToolPath)"
-        NoLogo="$(InscribeNoLogo)"
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)">
-      <Output TaskParameter="Output" ItemName="SignBundleEngine" />
-    </Insignia>
-    <!-- Explicitly add output to FileWrites to ensure even when the target is up to date. -->
-    <CreateItem Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
-  </Target>
-  <!--
-  ================================================================================================
-  InscribeBundle
-    To be called after signing the bundle engine to reattach the attached container.
-    [IN]
-    @(Inscribe) - The bundle to inscribe.
-    [OUT]
-    @(SignBundle) - The bundle engine file to be signed.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeBundleDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignBundleEngine
-    </InscribeBundleDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundle"
-      DependsOnTargets="$(InscribeBundleDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <Insignia
-        BundleFile="@(SignBundleEngine)"
-        OriginalBundleFile="@(SignTargetPath)"
-        OutputFile="@(SignTargetPath)"
-        ToolPath="$(WixToolPath)"
-        NoLogo="$(InscribeNoLogo)"
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)">
-      <Output TaskParameter="Output" ItemName="SignBundle" />
-      <Output TaskParameter="Output" ItemName="FileWrites" />
-    </Insignia>
-  </Target>
-  <!--
-  ==================================================================================================
-  BeforeSigning
-    Redefine this target in your project in order to run tasks just before all signing tasks.
-  ==================================================================================================
-  -->
-  <Target Name="BeforeSigning" />
-  <!--
-  ==================================================================================================
-  SignMsm
-    Redefine this target in your project in order to sign merge modules.
-    [IN]
-    @(SignMsm) - merge module files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignMsm" />
-  <!--
-  ==================================================================================================
-  SignCabs
-    Redefine this target in your project in order to sign the cabs of your database.
-    [IN]
-    @(SignCabs) - cabinet files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignCabs" />
-  <!--
-  ==================================================================================================
-  SignMsi
-    Redefine this target in your project in order to sign your database, after it has been inscribed
-    with the signatures of your signed cabs.
-    [IN]
-    @(SignMsi) - database files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignMsi" />
-  <!--
-  ==================================================================================================
-  SignContainers
-    Redefine this target in your project in order to sign your bundle's detached containers.
-    [IN]
-    @(SignContainers) - detached container files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignContainers" />
-  <!--
-  ==================================================================================================
-  SignBundleEngine
-    Redefine this target in your project in order to sign your bundle, after it has been inscribed
-    with the signatures of your signed containers.
-    [IN]
-    @(SignBundleEngine) - bundle engine file to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignBundleEngine" />
-  <!--
-  ==================================================================================================
-  SignBundle
-    Redefine this target in your project in order to sign your bundle, after the attached container
-    is reattached.
-    [IN]
-    @(SignBundle) - bundle file to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignBundle" />
-  <!--
-  ==================================================================================================
-  AfterSigning
-    Redefine this target in your project in order to run tasks just after all signing tasks.
-  ==================================================================================================
-  -->
-  <Target Name="AfterSigning" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets
deleted file mode 100644
index c9704094..00000000
--- a/src/WixToolset.BuildTasks/wix.targets
+++ /dev/null
@@ -1,1356 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="_CheckRequiredProperties" DefaultTargets="Build">
-  <PropertyGroup>
-    <WixTargetsImported>true</WixTargetsImported>
-  </PropertyGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Extension Points
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!-- Allow a user-customized targets files to be used as part of the build. -->
-  <Import Project="$(CustomBeforeWixTargets)" Condition=" '$(CustomBeforeWixTargets)' != '' and Exists('$(CustomBeforeWixTargets)')" />
-  <!-- These properties can be overridden to support non-default installations. -->
-  <PropertyGroup>
-    <WixBinDir Condition=" '$(WixBinDir)' == ''">$(MSBuildThisFileDirectory)</WixBinDir>
-    <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
-    <WixHarvestTargetsPath Condition=" '$(WixHarvestTargetsPath)' == '' ">$(WixBinDir)wix.harvest.targets</WixHarvestTargetsPath>
-    <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(WixBinDir)wix.signing.targets</WixSigningTargetsPath>
-    <LuxTargetsPath Condition=" '$(LuxTargetsPath)' == '' ">$(WixBinDir)lux.targets</LuxTargetsPath>
-    <LuxTasksPath Condition=" '$(LuxTasksPath)' == '' ">$(WixBinDir)LuxTasks.dll</LuxTasksPath>
-  </PropertyGroup>
-  <!-- This makes the project files a dependency of all targets so that things rebuild if they change -->
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <MSBuildAllProjects Condition="Exists('$(WixHarvestTargetsPath)')">$(MSBuildAllProjects);$(WixHarvestTargetsPath)</MSBuildAllProjects>
-    <MSBuildAllProjects Condition="Exists('$(WixSigningTargetsPath)')">$(MSBuildAllProjects);$(WixSigningTargetsPath)</MSBuildAllProjects>
-    <MSBuildAllProjects Condition="Exists('$(LuxTargetsPath)')">$(MSBuildAllProjects);$(LuxTargetsPath)</MSBuildAllProjects>
-    <MSBuildAllProjects Condition="Exists('$(CustomBeforeWixTargets)')">$(MSBuildAllProjects);$(CustomBeforeWixTargets)</MSBuildAllProjects>
-    <MSBuildAllProjects Condition="Exists('$(CustomAfterWixTargets)')">$(MSBuildAllProjects);$(CustomAfterWixTargets)</MSBuildAllProjects>
-  </PropertyGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Declarations for Microsoft.Common.targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <PropertyGroup>
-    <DefaultLanguageSourceExtension>.wxs</DefaultLanguageSourceExtension>
-    <Language>wix</Language>
-    <TargetRuntime>Managed</TargetRuntime>
-    <!-- Use OutputName to set the AssemblyName for Microsoft.Common.targets -->
-    <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName>
-    <AssemblyName>$(OutputName)</AssemblyName>
-    <!-- Default the OutputType to a known WiX toolset TYPE.  -->
-    <_OriginalOutputType>$(OutputType)</_OriginalOutputType>
-    <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType>
-  </PropertyGroup>
-  <!--
-  IDE Macros available from both integrated builds and from command line builds.
-  The following properties are 'macros' that are available via IDE for pre and post build steps.
-  All of them should be added to WixBuildMacroCollection to ensure that they are shown in the UI.
-  -->
-  <PropertyGroup>
-    <TargetExt Condition=" '$(OutputType)' == 'Package' ">.msi</TargetExt>
-    <TargetExt Condition=" '$(OutputType)' == 'Module' ">.msm</TargetExt>
-    <TargetExt Condition=" '$(OutputType)' == 'PatchCreation' ">.pcp</TargetExt>
-    <TargetExt Condition=" '$(OutputType)' == 'Library' ">.wixlib</TargetExt>
-    <TargetExt Condition=" '$(OutputType)' == 'Bundle' ">.exe</TargetExt>
-  </PropertyGroup>
-  <!-- Provide the correct output name for the .wixpdb -->
-  <ItemGroup Condition="'$(_DebugSymbolsProduced)' == 'true'">
-    <_DebugSymbolsIntermediatePath Include="$(PdbOutputDir)$(TargetPdbName)" Condition=" '@(_DebugSymbolsIntermediatePath)' == '' " />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-  <PropertyGroup>
-    <!-- Default pdb output path to the intermediate output directory -->
-    <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(IntermediateOutputPath)</PdbOutputDir>
-    <PdbOutputDir Condition=" '$(PdbOutputDir)' != '' and !HasTrailingSlash('$(PdbOutputDir)') ">$(PdbOutputDir)\</PdbOutputDir>
-    <!-- Example, C:\MyProjects\MyProject\bin\debug\ -->
-    <TargetPdbDir Condition=" '$(PdbOutputDir)'!='' ">$([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputDir)`))`))</TargetPdbDir>
-    <!-- Example, MySetup.wixpdb" -->
-    <TargetPdbName Condition=" '$(TargetPdbName)' == '' ">$(TargetName).wixpdb</TargetPdbName>
-    <!-- Example, C:\MyProjects\MyProject\bin\debug\MyPackage.wixpdb -->
-    <TargetPdbPath Condition=" '$(TargetPdbPath)' == '' ">$(TargetPdbDir)$(TargetPdbName)</TargetPdbPath>
-  </PropertyGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Property Declarations
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!-- These tasks can be used as general-purpose build tasks. -->
-  <UsingTask TaskName="Candle" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="DoIt" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="Lit" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="Light" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="Torch" AssemblyFile="$(WixTasksPath)" />
-  <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. -->
-  <UsingTask TaskName="CreateItemAvoidingInference" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="CreateProjectReferenceDefineConstants" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)"/>
-  <UsingTask TaskName="ReplaceString" AssemblyFile="$(WixTasksPath)"/>
-  <UsingTask TaskName="GetCabList" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetLooseFileList" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GenerateCompileWithObjectPath" AssemblyFile="$(WixTasksPath)"/>
-  <!-- WiX tools are 32bit EXEs, so run them out-of-proc when MSBuild is not 32bit. -->
-  <PropertyGroup>
-    <RunWixToolsOutOfProc Condition=" '$(PROCESSOR_ARCHITECTURE)'!='x86' ">true</RunWixToolsOutOfProc>
-  </PropertyGroup>
-  <PropertyGroup>
-    <BindContentsFile Condition=" '$(BindContentsFile)' == '' ">$(MSBuildProjectFile).BindContentsFileList.txt</BindContentsFile>
-    <BindOutputsFile Condition=" '$(BindOutputsFile)' == '' ">$(MSBuildProjectFile).BindOutputsFileList.txt</BindOutputsFile>
-    <BindBuiltOutputsFile Condition=" '$(BindBuiltOutputsFile)' == '' ">$(MSBuildProjectFile).BindBuiltOutputsFileList.txt</BindBuiltOutputsFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <CabinetCachePath Condition=" '$(CabinetCachePath)'=='' and '$(ReuseCabinetCache)'=='true' ">$(IntermediateOutputPath)cabcache\</CabinetCachePath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <WixToolDir Condition=" '$(WixToolDir)' == ''">$(WixBinDir)</WixToolDir>
-    <WixExtDir Condition=" '$(WixExtDir)' == ''">$(WixToolDir)</WixExtDir>
-  </PropertyGroup>
-  <!--
-  Set the SignTargetPath item directly when output is a Bundle. The AssignCultures target
-  sets SignTargetPath item for other output types based on the cultures provided.
-  -->
-  <ItemGroup>
-    <SignTargetPath Include="$(TargetPath)" Condition=" '$(OutputType)' == 'Bundle' AND '$(SignOutput)' == 'true' AND '$(SuppressLayout)' != 'true' " />
-  </ItemGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Default Compiler, Linker, and Librarian Property Declarations
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!-- If WixExtension was passed in via the command line, then convert it to an ItemGroup -->
-  <ItemGroup>
-    <WixExtension Include="$(WixExtension)"  Condition=" '$(WixExtension)' != '' " />
-  </ItemGroup>
-  <!-- Defaut Compiler properties. -->
-  <PropertyGroup>
-    <CompilerNoLogo Condition=" '$(CompilerNoLogo)' == '' ">$(NoLogo)</CompilerNoLogo>
-    <CompilerSuppressAllWarnings Condition=" '$(CompilerSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</CompilerSuppressAllWarnings>
-    <CompilerSuppressSpecificWarnings Condition=" '$(CompilerSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</CompilerSuppressSpecificWarnings>
-    <CompilerTreatWarningsAsErrors Condition=" '$(CompilerTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</CompilerTreatWarningsAsErrors>
-    <CompilerTreatSpecificWarningsAsErrors Condition=" '$(CompilerTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</CompilerTreatSpecificWarningsAsErrors>
-    <CompilerVerboseOutput Condition=" '$(CompilerVerboseOutput)' == '' ">$(VerboseOutput)</CompilerVerboseOutput>
-    <!-- TODO: This probably doesn't work any longer since Platform won't be defined until Microsoft.Common.targets is included -->
-    <InstallerPlatform Condition=" '$(InstallerPlatform)' == '' and '$(Platform)' != 'AnyCPU' and '$(Platform)' != 'Any CPU' ">$(Platform)</InstallerPlatform>
-  </PropertyGroup>
-  <!-- Default Lib properties. -->
-  <PropertyGroup>
-    <LibNoLogo Condition=" '$(LibNoLogo)' == '' ">$(NoLogo)</LibNoLogo>
-    <LibBindFiles Condition=" '$(LibBindFiles)' == '' ">$(BindFiles)</LibBindFiles>
-    <LibPedantic Condition=" '$(LibPedantic)' == '' ">$(Pedantic)</LibPedantic>
-    <LibSuppressAllWarnings Condition=" '$(LibSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</LibSuppressAllWarnings>
-    <LibSuppressSpecificWarnings Condition=" '$(LibSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</LibSuppressSpecificWarnings>
-    <LibSuppressSchemaValidation Condition=" '$(LibSuppressSchemaValidation)' == '' ">$(SuppressSchemaValidation)</LibSuppressSchemaValidation>
-    <LibSuppressIntermediateFileVersionMatching Condition=" '$(LibSuppressIntermediateFileVersionMatching)' == '' ">$(SuppressIntermediateFileVersionMatching)</LibSuppressIntermediateFileVersionMatching>
-    <LibTreatWarningsAsErrors Condition=" '$(LibTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</LibTreatWarningsAsErrors>
-    <LibTreatSpecificWarningsAsErrors Condition=" '$(LibTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</LibTreatSpecificWarningsAsErrors>
-    <LibVerboseOutput Condition=" '$(LibVerboseOutput)' == '' ">$(VerboseOutput)</LibVerboseOutput>
-  </PropertyGroup>
-  <!-- Default Linker properties. -->
-  <PropertyGroup>
-    <LinkerNoLogo Condition=" '$(LinkerNoLogo)' == '' ">$(NoLogo)</LinkerNoLogo>
-    <LinkerBindFiles Condition=" '$(LinkerBindFiles)' == '' ">$(BindFiles)</LinkerBindFiles>
-    <LinkerPedantic Condition=" '$(LinkerPedantic)' == '' ">$(Pedantic)</LinkerPedantic>
-    <LinkerSuppressAllWarnings Condition=" '$(LinkerSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</LinkerSuppressAllWarnings>
-    <LinkerSuppressSpecificWarnings Condition=" '$(LinkerSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</LinkerSuppressSpecificWarnings>
-    <LinkerSuppressSchemaValidation Condition=" '$(LinkerSuppressSchemaValidation)' == '' ">$(SuppressSchemaValidation)</LinkerSuppressSchemaValidation>
-    <LinkerSuppressIntermediateFileVersionMatching Condition=" '$(LinkerSuppressIntermediateFileVersionMatching)' == '' ">$(SuppressIntermediateFileVersionMatching)</LinkerSuppressIntermediateFileVersionMatching>
-    <LinkerTreatWarningsAsErrors Condition=" '$(LinkerTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</LinkerTreatWarningsAsErrors>
-    <LinkerTreatSpecificWarningsAsErrors Condition=" '$(LinkerTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</LinkerTreatSpecificWarningsAsErrors>
-    <LinkerVerboseOutput Condition=" '$(LinkerVerboseOutput)' == '' ">$(VerboseOutput)</LinkerVerboseOutput>
-  </PropertyGroup>
-  <!-- If BindInputPaths (or LinkerBindInputPaths) was passed in via the command line, then convert it to an ItemGroup -->
-  <ItemGroup>
-    <BindInputPaths Include="$(BindInputPaths)"  Condition=" '$(BindInputPaths)' != '' " />
-    <LinkerBindInputPaths Include="$(LinkerBindInputPaths)"  Condition=" '$(LinkerBindInputPaths)' != '' " />
-  </ItemGroup>
-  <!-- Default Lit and Light "properties" -->
-  <ItemGroup>
-    <LinkerBindInputPaths Condition=" '@(LinkerBindInputPaths)' == '' " Include="@(BindInputPaths)" />
-  </ItemGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Initial Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  _CheckRequiredProperties
-    Checks properties that must be set in the main project file or on the command line before
-    using this .TARGETS file.
-    [IN]
-    $(OutputName) - The name of the MSI/MSM/wixlib to build (without the extension)
-    $(OutputType) - Possible values are 'package', 'PatchCreation', 'module', 'library', 'bundle'
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <_PleaseSetThisInProjectFile>Please set this in the project file before the &lt;Import&gt; of the wix.targets file.</_PleaseSetThisInProjectFile>
-    <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), wix library (.wixlib), or self-extracting executable (.exe) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', 'Library', and 'Bundle'.</_OutputTypeDescription>
-  </PropertyGroup>
-  <Target Name="_CheckRequiredProperties">
-    <Error
-      Code="WIXTARGETS100"
-      Condition=" '$(OutputName)' == '' "
-      Text="The OutputName property is not set in project &quot;$(MSBuildProjectFile)&quot;. The OutputName defines the name of the output without a file extension. $(_PleaseSetThisInProjectFile)" />
-    <Warning
-      Code="WIXTARGETS101"
-      Condition=" '$(_OriginalOutputType)' == '' "
-      Text="The OutputType property is not set in project &quot;$(MSBuildProjectFile)&quot;. Defaulting to '$(OutputType)'. $(_OutputTypeDescription)" />
-    <Error
-      Code="WIXTARGETS102"
-      Condition=" '$(OutputType)' != 'Package' and '$(OutputType)' != 'PatchCreation' and '$(OutputType)' != 'Module' and '$(OutputType)' != 'Library' and '$(OutputType)' != 'Bundle' "
-      Text="The OutputType property '$(OutputType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. $(_OutputTypeDescription)" />
-    <Error
-      Code="WIXTARGETS103"
-      Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' &lt; '4.0' "
-      Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. You must use MSBuild v4.0 or later." />
-  </Target>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Build Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  CoreBuild - OVERRIDE DependsOn
-    The core build step calls each of the build targets.
-    This is where we insert our targets into the build process.
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <CoreBuildDependsOn>
-      BuildOnlySettings;
-      PrepareForBuild;
-      PreBuildEvent;
-      ResolveReferences;
-      <!--CompileAndLink;-->
-      DoIt;
-      Signing;
-      GetTargetPath;
-      PrepareForRun;
-      IncrementalClean;
-      PostBuildEvent
-    </CoreBuildDependsOn>
-  </PropertyGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Resolve References Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  ResolveReferences - OVERRIDE DependsOn
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <ResolveReferencesDependsOn>
-      BeforeResolveReferences;
-      AssignProjectConfiguration;
-      ResolveProjectReferences;
-      ResolveWixLibraryReferences;
-      ResolveWixExtensionReferences;
-      AfterResolveReferences
-    </ResolveReferencesDependsOn>
-  </PropertyGroup>
-  <!--
-  ================================================================================================
-  ResolveProjectReferences
-    Builds all of the referenced projects to get their outputs.
-    [IN]
-    @(NonVCProjectReference) - The list of non-VC project references.
-    [OUT]
-    @(ProjectReferenceWithConfiguration) - The list of non-VC project references.
-    @(WixLibProjects) - Paths to any .wixlibs that were built by referenced projects.
-  ================================================================================================
-  -->
-  <Target
-    Name="ResolveProjectReferences"
-    DependsOnTargets="AssignProjectConfiguration;_SplitProjectReferencesByFileExistence"
-    Condition=" '@(ProjectReferenceWithConfiguration)' != '' ">
-    <!-- Issue a warning for each non-existent project. -->
-    <Warning
-      Text="The referenced project '%(_MSBuildProjectReferenceNonexistent.Identity)' does not exist."
-      Condition=" '@(_MSBuildProjectReferenceNonexistent)' != '' " />
-    <!--
-    When building this project from the IDE or when building a .sln from the command line or
-    when only building .wixlib project references, gather the referenced build outputs. The
-    code that builds the .sln will already have built the project, so there's no need to do
-    it again here and when building only .wixlib project references we'll use the results to
-    determine which projects to build.
-    The ContinueOnError setting is here so that, during project load, as much information as
-    possible will be passed to the compilers.
-    -->
-    <MSBuild
-      Projects="@(_MSBuildProjectReferenceExistent)"
-      Targets="%(_MSBuildProjectReferenceExistent.Targets);GetTargetPath"
-      Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration);%(_MSBuildProjectReferenceExistent.SetPlatform)"
-      Condition="('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true' or '$(BuildProjectReferences)' != 'true') and '@(_MSBuildProjectReferenceExistent)' != '' "
-      ContinueOnError="!$(BuildingProject)">
-      <Output TaskParameter="TargetOutputs" ItemName="_GatheredProjectReferencePaths" />
-    </MSBuild>
-    <!--
-    Determine which project references should be built. Note: we will not build any project references
-    if building in the IDE because it builds project references directly.
-    If BuildProjectReferences is 'true' (the default) then take all MSBuild project references that exist
-    on disk and add them to the list of things to build. This is the easy case.
-    -->
-    <CreateItem
-      Include="@(_MSBuildProjectReferenceExistent)"
-      Condition=" '$(BuildProjectReferences)' == 'true' and '$(BuildingInsideVisualStudio)' != 'true' ">
-      <Output TaskParameter="Include" ItemName="_ProjectReferencesToBuild" />
-    </CreateItem>
-    <!--
-    If BuildProjectReferences is 'wixlib' then build only the MSBuild project references that exist and
-    create a .wixlib file. That requires us to first filter the gathered project references down to only
-    those that build .wixlibs.
-    -->
-    <CreateItem
-      Include="@(_GatheredProjectReferencePaths)"
-      Condition=" '$(BuildProjectReferences)' == 'wixlib' and '%(Extension)' == '.wixlib' and '$(BuildingInsideVisualStudio)' != 'true' ">
-      <Output TaskParameter="Include" ItemName="_ReferencedWixLibPaths" />
-    </CreateItem>
-    <!--
-    The second step when building only 'wixlib' project references is to create the list of existing MSBuild
-    project references that do *not* build a .wixlib. These are the projects that will be skipped.
-     -->
-    <CreateItem
-      Include="@(_MSBuildProjectReferenceExistent->'%(FullPath)')"
-      Exclude="@(_ReferencedWixLibPaths->'%(MSBuildSourceProjectFile)')"
-      Condition=" '$(BuildProjectReferences)' == 'wixlib' and '$(BuildingInsideVisualStudio)' != 'true' ">
-      <Output TaskParameter="Include" ItemName="_ProjectReferencesToSkip" />
-    </CreateItem>
-    <!--
-    Finally, when building only 'wixlib' project references, the list of projects to build are naturally the
-    list of projects *not* being skipped.
-    -->
-    <CreateItem
-      Include="@(_MSBuildProjectReferenceExistent->'%(FullPath)')"
-      Exclude="@(_ProjectReferencesToSkip)"
-      Condition=" '$(BuildProjectReferences)' == 'wixlib' and '$(BuildingInsideVisualStudio)' != 'true' ">
-      <Output TaskParameter="Include" ItemName="_ProjectReferencesToBuild" />
-    </CreateItem>
-    <!-- Display a warning for all projects being skipped. -->
-    <Warning
-      Text="BuildProjectReferences set to '$(BuildProjectReferences)'. Skipping the non-Library project: %(_ProjectReferencesToSkip.Identity)"
-      Condition=" '@(_ProjectReferencesToSkip)' != '' " />
-    <Message
-      Importance="low"
-      Text="Project reference to build: %(_ProjectReferencesToBuild.Identity), properties: %(_ProjectReferencesToBuild.Properties)"
-      Condition=" '@(_ProjectReferencesToBuild)' != '' " />
-    <!--
-    Build referenced projects when building from the command line.
-    The $(ProjectReferenceBuildTargets) will normally be blank so that the project's default target
-    is used during a P2P reference. However if a custom build process requires that the referenced
-    project has a different target to build it can be specified.
-    -->
-    <MSBuild
-      Projects="@(_ProjectReferencesToBuild)"
-      Targets="$(ProjectReferenceBuildTargets)"
-      Properties="%(_ProjectReferencesToBuild.SetConfiguration);%(_ProjectReferencesToBuild.SetPlatform)"
-      Condition=" '@(_ProjectReferencesToBuild)' != '' ">
-      <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectReferencePaths" />
-    </MSBuild>
-    <!--
-    VC project references must build GetNativeTargetPath because neither GetTargetPath nor the return of the default build
-    target return the output for a native .vcxproj.
-    -->
-    <MSBuild
-      Projects="@(_MSBuildProjectReferenceExistent)"
-      Targets="GetNativeTargetPath"
-      Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration);%(_MSBuildProjectReferenceExistent.SetPlatform)"
-      Condition=" '@(ProjectReferenceWithConfiguration)' != '' and '%(_MSBuildProjectReferenceExistent.Extension)' == '.vcxproj' ">
-      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProjectReferencePaths" />
-      <Output TaskParameter="TargetOutputs" ItemName="_MSBuildResolvedProjectReferencePaths" />
-    </MSBuild>
-    <!-- Assign the unique gathered and built project references to the resolved project
-         reference paths. -->
-    <RemoveDuplicates Inputs="@(_GatheredProjectReferencePaths);@(_BuiltProjectReferencePaths)">
-      <Output TaskParameter="Filtered" ItemName="_ResolvedProjectReferencePaths" />
-      <Output TaskParameter="Filtered" ItemName="_MSBuildResolvedProjectReferencePaths" />
-    </RemoveDuplicates>
-    <!-- Create list of all .wixlib project references. -->
-    <CreateItem
-      Include="@(_ResolvedProjectReferencePaths)"
-      Condition=" '%(Extension)' == '.wixlib' ">
-      <Output TaskParameter="Include" ItemName="WixLibProjects" />
-    </CreateItem>
-    <Message
-      Importance="low"
-      Text="Library from referenced projects: %(WixLibProjects.Identity)"
-      Condition=" '@(WixLibProjects)' != '' " />
-  </Target>
-  <!--
-  ================================================================================================
-  ResolveWixLibraryReferences
-    Resolve the library references to full paths.
-    [IN]
-    @(WixLibrary) - The list of .wixlib files.
-    [OUT]
-    @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <ResolveWixLibraryReferencesDependsOn></ResolveWixLibraryReferencesDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="ResolveWixLibraryReferences"
-    DependsOnTargets="$(ResolveWixLibraryReferencesDependsOn)"
-    Condition=" '@(WixLibrary)' != ''">
-    <!--
-    The WixLibrarySearchPaths property is set to find assemblies in the following order:
-        (1) $(ReferencePaths) - the reference paths property, which comes from the .USER file.
-        (2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}.
-        (3) Treat the reference's Include as if it were a real file name.
-        (4) Path specified by the WixExtDir property.
-    -->
-    <CreateProperty Condition=" '$(WixLibrarySearchPaths)' == '' " Value="
-      $(ReferencePaths);
-      {HintPathFromItem};
-      {RawFileName};
-      $(WixExtDir)
-      ">
-      <Output TaskParameter="Value" PropertyName="WixLibrarySearchPaths" />
-    </CreateProperty>
-    <ResolveWixReferences
-      WixReferences="@(WixLibrary)"
-      SearchPaths="$(WixLibrarySearchPaths)"
-      SearchFilenameExtensions=".wixlib">
-      <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixLibraryPaths" />
-    </ResolveWixReferences>
-    <!-- Remove duplicate library items that would cause build errors -->
-    <RemoveDuplicates Inputs="@(_AllResolvedWixLibraryPaths)">
-      <Output TaskParameter="Filtered" ItemName="_ResolvedWixLibraryPaths" />
-    </RemoveDuplicates>
-  </Target>
-  <!--
-  ==================================================================================================
-  ResolveWixExtensionReferences
-    Resolves WiX extension references to full paths. Any properties you use
-    to resolve paths to extensions must be defined before importing this
-    file or the extensions will be automatically resolved to $(WixExtDir).
-    [IN]
-    @(WixExtension) - WixExtension item group
-    [OUT]
-    @(_ResolvedWixExtensionPaths) - Item group with full paths to extensions
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <ResolveWixExtensionReferencesDependsOn></ResolveWixExtensionReferencesDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="ResolveWixExtensionReferences"
-    DependsOnTargets="$(ResolveWixExtensionReferencesDependsOn)"
-    Condition=" '@(WixExtension)' != ''">
-    <!--
-    The WixExtensionSearchPaths property is set to find assemblies in the following order:
-        (1) $(ReferencePaths) - the reference paths property, which comes from the .USER file.
-        (2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}.
-        (3) Treat the reference's Include as if it were a real file name.
-        (4) Path specified by the WixExtDir property.
-    -->
-    <CreateProperty Condition=" '$(WixExtensionSearchPaths)' == '' " Value="
-      $(ReferencePaths);
-      {HintPathFromItem};
-      {RawFileName};
-      $(WixExtDir)
-      ">
-      <Output TaskParameter="Value" PropertyName="WixExtensionSearchPaths" />
-    </CreateProperty>
-    <ResolveWixReferences
-      WixReferences="@(WixExtension)"
-      SearchPaths="$(WixExtensionSearchPaths)"
-      SearchFilenameExtensions=".dll">
-      <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixExtensionPaths" />
-    </ResolveWixReferences>
-    <!-- Remove duplicate extension items that would cause build errors -->
-    <RemoveDuplicates Inputs="@(_AllResolvedWixExtensionPaths)">
-      <Output TaskParameter="Filtered" ItemName="_ResolvedWixExtensionPaths" />
-    </RemoveDuplicates>
-  </Target>
-  <!--
-  ================================================================================================
-  GetTargetPath - OVERRIDE DependsOn
-    This stand-alone target returns the name of the build product (i.e. MSI, MSM) that would be
-    produced if we built this project.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <GetTargetPathDependsOn>AssignCultures</GetTargetPathDependsOn>
-  </PropertyGroup>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  DoIt Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  DoIt
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <DoItDependsOn>
-      PrepareForBuild;
-      ResolveReferences;
-      BeforeCompile;
-      _TimeStampBeforeCompile;
-      Harvest;
-      CalculateDefineConstants;
-      GenerateCompileWithObjectPath;
-      AssignCultures;
-      ReadPreviousBindInputsAndBuiltOutputs;
-      ActuallyDoIt;
-      UpdateLinkFileWrites;
-      _TimeStampAfterCompile;
-      AfterCompile
-    </DoItDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="DoIt"
-    DependsOnTargets="$(DoItDependsOn)" />
-  <Target
-    Name="ActuallyDoIt"
-    Inputs="@(Compile);
-    @(Content);
-    @(EmbeddedResource);
-    @(WixObject);
-    @(_ResolvedProjectReferencePaths);
-    @(_ResolvedWixLibraryPaths);
-    @(_ResolvedWixExtensionPaths);
-    @(_BindInputs);
-    $(MSBuildAllProjects)"
-    Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
-    Condition=" '@(Compile)' != '' ">
-    <PropertyGroup>
-      <OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)))</OutputFile>
-      <PdbOutputFile>$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbName)</PdbOutputFile>
-    </PropertyGroup>
-    <DoIt
-        SourceFiles="@(_CompileWithObjectPath)"
-        LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
-        LocalizationFiles="@(EmbeddedResource)"
-        Cultures="%(CultureGroup.Identity)"
-        ExtensionDirectory="$(WixExtDir)"
-        Extensions="@(_ResolvedWixExtensionPaths)"
-        IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
-        OutputFile="$(OutputFile)"
-        OutputType="$(OutputType)"
-        PdbOutputFile="$(PdbOutputFile)"
-        AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
-        DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"
-        IncludeSearchPaths="$(IncludeSearchPaths)"
-        InstallerPlatform="$(InstallerPlatform)"
-        NoLogo="true"
-        Pedantic="$(Pedantic)"
-        ReferencePaths="$(ReferencePaths)"
-        SuppressSpecificWarnings="$(CompilerSuppressSpecificWarnings);$(LinkerSuppressSpecificWarnings)"
-        TreatSpecificWarningsAsErrors="$(CompilerTreatSpecificWarningsAsErrors)"
-        BindInputPaths="@(LinkerBindInputPaths)"
-        BindFiles="$(LinkerBindFiles)"
-        BindContentsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)"
-        BindOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)"
-        BindBuiltOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)"
-        CabinetCachePath="$(CabinetCachePath)"
-        CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
-        DefaultCompressionLevel="$(DefaultCompressionLevel)"
-        UnreferencedSymbolsFile="$(UnreferencedSymbolsFile)"
-        WixProjectFile="$(ProjectPath)"
-        WixVariables="$(WixVariables)"
-        SuppressValidation="$(SuppressValidation)"
-        SuppressIces="$(SuppressIces)"
-        AdditionalCub="$(AdditionalCub)" />
-    <!--
-    SuppressAllWarnings="$(CompilerSuppressAllWarnings);$(LinkerSuppressAllWarnings)"
-    TreatWarningsAsErrors="$(CompilerTreatWarningsAsErrors);$(LinkerTreatWarningsAsErrors)"
-    VerboseOutput="$(CompilerVerboseOutput);$(LinkerVerboseOutput)"
-    -->
-</Target>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  CompileAndLink Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  CompileAndLink
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <CompileAndLinkDependsOn>
-      ResolveReferences;
-      BeforeCompile;
-      _TimeStampBeforeCompile;
-      Harvest;
-      Compile;
-      Lib;
-      Link;
-      UpdateLinkFileWrites;
-      _TimeStampAfterCompile;
-      AfterCompile
-    </CompileAndLinkDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="CompileAndLink"
-    DependsOnTargets="$(CompileAndLinkDependsOn)" />
-  <!--
-  ==================================================================================================
-  CalculateDefineConstants
-    Adds project references to the constants passed into the compiler.
-    [IN]
-    @(_ResolvedProjectReferencePaths) - paths to projects' outputs
-    $(VSProjectConfigurations) - map of project names to configurations, provided by VS when building in the IDE
-    [OUT]
-    $(ProjectReferenceDefineConstants) - the list of referenced project variables to be passed into the compiler
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <CalculateDefineConstantsDependsOn>ResolveReferences</CalculateDefineConstantsDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="CalculateDefineConstants"
-      DependsOnTargets="$(CalculateDefineConstantsDependsOn)"
-      Condition=" '@(_ResolvedProjectReferencePaths)' != '' ">
-    <PropertyGroup>
-      <ProjectDefineConstants>
-        Configuration=$(ConfigurationName);
-        OutDir=$(OutDir);
-        Platform=$(PlatformName);
-        ProjectDir=$(ProjectDir);
-        ProjectExt=$(ProjectExt);
-        ProjectFileName=$(ProjectFileName);
-        ProjectName=$(ProjectName);
-        ProjectPath=$(ProjectPath);
-        TargetDir=$(TargetDir);
-        TargetExt=$(TargetExt);
-        TargetFileName=$(TargetFileName);
-        TargetName=$(TargetName);
-        TargetPath=$(TargetPath);
-      </ProjectDefineConstants>
-    </PropertyGroup>
-    <PropertyGroup>
-      <SolutionDefineConstants Condition=" '$(DevEnvDir)'!='*Undefined*' ">$(SolutionDefineConstants);DevEnvDir=$(DevEnvDir)</SolutionDefineConstants>
-      <SolutionDefineConstants Condition=" '$(SolutionDir)'!='*Undefined*' ">$(SolutionDefineConstants);SolutionDir=$(SolutionDir)</SolutionDefineConstants>
-      <SolutionDefineConstants Condition=" '$(SolutionExt)'!='*Undefined*' ">$(SolutionDefineConstants);SolutionExt=$(SolutionExt)</SolutionDefineConstants>
-      <SolutionDefineConstants Condition=" '$(SolutionFileName)'!='*Undefined*' ">$(SolutionDefineConstants);SolutionFileName=$(SolutionFileName)</SolutionDefineConstants>
-      <SolutionDefineConstants Condition=" '$(SolutionName)'!='*Undefined*' ">$(SolutionDefineConstants);SolutionName=$(SolutionName)</SolutionDefineConstants>
-      <SolutionDefineConstants Condition=" '$(SolutionPath)'!='*Undefined*' ">$(SolutionDefineConstants);SolutionPath=$(SolutionPath)</SolutionDefineConstants>
-    </PropertyGroup>
-    <CreateProjectReferenceDefineConstants
-        ProjectReferencePaths="@(_ResolvedProjectReferencePaths)"
-        ProjectConfigurations="$(VSProjectConfigurations)">
-      <Output TaskParameter="DefineConstants" PropertyName="ProjectReferenceDefineConstants" />
-    </CreateProjectReferenceDefineConstants>
-    <ItemGroup>
-      <LinkerBindInputPaths Include="%(_ResolvedProjectReferencePaths.RootDir)%(_ResolvedProjectReferencePaths.Directory)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ================================================================================================
-  GenerateCompileWithObjectPath
-    Generates metadata on the for compile output objects.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <GenerateCompileWithObjectPathDependsOn></GenerateCompileWithObjectPathDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="GenerateCompileWithObjectPath"
-      Condition=" '@(Compile)' != '' ">
-    <GenerateCompileWithObjectPath
-        Compile="@(Compile)"
-        IntermediateOutputPath="$(IntermediateOutputPath)">
-      <Output TaskParameter="CompileWithObjectPath" ItemName="_CompileWithObjectPath" />
-    </GenerateCompileWithObjectPath>
-  </Target>
-  <!--
-  ================================================================================================
-  Compile
-    Compiles the wxs files into wixobj files using candle.exe.
-    [IN]
-    @(Compile) - The list of wxs files to compile.
-    @(Content) - Files that the project uses in the installer.
-    @(WixExtension) - The list of wixlib or wix dll extensions.
-    [OUT]
-    @(CompileObjOutput) - The compiled .wixobj files.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <CompileDependsOn>
-      PrepareForBuild;
-      ResolveReferences;
-      CalculateDefineConstants;
-      GenerateCompileWithObjectPath
-    </CompileDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="Compile"
-      Inputs="@(Compile);
-              @(Content);
-              @(_ResolvedWixExtensionPaths);
-              @(_ResolvedProjectReferencePaths);
-              $(MSBuildAllProjects)"
-      Outputs="@(_CompileWithObjectPath -> '%(ObjectPath)%(Filename).wixobj')"
-      DependsOnTargets="$(CompileDependsOn)"
-      Condition=" '@(Compile)' != '' ">
-    <Candle
-        SourceFiles="@(_CompileWithObjectPath)"
-        AdditionalOptions="$(CompilerAdditionalOptions)"
-        DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"
-        ExtensionDirectory="$(WixExtDir)"
-        Extensions="@(_ResolvedWixExtensionPaths)"
-        PreprocessToStdOut="$(PreprocessToStdOut)"
-        PreprocessToFile="$(PreprocessToFile)"
-        IncludeSearchPaths="$(IncludeSearchPaths)"
-        InstallerPlatform="$(InstallerPlatform)"
-        IntermediateDirectory="$(IntermediateOutputPath)"
-        NoLogo="$(CompilerNoLogo)"
-        OutputFile="%(_CompileWithObjectPath.ObjectPath)"
-        Pedantic="$(Pedantic)"
-        ReferencePaths="$(ReferencePaths)"
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        SuppressAllWarnings="$(CompilerSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(CompilerSuppressSpecificWarnings)"
-        ToolPath="$(WixToolDir)"
-        TreatWarningsAsErrors="$(CompilerTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(CompilerTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(CompilerVerboseOutput)">
-    </Candle>
-    <!-- These will be still be set even if the Compile target is up to date. -->
-    <ItemGroup>
-      <CompileObjOutput Include="@(_CompileWithObjectPath -> '%(ObjectPath)%(Filename).wixobj')" />
-      <FileWrites Include="@(CompileObjOutput)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ================================================================================================
-  Lib
-    Links the .wixobj, .wxl, .wixlib, wix extensions into a .wixlib file using lit.exe.
-    [IN]
-    @(CompileObjOutput) - The compiled .wixobj file.
-    @(EmbeddedResource) - The list of wxl files to use for localization.
-    @(WixObject) - The list of .wixobj files.
-    @(WixLibrary) - The list of .wixlib files.
-    @(WixExtension) - The list of wix dll extension files.
-    [OUT]
-    $(TargetPath) - The compiled .wixlib file.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <LibDependsOn>
-      PrepareForBuild;
-      ResolveReferences
-    </LibDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="Lib"
-      Inputs="@(CompileObjOutput);
-              @(EmbeddedResource);
-              @(WixObject);
-              @(WixLibrary);
-              @(_ResolvedWixExtensionPaths);
-              $(MSBuildAllProjects)"
-      Outputs="$(TargetPath)"
-      DependsOnTargets="$(LibDependsOn)"
-      Condition=" '$(OutputType)' == 'Library' ">
-    <Lit
-      ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)"
-      AdditionalOptions="$(LibAdditionalOptions)"
-      BindInputPaths="@(LinkerBindInputPaths)"
-      BindFiles="$(LibBindFiles)"
-      ExtensionDirectory="$(WixExtDir)"
-      Extensions="@(_ResolvedWixExtensionPaths)"
-      LocalizationFiles="@(EmbeddedResource)"
-      NoLogo="$(LibNoLogo)"
-      OutputFile="$(TargetPath)"
-      Pedantic="$(LibPedantic)"
-      ReferencePaths="$(ReferencePaths)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      SuppressAllWarnings="$(LibSuppressAllWarnings)"
-      SuppressIntermediateFileVersionMatching="$(LibSuppressIntermediateFileVersionMatching)"
-      SuppressSchemaValidation="$(LibSuppressSchemaValidation)"
-      SuppressSpecificWarnings="$(LibSuppressSpecificWarnings)"
-      ToolPath="$(WixToolDir)"
-      TreatWarningsAsErrors="$(LibTreatWarningsAsErrors)"
-      VerboseOutput="$(LibVerboseOutput)" />
-  </Target>
-  <!--
-  ================================================================================================
-  AssignCultures
-    Determines the final list of culture groups to build based on either the Cultures property or
-    those specified in .wxl files.
-      Culture groups specified in the Cultures property must be specified as a semi-colon
-      delimited  list of groups, with comma-delimited cultures within a group.
-      For example:
-        <Cultures>en-US,en;en-GB,en</Cultures>
-      This will build 2 targets, outputing to en-US and en-GB sub-folders.  Light will first look
-      for strings in the first culture (en-US or en-GB) then the second (en).
-      Cultures of .wxl files will be used when the Culture property is not set.  The culture of a
-      .wxl file is determined by the Culture attribute in the WixLocalization element in the file
-    Sets the OutputFolder metadata on each culture group.  In most cases this is the same as the
-    first culture in the culture group.  When the Culture's property is unspecified and no .wxl
-    files are provided this is the same as the output directory.  When the Culture's property
-    specifies a single culture group and no .wxl files are provided this is the same as the output
-    directory.
-    Updates the TargetPath and TargetPdbPath properties to be used in subsequent targets.
-    [IN]
-    @(EmbeddedResource) - The list of wxl files to use for localization.
-    $(Cultures) - The list of culture groups to build.
-    [OUT]
-    @(CultureGroup) - The list of culture group strings with OutputFolder metadata
-    $(TargetPath) - Property list of target link output MSIs/MSMs
-    $(TargetPdbPath) - Property list of target output pdbs
-    @(SignTargetPath) - The list of target to be signed
-  ================================================================================================
-  -->
-  <Target
-      Name="AssignCultures"
-      Condition=" '$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module' ">
-    <WixAssignCulture
-        Cultures="$(Cultures)"
-        Files="@(EmbeddedResource)">
-      <Output TaskParameter="CultureGroups" ItemName="CultureGroup" />
-    </WixAssignCulture>
-    <!-- Build an itemgroup of outputs -->
-    <ItemGroup>
-      <_TargetPathItems Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)" />
-      <_TargetPdbPathItems Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbName)" />
-    </ItemGroup>
-    <!-- Convert the itemgroup to a semicolon-delimited property -->
-    <PropertyGroup>
-      <TargetPath>@(_TargetPathItems)</TargetPath>
-      <TargetPdbPath>@(_TargetPdbPathItems)</TargetPdbPath>
-    </PropertyGroup>
-    <!-- Set the sign target items, if we're signing output. -->
-    <ItemGroup Condition=" '$(SignOutput)' == 'true' AND '$(SuppressLayout)' != 'true' ">
-      <SignTargetPath Include="@(_TargetPathItems)" />
-    </ItemGroup>
-  </Target>
-  <!--
-  ================================================================================================
-  ReadPreviousBindInputsAndBuiltOutputs
-    Reads a previous build's Bind contents and built outputs file into @(_BindInputs) and
-    @(_BindBuiltOutputs) respectively.
-    Note: Only the *built* outputs are used because using files copied to output folder
-          can cause perpetual incremental build.
-          Imagine the case where you have: Msi.wixproj -> Lib.wixproj -> Exe.csproj. The
-          Exe.csproj cannot be both an input to Lib.wixproj and an output of Msi.wixproj
-          (as an uncompressed file) because the Lib.wixproj will always newer than the
-          Exe.csproj.
-    [IN]
-    [OUT]
-    @(_BindInputs) - the content files required to bind (i.e. the Binary/@SourceFile and File/@Source files).
-    @(_BindBuiltOutputs) - the previously built .msi, .msm, .pcp, .exe .wixpdb, .cabs, etc.
-                           Does not include content copied to output folder.
-  ================================================================================================
-  -->
-  <Target
-    Name="ReadPreviousBindInputsAndBuiltOutputs">
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)">
-      <Output TaskParameter="Lines" ItemName="_BindInputs" />
-    </ReadLinesFromFile>
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_BindBuiltOutputs" />
-    </ReadLinesFromFile>
-    <Message Importance="low" Text="Previous bind inputs: @(_BindInputs)" />
-    <Message Importance="low" Text="Previous bind outputs: @(_BindBuiltOutputs)" />
-  </Target>
-  <!--
-  ================================================================================================
-  Link
-    Links the .wixobj, .wxl, .wixlib, wix extensions into an .msi or .msm file using light.exe,
-    once per culture group. All WXL files are passed into light and the culture switch determines
-    which are used
-    [IN]
-    @(CompileObjOutput) - The compiled .wixobj file.
-    @(CultureGroup) - The cultures to build
-    @(EmbeddedResource) - The list of wxl files to use for localization.
-    @(WixObject) - The list of .wixobj files.
-    @(WixLibrary) - The list of .wixlib files.
-    @(WixExtension) - The list of wix dll extension files.
-    [OUT]
-    $(TargetDir)\%(Culture)\$(TargetName)$(TargetExt) - The compiled .msi, .msm, or .exe files.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <LinkDependsOn>
-      PrepareForBuild;
-      ResolveReferences;
-      AssignCultures;
-      ReadPreviousBindInputsAndBuiltOutputs;
-    </LinkDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="Link"
-      Inputs="@(CompileObjOutput);
-              @(EmbeddedResource);
-              @(WixObject);
-              @(_ResolvedProjectReferencePaths);
-              @(_ResolvedWixLibraryPaths);
-              @(_ResolvedWixExtensionPaths);
-              $(MSBuildAllProjects);
-              @(_BindInputs)"
-      Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
-      DependsOnTargets="$(LinkDependsOn)"
-      Condition=" '$(OutputType)' == 'Bundle' or '$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module' ">
-    <PropertyGroup>
-      <PdbOutputFile>$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbName)</PdbOutputFile>
-    </PropertyGroup>
-    <!-- Call light using the culture subdirectory for output -->
-    <Light
-      ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
-      AdditionalOptions="$(LinkerAdditionalOptions)"
-      AllowIdenticalRows="$(AllowIdenticalRows)"
-      AllowUnresolvedReferences="$(AllowUnresolvedReferences)"
-      AdditionalCub="$(AdditionalCub)"
-      BackwardsCompatibleGuidGeneration="$(BackwardsCompatibleGuidGeneration)"
-      BindInputPaths="@(LinkerBindInputPaths)"
-      BindFiles="$(LinkerBindFiles)"
-      BindContentsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)"
-      BindOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)"
-      BindBuiltOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)"
-      CabinetCachePath="$(CabinetCachePath)"
-      CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
-      Cultures="%(CultureGroup.Identity)"
-      CustomBinder="$(CustomBinder)"
-      DefaultCompressionLevel="$(DefaultCompressionLevel)"
-      DropUnrealTables="$(DropUnrealTables)"
-      ExactAssemblyVersions="$(ExactAssemblyVersions)"
-      ExtensionDirectory="$(WixExtDir)"
-      Extensions="@(_ResolvedWixExtensionPaths)"
-      Ices="$(Ices)"
-      LeaveTemporaryFiles="$(LeaveTemporaryFiles)"
-      LocalizationFiles="@(EmbeddedResource)"
-      NoLogo="$(LinkerNoLogo)"
-      OutputAsXml="$(OutputAsXml)"
-      OutputFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)"
-      PdbOutputFile="$(PdbOutputFile)"
-      Pedantic="$(LinkerPedantic)"
-      ReferencePaths="$(ReferencePaths)"
-      ReuseCabinetCache="$(ReuseCabinetCache)"
-      RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-      SuppressAclReset="$(SuppressAclReset)"
-      SuppressAllWarnings="$(LinkerSuppressAllWarnings)"
-      SuppressAssemblies="$(SuppressAssemblies)"
-      SuppressDefaultAdminSequenceActions="$(SuppressDefaultAdminSequenceActions)"
-      SuppressDefaultAdvSequenceActions="$(SuppressDefaultAdvSequenceActions)"
-      SuppressDefaultUISequenceActions="$(SuppressDefaultUISequenceActions)"
-      SuppressFileHashAndInfo="$(SuppressFileHashAndInfo)"
-      SuppressFiles="$(SuppressFiles)"
-      SuppressIntermediateFileVersionMatching="$(LinkerSuppressIntermediateFileVersionMatching)"
-      SuppressIces="$(SuppressIces)"
-      SuppressLayout="$(SuppressLayout)"
-      SuppressLocalization="$(SuppressLocalization)"
-      SuppressMsiAssemblyTableProcessing="$(SuppressMsiAssemblyTableProcessing)"
-      SuppressPdbOutput="$(SuppressPdbOutput)"
-      SuppressSchemaValidation="$(LinkerSuppressSchemaValidation)"
-      SuppressValidation="$(SuppressValidation)"
-      SuppressSpecificWarnings="$(LinkerSuppressSpecificWarnings)"
-      SuppressTagSectionIdAttributeOnTuples="$(SuppressTagSectionIdAttributeOnTuples)"
-      ToolPath="$(WixToolDir)"
-      TreatWarningsAsErrors="$(LinkerTreatWarningsAsErrors)"
-      UnreferencedSymbolsFile="$(UnreferencedSymbolsFile)"
-      VerboseOutput="$(LinkerVerboseOutput)"
-      WixProjectFile="$(ProjectPath)"
-      WixVariables="$(WixVariables)" />
-  </Target>
-  <!--
-  ================================================================================================
-  UpdateLinkFileWrites
-    Reads the bind outputs file(s) output generated during Link to correctly set the @(FileWrites)
-    item. Most targets have it easy because they can do a static mapping from inputs to the outputs.
-    However, the Link target outputs are determined after a rather complex calculation we call
-    linking and binding!
-    This target runs independently after Link to ensure that @(FileWrites) is updated even if the
-    "Light" task fails.
-    [IN]
-    Path to bind outputs file(s).
-    [OUT]
-    @(FileWrites) updated with outputs from bind.
-  ================================================================================================
-  -->
-  <Target
-      Name="UpdateLinkFileWrites">
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="FileWrites"/>
-    </ReadLinesFromFile>
-    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)') " />
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)') " />
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)') " />
-    </ItemGroup>
-    <Message Importance="low" Text="Build files after link: @(FileWrites)" />
-  </Target>
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  AllProjectOutputGroups Section
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-  <!--
-  ==================================================================================================
-  AllProjectOutputGroups - OVERRIDE Target
-  ==================================================================================================
-  -->
-  <Target
-      Name="AllProjectOutputGroups"
-      DependsOnTargets="
-        BuiltProjectOutputGroup;
-        DebugSymbolsProjectOutputGroup;
-        SourceFilesProjectOutputGroup;
-        ContentFilesProjectOutputGroup" />
-  <!--
-  This is the key output for the BuiltProjectOutputGroup and is meant to be read directly from the IDE.
-  Reading an item is faster than invoking a target.
-  -->
-  <ItemGroup>
-    <BuiltProjectOutputGroupKeyOutput Include="$(TargetPath)">
-      <IsKeyOutput>true</IsKeyOutput>
-      <FinalOutputPath>$(TargetPath)</FinalOutputPath>
-      <TargetPath>$(TargetFileName)</TargetPath>
-    </BuiltProjectOutputGroupKeyOutput>
-  </ItemGroup>
-  <!--
-  ==================================================================================================
-  BuiltProjectOutputGroup - OVERRIDE Target
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <BuiltProjectOutputGroupDependsOn>PrepareForBuild;AssignCultures</BuiltProjectOutputGroupDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="BuiltProjectOutputGroup"
-    Outputs="@(BuiltProjectOutputGroupOutput)"
-    DependsOnTargets="$(BuiltProjectOutputGroupDependsOn)">
-    <!-- Don't add BuiltProjectOutputGroupKeyOutput - to avoid duplicates, we only want to get the updated list of TargetPaths from the TargetPath property below -->
-    <!-- Try to read the outputs from the bind outputs text file since that's the output list straight from linker. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_BuiltProjectOutputGroupOutputIntermediate"/>
-    </ReadLinesFromFile>
-    <!-- If we didn't get anything from the bind outputs text file, default to the target path. -->
-    <ItemGroup Condition=" '@(_BuiltProjectOutputGroupOutputIntermediate)'=='' ">
-      <_BuiltProjectOutputGroupOutputIntermediate Include="$(TargetPath)" />
-    </ItemGroup>
-    <!-- Convert intermediate items into final items; this way we can get the full path for each item -->
-    <ItemGroup>
-      <BuiltProjectOutputGroupOutput Include="@(_BuiltProjectOutputGroupOutputIntermediate->'%(FullPath)')">
-        <!-- For compatibility with 2.0 -->
-        <OriginalItemSpec Condition="'%(_BuiltProjectOutputGroupOutputIntermediate.OriginalItemSpec)' == ''">%(_BuiltProjectOutputGroupOutputIntermediate.FullPath)</OriginalItemSpec>
-      </BuiltProjectOutputGroupOutput>
-    </ItemGroup>
-  </Target>
-  <!--
-  ==================================================================================================
-  DebugSymbolsProjectOutputGroup
-    Populates the Debug Symbols project output group.
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <DebugSymbolsProjectOutputGroupDependsOn>AssignCultures</DebugSymbolsProjectOutputGroupDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="DebugSymbolsProjectOutputGroup"
-    Outputs="@(DebugSymbolsProjectOutputGroupOutput)"
-    DependsOnTargets="$(DebugSymbolsProjectOutputGroupDependsOn)">
-    <!-- Include build output pdb(s).  Different than predefined itemgroup since AssignCultures target may change -->
-    <ItemGroup>
-      <DebugSymbolsProjectOutputGroupOutput Include="$(TargetPdbPath)" Condition=" '$(SuppressPdbOutput)' != 'true' "/>
-    </ItemGroup>
-  </Target>
-  <!--
-  ==================================================================================================
-  CopyFilesToOutputDirectory - OVERRIDE Target
-  Copy all build outputs, satellites and other necessary files to the final directory.
-  ============================================================
-  -->
-  <Target
-      Name="CopyFilesToOutputDirectory">
-    <PropertyGroup>
-      <!-- By default we're using hard links to copy to the output directory, disabling this could slow the build significantly -->
-      <CreateHardLinksForCopyFilesToOutputDirectoryIfPossible Condition=" '$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)' == '' ">true</CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>
-    </PropertyGroup>
-    <PropertyGroup>
-      <CopyBuildOutputToOutputDirectory Condition="'$(CopyBuildOutputToOutputDirectory)'==''">true</CopyBuildOutputToOutputDirectory>
-      <CopyOutputSymbolsToOutputDirectory Condition="'$(CopyOutputSymbolsToOutputDirectory)'==''">true</CopyOutputSymbolsToOutputDirectory>
-      <FullIntermediateOutputPath>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)))</FullIntermediateOutputPath>
-    </PropertyGroup>
-    <!-- Copy the bound files. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_FullPathToCopy"/>
-    </ReadLinesFromFile>
-    <ItemGroup>
-      <_FullPathToCopy Include="$(OutputFile)" Condition=" '@(_FullPathToCopy)'=='' " />
-      <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.Identity)))" />
-    </ItemGroup>
-    <Copy
-        SourceFiles="@(_RelativePath->'$(IntermediateOutputPath)%(Identity)')"
-        DestinationFiles="@(_RelativePath->'$(OutDir)%(Identity)')"
-        SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
-        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
-        Retries="$(CopyRetryCount)"
-        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
-        UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
-        Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)' != 'true'"
-            >
-      <Output TaskParameter="DestinationFiles" ItemName="MainAssembly"/>
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
-    </Copy>
-    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(TargetPath)" Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />
-    <!--<Message Importance="High" Text="$(MSBuildProjectName) -&gt; @(MainAssembly->'%(FullPath)')" Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />-->
-    <!-- Copy the debug information file (.pdb), if any
-    <Copy
-        SourceFiles="@(_DebugSymbolsIntermediatePath)"
-        DestinationFiles="@(_DebugSymbolsOutputPath)"
-        SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
-        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
-        Retries="$(CopyRetryCount)"
-        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
-        UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
-        Condition="'$(_DebugSymbolsProduced)'=='true' and '$(SkipCopyingSymbolsToOutputDirectory)' != 'true' and '$(CopyOutputSymbolsToOutputDirectory)'=='true'">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
-    </Copy>
-    -->
-  </Target>
-  <Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" />
-  <Import Project="$(WixSigningTargetsPath)" Condition=" '$(WixSigningTargetsPath)' != '' and Exists('$(WixSigningTargetsPath)')" />
-  <Import Project="$(LuxTargetsPath)" Condition=" '$(LuxTargetsPath)' != '' and Exists('$(LuxTargetsPath)')" />
-  <!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
-  <Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" />
-</Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
deleted file mode 100644
index 73f331ff..00000000
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>netstandard2.0</TargetFramework>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <Description>Internal WiX Toolset Tools</Description>
-    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
-    <NuspecBasePath>$(OutputPath)publish</NuspecBasePath>
-    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-  </ItemGroup>
-  <PropertyGroup>
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
-  </PropertyGroup>
-  <Target Name="SetNuspecVersion">
-    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
-</Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
deleted file mode 100644
index a461557a..00000000
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-  <files>
-    <file src="$projectFolder$$id$.props" target="build" />
-    <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
-    <file src="net461\*" target="tools\net461" />
-    <file src="net461\redirects\*" target="msbuild" />
-  </files>
-</package>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
deleted file mode 100644
index 8d71aa66..00000000
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\net461\wix.targets</WixTargetsPath>
-  </PropertyGroup>
-</Project>
diff --git a/src/WixToolset.Core.TestPackage/WixRunner.cs b/src/WixToolset.Core.TestPackage/WixRunner.cs
index ca0a6fb8..45c7ab3d 100644
--- a/src/WixToolset.Core.TestPackage/WixRunner.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunner.cs
@@ -2,9 +2,11 @@
 namespace WixToolset.Core.TestPackage
 {
+    using System;
    using System.Collections.Generic;
    using WixToolset.Data;
    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
    public static class WixRunner
    {
@@ -12,12 +14,41 @@ namespace WixToolset.Core.TestPackage
        {
            var listener = new TestListener();
-            var program = new Program();
-            var result = program.Run(new WixToolsetServiceProvider(), listener, args);
            messages = listener.Messages;
-            return result;
+            var serviceProvider = new WixToolsetServiceProvider();
+            var messaging = serviceProvider.GetService<IMessaging>();
+            messaging.SetListener(listener);
+            var arguments = serviceProvider.GetService<ICommandLineArguments>();
+            arguments.Populate(args);
+            var context = serviceProvider.GetService<ICommandLineContext>();
+            context.Messaging = messaging;
+            context.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
+            context.Arguments = arguments;
+            var commandLine = serviceProvider.GetService<ICommandLine>();
+            var command = commandLine.ParseStandardCommandLine(context);
+            return command?.Execute() ?? 1;
+        }
+        private static IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, string[] extensions)
+        {
+            var extensionManager = serviceProvider.GetService<IExtensionManager>();
+            foreach (var type in new[] { typeof(WixToolset.Core.Burn.WixToolsetStandardBackend), typeof(WixToolset.Core.WindowsInstaller.WixToolsetStandardBackend) })
+            {
+                extensionManager.Add(type.Assembly);
+            }
+            foreach (var extension in extensions)
+            {
+                extensionManager.Load(extension);
+            }
+            return extensionManager;
        }
        private class TestListener : IMessageListener
diff --git a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
index 2b9e2bde..6cdd8762 100644
--- a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+++ b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
@@ -10,7 +10,6 @@
  </PropertyGroup>
  <ItemGroup>
-    <ProjectReference Include="..\wix\wix.csproj" IncludeAssets="true" />
    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" IncludeAssets="true" />
    <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" IncludeAssets="true" />
    <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" />
@@ -18,7 +17,6 @@
  <!-- This is a workaround until https://github.com/NuGet/Home/issues/3891 is resolved -->
  <ItemGroup>
-    <_PackageFiles Include="$(OutputPath)\wix.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
    <_PackageFiles Include="$(OutputPath)\WixToolset.Core.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
    <_PackageFiles Include="$(OutputPath)\WixToolset.Core.Burn.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
    <_PackageFiles Include="$(OutputPath)\WixToolset.Core.WindowsInstaller.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
@@ -37,6 +35,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
  </ItemGroup>
 </Project>
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 60aec15b..11198b2b 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Core.WindowsInstaller
    internal class MsiBackend : IBackend
    {
-        public BindResult Bind(WixToolset.Extensibility.IBindContext context)
+        public BindResult Bind(IBindContext context)
        {
            var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj
index 3c3ac5d7..1d884489 100644
--- a/src/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/WixToolset.Core/WixToolset.Core.csproj
@@ -28,6 +28,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
  </ItemGroup>
 </Project>
diff --git a/src/candle/App.ico b/src/candle/App.ico
deleted file mode 100644
index 3a5525fd..00000000
--- a/src/candle/App.ico
+++ /dev/null
Binary files differ
diff --git a/src/candle/AssemblyInfo.cs b/src/candle/AssemblyInfo.cs
deleted file mode 100644
index 7df55940..00000000
--- a/src/candle/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +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.
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-[assembly: AssemblyTitle("WiX Toolset Compiler")]
-[assembly: AssemblyDescription("Compiler")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
diff --git a/src/candle/CandleCommandLine.cs b/src/candle/CandleCommandLine.cs
deleted file mode 100644
index 81fdf7b2..00000000
--- a/src/candle/CandleCommandLine.cs
+++ /dev/null
@@ -1,343 +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.Tools
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using WixToolset.Data;
-    /// <summary>
-    /// Parse command line for candle.
-    /// </summary>
-    public class CandleCommandLine
-    {
-        public CandleCommandLine()
-        {
-            this.Platform = Platform.X86;
-            this.ShowLogo = true;
-            this.Extensions = new List<string>();
-            this.Files = new List<CompileFile>();
-            this.IncludeSearchPaths = new List<string>();
-            this.PreprocessorVariables = new Dictionary<string, string>();
-        }
-        public Platform Platform { get; private set; }
-        public bool ShowLogo { get; private set; }
-        public bool ShowHelp { get; private set; }
-        public bool ShowPedanticMessages { get; private set; }
-        public string OutputFolder { get; private set; }
-        public string OutputFile { get; private set; }
-        public List<string> Extensions { get; private set; }
-        public List<CompileFile> Files { get; private set; }
-        public List<string> IncludeSearchPaths { get; private set; }
-        public string PreprocessFile { get; private set; }
-        public Dictionary<string, string> PreprocessorVariables { get; private set; }
-        /// <summary>
-        /// Parse the commandline arguments.
-        /// </summary>
-        /// <param name="args">Commandline arguments.</param>
-        public string[] Parse(string[] args)
-        {
-            List<string> unprocessed = new List<string>();
-            for (int i = 0; i < args.Length; ++i)
-            {
-                string arg = args[i];
-                if (String.IsNullOrEmpty(arg)) // skip blank arguments
-                {
-                    continue;
-                }
-                if (1 == arg.Length) // treat '-' and '@' as filenames when by themselves.
-                {
-                    unprocessed.Add(arg);
-                }
-                else if ('-' == arg[0] || '/' == arg[0])
-                {
-                    string parameter = arg.Substring(1);
-                    if ('d' == parameter[0])
-                    {
-                        if (1 >= parameter.Length || '=' == parameter[1])
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.InvalidVariableDefinition(arg));
-                            break;
-                        }
-                        parameter = arg.Substring(2);
-                        string[] value = parameter.Split("=".ToCharArray(), 2);
-                        if (this.PreprocessorVariables.ContainsKey(value[0]))
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.DuplicateVariableDefinition(value[0], (1 == value.Length) ? String.Empty : value[1], this.PreprocessorVariables[value[0]]));
-                            break;
-                        }
-                        if (1 == value.Length)
-                        {
-                            this.PreprocessorVariables.Add(value[0], String.Empty);
-                        }
-                        else
-                        {
-                            this.PreprocessorVariables.Add(value[0], value[1]);
-                        }
-                    }
-                    else if ('I' == parameter[0])
-                    {
-                        this.IncludeSearchPaths.Add(parameter.Substring(1));
-                    }
-                    else if ("ext" == parameter)
-                    {
-                        if (!CommandLine.IsValidArg(args, ++i))
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.TypeSpecificationForExtensionRequired("-ext"));
-                            break;
-                        }
-                        else
-                        {
-                            this.Extensions.Add(args[i]);
-                        }
-                    }
-                    else if ("nologo" == parameter)
-                    {
-                        this.ShowLogo = false;
-                    }
-                    else if ("o" == parameter || "out" == parameter)
-                    {
-                        string path = CommandLine.GetFileOrDirectory(parameter, args, ++i);
-                        if (!String.IsNullOrEmpty(path))
-                        {
-                            if (path.EndsWith("\\", StringComparison.Ordinal) || path.EndsWith("/", StringComparison.Ordinal))
-                            {
-                                this.OutputFolder = path;
-                            }
-                            else
-                            {
-                                this.OutputFile = path;
-                            }
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-                    else if ("pedantic" == parameter)
-                    {
-                        this.ShowPedanticMessages = true;
-                    }
-                    else if ("arch" == parameter)
-                    {
-                        if (!CommandLine.IsValidArg(args, ++i))
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.InvalidPlatformParameter(parameter, String.Empty));
-                            break;
-                        }
-                        if (String.Equals(args[i], "intel", StringComparison.OrdinalIgnoreCase) || String.Equals(args[i], "x86", StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.Platform = Platform.X86;
-                        }
-                        else if (String.Equals(args[i], "x64", StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.Platform = Platform.X64;
-                        }
-                        else if (String.Equals(args[i], "intel64", StringComparison.OrdinalIgnoreCase) || String.Equals(args[i], "ia64", StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.Platform = Platform.IA64;
-                        }
-                        else if (String.Equals(args[i], "arm", StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.Platform = Platform.ARM;
-                        }
-                        else
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.InvalidPlatformParameter(parameter, args[i]));
-                        }
-                    }
-                    else if ('p' == parameter[0])
-                    {
-                        string file = parameter.Substring(1);
-                        this.PreprocessFile = String.IsNullOrEmpty(file) ? "con:" : file;
-                    }
-                    else if (parameter.StartsWith("sw", StringComparison.Ordinal))
-                    {
-                        string paramArg = parameter.Substring(2);
-                        try
-                        {
-                            if (0 == paramArg.Length)
-                            {
-                                Messaging.Instance.SuppressAllWarnings = true;
-                            }
-                            else
-                            {
-                                int suppressWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
-                                if (0 >= suppressWarning)
-                                {
-                                    Messaging.Instance.OnMessage(WixErrors.IllegalSuppressWarningId(paramArg));
-                                }
-                                Messaging.Instance.SuppressWarningMessage(suppressWarning);
-                            }
-                        }
-                        catch (FormatException)
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.IllegalSuppressWarningId(paramArg));
-                        }
-                        catch (OverflowException)
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.IllegalSuppressWarningId(paramArg));
-                        }
-                    }
-                    else if (parameter.StartsWith("wx", StringComparison.Ordinal))
-                    {
-                        string paramArg = parameter.Substring(2);
-                        try
-                        {
-                            if (0 == paramArg.Length)
-                            {
-                                Messaging.Instance.WarningsAsError = true;
-                            }
-                            else
-                            {
-                                int elevateWarning = Convert.ToInt32(paramArg, CultureInfo.InvariantCulture.NumberFormat);
-                                if (0 >= elevateWarning)
-                                {
-                                    Messaging.Instance.OnMessage(WixErrors.IllegalWarningIdAsError(paramArg));
-                                }
-                                Messaging.Instance.ElevateWarningMessage(elevateWarning);
-                            }
-                        }
-                        catch (FormatException)
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.IllegalWarningIdAsError(paramArg));
-                        }
-                        catch (OverflowException)
-                        {
-                            Messaging.Instance.OnMessage(WixErrors.IllegalWarningIdAsError(paramArg));
-                        }
-                    }
-                    else if ("v" == parameter)
-                    {
-                        Messaging.Instance.ShowVerboseMessages = true;
-                    }
-                    else if ("?" == parameter || "help" == parameter)
-                    {
-                        this.ShowHelp = true;
-                        break;
-                    }
-                    else
-                    {
-                        unprocessed.Add(arg);
-                    }
-                }
-                else if ('@' == arg[0])
-                {
-                    string[] parsedArgs = CommandLineResponseFile.Parse(arg.Substring(1));
-                    string[] unparsedArgs = this.Parse(parsedArgs);
-                    unprocessed.AddRange(unparsedArgs);
-                }
-                else
-                {
-                    unprocessed.Add(arg);
-                }
-            }
-            return unprocessed.ToArray();
-        }
-        public string[] ParsePostExtensions(string[] remaining)
-        {
-            List<string> unprocessed = new List<string>();
-            List<string> files = new List<string>();
-            for (int i = 0; i < remaining.Length; ++i)
-            {
-                string arg = remaining[i];
-                if (String.IsNullOrEmpty(arg)) // skip blank arguments
-                {
-                    continue;
-                }
-                if (1 < arg.Length && ('-' == arg[0] || '/' == arg[0]))
-                {
-                    unprocessed.Add(arg);
-                }
-                else
-                {
-                    files.AddRange(CommandLine.GetFiles(arg, "Source"));
-                }
-            }
-            if (0 == files.Count)
-            {
-                this.ShowHelp = true;
-            }
-            else
-            {
-                Dictionary<string, List<string>> sourcesForOutput = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
-                foreach (string file in files)
-                {
-                    string sourceFileName = Path.GetFileName(file);
-                    CompileFile compileFile = new CompileFile();
-                    compileFile.SourcePath = Path.GetFullPath(file);
-                    if (null != this.OutputFile)
-                    {
-                        compileFile.OutputPath = this.OutputFile;
-                    }
-                    else if (null != this.OutputFolder)
-                    {
-                        compileFile.OutputPath = Path.Combine(this.OutputFolder, Path.ChangeExtension(sourceFileName, ".wixobj"));
-                    }
-                    else
-                    {
-                        compileFile.OutputPath = Path.ChangeExtension(sourceFileName, ".wixobj");
-                    }
-                    // Track which source files result in a given output file, to ensure we aren't
-                    // overwriting the output.
-                    List<string> sources;
-                    string targetPath = Path.GetFullPath(compileFile.OutputPath);
-                    if (!sourcesForOutput.TryGetValue(targetPath, out sources))
-                    {
-                        sources = new List<string>();
-                        sourcesForOutput.Add(targetPath, sources);
-                    }
-                    sources.Add(compileFile.SourcePath);
-                    this.Files.Add(compileFile);
-                }
-                // Show an error for every output file that had more than 1 source file.
-                foreach (KeyValuePair<string, List<string>> outputSources in sourcesForOutput)
-                {
-                    if (1 < outputSources.Value.Count)
-                    {
-                        string sourceFiles = String.Join(", ", outputSources.Value);
-                        Messaging.Instance.OnMessage(WixErrors.DuplicateSourcesForOutput(sourceFiles, outputSources.Key));
-                    }
-                }
-            }
-            return unprocessed.ToArray();
-        }
-    }
-}
diff --git a/src/candle/CandleStrings.Designer.cs b/src/candle/CandleStrings.Designer.cs
deleted file mode 100644
index aaf7254e..00000000
--- a/src/candle/CandleStrings.Designer.cs
+++ /dev/null
@@ -1,81 +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.Tools {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class CandleStrings {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal CandleStrings() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.Tools.CandleStrings", typeof(CandleStrings).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot specify more than one source file with single output file.  Either specify an output directory for the -out argument by ending the argument with a &apos;\&apos; or remove the -out argument to have the source files compiled to the current directory..
-        /// </summary>
-        internal static string CannotSpecifyMoreThanOneSourceFileForSingleTargetFile {
-            get {
-                return ResourceManager.GetString("CannotSpecifyMoreThanOneSourceFileForSingleTargetFile", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to  usage:  candle.exe [-?] [-nologo] [-out outputFile] sourceFile [sourceFile ...] [@responseFile]
-        ///
-        ///   -arch      set architecture defaults for package, components, etc.
-        ///              values: x86, x64, or ia64 (default: x86)
-        ///   -d&lt;name&gt;[=&lt;value&gt;]  define a parameter for the preprocessor
-        ///   -ext &lt;extension&gt;  extension assembly or &quot;class, assembly&quot;
-        ///   -I&lt;dir&gt;    add to include search path
-        ///   -nologo    skip printing candle logo information
-        ///   -o[ut]     s [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string HelpMessage {
-            get {
-                return ResourceManager.GetString("HelpMessage", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/candle/CandleStrings.resx b/src/candle/CandleStrings.resx
deleted file mode 100644
index d77788ca..00000000
--- a/src/candle/CandleStrings.resx
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="CannotSpecifyMoreThanOneSourceFileForSingleTargetFile" xml:space="preserve">
-    <value>Cannot specify more than one source file with single output file.  Either specify an output directory for the -out argument by ending the argument with a '\' or remove the -out argument to have the source files compiled to the current directory.</value>
-  </data>
-  <data name="HelpMessage" xml:space="preserve">
-    <value> usage:  candle.exe [-?] [-nologo] [-out outputFile] sourceFile [sourceFile ...] [@responseFile]
-   -arch      set architecture defaults for package, components, etc.
-              values: x86, x64, ia64 or arm (default: x86)
-   -d&lt;name&gt;[=&lt;value&gt;]  define a parameter for the preprocessor
-   -ext &lt;extension&gt;  extension assembly or "class, assembly"
-   -I&lt;dir&gt;    add to include search path
-   -nologo    skip printing candle logo information
-   -o[ut]     specify output file (default: write to current directory)
-   -p&lt;file&gt;   preprocess to a file (or stdout if no file supplied)
-   -pedantic  show pedantic messages
-   -sw[N]     suppress all warnings or a specific message ID
-              (example: -sw1009 -sw1103)
-   -v         verbose output
-   -wx[N]     treat all warnings or a specific message ID as an error
-              (example: -wx1009 -wx1103)
-   -? | -help this help information</value>
-  </data>
-</root>
-\ No newline at end of file
diff --git a/src/candle/CompileFile.cs b/src/candle/CompileFile.cs
deleted file mode 100644
index 682acc21..00000000
--- a/src/candle/CompileFile.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.
-namespace WixToolset.Tools
-{
-    /// <summary>
-    /// Source code file to be compiled.
-    /// </summary>
-    public class CompileFile
-    {
-        /// <summary>
-        /// Path to the source code file.
-        /// </summary>
-        public string SourcePath { get; set; }
-        /// <summary>
-        /// Path to compile the output to.
-        /// </summary>
-        public string OutputPath { get; set; }
-    }
-}
diff --git a/src/candle/app.config b/src/candle/app.config
deleted file mode 100644
index 71c529fb..00000000
--- a/src/candle/app.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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. -->
-<configuration>
-    <runtime>
-        <loadFromRemoteSources enabled="true"/>
-    </runtime>
-</configuration>
diff --git a/src/candle/candle.cs b/src/candle/candle.cs
deleted file mode 100644
index f5c65cb1..00000000
--- a/src/candle/candle.cs
+++ /dev/null
@@ -1,200 +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.Tools
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Xml.Linq;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    /// <summary>
-    /// The main entry point for candle.
-    /// </summary>
-    public sealed class Candle
-    {
-        private CandleCommandLine commandLine;
-        private IEnumerable<IPreprocessorExtension> preprocessorExtensions;
-        private IEnumerable<ICompilerExtension> compilerExtensions;
-        private IEnumerable<IExtensionData> extensionData;
-        /// <summary>
-        /// The main entry point for candle.
-        /// </summary>
-        /// <param name="args">Commandline arguments for the application.</param>
-        /// <returns>Returns the application error code.</returns>
-        [MTAThread]
-        public static int Main(string[] args)
-        {
-            AppCommon.PrepareConsoleForLocalization();
-            Messaging.Instance.InitializeAppName("CNDL", "candle.exe").Display += AppCommon.ConsoleDisplayMessage;
-            Candle candle = new Candle();
-            return candle.Execute(args);
-        }
-        private int Execute(string[] args)
-        {
-            try
-            {
-                string[] unparsed = this.ParseCommandLineAndLoadExtensions(args);
-                if (!Messaging.Instance.EncounteredError)
-                {
-                    if (this.commandLine.ShowLogo)
-                    {
-                        AppCommon.DisplayToolHeader();
-                    }
-                    if (this.commandLine.ShowHelp)
-                    {
-                        Console.WriteLine(CandleStrings.HelpMessage);
-                        AppCommon.DisplayToolFooter();
-                    }
-                    else
-                    {
-                        foreach (string arg in unparsed)
-                        {
-                            Messaging.Instance.OnMessage(WixWarnings.UnsupportedCommandLineArgument(arg));
-                        }
-                        this.Run();
-                    }
-                }
-            }
-            catch (WixException we)
-            {
-                Messaging.Instance.OnMessage(we.Error);
-            }
-            catch (Exception e)
-            {
-                Messaging.Instance.OnMessage(WixErrors.UnexpectedException(e.Message, e.GetType().ToString(), e.StackTrace));
-                if (e is NullReferenceException || e is SEHException)
-                {
-                    throw;
-                }
-            }
-            return Messaging.Instance.LastErrorNumber;
-        }
-        private string[] ParseCommandLineAndLoadExtensions(string[] args)
-        {
-            this.commandLine = new CandleCommandLine();
-            string[] unprocessed = commandLine.Parse(args);
-            if (Messaging.Instance.EncounteredError)
-            {
-                return unprocessed;
-            }
-            // Load extensions.
-            ExtensionManager extensionManager = new ExtensionManager();
-            foreach (string extension in this.commandLine.Extensions)
-            {
-                extensionManager.Load(extension);
-            }
-            // Preprocessor extension command line processing.
-            this.preprocessorExtensions = extensionManager.Create<IPreprocessorExtension>();
-            foreach (IExtensionCommandLine pce in this.preprocessorExtensions.Where(e => e is IExtensionCommandLine).Cast<IExtensionCommandLine>())
-            {
-                pce.MessageHandler = Messaging.Instance;
-                unprocessed = pce.ParseCommandLine(unprocessed);
-            }
-            // Compiler extension command line processing.
-            this.compilerExtensions = extensionManager.Create<ICompilerExtension>();
-            foreach (IExtensionCommandLine cce in this.compilerExtensions.Where(e => e is IExtensionCommandLine).Cast<IExtensionCommandLine>())
-            {
-                cce.MessageHandler = Messaging.Instance;
-                unprocessed = cce.ParseCommandLine(unprocessed);
-            }
-            // Extension data command line processing.
-            this.extensionData = extensionManager.Create<IExtensionData>();
-            foreach (IExtensionCommandLine dce in this.extensionData.Where(e => e is IExtensionCommandLine).Cast<IExtensionCommandLine>())
-            {
-                dce.MessageHandler = Messaging.Instance;
-                unprocessed = dce.ParseCommandLine(unprocessed);
-            }
-            return commandLine.ParsePostExtensions(unprocessed);
-        }
-        private void Run()
-        {
-            // Create the preprocessor and compiler
-            Preprocessor preprocessor = new Preprocessor();
-            preprocessor.CurrentPlatform = this.commandLine.Platform;
-            foreach (string includePath in this.commandLine.IncludeSearchPaths)
-            {
-                preprocessor.IncludeSearchPaths.Add(includePath);
-            }
-            foreach (IPreprocessorExtension pe in this.preprocessorExtensions)
-            {
-                preprocessor.AddExtension(pe);
-            }
-            Compiler compiler = new Compiler();
-            compiler.ShowPedanticMessages = this.commandLine.ShowPedanticMessages;
-            compiler.CurrentPlatform = this.commandLine.Platform;
-            foreach (IExtensionData ed in this.extensionData)
-            {
-                compiler.AddExtensionData(ed);
-            }
-            foreach (ICompilerExtension ce in this.compilerExtensions)
-            {
-                compiler.AddExtension(ce);
-            }
-            // Preprocess then compile each source file.
-            foreach (CompileFile file in this.commandLine.Files)
-            {
-                // print friendly message saying what file is being compiled
-                Console.WriteLine(file.SourcePath);
-                // preprocess the source
-                XDocument sourceDocument;
-                try
-                {
-                    if (!String.IsNullOrEmpty(this.commandLine.PreprocessFile))
-                    {
-                        preprocessor.PreprocessOut = this.commandLine.PreprocessFile.Equals("con:", StringComparison.OrdinalIgnoreCase) ? Console.Out : new StreamWriter(this.commandLine.PreprocessFile);
-                    }
-                    sourceDocument = preprocessor.Process(file.SourcePath, this.commandLine.PreprocessorVariables);
-                }
-                finally
-                {
-                    if (null != preprocessor.PreprocessOut && Console.Out != preprocessor.PreprocessOut)
-                    {
-                        preprocessor.PreprocessOut.Close();
-                    }
-                }
-                // If we're not actually going to compile anything, move on to the next file.
-                if (null == sourceDocument || !String.IsNullOrEmpty(this.commandLine.PreprocessFile))
-                {
-                    continue;
-                }
-                // and now we do what we came here to do...
-                Intermediate intermediate = compiler.Compile(sourceDocument);
-                // save the intermediate to disk if no errors were found for this source file
-                if (null != intermediate)
-                {
-                    intermediate.Save(file.OutputPath);
-                }
-            }
-        }
-    }
-}
diff --git a/src/candle/candle.csproj b/src/candle/candle.csproj
deleted file mode 100644
index cea0cf62..00000000
--- a/src/candle/candle.csproj
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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 DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectGuid>{956401A5-3C04-4786-9611-B2AEC6207686}</ProjectGuid>
-    <AssemblyName>candle</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>WixToolset.Tools</RootNamespace>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="candle.cs" />
-    <Compile Include="CandleCommandLine.cs" />
-    <Compile Include="CompileFile.cs" />
-    <Compile Include="CandleStrings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CandleStrings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedNativeResource Include="candle.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="CandleStrings.resx">
-      <SubType>Designer</SubType>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>CandleStrings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <ProjectReference Include="..\..\libs\WixToolset.Data\WixToolset.Data.csproj">
-      <Project>{6a98499e-40ec-4335-9c31-96a2511d47c6}</Project>
-      <Name>WixToolset.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\libs\WixToolset.Extensibility\WixToolset.Extensibility.csproj">
-      <Project>{eee88c2a-45a0-4e48-a40a-431a4ba458d8}</Project>
-      <Name>WixToolset.Extensibility</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\wconsole\wconsole.csproj">
-      <Project>{4B2BD779-59F7-4BF1-871C-A75952BCA749}</Project>
-      <Name>wconsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\wix\Wix.csproj">
-      <Project>{9E03A94C-C70E-45C6-A269-E737BBD8B319}</Project>
-      <Name>Wix</Name>
-    </ProjectReference>
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
diff --git a/src/candle/candle.exe.manifest b/src/candle/candle.exe.manifest
deleted file mode 100644
index b05ab18b..00000000
--- a/src/candle/candle.exe.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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. -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
- <assemblyIdentity name="WixToolset.Tools.Candle" version="2.0.0.0" processorArchitecture="x86" type="win32"/> 
- <description>WiX Toolset Compiler</description> 
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
-</assembly>
diff --git a/src/candle/candle.rc b/src/candle/candle.rc
deleted file mode 100644
index 47864811..00000000
--- a/src/candle/candle.rc
+++ /dev/null
@@ -1,10 +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.
-#define VER_APP
-#define VER_ORIGINAL_FILENAME "candle.exe"
-#define VER_INTERNAL_NAME "candle"
-#define VER_FILE_DESCRIPTION "WiX Toolset Compiler"
-#include "wix.rc"
-#define MANIFEST_RESOURCE_ID 1
-MANIFEST_RESOURCE_ID RT_MANIFEST "candle.exe.manifest"
diff --git a/src/light/App.ico b/src/light/App.ico
deleted file mode 100644
index 3a5525fd..00000000
--- a/src/light/App.ico
+++ /dev/null
Binary files differ
diff --git a/src/light/AssemblyInfo.cs b/src/light/AssemblyInfo.cs
deleted file mode 100644
index ab2fc0ab..00000000
--- a/src/light/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +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.
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
diff --git a/src/light/LightCommandLine.cs b/src/light/LightCommandLine.cs
deleted file mode 100644
index 2aa9ea59..00000000
--- a/src/light/LightCommandLine.cs
+++ /dev/null
@@ -1,421 +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.Tools
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-    public class LightCommandLine
-    {
-        public LightCommandLine(IMessaging messaging)
-        {
-            this.Messaging = messaging;
-            this.ShowLogo = true;
-            this.Tidy = true;
-            this.CubeFiles = new List<string>();
-            this.SuppressIces = new List<string>();
-            this.Ices = new List<string>();
-            this.BindPaths = new List<BindPath>();
-            this.Files = new List<string>();
-            this.LocalizationFiles = new List<string>();
-            this.Variables = new Dictionary<string, string>();
-        }
-        public IMessaging Messaging { get; }
-        public string PdbFile { get; private set; }
-        public CompressionLevel? DefaultCompressionLevel { get; set; }
-        public bool SuppressAclReset { get; private set; }
-        public bool SuppressLayout { get; private set; }
-        public bool SuppressWixPdb { get; private set; }
-        public bool SuppressValidation { get; private set; }
-        public string IntermediateFolder { get; private set; }
-        public string OutputsFile { get; private set; }
-        public string BuiltOutputsFile { get; private set; }
-        public string WixprojectFile { get; private set; }
-        public string ContentsFile { get; private set; }
-        public List<string> Ices { get; private set; }
-        public string CabCachePath { get; private set; }
-        public int CabbingThreadCount { get; private set; }
-        public List<string> CubeFiles { get; private set; }
-        public List<string> SuppressIces { get; private set; }
-        public bool ShowLogo { get; private set; }
-        public bool ShowHelp { get; private set; }
-        public bool ShowPedanticMessages { get; private set; }
-        public bool SuppressLocalization { get; private set; }
-        public bool SuppressVersionCheck { get; private set; }
-        public string[] Cultures { get; private set; }
-        public string OutputFile { get; private set; }
-        public bool OutputXml { get; private set; }
-        public List<BindPath> BindPaths { get; private set; }
-        public List<string> Files { get; private set; }
-        public List<string> LocalizationFiles { get; private set; }
-        public bool Tidy { get; private set; }
-        public string UnreferencedSymbolsFile { get; private set; }
-        public IDictionary<string, string> Variables { get; private set; }
-        /// <summary>
-        /// Parse the commandline arguments.
-        /// </summary>
-        /// <param name="args">Commandline arguments.</param>
-        public string[] Parse(ICommandLineContext context)
-        {
-            var unprocessed = new List<string>();
-            var extensions = context.ExtensionManager.Create<IExtensionCommandLine>();
-            foreach (var extension in extensions)
-            {
-                extension.PreParse(context);
-            }
-            var parser = context.Arguments.Parse();
-            while (!this.ShowHelp &&
-                   String.IsNullOrEmpty(parser.ErrorArgument) &&
-                   parser.TryGetNextSwitchOrArgument(out var arg))
-            {
-                if (String.IsNullOrWhiteSpace(arg)) // skip blank arguments.
-                {
-                    continue;
-                }
-                if (parser.IsSwitch(arg))
-                {
-                    var parameter = arg.Substring(1);
-                    if (parameter.Equals("b", StringComparison.Ordinal))
-                    {
-                        var result = parser.GetNextArgumentOrError(arg);
-                        if (!String.IsNullOrEmpty(result))
-                        {
-                            var bindPath = BindPath.Parse(result);
-                            this.BindPaths.Add(bindPath);
-                        }
-                    }
-                    else if (parameter.StartsWith("cultures:", StringComparison.Ordinal))
-                    {
-                        string culturesString = arg.Substring(10).ToLower(CultureInfo.InvariantCulture);
-                        // When null is used treat it as if cultures wasn't specified.
-                        // This is needed for batching over the light task when using MSBuild which doesn't
-                        // support empty items
-                        if (culturesString.Equals("null", StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.Cultures = null;
-                        }
-                        else
-                        {
-                            this.Cultures = culturesString.Split(';', ',');
-                            for (int c = 0; c < this.Cultures.Length; ++c)
-                            {
-                                // Neutral is different from null. For neutral we still want to do WXL filtering.
-                                // Set the culture to the empty string = identifier for the invariant culture
-                                if (this.Cultures[c].Equals("neutral", StringComparison.OrdinalIgnoreCase))
-                                {
-                                    this.Cultures[c] = String.Empty;
-                                }
-                            }
-                        }
-                    }
-                    else if (parameter.StartsWith("dcl:", StringComparison.Ordinal))
-                    {
-                        string defaultCompressionLevel = arg.Substring(5);
-                        if (String.IsNullOrEmpty(defaultCompressionLevel))
-                        {
-                            break;
-                        }
-                        else if (Enum.TryParse(defaultCompressionLevel, true, out CompressionLevel compressionLevel))
-                        {
-                            this.DefaultCompressionLevel = compressionLevel;
-                        }
-                    }
-                    else if (parameter.StartsWith("d", StringComparison.Ordinal))
-                    {
-                        parameter = arg.Substring(2);
-                        string[] value = parameter.Split("=".ToCharArray(), 2);
-                        string preexisting;
-                        if (1 == value.Length)
-                        {
-                            this.Messaging.Write(ErrorMessages.ExpectedWixVariableValue(value[0]));
-                        }
-                        else if (this.Variables.TryGetValue(value[0], out preexisting))
-                        {
-                            this.Messaging.Write(ErrorMessages.WixVariableCollision(null, value[0]));
-                        }
-                        else
-                        {
-                            this.Variables.Add(value[0], value[1]);
-                        }
-                    }
-                    else if (parameter.Equals("loc", StringComparison.Ordinal))
-                    {
-                        parser.GetNextArgumentAsFilePathOrError(arg, "localization files", this.LocalizationFiles);
-                    }
-                    else if (parameter.Equals("nologo", StringComparison.Ordinal))
-                    {
-                        this.ShowLogo = false;
-                    }
-                    else if (parameter.Equals("notidy", StringComparison.Ordinal))
-                    {
-                        this.Tidy = false;
-                    }
-                    else if ("o" == parameter || "out" == parameter)
-                    {
-                        this.OutputFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.Equals("pedantic", StringComparison.Ordinal))
-                    {
-                        this.ShowPedanticMessages = true;
-                    }
-                    else if (parameter.Equals("sloc", StringComparison.Ordinal))
-                    {
-                        this.SuppressLocalization = true;
-                    }
-                    else if (parameter.Equals("usf", StringComparison.Ordinal))
-                    {
-                        this.UnreferencedSymbolsFile = parser.GetNextArgumentAsDirectoryOrError(arg);
-                    }
-                    else if (parameter.Equals("xo", StringComparison.Ordinal))
-                    {
-                        this.OutputXml = true;
-                    }
-                    else if (parameter.Equals("cc", StringComparison.Ordinal))
-                    {
-                        this.CabCachePath = parser.GetNextArgumentAsDirectoryOrError(arg);
-                    }
-                    else if (parameter.Equals("ct", StringComparison.Ordinal))
-                    {
-                        var result = parser.GetNextArgumentOrError(arg);
-                        if (!String.IsNullOrEmpty(result))
-                        {
-                            if (!Int32.TryParse(result, out var ct) || 0 >= ct)
-                            {
-                                this.Messaging.Write(ErrorMessages.IllegalCabbingThreadCount(result));
-                                parser.ErrorArgument = arg;
-                                break;
-                            }
-                            this.CabbingThreadCount = ct;
-                            this.Messaging.Write(VerboseMessages.SetCabbingThreadCount(this.CabbingThreadCount.ToString()));
-                        }
-                    }
-                    else if (parameter.Equals("cub", StringComparison.Ordinal))
-                    {
-                        parser.GetNextArgumentAsFilePathOrError(arg, "static validation files", this.CubeFiles);
-                    }
-                    else if (parameter.StartsWith("ice:", StringComparison.Ordinal))
-                    {
-                        this.Ices.Add(parameter.Substring(4));
-                    }
-                    else if (parameter.Equals("intermediatefolder", StringComparison.OrdinalIgnoreCase))
-                    {
-                        this.IntermediateFolder = parser.GetNextArgumentAsDirectoryOrError(arg);
-                    }
-                    else if (parameter.Equals("contentsfile", StringComparison.Ordinal))
-                    {
-                        this.ContentsFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.Equals("outputsfile", StringComparison.Ordinal))
-                    {
-                        this.OutputsFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.Equals("builtoutputsfile", StringComparison.Ordinal))
-                    {
-                        this.BuiltOutputsFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.Equals("wixprojectfile", StringComparison.Ordinal))
-                    {
-                        this.WixprojectFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.Equals("pdbout", StringComparison.Ordinal))
-                    {
-                        this.PdbFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                    }
-                    else if (parameter.StartsWith("sice:", StringComparison.Ordinal))
-                    {
-                        this.SuppressIces.Add(parameter.Substring(5));
-                    }
-                    else if (parameter.Equals("sl", StringComparison.Ordinal))
-                    {
-                        this.SuppressLayout = true;
-                    }
-                    else if (parameter.Equals("spdb", StringComparison.Ordinal))
-                    {
-                        this.SuppressWixPdb = true;
-                    }
-                    else if (parameter.Equals("sacl", StringComparison.Ordinal))
-                    {
-                        this.SuppressAclReset = true;
-                    }
-                    else if (parameter.Equals("sval", StringComparison.Ordinal))
-                    {
-                        this.SuppressValidation = true;
-                    }
-                    else if ("sv" == parameter)
-                    {
-                        this.SuppressVersionCheck = true;
-                    }
-                    else if (parameter.StartsWith("sw", StringComparison.Ordinal))
-                    {
-                        string paramArg = parameter.Substring(2);
-                        if (0 == paramArg.Length)
-                        {
-                            this.Messaging.SuppressAllWarnings = true;
-                        }
-                        else
-                        {
-                            int suppressWarning = 0;
-                            if (!Int32.TryParse(paramArg, out suppressWarning) || 0 >= suppressWarning)
-                            {
-                                this.Messaging.Write(ErrorMessages.IllegalSuppressWarningId(paramArg));
-                            }
-                            else
-                            {
-                                this.Messaging.SuppressWarningMessage(suppressWarning);
-                            }
-                        }
-                    }
-                    else if (parameter.StartsWith("wx", StringComparison.Ordinal))
-                    {
-                        string paramArg = parameter.Substring(2);
-                        if (0 == paramArg.Length)
-                        {
-                            this.Messaging.WarningsAsError = true;
-                        }
-                        else
-                        {
-                            int elevateWarning = 0;
-                            if (!Int32.TryParse(paramArg, out elevateWarning) || 0 >= elevateWarning)
-                            {
-                                this.Messaging.Write(ErrorMessages.IllegalWarningIdAsError(paramArg));
-                            }
-                            else
-                            {
-                                this.Messaging.ElevateWarningMessage(elevateWarning);
-                            }
-                        }
-                    }
-                    else if ("v" == parameter)
-                    {
-                        this.Messaging.ShowVerboseMessages = true;
-                    }
-                    else if ("?" == parameter || "help" == parameter)
-                    {
-                        this.ShowHelp = true;
-                        break;
-                    }
-                    else if (!this.TryParseCommandLineArgumentWithExtension(arg, parser, extensions))
-                    {
-                        unprocessed.Add(arg);
-                    }
-                }
-                else if (!this.TryParseCommandLineArgumentWithExtension(arg, parser, extensions))
-                {
-                    unprocessed.Add(arg);
-                }
-            }
-            return this.ParsePostExtensions(parser, unprocessed.ToArray());
-        }
-        private string[] ParsePostExtensions(IParseCommandLine parser, string[] remaining)
-        {
-            var unprocessed = new List<string>();
-            for (int i = 0; i < remaining.Length; ++i)
-            {
-                var arg = remaining[i];
-                if (parser.IsSwitch(arg))
-                {
-                    unprocessed.Add(arg);
-                }
-                else
-                {
-                    parser.GetArgumentAsFilePathOrError(arg, "source files", this.Files);
-                }
-            }
-            if (0 == this.Files.Count)
-            {
-                this.ShowHelp = true;
-            }
-            else if (String.IsNullOrEmpty(this.OutputFile))
-            {
-                if (1 < this.Files.Count)
-                {
-                    this.Messaging.Write(ErrorMessages.MustSpecifyOutputWithMoreThanOneInput());
-                }
-                // After the linker tells us what the output type actually is, we'll change the ".wix" to the correct extension.
-                this.OutputFile = Path.ChangeExtension(Path.GetFileName(this.Files[0]), ".wix");
-                // Add the directories of the input files as unnamed bind paths.
-                foreach (string file in this.Files)
-                {
-                    var bindPath = new BindPath(Path.GetDirectoryName(Path.GetFullPath(file)));
-                    this.BindPaths.Add(bindPath);
-                }
-            }
-            if (!this.SuppressWixPdb && String.IsNullOrEmpty(this.PdbFile) && !String.IsNullOrEmpty(this.OutputFile))
-            {
-                this.PdbFile = Path.ChangeExtension(this.OutputFile, ".wixpdb");
-            }
-            return unprocessed.ToArray();
-        }
-        private bool TryParseCommandLineArgumentWithExtension(string arg, IParseCommandLine parser, IEnumerable<IExtensionCommandLine> extensions)
-        {
-            foreach (var extension in extensions)
-            {
-                if (extension.TryParseArgument(parser, arg))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/src/light/LightStrings.Designer.cs b/src/light/LightStrings.Designer.cs
deleted file mode 100644
index 50e271fd..00000000
--- a/src/light/LightStrings.Designer.cs
+++ /dev/null
@@ -1,104 +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.Tools {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class LightStrings {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal LightStrings() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.Tools.LightStrings", typeof(LightStrings).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to    -b &lt;path&gt;  specify a binder path to locate all files
-        ///              (default: current directory)
-        ///              prefix the path with &apos;name=&apos; where &apos;name&apos; is the name of your
-        ///              named bindpath.
-        ///   -cc &lt;path&gt; path to cache built cabinets (will not be deleted after linking)
-        ///   -ct &lt;N&gt;    number of threads to use when creating cabinets
-        ///              (default: %NUMBER_OF_PROCESSORS%)
-        ///   -cub &lt;file.cub&gt; additional .cub file containing ICEs to run
-        ///   -dcl:level set default cabinet compression l [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string CommandLineArguments {
-            get {
-                return ResourceManager.GetString("CommandLineArguments", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The -bf (bind files) option is only applicable with the -xo option..
-        /// </summary>
-        internal static string EXP_BindFileOptionNotApplicable {
-            get {
-                return ResourceManager.GetString("EXP_BindFileOptionNotApplicable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot link object files (.wixobj) files with an output file (.wixout).
-        /// </summary>
-        internal static string EXP_CannotLinkObjFilesWithOutpuFile {
-            get {
-                return ResourceManager.GetString("EXP_CannotLinkObjFilesWithOutpuFile", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to  usage:  light.exe [-?] [-b bindPath] [-nologo] [-out outputFile] objectFile [objectFile ...] [@responseFile]
-        ///
-        ///{0}
-        ///
-        ///Environment variables:
-        ///   WIX_TEMP   overrides the temporary directory used for cab creation, msm exploding, ....
-        /// </summary>
-        internal static string HelpMessage {
-            get {
-                return ResourceManager.GetString("HelpMessage", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/light/LightStrings.resx b/src/light/LightStrings.resx
deleted file mode 100644
index 3f586a5d..00000000
--- a/src/light/LightStrings.resx
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="CommandLineArguments" xml:space="preserve">
-    <value>   -b &lt;path&gt;  specify a binder path to locate all files
-              (default: current directory)
-              prefix the path with 'name=' where 'name' is the name of your
-              named bindpath.
-   -cc &lt;path&gt; path to cache built cabinets (will not be deleted after linking)
-   -ct &lt;N&gt;    number of threads to use when creating cabinets
-              (default: %NUMBER_OF_PROCESSORS%)
-   -cub &lt;file.cub&gt; additional .cub file containing ICEs to run
-   -dcl:level set default cabinet compression level
-              (low, medium, high, none, mszip; mszip default)
-   -eav       exact assembly versions (breaks .NET 1.1 RTM compatibility)
-   -ice:&lt;ICE&gt;   run a specific internal consistency evaluator (ICE)
-   -pdbout &lt;output.wixpdb&gt;  save the WixPdb to a specific file
-              (default: same name as output with wixpdb extension)
-   -reusecab  reuse cabinets from cabinet cache
-   -sacl      suppress resetting ACLs
-              (useful when laying out image to a network share)
-   -sice:&lt;ICE&gt;  suppress an internal consistency evaluator (ICE)
-   -sl        suppress layout
-   -spdb      suppress outputting the WixPdb
-   -sval      suppress MSI/MSM validation
-   -cultures:&lt;cultures&gt;  semicolon or comma delimited list of localized
-             string cultures to load from .wxl files and libraries.
-             Precedence of cultures is from left to right.
-   -d&lt;name&gt;[=&lt;value&gt;]  define a wix variable, with or without a value.
-   -ext &lt;extension&gt;  extension assembly or "class, assembly"
-   -loc &lt;loc.wxl&gt;  read localization strings from .wxl file
-   -nologo    skip printing light logo information
-   -notidy    do not delete temporary files (useful for debugging)
-   -o[ut]     specify output file (default: write to current directory)
-   -pedantic  show pedantic messages
-   -sloc      suppress localization
-   -sw[N]     suppress all warnings or a specific message ID
-              (example: -sw1009 -sw1103)
-   -usf &lt;output.xml&gt;  unreferenced symbols file
-   -v         verbose output
-   -wx[N]     treat all warnings or a specific message ID as an error
-              (example: -wx1009 -wx1103)
-   -xo        output wixout format instead of MSI format
-   -? | -help this help information</value>
-  </data>
-  <data name="EXP_CannotLinkObjFilesWithOutpuFile" xml:space="preserve">
-    <value>Cannot link object files (.wixobj) files with an output file (.wixout)</value>
-  </data>
-  <data name="HelpMessage" xml:space="preserve">
-    <value> usage:  light.exe [-?] [-b bindPath] [-nologo] [-out outputFile] objectFile [objectFile ...] [@responseFile]
-{0}
-Environment variables:
-   WIX_TEMP   overrides the temporary directory used for cab creation, msm exploding, ...</value>
-    <comment>{0} is replaced by a list of light's arguments.</comment>
-  </data>
-</root>
diff --git a/src/light/app.config b/src/light/app.config
deleted file mode 100644
index 71c529fb..00000000
--- a/src/light/app.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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. -->
-<configuration>
-    <runtime>
-        <loadFromRemoteSources enabled="true"/>
-    </runtime>
-</configuration>
diff --git a/src/light/light.cs b/src/light/light.cs
deleted file mode 100644
index 0f467bbb..00000000
--- a/src/light/light.cs
+++ /dev/null
@@ -1,574 +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.Tools
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Threading;
-    using WixToolset.Core;
-    using WixToolset.Data;
-    using WixToolset.Data.Bind;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-    /// <summary>
-    /// The main entry point for light.
-    /// </summary>
-    public sealed class Light
-    {
-        LightCommandLine commandLine;
-        //private IEnumerable<IBinderExtension> binderExtensions;
-        //private IEnumerable<IBinderFileManager> fileManagers;
-        /// <summary>
-        /// The main entry point for light.
-        /// </summary>
-        /// <param name="args">Commandline arguments for the application.</param>
-        /// <returns>Returns the application error code.</returns>
-        [MTAThread]
-        public static int Main(string[] args)
-        {
-            var serviceProvider = new WixToolsetServiceProvider();
-            var listener = new ConsoleMessageListener("WIX", "light.exe");
-            Light light = new Light();
-            return light.Run(serviceProvider, listener, args);
-        }
-        /// <summary>
-        /// Main running method for the application.
-        /// </summary>
-        /// <param name="args">Commandline arguments to the application.</param>
-        /// <returns>Returns the application error code.</returns>
-        public int Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args)
-        {
-            var messaging = serviceProvider.GetService<IMessaging>();
-            messaging.SetListener(listener);
-            try
-            {
-                var unparsed = this.ParseCommandLineAndLoadExtensions(serviceProvider, messaging, args);
-                if (!messaging.EncounteredError)
-                {
-                    if (this.commandLine.ShowLogo)
-                    {
-                        AppCommon.DisplayToolHeader();
-                    }
-                    if (this.commandLine.ShowHelp)
-                    {
-                        PrintHelp();
-                        AppCommon.DisplayToolFooter();
-                    }
-                    else
-                    {
-                        foreach (string arg in unparsed)
-                        {
-                            messaging.Write(WarningMessages.UnsupportedCommandLineArgument(arg));
-                        }
-                        this.Bind(serviceProvider, messaging);
-                    }
-                }
-            }
-            catch (WixException we)
-            {
-                messaging.Write(we.Error);
-            }
-            catch (Exception e)
-            {
-                messaging.Write(ErrorMessages.UnexpectedException(e.Message, e.GetType().ToString(), e.StackTrace));
-                if (e is NullReferenceException || e is SEHException)
-                {
-                    throw;
-                }
-            }
-            return messaging.LastErrorNumber;
-        }
-        /// <summary>
-        /// Parse command line and load all the extensions.
-        /// </summary>
-        /// <param name="args">Command line arguments to be parsed.</param>
-        private IEnumerable<string> ParseCommandLineAndLoadExtensions(IServiceProvider serviceProvider, IMessaging messaging, string[] args)
-        {
-            var arguments = serviceProvider.GetService<ICommandLineArguments>();
-            arguments.Populate(args);
-            var extensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
-            var context = serviceProvider.GetService<ICommandLineContext>();
-            context.ExtensionManager = extensionManager;
-            context.Messaging = messaging;
-            context.Arguments = arguments;
-            this.commandLine = new LightCommandLine(messaging);
-            var unprocessed = this.commandLine.Parse(context);
-            return unprocessed;
-        }
-        private void Bind(IServiceProvider serviceProvider, IMessaging messaging)
-        {
-            var output = this.LoadWixout(messaging);
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            var intermediateFolder = this.commandLine.IntermediateFolder;
-            if (String.IsNullOrEmpty(intermediateFolder))
-            {
-                intermediateFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            }
-            var localizations = this.LoadLocalizationFiles(messaging, this.commandLine.LocalizationFiles);
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            ResolveResult resolveResult;
-            {
-                var resolver = new Resolver(serviceProvider);
-                resolver.BindPaths = this.commandLine.BindPaths;
-                resolver.IntermediateFolder = intermediateFolder;
-                resolver.IntermediateRepresentation = output;
-                resolver.Localizations = localizations;
-                resolveResult = resolver.Execute();
-            }
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            BindResult bindResult;
-            {
-                var binder = new Binder(serviceProvider);
-                binder.CabbingThreadCount = this.commandLine.CabbingThreadCount;
-                binder.CabCachePath = this.commandLine.CabCachePath;
-                binder.Codepage = resolveResult.Codepage;
-                binder.DefaultCompressionLevel = this.commandLine.DefaultCompressionLevel;
-                binder.DelayedFields = resolveResult.DelayedFields;
-                binder.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
-                binder.Ices = this.commandLine.Ices;
-                binder.IntermediateFolder = intermediateFolder;
-                binder.IntermediateRepresentation = resolveResult.IntermediateRepresentation;
-                binder.OutputPath = this.commandLine.OutputFile;
-                binder.OutputPdbPath = Path.ChangeExtension(this.commandLine.OutputFile, ".wixpdb");
-                binder.SuppressIces = this.commandLine.SuppressIces;
-                binder.SuppressValidation = this.commandLine.SuppressValidation;
-                bindResult = binder.Execute();
-            }
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            {
-                var layout = new Layout(serviceProvider);
-                layout.FileTransfers = bindResult.FileTransfers;
-                layout.ContentFilePaths = bindResult.ContentFilePaths;
-                layout.ContentsFile = this.commandLine.ContentsFile;
-                layout.OutputsFile = this.commandLine.OutputsFile;
-                layout.BuiltOutputsFile = this.commandLine.BuiltOutputsFile;
-                layout.SuppressAclReset = this.commandLine.SuppressAclReset;
-                layout.Execute();
-            }
-        }
-        private void Run(IMessaging messaging)
-        {
-#if false
-            // Initialize the variable resolver from the command line.
-            WixVariableResolver wixVariableResolver = new WixVariableResolver();
-            foreach (var wixVar in this.commandLine.Variables)
-            {
-                wixVariableResolver.AddVariable(wixVar.Key, wixVar.Value);
-            }
-            // Initialize the linker from the command line.
-            Linker linker = new Linker();
-            linker.UnreferencedSymbolsFile = this.commandLine.UnreferencedSymbolsFile;
-            linker.ShowPedanticMessages = this.commandLine.ShowPedanticMessages;
-            linker.WixVariableResolver = wixVariableResolver;
-            foreach (IExtensionData data in this.extensionData)
-            {
-                linker.AddExtensionData(data);
-            }
-            // Initialize the binder from the command line.
-            WixToolset.Binder binder = new WixToolset.Binder();
-            binder.CabCachePath = this.commandLine.CabCachePath;
-            binder.ContentsFile = this.commandLine.ContentsFile;
-            binder.BuiltOutputsFile = this.commandLine.BuiltOutputsFile;
-            binder.OutputsFile = this.commandLine.OutputsFile;
-            binder.WixprojectFile = this.commandLine.WixprojectFile;
-            binder.BindPaths.AddRange(this.commandLine.BindPaths);
-            binder.CabbingThreadCount = this.commandLine.CabbingThreadCount;
-            if (this.commandLine.DefaultCompressionLevel.HasValue)
-            {
-                binder.DefaultCompressionLevel = this.commandLine.DefaultCompressionLevel.Value;
-            }
-            binder.Ices.AddRange(this.commandLine.Ices);
-            binder.SuppressIces.AddRange(this.commandLine.SuppressIces);
-            binder.SuppressAclReset = this.commandLine.SuppressAclReset;
-            binder.SuppressLayout = this.commandLine.SuppressLayout;
-            binder.SuppressValidation = this.commandLine.SuppressValidation;
-            binder.PdbFile = this.commandLine.SuppressWixPdb ? null : this.commandLine.PdbFile;
-            binder.TempFilesLocation = AppCommon.GetTempLocation();
-            binder.WixVariableResolver = wixVariableResolver;
-            foreach (IBinderExtension extension in this.binderExtensions)
-            {
-                binder.AddExtension(extension);
-            }
-            foreach (IBinderFileManager fileManager in this.fileManagers)
-            {
-                binder.AddExtension(fileManager);
-            }
-            // Initialize the localizer.
-            Localizer localizer = this.InitializeLocalization(linker.TableDefinitions);
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            wixVariableResolver.Localizer = localizer;
-            linker.Localizer = localizer;
-            binder.Localizer = localizer;
-            // Loop through all the believed object files.
-            List<Section> sections = new List<Section>();
-            Output output = null;
-            foreach (string inputFile in this.commandLine.Files)
-            {
-                string inputFileFullPath = Path.GetFullPath(inputFile);
-                FileFormat format = FileStructure.GuessFileFormatFromExtension(Path.GetExtension(inputFileFullPath));
-                bool retry;
-                do
-                {
-                    retry = false;
-                    try
-                    {
-                        switch (format)
-                        {
-                            case FileFormat.Wixobj:
-                                Intermediate intermediate = Intermediate.Load(inputFileFullPath, linker.TableDefinitions, this.commandLine.SuppressVersionCheck);
-                                sections.AddRange(intermediate.Sections);
-                                break;
-                            case FileFormat.Wixlib:
-                                Library library = Library.Load(inputFileFullPath, linker.TableDefinitions, this.commandLine.SuppressVersionCheck);
-                                AddLibraryLocalizationsToLocalizer(library, this.commandLine.Cultures, localizer);
-                                sections.AddRange(library.Sections);
-                                break;
-                            default:
-                                output = Output.Load(inputFileFullPath, this.commandLine.SuppressVersionCheck);
-                                break;
-                        }
-                    }
-                    catch (WixUnexpectedFileFormatException e)
-                    {
-                        format = e.FileFormat;
-                        retry = (FileFormat.Wixobj == format || FileFormat.Wixlib == format || FileFormat.Wixout == format); // .wixobj, .wixout and .wixout are supported by light.
-                        if (!retry)
-                        {
-                            messaging.OnMessage(e.Error);
-                        }
-                    }
-                } while (retry);
-            }
-            // Stop processing if any errors were found loading object files.
-            if (messaging.EncounteredError)
-            {
-                return;
-            }
-            // and now for the fun part
-            if (null == output)
-            {
-                OutputType expectedOutputType = OutputType.Unknown;
-                if (!String.IsNullOrEmpty(this.commandLine.OutputFile))
-                {
-                    expectedOutputType = Output.GetOutputType(Path.GetExtension(this.commandLine.OutputFile));
-                }
-                output = linker.Link(sections, expectedOutputType);
-                // If an error occurred during linking, stop processing.
-                if (null == output)
-                {
-                    return;
-                }
-            }
-            else if (0 != sections.Count)
-            {
-                throw new InvalidOperationException(LightStrings.EXP_CannotLinkObjFilesWithOutpuFile);
-            }
-            bool tidy = true; // clean up after ourselves by default.
-            try
-            {
-                // only output the xml if its a patch build or user specfied to only output wixout
-                string outputFile = this.commandLine.OutputFile;
-                string outputExtension = Path.GetExtension(outputFile);
-                if (this.commandLine.OutputXml || OutputType.Patch == output.Type)
-                {
-                    if (String.IsNullOrEmpty(outputExtension) || outputExtension.Equals(".wix", StringComparison.Ordinal))
-                    {
-                        outputExtension = (OutputType.Patch == output.Type) ? ".wixmsp" : ".wixout";
-                        outputFile = Path.ChangeExtension(outputFile, outputExtension);
-                    }
-                    output.Save(outputFile);
-                }
-                else // finish creating the MSI/MSM
-                {
-                    if (String.IsNullOrEmpty(outputExtension) || outputExtension.Equals(".wix", StringComparison.Ordinal))
-                    {
-                        outputExtension = Output.GetExtension(output.Type);
-                        outputFile = Path.ChangeExtension(outputFile, outputExtension);
-                    }
-                    binder.Bind(output, outputFile);
-                }
-            }
-            catch (WixException we) // keep files around for debugging IDT issues.
-            {
-                if (we is WixInvalidIdtException)
-                {
-                    tidy = false;
-                }
-                throw;
-            }
-            catch (Exception) // keep files around for debugging unexpected exceptions.
-            {
-                tidy = false;
-                throw;
-            }
-            finally
-            {
-                if (null != binder)
-                {
-                    binder.Cleanup(tidy);
-                }
-            }
-            return;
-#endif
-        }
-#if false
-        private Localizer InitializeLocalization(TableDefinitionCollection tableDefinitions)
-        {
-            Localizer localizer = null;
-            // Instantiate the localizer and load any localization files.
-            if (!this.commandLine.SuppressLocalization || 0 < this.commandLine.LocalizationFiles.Count || null != this.commandLine.Cultures || !this.commandLine.OutputXml)
-            {
-                List<Localization> localizations = new List<Localization>();
-                // Load each localization file.
-                foreach (string localizationFile in this.commandLine.LocalizationFiles)
-                {
-                    Localization localization = Localizer.ParseLocalizationFile(localizationFile, tableDefinitions);
-                    if (null != localization)
-                    {
-                        localizations.Add(localization);
-                    }
-                }
-                localizer = new Localizer();
-                if (null != this.commandLine.Cultures)
-                {
-                    // Alocalizations in order specified in cultures.
-                    foreach (string culture in this.commandLine.Cultures)
-                    {
-                        foreach (Localization localization in localizations)
-                        {
-                            if (culture.Equals(localization.Culture, StringComparison.OrdinalIgnoreCase))
-                            {
-                                localizer.AddLocalization(localization);
-                            }
-                        }
-                    }
-                }
-                else // no cultures specified, so try neutral culture and if none of those add all loc files.
-                {
-                    bool neutralFound = false;
-                    foreach (Localization localization in localizations)
-                    {
-                        if (String.IsNullOrEmpty(localization.Culture))
-                        {
-                            // If a neutral wxl was provided use it.
-                            localizer.AddLocalization(localization);
-                            neutralFound = true;
-                        }
-                    }
-                    if (!neutralFound)
-                    {
-                        // No cultures were specified and no neutral wxl are available, include all of the loc files.
-                        foreach (Localization localization in localizations)
-                        {
-                            localizer.AddLocalization(localization);
-                        }
-                    }
-                }
-                // Load localizations provided by extensions with data.
-                foreach (IExtensionData data in this.extensionData)
-                {
-                    Library library = data.GetLibrary(tableDefinitions);
-                    if (null != library)
-                    {
-                        // Load the extension's default culture if it provides one and no cultures were specified.
-                        string[] extensionCultures = this.commandLine.Cultures;
-                        if (null == extensionCultures && null != data.DefaultCulture)
-                        {
-                            extensionCultures = new string[] { data.DefaultCulture };
-                        }
-                        AddLibraryLocalizationsToLocalizer(library, extensionCultures, localizer);
-                    }
-                }
-            }
-            return localizer;
-        }
-        private void AddLibraryLocalizationsToLocalizer(Library library, string[] cultures, Localizer localizer)
-        {
-            foreach (Localization localization in library.GetLocalizations(cultures))
-            {
-                localizer.AddLocalization(localization);
-            }
-        }
-#endif
-        private bool TryParseCommandLineArgumentWithExtension(string arg, IEnumerable<IExtensionCommandLine> extensions)
-        {
-            foreach (var extension in extensions)
-            {
-                // TODO: decide what to do with "IParseCommandLine" argument.
-                if (extension.TryParseArgument(null, arg))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-        private IEnumerable<Localization> LoadLocalizationFiles(IMessaging messaging, IEnumerable<string> locFiles)
-        {
-            foreach (var loc in locFiles)
-            {
-                var localization = Localizer.ParseLocalizationFile(messaging, loc);
-                yield return localization;
-            }
-        }
-        private Intermediate LoadWixout(IMessaging messaging)
-        {
-            var path = this.commandLine.Files.Single();
-            return Intermediate.Load(path);
-        }
-        private static IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, IEnumerable<string> extensions)
-        {
-            var extensionManager = serviceProvider.GetService<IExtensionManager>();
-            foreach (var type in new[] { typeof(WixToolset.Core.Burn.WixToolsetStandardBackend), typeof(WixToolset.Core.WindowsInstaller.WixToolsetStandardBackend) })
-            {
-                extensionManager.Add(type.Assembly);
-            }
-            foreach (var extension in extensions)
-            {
-                extensionManager.Load(extension);
-            }
-            return extensionManager;
-        }
-        private static void PrintHelp()
-        {
-            string lightArgs = LightStrings.CommandLineArguments;
-            Console.WriteLine(String.Format(LightStrings.HelpMessage, lightArgs));
-        }
-        private class ConsoleMessageListener : IMessageListener
-        {
-            public ConsoleMessageListener(string shortName, string longName)
-            {
-                this.ShortAppName = shortName;
-                this.LongAppName = longName;
-                PrepareConsoleForLocalization();
-            }
-            public string LongAppName { get; }
-            public string ShortAppName { get; }
-            public void Write(Message message)
-            {
-                var filename = message.SourceLineNumbers?.FileName ?? this.LongAppName;
-                var line = message.SourceLineNumbers?.LineNumber ?? -1;
-                var type = message.Level.ToString().ToLowerInvariant();
-                var output = message.Level >= MessageLevel.Warning ? Console.Out : Console.Error;
-                if (line > 0)
-                {
-                    filename = String.Concat(filename, "(", line, ")");
-                }
-                output.WriteLine("{0} : {1} {2}{3:0000}: {4}", filename, type, this.ShortAppName, message.Id, message.ToString());
-            }
-            public void Write(string message)
-            {
-                Console.Out.WriteLine(message);
-            }
-            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/light/light.csproj b/src/light/light.csproj
deleted file mode 100644
index 95adba01..00000000
--- a/src/light/light.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>net461</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <Description>Linker</Description>
-    <Title>WiX Toolset Linker</Title>
-    <DebugType>embedded</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/TestData/Example.Extension/Data/example.txt b/src/test/Example.Extension/Data/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/TestData/Example.Extension/Data/example.txt
+++ b/src/test/Example.Extension/Data/example.txt
diff --git a/src/test/TestData/Example.Extension/Data/example.wir b/src/test/Example.Extension/Data/example.wir
index 674f63fc..674f63fc 100644
--- a/src/test/TestData/Example.Extension/Data/example.wir
+++ b/src/test/Example.Extension/Data/example.wir
Binary files differ
diff --git a/src/test/TestData/Example.Extension/Data/example.wxs b/src/test/Example.Extension/Data/example.wxs
index 53531e99..53531e99 100644
--- a/src/test/TestData/Example.Extension/Data/example.wxs
+++ b/src/test/Example.Extension/Data/example.wxs
diff --git a/src/test/TestData/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index 1dde5044..1dde5044 100644
--- a/src/test/TestData/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
diff --git a/src/test/TestData/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs
index cd9e1fb9..cd9e1fb9 100644
--- a/src/test/TestData/Example.Extension/ExampleCompilerExtension.cs
+++ b/src/test/Example.Extension/ExampleCompilerExtension.cs
diff --git a/src/test/TestData/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs
index 724f9eea..724f9eea 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/Example.Extension/ExampleExtensionData.cs
diff --git a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs b/src/test/Example.Extension/ExampleExtensionFactory.cs
index a081b758..a081b758 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
+++ b/src/test/Example.Extension/ExampleExtensionFactory.cs
diff --git a/src/test/TestData/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs b/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
index 6f86e20d..6f86e20d 100644
--- a/src/test/TestData/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
+++ b/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
diff --git a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
index dbd6491b..dbd6491b 100644
--- a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTableDefinitions.cs
diff --git a/src/test/TestData/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs
index 0fc0d82c..0fc0d82c 100644
--- a/src/test/TestData/Example.Extension/ExampleTuple.cs
+++ b/src/test/Example.Extension/ExampleTuple.cs
diff --git a/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs
index 4775b827..4775b827 100644
--- a/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs
diff --git a/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
index f00a5102..f00a5102 100644
--- a/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
diff --git a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs b/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs
deleted file mode 100644
index 8fd69414..00000000
--- a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs
+++ /dev/null
@@ -1,33 +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 WixToolsetTest.BuildTasks
-{
-    using System.Collections;
-    using System.Text;
-    using Microsoft.Build.Framework;
-    internal class FakeBuildEngine : IBuildEngine
-    {
-        private StringBuilder output = new StringBuilder();
-        public int ColumnNumberOfTaskNode => 0;
-        public bool ContinueOnError => false;
-        public int LineNumberOfTaskNode => 0;
-        public string ProjectFileOfTaskNode => "fake_wix.targets";
-        public string Output => this.output.ToString();
-        public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => throw new System.NotImplementedException();
-        public void LogCustomEvent(CustomBuildEventArgs e) => this.output.AppendLine(e.Message);
-        public void LogErrorEvent(BuildErrorEventArgs e) => this.output.AppendLine(e.Message);
-        public void LogMessageEvent(BuildMessageEventArgs e) => this.output.AppendLine(e.Message);
-        public void LogWarningEvent(BuildWarningEventArgs e) => this.output.AppendLine(e.Message);
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
deleted file mode 100644
index a27928d5..00000000
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ /dev/null
@@ -1,64 +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 WixToolsetTest.BuildTasks
-{
-    using System.IO;
-    using System.Linq;
-    using Microsoft.Build.Utilities;
-    using WixBuildTools.TestSupport;
-    using WixToolset.BuildTasks;
-    using WixToolset.Data;
-    using WixToolset.Data.Tuples;
-    using Xunit;
-    public partial class MsbuildFixture
-    {
-        [Fact]
-        public void CanBuildSimpleMsiPackage()
-        {
-            var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var engine = new FakeBuildEngine();
-                var task = new DoIt
-                {
-                    BuildEngine = engine,
-                    SourceFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.wxs")),
-                        new TaskItem(Path.Combine(folder, "PackageComponents.wxs")),
-                    },
-                    LocalizationFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
-                    },
-                    BindInputPaths = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "data")),
-                    },
-                    IntermediateDirectory = new TaskItem(intermediateFolder),
-                    OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
-                };
-                var result = task.Execute();
-                Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}");
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\cab1.cab")));
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir"));
-                var section = intermediate.Sections.Single();
-                var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
deleted file mode 100644
index e04ea43d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-    <OutputName>MsiPackage</OutputName>
-    <OutputType>Package</OutputType>
-    <Name>MsiPackage</Name>
-    <RootNamespace>MsiPackage</RootNamespace>
-    <Cultures>en-US,en;de-DE</Cultures>
-  </PropertyGroup>
-  <PropertyGroup>
-    <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\net461\wix.targets</WixTargetsPath>
-  </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" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-    <EmbeddedResource Include="Package.de-de.wxl" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="data" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
deleted file mode 100644
index 23493ace..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains the declaration of all the localizable strings.
-->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE">
-  <String Id="DowngradeError">German DowngradeError</String>
-  <String Id="FeatureTitle">German FeatureTitle</String>
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains the declaration of all the localizable strings.
-->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
deleted file mode 100644
index d5a5a40d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
-\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
deleted file mode 100644
index 2c88704e..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|x64 = Debug|x64
-                Debug|x86 = Debug|x86
-                Release|x64 = Release|x64
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5}
-        EndGlobalSection
-EndGlobal
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
deleted file mode 100644
index 31c3ec9c..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-    <OutputName>MsiPackage</OutputName>
-    <OutputType>Package</OutputType>
-    <Name>MsiPackage</Name>
-    <RootNamespace>MsiPackage</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup>
-    <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\wix.targets</WixTargetsPath>
-  </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" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-  </ItemGroup>
-  <ItemGroup>
-    <BindInputPaths Include="data" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
-\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains the declaration of all the localizable strings.
-->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
deleted file mode 100644
index d5a5a40d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
-\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
deleted file mode 100644
index 2c88704e..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|x64 = Debug|x64
-                Debug|x86 = Debug|x86
-                Release|x64 = Release|x64
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86
-                {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5}
-        EndGlobalSection
-EndGlobal
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
deleted file mode 100644
index 5ec5b7fd..00000000
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>net461</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="All" />
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 5de61368..cc631c22 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -8,6 +8,7 @@ namespace WixToolsetTest.CoreIntegration
    using Example.Extension;
    using WixBuildTools.TestSupport;
    using WixToolset.Core;
+    using WixToolset.Core.TestPackage;
    using WixToolset.Data;
    using WixToolset.Data.Tuples;
    using Xunit;
@@ -37,8 +38,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -48,7 +48,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\extest.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -80,8 +80,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -92,7 +91,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-intermediateFolder", intermediateFolder,
                    "-example", "test",
                    "-o", Path.Combine(intermediateFolder, @"bin\extest.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -107,8 +106,7 @@ namespace WixToolsetTest.CoreIntegration
        private static void Build(string[] args)
        {
-            var program = new Program();
+            var result = WixRunner.Execute(args, out var messages);
-            var result = program.Run(new WixToolsetServiceProvider(), null, args);
            Assert.Equal(0, result);
        }
    }
diff --git a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index 5a3071c7..7a10f71e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -5,13 +5,13 @@ namespace WixToolsetTest.CoreIntegration
    using System.IO;
    using System.Linq;
    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
+    using WixToolset.Core.TestPackage;
    using WixToolset.Data;
    using WixToolset.Data.Tuples;
    using WixToolset.Data.WindowsInstaller;
    using Xunit;
-    public class ProgramFixture
+    public class MsiFixture
    {
        [Fact]
        public void CanBuildSingleFile()
@@ -23,8 +23,7 @@ namespace WixToolsetTest.CoreIntegration
                var baseFolder = fs.GetFolder();
                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -33,8 +32,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
@@ -59,8 +57,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -69,7 +66,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -95,8 +92,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -106,7 +102,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -125,8 +121,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -136,7 +131,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -155,8 +150,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -166,7 +160,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -185,8 +179,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -196,7 +189,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -221,8 +214,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Module.wxs"),
@@ -230,7 +222,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -255,8 +247,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -265,7 +256,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -292,8 +283,7 @@ namespace WixToolsetTest.CoreIntegration
                var baseFolder = fs.GetFolder();
                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -302,7 +292,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(baseFolder, @"bin\test.wixipl")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -324,8 +314,7 @@ namespace WixToolsetTest.CoreIntegration
                var baseFolder = fs.GetFolder();
                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -334,7 +323,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(baseFolder, @"bin\test.wixlib")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -357,8 +346,7 @@ namespace WixToolsetTest.CoreIntegration
                var baseFolder = fs.GetFolder();
                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -368,7 +356,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(baseFolder, @"bin\test.msi"),
                    "-i", bindpath,
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -395,8 +383,7 @@ namespace WixToolsetTest.CoreIntegration
                var baseFolder = fs.GetFolder();
                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -405,7 +392,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
@@ -434,8 +421,7 @@ namespace WixToolsetTest.CoreIntegration
            {
                var intermediateFolder = fs.GetFolder();
-                var program = new Program();
+                var result = WixRunner.Execute(new[]
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
                {
                    "build",
                    Path.Combine(folder, "Package.wxs"),
@@ -444,7 +430,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-bindpath", Path.Combine(folder, "data"),
                    "-intermediateFolder", intermediateFolder,
                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
+                }, out var messages);
                Assert.Equal(0, result);
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 5f1fb3d3..71e7dd68 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -52,8 +52,11 @@
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\wix\wix.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" />
-    <ProjectReference Include="..\TestData\Example.Extension\Example.Extension.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
+    <ProjectReference Include="..\Example.Extension\Example.Extension.csproj" />
  </ItemGroup>
  <ItemGroup>
diff --git a/src/test/WixToolsetTest.LightIntegration/LightFixture.cs b/src/test/WixToolsetTest.LightIntegration/LightFixture.cs
deleted file mode 100644
index 21c10be9..00000000
--- a/src/test/WixToolsetTest.LightIntegration/LightFixture.cs
+++ /dev/null
@@ -1,48 +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 WixToolsetTest.LightIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixToolset.Core;
-    using WixToolset.Tools;
-    using WixToolsetTest.LightIntegration.Utility;
-    using Xunit;
-    public class LightFixture
-    {
-        [Fact]
-        public void CanBuildFromWixout()
-        {
-            var folder = TestData.Get(@"TestData\Wixout");
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var program = new Light();
-                var result = program.Run(new WixToolsetServiceProvider(), null, new[]
-                {
-                    Path.Combine(folder, "test.wixout"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-b", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-                Assert.Equal(0, result);
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var builtFiles = Directory.GetFiles(binFolder, "*", SearchOption.AllDirectories);
-                Assert.Equal(new[]{
-                    "MsiPackage\\test.txt",
-                    "test.msi",
-                    "test.wir",
-                    "test.wixpdb",
-                }, builtFiles.Select(f => f.Substring(binFolder.Length)).OrderBy(s => s).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/Package.en-us.wxl b/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains the declaration of all the localizable strings.
-->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/data/test.txt b/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
-\ No newline at end of file
diff --git a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/test.wixout b/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/test.wixout
deleted file mode 100644
index 009b625f..00000000
--- a/src/test/WixToolsetTest.LightIntegration/TestData/Wixout/test.wixout
+++ /dev/null
Binary files differ
diff --git a/src/test/WixToolsetTest.LightIntegration/Utility/DisposableFileSystem.cs b/src/test/WixToolsetTest.LightIntegration/Utility/DisposableFileSystem.cs
deleted file mode 100644
index 3b8c0e19..00000000
--- a/src/test/WixToolsetTest.LightIntegration/Utility/DisposableFileSystem.cs
+++ /dev/null
@@ -1,86 +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 WixToolsetTest.LightIntegration.Utility
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    public class DisposableFileSystem : IDisposable
-    {
-        protected bool Disposed { get; private set; }
-        private List<string> CleanupPaths { get; } = new List<string>();
-        protected string GetFile(bool create = false)
-        {
-            var path = Path.GetTempFileName();
-            if (!create)
-            {
-                File.Delete(path);
-            }
-            this.CleanupPaths.Add(path);
-            return path;
-        }
-        public string GetFolder(bool create = false)
-        {
-            var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            if (create)
-            {
-                Directory.CreateDirectory(path);
-            }
-            this.CleanupPaths.Add(path);
-            return path;
-        }
-        #region // IDisposable
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-        protected virtual void Dispose(bool disposing)
-        {
-            if (this.Disposed)
-            {
-                return;
-            }
-            if (disposing)
-            {
-                foreach (var path in this.CleanupPaths)
-                {
-                    try
-                    {
-                        if (File.Exists(path))
-                        {
-                            File.Delete(path);
-                        }
-                        else if (Directory.Exists(path))
-                        {
-                            Directory.Delete(path, true);
-                        }
-                    }
-                    catch
-                    {
-                        // Best effort delete, so ignore any failures.
-                    }
-                }
-            }
-            this.Disposed = true;
-        }
-        #endregion
-    }
-}
diff --git a/src/test/WixToolsetTest.LightIntegration/Utility/TestData.cs b/src/test/WixToolsetTest.LightIntegration/Utility/TestData.cs
deleted file mode 100644
index c13e9d6d..00000000
--- a/src/test/WixToolsetTest.LightIntegration/Utility/TestData.cs
+++ /dev/null
@@ -1,17 +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 WixToolsetTest.LightIntegration.Utility
-{
-    using System;
-    using System.IO;
-    public class TestData
-    {
-        public static string LocalPath => Path.GetDirectoryName(new Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).LocalPath);
-        public static string Get(params string[] paths)
-        {
-            return Path.Combine(LocalPath, Path.Combine(paths));
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj b/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj
deleted file mode 100644
index 59068682..00000000
--- a/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>net461</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="TestData\Wixout\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\Wixout\Package.en-us.wxl">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\Wixout\test.wixout">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\light\light.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-  </ItemGroup>
-</Project>
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
deleted file mode 100644
index aefc6be8..00000000
--- a/src/wix/Program.cs
+++ /dev/null
@@ -1,122 +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.Core
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using System.Threading;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-    /// <summary>
-    /// Wix Toolset Command-Line Interface.
-    /// </summary>
-    public sealed class Program
-    {
-        /// <summary>
-        /// The main entry point for wix command-line interface.
-        /// </summary>
-        /// <param name="args">Commandline arguments for the application.</param>
-        /// <returns>Returns the application error code.</returns>
-        [MTAThread]
-        public static int Main(string[] args)
-        {
-            var serviceProvider = new WixToolsetServiceProvider();
-            var listener = new ConsoleMessageListener("WIX", "wix.exe");
-            var program = new Program();
-            return program.Run(serviceProvider, listener, args);
-        }
-        /// <summary>
-        /// Executes the wix command-line interface.
-        /// </summary>
-        /// <param name="serviceProvider">Service provider to use throughout this execution.</param>
-        /// <param name="args">Command-line arguments to execute.</param>
-        /// <returns>Returns the application error code.</returns>
-        public int Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args)
-        {
-            var messaging = serviceProvider.GetService<IMessaging>();
-            messaging.SetListener(listener);
-            var arguments = serviceProvider.GetService<ICommandLineArguments>();
-            arguments.Populate(args);
-            var context = serviceProvider.GetService<ICommandLineContext>();
-            context.Messaging = messaging;
-            context.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, arguments.Extensions);
-            context.Arguments = arguments;
-            var commandLine = serviceProvider.GetService<ICommandLine>();
-            var command = commandLine.ParseStandardCommandLine(context);
-            return command?.Execute() ?? 1;
-        }
-        private static IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, string[] extensions)
-        {
-            var extensionManager = serviceProvider.GetService<IExtensionManager>();
-            foreach (var type in new[] { typeof(WixToolset.Core.Burn.WixToolsetStandardBackend), typeof(WixToolset.Core.WindowsInstaller.WixToolsetStandardBackend) })
-            {
-                extensionManager.Add(type.Assembly);
-            }
-            foreach (var extension in extensions)
-            {
-                extensionManager.Load(extension);
-            }
-            return extensionManager;
-        }
-        private class ConsoleMessageListener : IMessageListener
-        {
-            public ConsoleMessageListener(string shortName, string longName)
-            {
-                this.ShortAppName = shortName;
-                this.LongAppName = longName;
-                PrepareConsoleForLocalization();
-            }
-            public string LongAppName { get; }
-            public string ShortAppName { get; }
-            public void Write(Message message)
-            {
-                var filename = message.SourceLineNumbers?.FileName ?? this.LongAppName;
-                var line = message.SourceLineNumbers?.LineNumber ?? -1;
-                var type = message.Level.ToString().ToLowerInvariant();
-                var output = message.Level >= MessageLevel.Warning ? Console.Out : Console.Error;
-                if (line > 0)
-                {
-                    filename = String.Concat(filename, "(", line, ")");
-                }
-                output.WriteLine("{0} : {1} {2}{3:0000}: {4}", filename, type, this.ShortAppName, message.Id, message.ToString());
-            }
-            public void Write(string message)
-            {
-                Console.Out.WriteLine(message);
-            }
-            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/wix.cmd b/src/wix/wix.cmd
deleted file mode 100644
index a0064ed7..00000000
--- a/src/wix/wix.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal
-@set _D=%~dpn0.dll
-@dotnet %_D% %*
-\ No newline at end of file
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
deleted file mode 100644
index 989486e8..00000000
--- a/src/wix/wix.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>netcoreapp2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <Description>Compiler</Description>
-    <Title>WiX Toolset Compiler</Title>
-    <DebugType>embedded</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-  <!--
-  <ItemGroup>
-    <Content Include="wix.cmd" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  -->
-  <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
-    <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-  </ItemGroup>
-</Project>