diff --git a/.editorconfig b/src/.editorconfig
index 1d72e683..1d72e683 100644
--- a/.editorconfig
+++ b/src/.editorconfig

diff --git a/src/ThmViewerPackage/Package.wxs b/src/samples/ThmViewerPackage/Package.wxs
index cb2139cf..cb2139cf 100644
--- a/src/ThmViewerPackage/Package.wxs
+++ b/src/samples/ThmViewerPackage/Package.wxs

diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
index 23d24654..23d24654 100644
--- a/src/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj

diff --git a/src/ThmViewerPackage/packages.config b/src/samples/ThmViewerPackage/packages.config
index 7e55f706..7e55f706 100644
--- a/src/ThmViewerPackage/packages.config
+++ b/src/samples/ThmViewerPackage/packages.config

diff --git a/src/thmviewer/Resources/LoremIpsum.rtf b/src/samples/thmviewer/Resources/LoremIpsum.rtf
index 1ab0e65b..1ab0e65b 100644
--- a/src/thmviewer/Resources/LoremIpsum.rtf
+++ b/src/samples/thmviewer/Resources/LoremIpsum.rtf

diff --git a/src/thmviewer/Resources/thm.xml b/src/samples/thmviewer/Resources/thm.xml
index 6394f0f1..6394f0f1 100644
--- a/src/thmviewer/Resources/thm.xml
+++ b/src/samples/thmviewer/Resources/thm.xml

diff --git a/src/thmviewer/display.cpp b/src/samples/thmviewer/display.cpp
index 52fa3cf8..52fa3cf8 100644
--- a/src/thmviewer/display.cpp
+++ b/src/samples/thmviewer/display.cpp

diff --git a/src/thmviewer/load.cpp b/src/samples/thmviewer/load.cpp
index 0267402a..0267402a 100644
--- a/src/thmviewer/load.cpp
+++ b/src/samples/thmviewer/load.cpp

diff --git a/src/thmviewer/packages.config b/src/samples/thmviewer/packages.config
index a98c0c8e..a98c0c8e 100644
--- a/src/thmviewer/packages.config
+++ b/src/samples/thmviewer/packages.config

diff --git a/src/thmviewer/precomp.cpp b/src/samples/thmviewer/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/thmviewer/precomp.cpp
+++ b/src/samples/thmviewer/precomp.cpp

diff --git a/src/thmviewer/precomp.h b/src/samples/thmviewer/precomp.h
index 15d889fc..15d889fc 100644
--- a/src/thmviewer/precomp.h
+++ b/src/samples/thmviewer/precomp.h

diff --git a/src/thmviewer/resource.h b/src/samples/thmviewer/resource.h
index 4acc32cc..4acc32cc 100644
--- a/src/thmviewer/resource.h
+++ b/src/samples/thmviewer/resource.h

diff --git a/src/thmviewer/thmviewer.cpp b/src/samples/thmviewer/thmviewer.cpp
index f83182d3..f83182d3 100644
--- a/src/thmviewer/thmviewer.cpp
+++ b/src/samples/thmviewer/thmviewer.cpp

diff --git a/src/thmviewer/thmviewer.manifest b/src/samples/thmviewer/thmviewer.manifest
index 4663b61c..4663b61c 100644
--- a/src/thmviewer/thmviewer.manifest
+++ b/src/samples/thmviewer/thmviewer.manifest

diff --git a/src/thmviewer/thmviewer.rc b/src/samples/thmviewer/thmviewer.rc
index dc6d7242..dc6d7242 100644
--- a/src/thmviewer/thmviewer.rc
+++ b/src/samples/thmviewer/thmviewer.rc

diff --git a/src/thmviewer/thmviewer.v3.ncrunchproject b/src/samples/thmviewer/thmviewer.v3.ncrunchproject
index 3cffd6ce..3cffd6ce 100644
--- a/src/thmviewer/thmviewer.v3.ncrunchproject
+++ b/src/samples/thmviewer/thmviewer.v3.ncrunchproject

diff --git a/src/thmviewer/thmviewer.vcxproj b/src/samples/thmviewer/thmviewer.vcxproj
index c02dc237..c02dc237 100644
--- a/src/thmviewer/thmviewer.vcxproj
+++ b/src/samples/thmviewer/thmviewer.vcxproj

diff --git a/src/thmviewer/thmviewer.vcxproj.filters b/src/samples/thmviewer/thmviewer.vcxproj.filters
index 488d5510..488d5510 100644
--- a/src/thmviewer/thmviewer.vcxproj.filters
+++ b/src/samples/thmviewer/thmviewer.vcxproj.filters

diff --git a/version.json b/src/version.json
index eaeb2c79..eaeb2c79 100644
--- a/version.json
+++ b/src/version.json

diff --git a/src/Directory.Build.props b/src/wix/Directory.Build.props
index b3c6287c..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/wix/Directory.Build.props

diff --git a/src/Directory.Build.targets b/src/wix/Directory.Build.targets
index 2fcc765a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/wix/Directory.Build.targets

diff --git a/src/Directory.csproj.props b/src/wix/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/Directory.csproj.props
+++ b/src/wix/Directory.csproj.props

diff --git a/src/Directory.csproj.targets b/src/wix/Directory.csproj.targets
index c3270426..c3270426 100644
--- a/src/Directory.csproj.targets
+++ b/src/wix/Directory.csproj.targets

diff --git a/src/Directory.vcxproj.props b/src/wix/Directory.vcxproj.props
index bcf26c57..bcf26c57 100644
--- a/src/Directory.vcxproj.props
+++ b/src/wix/Directory.vcxproj.props

diff --git a/src/Directory.wixproj.props b/src/wix/Directory.wixproj.props
index a0aaa658..a0aaa658 100644
--- a/src/Directory.wixproj.props
+++ b/src/wix/Directory.wixproj.props

diff --git a/README.md b/src/wix/README-Tools.md
index a806dbde..a806dbde 100644
--- a/README.md
+++ b/src/wix/README-Tools.md

diff --git a/Tools.sln b/src/wix/Tools.sln
index 23f8a4d9..23f8a4d9 100644
--- a/Tools.sln
+++ b/src/wix/Tools.sln

diff --git a/Tools.v3.ncrunchsolution b/src/wix/Tools.v3.ncrunchsolution
index 10420ac9..10420ac9 100644
--- a/Tools.v3.ncrunchsolution
+++ b/src/wix/Tools.v3.ncrunchsolution

diff --git a/src/WixToolset.BuildTasks/AssemblyInfo.cs b/src/wix/WixToolset.BuildTasks/AssemblyInfo.cs
index ae52fce8..ae52fce8 100644
--- a/src/WixToolset.BuildTasks/AssemblyInfo.cs
+++ b/src/wix/WixToolset.BuildTasks/AssemblyInfo.cs

diff --git a/src/WixToolset.BuildTasks/BuildException.cs b/src/wix/WixToolset.BuildTasks/BuildException.cs
index 953134ba..953134ba 100644
--- a/src/WixToolset.BuildTasks/BuildException.cs
+++ b/src/wix/WixToolset.BuildTasks/BuildException.cs

diff --git a/src/WixToolset.BuildTasks/Common.cs b/src/wix/WixToolset.BuildTasks/Common.cs
index c5b709c2..c5b709c2 100644
--- a/src/WixToolset.BuildTasks/Common.cs
+++ b/src/wix/WixToolset.BuildTasks/Common.cs

diff --git a/src/WixToolset.BuildTasks/ConvertReferences.cs b/src/wix/WixToolset.BuildTasks/ConvertReferences.cs
index 3fdc78d1..3fdc78d1 100644
--- a/src/WixToolset.BuildTasks/ConvertReferences.cs
+++ b/src/wix/WixToolset.BuildTasks/ConvertReferences.cs

diff --git a/src/WixToolset.BuildTasks/CreateItemAvoidingInference.cs b/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs
index 3441bd85..3441bd85 100644
--- a/src/WixToolset.BuildTasks/CreateItemAvoidingInference.cs
+++ b/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs

diff --git a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs b/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
index 7cda6b01..7cda6b01 100644
--- a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
+++ b/src/wix/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs

diff --git a/src/WixToolset.BuildTasks/FileSearchHelperMethods.cs b/src/wix/WixToolset.BuildTasks/FileSearchHelperMethods.cs
index 397c9d7c..397c9d7c 100644
--- a/src/WixToolset.BuildTasks/FileSearchHelperMethods.cs
+++ b/src/wix/WixToolset.BuildTasks/FileSearchHelperMethods.cs

diff --git a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs b/src/wix/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
index a5f76618..a5f76618 100644
--- a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
+++ b/src/wix/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs

diff --git a/src/WixToolset.BuildTasks/GetCabList.cs b/src/wix/WixToolset.BuildTasks/GetCabList.cs
index 33fa5b37..33fa5b37 100644
--- a/src/WixToolset.BuildTasks/GetCabList.cs
+++ b/src/wix/WixToolset.BuildTasks/GetCabList.cs

diff --git a/src/WixToolset.BuildTasks/GetLooseFileList.cs b/src/wix/WixToolset.BuildTasks/GetLooseFileList.cs
index d1eb62c1..d1eb62c1 100644
--- a/src/WixToolset.BuildTasks/GetLooseFileList.cs
+++ b/src/wix/WixToolset.BuildTasks/GetLooseFileList.cs

diff --git a/src/WixToolset.BuildTasks/HeatDirectory.cs b/src/wix/WixToolset.BuildTasks/HeatDirectory.cs
index 79da303a..79da303a 100644
--- a/src/WixToolset.BuildTasks/HeatDirectory.cs
+++ b/src/wix/WixToolset.BuildTasks/HeatDirectory.cs

diff --git a/src/WixToolset.BuildTasks/HeatFile.cs b/src/wix/WixToolset.BuildTasks/HeatFile.cs
index 57fe579d..57fe579d 100644
--- a/src/WixToolset.BuildTasks/HeatFile.cs
+++ b/src/wix/WixToolset.BuildTasks/HeatFile.cs

diff --git a/src/WixToolset.BuildTasks/HeatProject.cs b/src/wix/WixToolset.BuildTasks/HeatProject.cs
index 3833a754..3833a754 100644
--- a/src/WixToolset.BuildTasks/HeatProject.cs
+++ b/src/wix/WixToolset.BuildTasks/HeatProject.cs

diff --git a/src/WixToolset.BuildTasks/HeatTask.cs b/src/wix/WixToolset.BuildTasks/HeatTask.cs
index 18c08342..18c08342 100644
--- a/src/WixToolset.BuildTasks/HeatTask.cs
+++ b/src/wix/WixToolset.BuildTasks/HeatTask.cs

diff --git a/src/WixToolset.BuildTasks/HeatTask_InProc.cs b/src/wix/WixToolset.BuildTasks/HeatTask_InProc.cs
index 48ee9e02..48ee9e02 100644
--- a/src/WixToolset.BuildTasks/HeatTask_InProc.cs
+++ b/src/wix/WixToolset.BuildTasks/HeatTask_InProc.cs

diff --git a/src/WixToolset.BuildTasks/Insignia.cs b/src/wix/WixToolset.BuildTasks/Insignia.cs
index d89770db..d89770db 100644
--- a/src/WixToolset.BuildTasks/Insignia.cs
+++ b/src/wix/WixToolset.BuildTasks/Insignia.cs

diff --git a/src/WixToolset.BuildTasks/MsbuildMessageListener.cs b/src/wix/WixToolset.BuildTasks/MsbuildMessageListener.cs
index f186d721..f186d721 100644
--- a/src/WixToolset.BuildTasks/MsbuildMessageListener.cs
+++ b/src/wix/WixToolset.BuildTasks/MsbuildMessageListener.cs

diff --git a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
index 7663e6df..7663e6df 100644
--- a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ b/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs

diff --git a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs b/src/wix/WixToolset.BuildTasks/RefreshGeneratedFile.cs
index c57e3f0f..c57e3f0f 100644
--- a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
+++ b/src/wix/WixToolset.BuildTasks/RefreshGeneratedFile.cs

diff --git a/src/WixToolset.BuildTasks/ResolveWixReferences.cs b/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs
index 9b8cfe6f..9b8cfe6f 100644
--- a/src/WixToolset.BuildTasks/ResolveWixReferences.cs
+++ b/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs

diff --git a/src/WixToolset.BuildTasks/ToolsetTask.cs b/src/wix/WixToolset.BuildTasks/ToolsetTask.cs
index d48f2a20..d48f2a20 100644
--- a/src/WixToolset.BuildTasks/ToolsetTask.cs
+++ b/src/wix/WixToolset.BuildTasks/ToolsetTask.cs

diff --git a/src/WixToolset.BuildTasks/ToolsetTask_InProc.cs b/src/wix/WixToolset.BuildTasks/ToolsetTask_InProc.cs
index fcf4aea9..fcf4aea9 100644
--- a/src/WixToolset.BuildTasks/ToolsetTask_InProc.cs
+++ b/src/wix/WixToolset.BuildTasks/ToolsetTask_InProc.cs

diff --git a/src/WixToolset.BuildTasks/WixAssignCulture.cs b/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs
index a8baa62f..a8baa62f 100644
--- a/src/WixToolset.BuildTasks/WixAssignCulture.cs
+++ b/src/wix/WixToolset.BuildTasks/WixAssignCulture.cs

diff --git a/src/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index dbff7e81..dbff7e81 100644
--- a/src/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs

diff --git a/src/WixToolset.BuildTasks/WixBuild_InProc.cs b/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs
index 9cba0f62..9cba0f62 100644
--- a/src/WixToolset.BuildTasks/WixBuild_InProc.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs

diff --git a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs b/src/wix/WixToolset.BuildTasks/WixCommandLineBuilder.cs
index a979dbb0..a979dbb0 100644
--- a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs
+++ b/src/wix/WixToolset.BuildTasks/WixCommandLineBuilder.cs

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 3a1c7f4c..3a1c7f4c 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject

diff --git a/src/WixToolset.Sdk/Sdk/Sdk.props b/src/wix/WixToolset.Sdk/Sdk/Sdk.props
index c517a1cf..c517a1cf 100644
--- a/src/WixToolset.Sdk/Sdk/Sdk.props
+++ b/src/wix/WixToolset.Sdk/Sdk/Sdk.props

diff --git a/src/WixToolset.Sdk/Sdk/Sdk.targets b/src/wix/WixToolset.Sdk/Sdk/Sdk.targets
index e21cf5c6..e21cf5c6 100644
--- a/src/WixToolset.Sdk/Sdk/Sdk.targets
+++ b/src/wix/WixToolset.Sdk/Sdk/Sdk.targets

diff --git a/src/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index 2374bf86..2374bf86 100644
--- a/src/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj

diff --git a/src/WixToolset.Sdk/WixToolset.Sdk.nuspec b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
index 591b63a6..591b63a6 100644
--- a/src/WixToolset.Sdk/WixToolset.Sdk.nuspec
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec

diff --git a/src/WixToolset.Sdk/WixToolset.Sdk.v3.ncrunchproject b/src/wix/WixToolset.Sdk/WixToolset.Sdk.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/WixToolset.Sdk/WixToolset.Sdk.v3.ncrunchproject
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.v3.ncrunchproject

diff --git a/src/WixToolset.Sdk/build/WixToolset.Sdk.props b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props
index b453361b..b453361b 100644
--- a/src/WixToolset.Sdk/build/WixToolset.Sdk.props
+++ b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props

diff --git a/src/WixToolset.Sdk/tools/wix.ca.targets b/src/wix/WixToolset.Sdk/tools/wix.ca.targets
index 4578c2d8..4578c2d8 100644
--- a/src/WixToolset.Sdk/tools/wix.ca.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.ca.targets

diff --git a/src/WixToolset.Sdk/tools/wix.harvest.targets b/src/wix/WixToolset.Sdk/tools/wix.harvest.targets
index f3ec760b..f3ec760b 100644
--- a/src/WixToolset.Sdk/tools/wix.harvest.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.harvest.targets

diff --git a/src/WixToolset.Sdk/tools/wix.signing.targets b/src/wix/WixToolset.Sdk/tools/wix.signing.targets
index 7c25175f..7c25175f 100644
--- a/src/WixToolset.Sdk/tools/wix.signing.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.signing.targets

diff --git a/src/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 5044bf5e..5044bf5e 100644
--- a/src/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets

diff --git a/appveyor.cmd b/src/wix/appveyor-Tools.cmd
index 504b2e9d..504b2e9d 100644
--- a/appveyor.cmd
+++ b/src/wix/appveyor-Tools.cmd

diff --git a/appveyor.yml b/src/wix/appveyor-Tools.yml
index 8fea070e..8fea070e 100644
--- a/appveyor.yml
+++ b/src/wix/appveyor-Tools.yml

diff --git a/src/dotnet-wix/DotnetToolSettings.xml b/src/wix/dotnet-wix/DotnetToolSettings.xml
index a7a87fb2..a7a87fb2 100644
--- a/src/dotnet-wix/DotnetToolSettings.xml
+++ b/src/wix/dotnet-wix/DotnetToolSettings.xml

diff --git a/src/dotnet-wix/dotnet-wix.csproj b/src/wix/dotnet-wix/dotnet-wix.csproj
index 710ab5cd..710ab5cd 100644
--- a/src/dotnet-wix/dotnet-wix.csproj
+++ b/src/wix/dotnet-wix/dotnet-wix.csproj

diff --git a/src/dotnet-wix/dotnet-wix.nuspec b/src/wix/dotnet-wix/dotnet-wix.nuspec
index 66d42c75..66d42c75 100644
--- a/src/dotnet-wix/dotnet-wix.nuspec
+++ b/src/wix/dotnet-wix/dotnet-wix.nuspec

diff --git a/src/dotnet-wix/dotnet-wix.v3.ncrunchproject b/src/wix/dotnet-wix/dotnet-wix.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/dotnet-wix/dotnet-wix.v3.ncrunchproject
+++ b/src/wix/dotnet-wix/dotnet-wix.v3.ncrunchproject

diff --git a/src/heat/AssemblyHarvester.cs b/src/wix/heat/AssemblyHarvester.cs
index be61f275..be61f275 100644
--- a/src/heat/AssemblyHarvester.cs
+++ b/src/wix/heat/AssemblyHarvester.cs

diff --git a/src/heat/Data/HarvesterErrors.cs b/src/wix/heat/Data/HarvesterErrors.cs
index a8a3055a..a8a3055a 100644
--- a/src/heat/Data/HarvesterErrors.cs
+++ b/src/wix/heat/Data/HarvesterErrors.cs

diff --git a/src/heat/Data/HarvesterVerboses.cs b/src/wix/heat/Data/HarvesterVerboses.cs
index 72de2351..72de2351 100644
--- a/src/heat/Data/HarvesterVerboses.cs
+++ b/src/wix/heat/Data/HarvesterVerboses.cs

diff --git a/src/heat/Data/HarvesterWarnings.cs b/src/wix/heat/Data/HarvesterWarnings.cs
index 80ee5c31..80ee5c31 100644
--- a/src/heat/Data/HarvesterWarnings.cs
+++ b/src/wix/heat/Data/HarvesterWarnings.cs

diff --git a/src/heat/Data/HeatCommandLineOption.cs b/src/wix/heat/Data/HeatCommandLineOption.cs
index 5815abf0..5815abf0 100644
--- a/src/heat/Data/HeatCommandLineOption.cs
+++ b/src/wix/heat/Data/HeatCommandLineOption.cs

diff --git a/src/heat/Data/IHeatCommandLine.cs b/src/wix/heat/Data/IHeatCommandLine.cs
index 9198468d..9198468d 100644
--- a/src/heat/Data/IHeatCommandLine.cs
+++ b/src/wix/heat/Data/IHeatCommandLine.cs

diff --git a/src/heat/DirectoryHarvester.cs b/src/wix/heat/DirectoryHarvester.cs
index 090d67ab..090d67ab 100644
--- a/src/heat/DirectoryHarvester.cs
+++ b/src/wix/heat/DirectoryHarvester.cs

diff --git a/src/heat/DllHarvester.cs b/src/wix/heat/DllHarvester.cs
index 723e44ee..723e44ee 100644
--- a/src/heat/DllHarvester.cs
+++ b/src/wix/heat/DllHarvester.cs

diff --git a/src/heat/Extensibility/BaseHarvesterExtension.cs b/src/wix/heat/Extensibility/BaseHarvesterExtension.cs
index 02696d5b..02696d5b 100644
--- a/src/heat/Extensibility/BaseHarvesterExtension.cs
+++ b/src/wix/heat/Extensibility/BaseHarvesterExtension.cs

diff --git a/src/heat/Extensibility/BaseHeatExtension.cs b/src/wix/heat/Extensibility/BaseHeatExtension.cs
index b76aaf62..b76aaf62 100644
--- a/src/heat/Extensibility/BaseHeatExtension.cs
+++ b/src/wix/heat/Extensibility/BaseHeatExtension.cs

diff --git a/src/heat/Extensibility/BaseMutatorExtension.cs b/src/wix/heat/Extensibility/BaseMutatorExtension.cs
index c36a8ed1..c36a8ed1 100644
--- a/src/heat/Extensibility/BaseMutatorExtension.cs
+++ b/src/wix/heat/Extensibility/BaseMutatorExtension.cs

diff --git a/src/heat/Extensibility/IHarvester.cs b/src/wix/heat/Extensibility/IHarvester.cs
index 6d363b50..6d363b50 100644
--- a/src/heat/Extensibility/IHarvester.cs
+++ b/src/wix/heat/Extensibility/IHarvester.cs

diff --git a/src/heat/Extensibility/IHarvesterCore.cs b/src/wix/heat/Extensibility/IHarvesterCore.cs
index 3c34b8a1..3c34b8a1 100644
--- a/src/heat/Extensibility/IHarvesterCore.cs
+++ b/src/wix/heat/Extensibility/IHarvesterCore.cs

diff --git a/src/heat/Extensibility/IHarvesterExtension.cs b/src/wix/heat/Extensibility/IHarvesterExtension.cs
index 5125ea32..5125ea32 100644
--- a/src/heat/Extensibility/IHarvesterExtension.cs
+++ b/src/wix/heat/Extensibility/IHarvesterExtension.cs

diff --git a/src/heat/Extensibility/IHeatCore.cs b/src/wix/heat/Extensibility/IHeatCore.cs
index 0aa01b62..0aa01b62 100644
--- a/src/heat/Extensibility/IHeatCore.cs
+++ b/src/wix/heat/Extensibility/IHeatCore.cs

diff --git a/src/heat/Extensibility/IHeatExtension.cs b/src/wix/heat/Extensibility/IHeatExtension.cs
index 8a00da37..8a00da37 100644
--- a/src/heat/Extensibility/IHeatExtension.cs
+++ b/src/wix/heat/Extensibility/IHeatExtension.cs

diff --git a/src/heat/Extensibility/IMutator.cs b/src/wix/heat/Extensibility/IMutator.cs
index c936339e..c936339e 100644
--- a/src/heat/Extensibility/IMutator.cs
+++ b/src/wix/heat/Extensibility/IMutator.cs

diff --git a/src/heat/Extensibility/IMutatorExtension.cs b/src/wix/heat/Extensibility/IMutatorExtension.cs
index b81f586e..b81f586e 100644
--- a/src/heat/Extensibility/IMutatorExtension.cs
+++ b/src/wix/heat/Extensibility/IMutatorExtension.cs

diff --git a/src/heat/FileHarvester.cs b/src/wix/heat/FileHarvester.cs
index 8bb1a155..8bb1a155 100644
--- a/src/heat/FileHarvester.cs
+++ b/src/wix/heat/FileHarvester.cs

diff --git a/src/heat/Harvester.cs b/src/wix/heat/Harvester.cs
index 791c1cb2..791c1cb2 100644
--- a/src/heat/Harvester.cs
+++ b/src/wix/heat/Harvester.cs

diff --git a/src/heat/HarvesterCore.cs b/src/wix/heat/HarvesterCore.cs
index 92b34ab0..92b34ab0 100644
--- a/src/heat/HarvesterCore.cs
+++ b/src/wix/heat/HarvesterCore.cs

diff --git a/src/heat/HeatCommand.cs b/src/wix/heat/HeatCommand.cs
index 99f27521..99f27521 100644
--- a/src/heat/HeatCommand.cs
+++ b/src/wix/heat/HeatCommand.cs

diff --git a/src/heat/HeatCommandLine.cs b/src/wix/heat/HeatCommandLine.cs
index b11dda4e..b11dda4e 100644
--- a/src/heat/HeatCommandLine.cs
+++ b/src/wix/heat/HeatCommandLine.cs

diff --git a/src/heat/HeatCommandLineFactory.cs b/src/wix/heat/HeatCommandLineFactory.cs
index 44291e48..44291e48 100644
--- a/src/heat/HeatCommandLineFactory.cs
+++ b/src/wix/heat/HeatCommandLineFactory.cs

diff --git a/src/heat/HeatCore.cs b/src/wix/heat/HeatCore.cs
index 578c4aab..578c4aab 100644
--- a/src/heat/HeatCore.cs
+++ b/src/wix/heat/HeatCore.cs

diff --git a/src/heat/HelpCommand.cs b/src/wix/heat/HelpCommand.cs
index bd2bcc24..bd2bcc24 100644
--- a/src/heat/HelpCommand.cs
+++ b/src/wix/heat/HelpCommand.cs

diff --git a/src/heat/IIsFinalizeHarvesterMutator.cs b/src/wix/heat/IIsFinalizeHarvesterMutator.cs
index 17d3bef4..17d3bef4 100644
--- a/src/heat/IIsFinalizeHarvesterMutator.cs
+++ b/src/wix/heat/IIsFinalizeHarvesterMutator.cs

diff --git a/src/heat/IIsHarvesterMutator.cs b/src/wix/heat/IIsHarvesterMutator.cs
index 76d94b6a..76d94b6a 100644
--- a/src/heat/IIsHarvesterMutator.cs
+++ b/src/wix/heat/IIsHarvesterMutator.cs

diff --git a/src/heat/IIsHeatExtension.cs b/src/wix/heat/IIsHeatExtension.cs
index 94e11a68..94e11a68 100644
--- a/src/heat/IIsHeatExtension.cs
+++ b/src/wix/heat/IIsHeatExtension.cs

diff --git a/src/heat/IIsWebSiteHarvester.cs b/src/wix/heat/IIsWebSiteHarvester.cs
index 86861b16..86861b16 100644
--- a/src/heat/IIsWebSiteHarvester.cs
+++ b/src/wix/heat/IIsWebSiteHarvester.cs

diff --git a/src/heat/Mutator.cs b/src/wix/heat/Mutator.cs
index 8c63882d..8c63882d 100644
--- a/src/heat/Mutator.cs
+++ b/src/wix/heat/Mutator.cs

diff --git a/src/heat/PayloadHarvester.cs b/src/wix/heat/PayloadHarvester.cs
index 4bf625d1..4bf625d1 100644
--- a/src/heat/PayloadHarvester.cs
+++ b/src/wix/heat/PayloadHarvester.cs

diff --git a/src/heat/PerformanceCategoryHarvester.cs b/src/wix/heat/PerformanceCategoryHarvester.cs
index d9c46001..d9c46001 100644
--- a/src/heat/PerformanceCategoryHarvester.cs
+++ b/src/wix/heat/PerformanceCategoryHarvester.cs

diff --git a/src/heat/Program.cs b/src/wix/heat/Program.cs
index d0bcf19f..d0bcf19f 100644
--- a/src/heat/Program.cs
+++ b/src/wix/heat/Program.cs

diff --git a/src/heat/RegFileHarvester.cs b/src/wix/heat/RegFileHarvester.cs
index a3d181f2..a3d181f2 100644
--- a/src/heat/RegFileHarvester.cs
+++ b/src/wix/heat/RegFileHarvester.cs

diff --git a/src/heat/RegistryHarvester.cs b/src/wix/heat/RegistryHarvester.cs
index d416236c..d416236c 100644
--- a/src/heat/RegistryHarvester.cs
+++ b/src/wix/heat/RegistryHarvester.cs

diff --git a/src/heat/Serialize/CodeDomInterfaces.cs b/src/wix/heat/Serialize/CodeDomInterfaces.cs
index bd674db6..bd674db6 100644
--- a/src/heat/Serialize/CodeDomInterfaces.cs
+++ b/src/wix/heat/Serialize/CodeDomInterfaces.cs

diff --git a/src/heat/Serialize/CodeDomReader.cs b/src/wix/heat/Serialize/CodeDomReader.cs
index 0741bf68..0741bf68 100644
--- a/src/heat/Serialize/CodeDomReader.cs
+++ b/src/wix/heat/Serialize/CodeDomReader.cs

diff --git a/src/heat/Serialize/ElementCollection.cs b/src/wix/heat/Serialize/ElementCollection.cs
index bacbafbd..bacbafbd 100644
--- a/src/heat/Serialize/ElementCollection.cs
+++ b/src/wix/heat/Serialize/ElementCollection.cs

diff --git a/src/heat/Serialize/WixHarvesterStrings.Designer.cs b/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs
index 6504a67b..6504a67b 100644
--- a/src/heat/Serialize/WixHarvesterStrings.Designer.cs
+++ b/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs

diff --git a/src/heat/Serialize/WixHarvesterStrings.resx b/src/wix/heat/Serialize/WixHarvesterStrings.resx
index 5894a190..5894a190 100644
--- a/src/heat/Serialize/WixHarvesterStrings.resx
+++ b/src/wix/heat/Serialize/WixHarvesterStrings.resx

diff --git a/src/heat/Serialize/iis.cs b/src/wix/heat/Serialize/iis.cs
index 3f2943f8..3f2943f8 100644
--- a/src/heat/Serialize/iis.cs
+++ b/src/wix/heat/Serialize/iis.cs

diff --git a/src/heat/Serialize/util.cs b/src/wix/heat/Serialize/util.cs
index 84f56eb0..84f56eb0 100644
--- a/src/heat/Serialize/util.cs
+++ b/src/wix/heat/Serialize/util.cs

diff --git a/src/heat/Serialize/vs.cs b/src/wix/heat/Serialize/vs.cs
index 8f926efc..8f926efc 100644
--- a/src/heat/Serialize/vs.cs
+++ b/src/wix/heat/Serialize/vs.cs

diff --git a/src/heat/Serialize/wix.cs b/src/wix/heat/Serialize/wix.cs
index e5a81cd0..e5a81cd0 100644
--- a/src/heat/Serialize/wix.cs
+++ b/src/wix/heat/Serialize/wix.cs

diff --git a/src/heat/TypeLibraryHarvester.cs b/src/wix/heat/TypeLibraryHarvester.cs
index 4a271a35..4a271a35 100644
--- a/src/heat/TypeLibraryHarvester.cs
+++ b/src/wix/heat/TypeLibraryHarvester.cs

diff --git a/src/heat/UtilFinalizeHarvesterMutator.cs b/src/wix/heat/UtilFinalizeHarvesterMutator.cs
index 3e9f1ce7..3e9f1ce7 100644
--- a/src/heat/UtilFinalizeHarvesterMutator.cs
+++ b/src/wix/heat/UtilFinalizeHarvesterMutator.cs

diff --git a/src/heat/UtilHarvesterMutator.cs b/src/wix/heat/UtilHarvesterMutator.cs
index 59fb9a93..59fb9a93 100644
--- a/src/heat/UtilHarvesterMutator.cs
+++ b/src/wix/heat/UtilHarvesterMutator.cs

diff --git a/src/heat/UtilHeatExtension.cs b/src/wix/heat/UtilHeatExtension.cs
index 7296a3b3..7296a3b3 100644
--- a/src/heat/UtilHeatExtension.cs
+++ b/src/wix/heat/UtilHeatExtension.cs

diff --git a/src/heat/UtilMutator.cs b/src/wix/heat/UtilMutator.cs
index 3ba3a8eb..3ba3a8eb 100644
--- a/src/heat/UtilMutator.cs
+++ b/src/wix/heat/UtilMutator.cs

diff --git a/src/heat/UtilTransformMutator.cs b/src/wix/heat/UtilTransformMutator.cs
index f4dda3c5..f4dda3c5 100644
--- a/src/heat/UtilTransformMutator.cs
+++ b/src/wix/heat/UtilTransformMutator.cs

diff --git a/src/heat/VSHeatExtension.cs b/src/wix/heat/VSHeatExtension.cs
index 7c0539bf..7c0539bf 100644
--- a/src/heat/VSHeatExtension.cs
+++ b/src/wix/heat/VSHeatExtension.cs

diff --git a/src/heat/VSProjectHarvester.cs b/src/wix/heat/VSProjectHarvester.cs
index 115ee828..115ee828 100644
--- a/src/heat/VSProjectHarvester.cs
+++ b/src/wix/heat/VSProjectHarvester.cs

diff --git a/src/heat/app.config b/src/wix/heat/app.config
index 65d3d6c3..65d3d6c3 100644
--- a/src/heat/app.config
+++ b/src/wix/heat/app.config

diff --git a/src/heat/heat.csproj b/src/wix/heat/heat.csproj
index 650203b0..650203b0 100644
--- a/src/heat/heat.csproj
+++ b/src/wix/heat/heat.csproj

diff --git a/src/heat/heat.exe.manifest b/src/wix/heat/heat.exe.manifest
index b4adfbb7..b4adfbb7 100644
--- a/src/heat/heat.exe.manifest
+++ b/src/wix/heat/heat.exe.manifest

diff --git a/src/heat/heat.net461.v3.ncrunchproject b/src/wix/heat/heat.net461.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/heat/heat.net461.v3.ncrunchproject
+++ b/src/wix/heat/heat.net461.v3.ncrunchproject

diff --git a/src/heat/heat.netcoreapp2.1.v3.ncrunchproject b/src/wix/heat/heat.netcoreapp2.1.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/heat/heat.netcoreapp2.1.v3.ncrunchproject
+++ b/src/wix/heat/heat.netcoreapp2.1.v3.ncrunchproject

diff --git a/nuget.config b/src/wix/nuget-Tools.config
index 81117c3d..81117c3d 100644
--- a/nuget.config
+++ b/src/wix/nuget-Tools.config

diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index 9d132f66..9d132f66 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs

diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index c01860cd..c01860cd 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj

diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
index f1d03cd7..f1d03cd7 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject

diff --git a/src/test/WixToolsetTest.Heat/HeatRunner.cs b/src/wix/test/WixToolsetTest.Heat/HeatRunner.cs
index 287698a9..287698a9 100644
--- a/src/test/WixToolsetTest.Heat/HeatRunner.cs
+++ b/src/wix/test/WixToolsetTest.Heat/HeatRunner.cs

diff --git a/src/test/WixToolsetTest.Heat/PayloadTests.cs b/src/wix/test/WixToolsetTest.Heat/PayloadTests.cs
index 8072f50d..8072f50d 100644
--- a/src/test/WixToolsetTest.Heat/PayloadTests.cs
+++ b/src/wix/test/WixToolsetTest.Heat/PayloadTests.cs

diff --git a/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu b/src/wix/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu
index c39f53b0..c39f53b0 100644
--- a/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu
+++ b/src/wix/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu

diff --git a/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe b/src/wix/test/WixToolsetTest.Heat/TestData/.Data/burn.exe
index 2a4f423f..2a4f423f 100644
--- a/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe
+++ b/src/wix/test/WixToolsetTest.Heat/TestData/.Data/burn.exe

diff --git a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs b/src/wix/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs
index 40100f22..40100f22 100644
--- a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs
+++ b/src/wix/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs

diff --git a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs b/src/wix/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs
index f203fe27..f203fe27 100644
--- a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs
+++ b/src/wix/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs

diff --git a/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index 4af6749c..4af6749c 100644
--- a/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj

diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 3c8e79e7..3c8e79e7 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs

diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
index 8b2e8e3d..8b2e8e3d 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs

diff --git a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
index 2e07af3a..2e07af3a 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs

diff --git a/src/test/WixToolsetTest.Sdk/README.md b/src/wix/test/WixToolsetTest.Sdk/README.md
index 7faf34b9..7faf34b9 100644
--- a/src/test/WixToolsetTest.Sdk/README.md
+++ b/src/wix/test/WixToolsetTest.Sdk/README.md

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
index 7d751319..7d751319 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
index 5f282702..5f282702 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
index 5f282702..5f282702 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
index 5abcee9f..5abcee9f 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj
index 3988acaf..3988acaf 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
index f5fa8cf6..f5fa8cf6 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
index c569e8ac..c569e8ac 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
index 6c12861b..6c12861b 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
index 907f0bb0..907f0bb0 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
index d30218f3..d30218f3 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs
index 2b2c5be2..2b2c5be2 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj
index 755976bc..755976bc 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs
index c29a2303..c29a2303 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
index 9c55f7a5..9c55f7a5 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
index 77ee4420..77ee4420 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
index ef62c31b..ef62c31b 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
index b892debd..b892debd 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
index 91579790..91579790 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
index 555addbe..555addbe 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
index 23493ace..23493ace 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
index df24aa33..df24aa33 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
index e26c4509..e26c4509 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
index 2c88704e..2c88704e 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index 18ae08b2..18ae08b2 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index 0a133c7d..0a133c7d 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
index ddb95faf..ddb95faf 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
index 3b4a9d6a..3b4a9d6a 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
index 199eb6d9..199eb6d9 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
index dd21489d..dd21489d 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs
index 6ab9a016..6ab9a016 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs

diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj
index 199eb6d9..199eb6d9 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj

diff --git a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 35ed053a..35ed053a 100644
--- a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj

diff --git a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject
index f1d03cd7..f1d03cd7 100644
--- a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject

diff --git a/src/wix/ConsoleMessageListener.cs b/src/wix/wix/ConsoleMessageListener.cs
index ebf1622b..ebf1622b 100644
--- a/src/wix/ConsoleMessageListener.cs
+++ b/src/wix/wix/ConsoleMessageListener.cs

diff --git a/src/wix/Program.cs b/src/wix/wix/Program.cs
index d1818df0..d1818df0 100644
--- a/src/wix/Program.cs
+++ b/src/wix/wix/Program.cs

diff --git a/src/wix/app.config b/src/wix/wix/app.config
index 081fea2c..081fea2c 100644
--- a/src/wix/app.config
+++ b/src/wix/wix/app.config

diff --git a/src/wix/wix.csproj b/src/wix/wix/wix.csproj
index 7fac5e95..7fac5e95 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj

diff --git a/src/wix/wix.exe.manifest b/src/wix/wix/wix.exe.manifest
index f35b5534..f35b5534 100644
--- a/src/wix/wix.exe.manifest
+++ b/src/wix/wix/wix.exe.manifest

diff --git a/src/wix/wix.net461.v3.ncrunchproject b/src/wix/wix/wix.net461.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/wix/wix.net461.v3.ncrunchproject
+++ b/src/wix/wix/wix.net461.v3.ncrunchproject

diff --git a/src/wix/wix.netcoreapp2.1.v3.ncrunchproject b/src/wix/wix/wix.netcoreapp2.1.v3.ncrunchproject
index cf22dfa9..cf22dfa9 100644
--- a/src/wix/wix.netcoreapp2.1.v3.ncrunchproject
+++ b/src/wix/wix/wix.netcoreapp2.1.v3.ncrunchproject