From ef0dbdc18c4335fef395fb954845031ea90503be Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 28 May 2020 23:00:05 +1000
Subject: Move the targets files into the top-level tools folder.

---
 .../WixToolset.BuildTasks.csproj                   |    9 -
 src/WixToolset.BuildTasks/redirects/wix.ca.targets |   10 -
 src/WixToolset.BuildTasks/redirects/wix.targets    |   10 -
 src/WixToolset.BuildTasks/wix.ca.targets           |  123 ---
 src/WixToolset.BuildTasks/wix.harvest.targets      |  505 ----------
 src/WixToolset.BuildTasks/wix.signing.targets      |  370 -------
 src/WixToolset.BuildTasks/wix.targets              | 1063 --------------------
 7 files changed, 2090 deletions(-)
 delete mode 100644 src/WixToolset.BuildTasks/redirects/wix.ca.targets
 delete mode 100644 src/WixToolset.BuildTasks/redirects/wix.targets
 delete mode 100644 src/WixToolset.BuildTasks/wix.ca.targets
 delete mode 100644 src/WixToolset.BuildTasks/wix.harvest.targets
 delete mode 100644 src/WixToolset.BuildTasks/wix.signing.targets
 delete mode 100644 src/WixToolset.BuildTasks/wix.targets

(limited to 'src/WixToolset.BuildTasks')

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 8724f2fc..a8363e7b 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -16,15 +16,6 @@
     <NoWarn>NU1701</NoWarn>
   </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.Tools.Core\WixToolset.Tools.Core.csproj" />
   </ItemGroup>
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 5dd2f729..00000000
--- a/src/WixToolset.BuildTasks/wix.harvest.targets
+++ /dev/null
@@ -1,505 +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)WixToolset.BuildTasks.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="true"
-      SuppressAllWarnings="$(HarvestProjectsSuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestProjectsSuppressSpecificWarnings)"
-      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)"
-      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="true"
-      SuppressAllWarnings="$(HarvestDirectorySuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestDirectorySuppressSpecificWarnings)"
-      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)"
-      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="@(HarvestFile->'$(IntermediateOutputPath)_%(ComponentGroupName)_%(DirectoryRefId)_%(Filename)%(Extension)_file.wxs')"
-    Condition=" '@(HarvestFile)' != '' ">
-
-    <HeatFile
-      NoLogo="true"
-      SuppressAllWarnings="$(HarvestFileSuppressAllWarnings)"
-      SuppressSpecificWarnings="$(HarvestFileSuppressSpecificWarnings)"
-      TreatWarningsAsErrors="$(HarvestFileTreatWarningsAsErrors)"
-      TreatSpecificWarningsAsErrors="$(HarvestFileTreatSpecificWarningsAsErrors)"
-      VerboseOutput="$(HarvestFileVerboseOutput)"
-      AutogenerateGuids="$(HarvestFileAutogenerateGuids)"
-      GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)"
-      OutputFile="$(IntermediateOutputPath)_%(HarvestFile.ComponentGroupName)_%(HarvestFile.DirectoryRefId)_%(HarvestFile.Filename)%(HarvestFile.Extension)_file.wxs"
-      SuppressFragments="$(HarvestFileSuppressFragments)"
-      SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)"
-      Transforms="%(HarvestFile.Transforms)"
-      File="@(HarvestFile)"
-      ComponentGroupName="%(HarvestFile.ComponentGroupName)"
-      DirectoryRefId="%(HarvestFile.DirectoryRefId)"
-      PreprocessorVariable="%(HarvestFile.PreprocessorVariable)"
-      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 7c25175f..00000000
--- a/src/WixToolset.BuildTasks/wix.signing.targets
+++ /dev/null
@@ -1,370 +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">
-  <PropertyGroup>
-    <SignedFileName Condition=" '$(SignedFileName)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFileName>
-    <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetCabList" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetLooseFileList" 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>
-      WixBuild;
-      CalculateSignTargetFiles;
-      BeforeSigning;
-      $(InternalSignDependsOn);
-      AfterSigning
-    </SigningDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="Signing"
-      DependsOnTargets="$(SigningDependsOn)"
-      Inputs="$(TargetPath)"
-      Outputs="$(SignedFilePath)"
-      Condition=" '$(SignOutput)' == 'true' ">
-
-    <ItemGroup>
-      <FileWrites Include="$(SignedFilePath)" />
-    </ItemGroup>
-
-    <WriteLinesToFile
-      File="$(SignedFilePath)"
-      Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
-      Overwrite="true" />
-  </Target>
-
-  <!-- Internal targets so correct signing targets are called. -->
-  <Target
-      Name="CalculateSignTargetFiles">
-    <ItemGroup>
-      <SignTargetPath Include="$(TargetPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-      Name="GetMsmsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <ItemGroup>
-      <SignMsm Include="@(SignTargetPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-      Name="InternalSignMsm"
-      DependsOnTargets="SignMsm"
-      Condition=" '@(SignMsm)' != '' " />
-
-  <Target
-      Name="GetCabsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-    <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="$(SignedFilePath)">
-    <CreateItemAvoidingInference InputProperties="@(SignTargetPath)">
-      <Output TaskParameter="OuputItems" ItemName="SignMsi" />
-      <Output TaskParameter="OuputItems" ItemName="FileWrites" />
-    </CreateItemAvoidingInference>
-  </Target>
-
-  <Target
-      Name="InternalSignMsi"
-      DependsOnTargets="SignMsi"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)"
-      Condition=" '@(SignMsi)' != '' " />
-
-  <Target
-      Name="GetContainersToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-    <!-- 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>
-    </InscribeMsiDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeMsi"
-      DependsOnTargets="$(InscribeMsiDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)"
-      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>
-    </InscribeBundleEngineDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundleEngine"
-      DependsOnTargets="$(InscribeBundleEngineDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <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 they are included even when the target is up to date. -->
-    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)" />
-    </ItemGroup>
-  </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>
-    </InscribeBundleDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundle"
-      DependsOnTargets="$(InscribeBundleDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <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 b8d6bb34..00000000
--- a/src/WixToolset.BuildTasks/wix.targets
+++ /dev/null
@@ -1,1063 +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>wix</TargetRuntime>
-
-    <!-- Use OutputName to set the AssemblyName for Microsoft.Common.targets -->
-    <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName>
-    <AssemblyName>$(OutputName)</AssemblyName>
-
-    <!-- Default OutputType to a known WiX Toolset type.  -->
-    <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType>
-
-    <!-- Default WixPdbType to a known WiX Toolset type.  -->
-    <WixPdbType Condition=" '$(WixPdbType)' == '' ">full</WixPdbType>
-  </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 Condition=" '$(TargetExt)' == '' ">
-    <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>
-    <TargetExt Condition=" '$(OutputType)' == 'IntermediatePostLink' ">.wixipl</TargetExt>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-
-  <PropertyGroup>
-    <!-- Default pdb output path to the intermediate output directory -->
-    <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(TargetDir)</PdbOutputDir>
-    <PdbOutputDir Condition=" !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" -->
-    <TargetPdbFileName Condition=" '$(TargetPdbFileName)' == '' ">$(TargetName).wixpdb</TargetPdbFileName>
-
-    <!-- Example, C:\MyProjects\MyProject\bin\debug\MyPackage.wixpdb -->
-    <TargetPdbPath Condition=" '$(TargetPdbPath)' == '' ">$(TargetPdbDir)$(TargetPdbFileName)</TargetPdbPath>
-  </PropertyGroup>
-
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  Property Declarations
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-
-  <!-- These tasks can be used as general-purpose build tasks. -->
-  <UsingTask TaskName="WixBuild" 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="GenerateCompileWithObjectPath" AssemblyFile="$(WixTasksPath)"/>
-
-  <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>
-    <WixExtDir Condition=" '$(WixExtDir)' == ''">$(WixBinDir)</WixExtDir>
-  </PropertyGroup>
-
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  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', 'IntermediatePostLink'
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <_PleaseSetThisInProjectFile>Please set this in the project file before the &lt;Import&gt; of the wix.targets file.</_PleaseSetThisInProjectFile>
-    <_OutputTypeDescription>Possible values are: 'Package', 'Module', 'Library', 'Bundle', 'IntermediatePostLink'. $(_PleaseSetThisInProjectFile)</_OutputTypeDescription>
-  </PropertyGroup>
-  <Target Name="_CheckRequiredProperties">
-
-    <Error
-      Code="WIX100"
-      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)" />
-
-    <Error
-      Code="WIX101"
-      Condition=" '$(OutputType)' != 'Package' and '$(OutputType)' != 'PatchCreation' and '$(OutputType)' != 'Module' and '$(OutputType)' != 'Library' and '$(OutputType)' != 'Bundle' and '$(OutputType)' != 'IntermediatePostLink' "
-      Text="The OutputType property '$(OutputType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. $(_OutputTypeDescription)" />
-
-    <Error
-      Code="WIX102"
-      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." />
-
-    <Error
-      Code="WIX103"
-      Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' "
-      Text="The WixPdbType property '$(WixPdbType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. Supported values are: 'full', 'none'" />
-
-  </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;
-
-      WixBuild;
-      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>AssignTargetPaths</GetTargetPathDependsOn>
-  </PropertyGroup>
-
-
-  <!--
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  WixBuild Targets
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////////////////////////////////
-  -->
-
-  <!--
-  ==================================================================================================
-  WixBuild
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <WixBuildDependsOn>
-      ResolveReferences;
-      BeforeCompile;
-      _TimeStampBeforeCompile;
-
-      CalculateDefineConstants;
-      Harvest;
-
-      GenerateCompileWithObjectPath;
-
-      AssignTargetPaths;
-      ReadPreviousBindInputsAndBuiltOutputs;
-
-      CoreWixBuild;
-
-      UpdateLinkFileWrites;
-      _TimeStampAfterCompile;
-      AfterCompile
-    </WixBuildDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="WixBuild"
-    DependsOnTargets="$(WixBuildDependsOn)" />
-
-  <Target
-      Name="CoreWixBuild"
-      Inputs="@(Compile);
-      @(Content);
-      @(EmbeddedResource);
-      @(WixObject);
-      @(_ResolvedProjectReferencePaths);
-      @(_ResolvedWixLibraryPaths);
-      @(_ResolvedWixExtensionPaths);
-      @(_BindInputs);
-      $(MSBuildAllProjects)"
-      Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
-      Condition=" '@(Compile)' != '' ">
-
-    <PropertyGroup>
-      <!--<OutputFile>$([System.IO.Path]::GetFullPath($(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)))</OutputFile>-->
-      <OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)))</OutputFile>
-      <!--<OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)))</OutputFile>-->
-      <PdbOutputFile>$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)</PdbOutputFile>
-    </PropertyGroup>
-
-    <WixBuild
-        SourceFiles="@(_CompileWithObjectPath)"
-        LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
-        LocalizationFiles="@(EmbeddedResource)"
-
-        Cultures="%(CultureGroup.Identity)"
-
-        ExtensionDirectory="$(WixExtDir)"
-        Extensions="@(_ResolvedWixExtensionPaths)"
-
-        IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
-
-        OutputFile="$(OutputFile)"
-        OutputType="$(OutputType)"
-        PdbFile="$(PdbOutputFile)"
-        PdbType="$(WixPdbType)"
-
-        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>
-
-
-  <!--
-  ==================================================================================================
-  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>
-
-  <!--
-  ================================================================================================
-  AssignTargetPaths - OVERRIDE Target
-
-    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
-
-  ================================================================================================
-  -->
-  <Target
-      Name="AssignTargetPaths"
-      Condition=" '$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module' ">
-
-    <WixAssignCulture Cultures="$(Cultures)" Files="@(EmbeddedResource)">
-      <Output TaskParameter="CultureGroups" ItemName="CultureGroup" />
-    </WixAssignCulture>
-
-    <!-- Expand the culture groups then put them back into the appropriate property -->
-    <ItemGroup>
-      <_CulturedTargetPath Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)" />
-      <_CulturedTargetPdbPath Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <TargetPath>@(_CulturedTargetPath)</TargetPath>
-      <TargetPdbPath>@(_CulturedTargetPdbPath)</TargetPdbPath>
-    </PropertyGroup>
-  </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>
-
-  <!--
-  ================================================================================================
-  UpdateLinkFileWrites
-
-    Reads the bind outputs file(s) output generated during WixBuild 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 WixBuild 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
-    "WixBuild" 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;AssignTargetPaths</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)$(BindBuiltOutputsFile)">
-      <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>AssignTargetPaths</DebugSymbolsProjectOutputGroupDependsOn>
-  </PropertyGroup>
-  <Target
-    Name="DebugSymbolsProjectOutputGroup"
-    Outputs="@(DebugSymbolsProjectOutputGroupOutput)"
-    DependsOnTargets="$(DebugSymbolsProjectOutputGroupDependsOn)">
-
-    <!-- Include build output pdb(s).  Different than predefined itemgroup since AssignTargetPaths 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)$(BindBuiltOutputsFile)">
-      <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>
-- 
cgit v1.2.3-55-g6feb