Implement integrated build process

48 files changed, 408 insertions, 922 deletions

diff --git a/src/api/wix/Custom.Build.props b/src/api/Directory.Build.props
index 889fb62e..9b11624c 100644
--- a/src/api/wix/Custom.Build.props
+++ b/src/api/Directory.Build.props
@@ -1,6 +1,10 @@
+<?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>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  <PropertyGroup>
+    <SegmentName>api</SegmentName>
   </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props" />
 </Project>
diff --git a/src/api/api.cmd b/src/api/api.cmd
new file mode 100644
index 00000000..e08c10aa
--- /dev/null
+++ b/src/api/api.cmd
@@ -0,0 +1,43 @@
+@setlocal
+@pushd %~dp0
+
+@set _C=Debug
+:parse_args
+@if /i "%1"=="release" set _C=Release& shift
+@if not "%1"=="" shift & goto parse_args
+
+@echo Building api %_C%
+
+:: burn
+
+nuget restore burn\api_burn.sln || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 burn\api_burn.sln || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 burn\api_burn.sln || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 burn\api_burn.sln || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 burn\api_burn.sln || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 burn\api_burn.sln || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 burn\api_burn.sln || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 burn\api_burn.sln || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 burn\api_burn.sln || exit /b
+
+dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
+
+msbuild -t:PackNative -p:Configuration=%_C% burn\balutil\balutil.vcxproj || exit /b
+msbuild -t:PackNative -p:Configuration=%_C% burn\bextutil\bextutil.vcxproj || exit /b
+msbuild -t:PackNative -Restore -p:Configuration=%_C% burn\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b
+msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
+
+
+:: wix
+
+msbuild -Restore -p:Configuration=%_C% wix\api_wix.sln || exit /b
+
+dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b
+
+msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wix\api_wix.sln || exit /b
+
+@popd
+@endlocal
diff --git a/src/api/api.sln b/src/api/api.sln
new file mode 100644
index 00000000..4bec2ec3
--- /dev/null
+++ b/src/api/api.sln
@@ -0,0 +1,208 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.6.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "wix\WixToolset.Data\WixToolset.Data.csproj", "{6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "wix\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{0B5A9161-EDBB-4B60-AE97-24199BCF36A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "wix\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{D6A57B9F-CF8C-442B-A9CE-F05258AB0046}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wix", "wix", "{A2DB791A-F5A8-44F9-9225-2C8BE1936356}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "burn", "burn", "{E5E93B46-D1AD-4F00-B3C2-F459DC670302}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "burn\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "burn\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "burn\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Debug|ARM64 = Debug|ARM64
+                Debug|x64 = Debug|x64
+                Debug|x86 = Debug|x86
+                Release|Any CPU = Release|Any CPU
+                Release|ARM64 = Release|ARM64
+                Release|x64 = Release|x64
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.Build.0 = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.Build.0 = Debug|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.Build.0 = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.ActiveCfg = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.Build.0 = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.ActiveCfg = Release|Any CPU
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.Build.0 = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.Build.0 = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.Build.0 = Debug|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.Build.0 = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.Build.0 = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.ActiveCfg = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.Build.0 = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.ActiveCfg = Release|Any CPU
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.Build.0 = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.Build.0 = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.Build.0 = Debug|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.Build.0 = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.Build.0 = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.ActiveCfg = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.Build.0 = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.ActiveCfg = Release|Any CPU
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.Build.0 = Release|Any CPU
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.Build.0 = Debug|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|Any CPU.ActiveCfg = Release|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.Build.0 = Debug|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|Any CPU.ActiveCfg = Release|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.Build.0 = Debug|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|Any CPU.ActiveCfg = Release|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32
+                {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|ARM64.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x64.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.ActiveCfg = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.Build.0 = Debug|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|Any CPU.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|ARM64.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x64.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.ActiveCfg = Release|Win32
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.Build.0 = Release|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.Build.0 = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|ARM64.ActiveCfg = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x64.ActiveCfg = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.ActiveCfg = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.Build.0 = Debug|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|Any CPU.ActiveCfg = Release|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|ARM64.ActiveCfg = Release|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x64.ActiveCfg = Release|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.ActiveCfg = Release|Win32
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.Build.0 = Release|Win32
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.Build.0 = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.Build.0 = Debug|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.Build.0 = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.Build.0 = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.ActiveCfg = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.Build.0 = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.ActiveCfg = Release|Any CPU
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.Build.0 = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.Build.0 = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.Build.0 = Debug|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.Build.0 = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.Build.0 = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.ActiveCfg = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.Build.0 = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.ActiveCfg = Release|Any CPU
+                {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(NestedProjects) = preSolution
+                {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356}
+                {0B5A9161-EDBB-4B60-AE97-24199BCF36A4} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356}
+                {D6A57B9F-CF8C-442B-A9CE-F05258AB0046} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356}
+                {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {06027492-1CB9-48BC-B31E-C1F9356ED07E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {665E0441-17F9-4105-B202-EDF274657F6E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {B69E6422-49B0-4E28-92F9-B8A7410A6ED9} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {17DA3E92-40C5-4328-9BA5-1FE459A13719} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+                {47029283-43EC-4F22-9417-A02B28594912} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302}
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {43BCDC9F-5870-4B64-8363-FF28585020ED}
+        EndGlobalSection
+EndGlobal
diff --git a/src/api/burn/Directory.Build.props b/src/api/burn/Directory.Build.props
deleted file mode 100644
index fb34d54e..00000000
--- a/src/api/burn/Directory.Build.props
+++ /dev/null
@@ -1,26 +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. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
-
-    <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
-    <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
-
-    <Authors>WiX Toolset Team</Authors>
-    <Company>WiX Toolset</Company>
-    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
-    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
-    <Product>WiX Toolset</Product>
-  </PropertyGroup>
-
-  <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
-  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
-</Project>
diff --git a/src/api/burn/Directory.Build.targets b/src/api/burn/Directory.Build.targets
deleted file mode 100644
index 44701fb6..00000000
--- a/src/api/burn/Directory.Build.targets
+++ /dev/null
@@ -1,73 +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. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder>
-    <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
-    <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist>
-    <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
-    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
-          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
-    <PropertyGroup>
-      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
-
-      <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-      <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath>
-      <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
-      <PublishRepositoryUrl>true</PublishRepositoryUrl>
-      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties"
-          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
-
-    <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' 
-          WorkingDirectory="$(MSBuildProjectDirectory)" />
-
-    <ItemGroup>
-      <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_GetSignClient"
-          Condition=" !Exists('$(SigningToolExe)') ">
-
-    <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
-
-    <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' />
-  </Target>
-
-  <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
-          Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and 
-                      ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
-
-    <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
-          WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
-  </Target>
-
-  <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative"
-          Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' ">
-    <ItemGroup>
-      <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
-    </ItemGroup>
-
-    <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
-          WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
-  </Target>
-
-  <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
-  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
-</Project>
diff --git a/src/api/burn/Directory.csproj.props b/src/api/burn/Directory.csproj.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/api/burn/Directory.csproj.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
-    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
-  </PropertyGroup>
-</Project>
diff --git a/src/api/burn/Directory.vcxproj.props b/src/api/burn/Directory.vcxproj.props
deleted file mode 100644
index 9ea7071b..00000000
--- a/src/api/burn/Directory.vcxproj.props
+++ /dev/null
@@ -1,115 +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>
-  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
-    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(OutputPath)$(Platform)\</OutDir>
-
-    <!-- NBGV properties -->
-    <AssemblyCompany>$(Company)</AssemblyCompany>
-    <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
-
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
-    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
-      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <ExceptionHandling>false</ExceptionHandling>
-      <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
-      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Link>
-      <SubSystem>$(ProjectSubSystem)</SubSystem>
-      <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
-      <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
-    <ClCompile>
-      <CallingConvention>CDecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
-    <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <OmitDefaultLibName>true</OmitDefaultLibName>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
-    <Link>
-      <KeyFile>$(LinkKeyFile)</KeyFile>
-      <DelaySign>$(LinkDelaySign)</DelaySign>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/src/api/burn/NativeMultiTargeting.Build.props b/src/api/burn/NativeMultiTargeting.Build.props
deleted file mode 100644
index 1ff46559..00000000
--- a/src/api/burn/NativeMultiTargeting.Build.props
+++ /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>
-  <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
-  <PropertyGroup>
-    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
-    <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
-  </PropertyGroup>
-</Project>
diff --git a/src/api/burn/README.md b/src/api/burn/README.md
deleted file mode 100644
index 380bbda3..00000000
--- a/src/api/burn/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# balutil
-balutil.lib - WiX Toolset Bootstrapper Application Layer native utility library
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
index b10b75d2..d86bb3cd 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
@@ -1,19 +1,20 @@
 <?xml version="1.0"?>
-<package >
-  <metadata>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
-    <authors>WiX Toolset Team</authors>
-    <owners>WiX Toolset Team</owners>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/BootstrapperCore</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
-    <file src="build\$id$.props" target="build\" />
-    <file src="inc\*" target="build\native\include" />
+    <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\inc\*" target="build\native\include" />
   </files>
 </package>
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
index 0899bdcf..0bd374c7 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
@@ -1,19 +1,19 @@
 <?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 ToolsVersion="4.0" DefaultTargets="Pack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.Build.NoTargets/3.0.4">
   <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageId>WixToolset.BootstrapperCore.Native</PackageId>
     <Description>WiX Bootstrapper native interfaces</Description>
   </PropertyGroup>
 
-  <Target Name="PackNative" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack $(PackageId).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Id=$(PackageId);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
-  </Target>
-  
-  <Import Project="..\Directory.Build.props" />  
-  <!-- <Import Project="..\Directory.Build.targets" /> -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
 
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="Pack"
+          DependsOnTargets="GitVersion;PackNative"
+          BeforeTargets="AfterBuild" />
 </Project>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 2bd7ca80..ce8c7105 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -13,47 +13,16 @@
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\mbanative\mbanative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x86" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
-    <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
-    <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
-  </PropertyGroup>
-
-  <Target Name="BuildMbaNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
-    <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
-    </MSBuild>
-
-    <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
-
-    <ItemGroup>
-      <FileWrites Include="$(NativeFileListPath)" />
-
-      <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </AllItemsFullPathWithTargetPath>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' ">
-    <ReadLinesFromFile File="$(NativeFileListPath)">
-      <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" />
-    </ReadLinesFromFile>
-
-    <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " />
-
-    <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
-      <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" />
-    </Copy>
-
-    <ItemGroup>
-      <FileWrites Include="@(_NCrunchNativeCopied)" />
-    </ItemGroup>
-  </Target>
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(NCrunch)'=='1' ">
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 </Project>
diff --git a/src/api/burn/balutil.sln b/src/api/burn/api_burn.sln
index cae580f3..858272fb 100644
--- a/src/api/burn/balutil.sln
+++ b/src/api/burn/api_burn.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29503.13
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "src\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "src\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "src\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "src\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/api/burn/appveyor.cmd b/src/api/burn/appveyor.cmd
deleted file mode 100644
index 26f75243..00000000
--- a/src/api/burn/appveyor.cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-@setlocal
-@pushd %~dp0
-@set _C=Release
-@if /i "%1"=="debug" set _C=Debug
-
-nuget restore || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b
-
-dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
-
-msbuild -t:PackNative -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b
-msbuild -t:PackNative -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b
-msbuild -t:PackNative -p:Configuration=%_C% src\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b
-msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
-
-@popd
-@endlocal
\ No newline at end of file
diff --git a/src/api/burn/appveyor.yml b/src/api/burn/appveyor.yml
deleted file mode 100644
index e4d25586..00000000
--- a/src/api/burn/appveyor.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-#
-#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
-#  then update all of the repos.
-
-branches:
-  only:
-    - master
-    - develop
-
-image: Visual Studio 2019
-
-version: 0.0.0.{build}
-configuration: Release
-
-environment:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  NUGET_XMLDOC_MODE: skip
-
-build_script:
-  - appveyor.cmd
-
-test: off
-
-pull_requests:
-  do_not_increment_build_number: true
-
-nuget:
-  disable_publish_on_pr: true
-
-skip_branch_with_pr: true
-skip_tags: true
-
-artifacts:
-- path: build\Release\**\*.nupkg
-  name: nuget
-
-notifications:
-- provider: Slack
-  incoming_webhook:
-    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index e38362ec..82509140 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -1,31 +1,32 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
+  <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
     <authors>$authors$</authors>
-    <owners>$authors$</owners>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-        <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
-        <dependency id="WixToolset.DUtil" version="[4,5)" />
+      <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
+      <dependency id="WixToolset.DUtil" version="[4,5)" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="build\$id$.props" target="build\" />
-    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
-    <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" />
-    <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" />
-    <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
+    <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <!-- <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" />
+    <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> -->
+    <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index ab33f159..8f763324 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -2,9 +2,6 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
-
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -44,8 +41,7 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
-  <Import Project="..\NativeMultiTargeting.Build.props" />
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
 
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -54,7 +50,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
@@ -86,16 +82,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+
+    <PackageReference Include="WixToolset.DUtil" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/api/burn/balutil/packages.config b/src/api/burn/balutil/packages.config
deleted file mode 100644
index 08ea3364..00000000
--- a/src/api/burn/balutil/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 752dbb97..e75c4a43 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -1,31 +1,32 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
+  <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
     <authors>$authors$</authors>
-    <owners>$authors$</owners>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-        <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
-        <dependency id="WixToolset.DUtil" version="[4,5)" />
+      <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
+      <dependency id="WixToolset.DUtil" version="[4,5)" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="build\$id$.props" target="build\" />
-    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
-    <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" />
-    <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" />
-    <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
+    <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" />
+    <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj
index b9334cf3..cbb83b96 100644
--- a/src/api/burn/bextutil/bextutil.vcxproj
+++ b/src/api/burn/bextutil/bextutil.vcxproj
@@ -2,9 +2,6 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
-
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -44,8 +41,7 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
-  <Import Project="..\NativeMultiTargeting.Build.props" />
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
 
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -54,7 +50,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
@@ -75,16 +71,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+
+    <PackageReference Include="WixToolset.DUtil" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/api/burn/bextutil/packages.config b/src/api/burn/bextutil/packages.config
deleted file mode 100644
index 08ea3364..00000000
--- a/src/api/burn/bextutil/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj
index f91fe3be..af02f34e 100644
--- a/src/api/burn/mbanative/mbanative.vcxproj
+++ b/src/api/burn/mbanative/mbanative.vcxproj
@@ -2,12 +2,6 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
-  <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
-  <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
-
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -47,18 +41,10 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\NativeMultiTargeting.Build.props" />
-
-  <ImportGroup Label="Shared">
-    <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
-    <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
-    <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
-    <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\balutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>balutil.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
@@ -75,28 +61,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\balutil\balutil.vcxproj">
       <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project>
+      <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties>
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+
+    <PackageReference Include="WixToolset.DUtil" />
+  </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/api/burn/mbanative/packages.config b/src/api/burn/mbanative/packages.config
deleted file mode 100644
index 745fcae9..00000000
--- a/src/api/burn/mbanative/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/api/burn/nuget.config b/src/api/burn/nuget.config
deleted file mode 100644
index 2c6c5608..00000000
--- a/src/api/burn/nuget.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
-    <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
-    <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index d3a81e2a..345c324c 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -3,9 +3,8 @@
 
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" />
-  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -16,6 +15,7 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+
   <PropertyGroup Label="Globals">
     <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
     <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid>
@@ -26,12 +26,15 @@
     <CLRSupport>true</CLRSupport>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\balutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
+
   <ItemGroup>
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -41,36 +44,17 @@
     <ClCompile Include="TestBAFunctions.cpp" />
     <ClCompile Include="TestBootstrapperApplication.cpp" />
   </ItemGroup>
+
   <ItemGroup>
     <ClInclude Include="precomp.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
-    </Reference>
-    <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\balutil\balutil.vcxproj">
       <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project>
     </ProjectReference>
   </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />
+</Project>
diff --git a/src/api/burn/test/BalUtilUnitTest/packages.config b/src/api/burn/test/BalUtilUnitTest/packages.config
deleted file mode 100644
index 6d381fbe..00000000
--- a/src/api/burn/test/BalUtilUnitTest/packages.config
+++ /dev/null
@@ -1,15 +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. -->
-<packages>
-  <package id="WixBuildTools.TestSupport" version="4.0.50" />
-  <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-  <package id="xunit.abstractions" version="2.0.3" />
-  <package id="xunit.assert" version="2.4.1" />
-  <package id="xunit.core" version="2.4.1" />
-  <package id="xunit.extensibility.core" version="2.4.1" />
-  <package id="xunit.extensibility.execution" version="2.4.1" />
-  <package id="xunit.runner.msbuild" version="2.4.1" />
-  <package id="xunit.runner.visualstudio" version="2.4.1" />
-</packages>
\ No newline at end of file
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
index a9937894..fc31ce57 100644
--- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" />
-  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -16,6 +14,7 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+
   <PropertyGroup Label="Globals">
     <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
     <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid>
@@ -26,12 +25,15 @@
     <CLRSupport>true</CLRSupport>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
+
   <ItemGroup>
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -40,36 +42,17 @@
     </ClCompile>
     <ClCompile Include="TestBundleExtension.cpp" />
   </ItemGroup>
+
   <ItemGroup>
     <ClInclude Include="precomp.h" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
-    </Reference>
-    <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\balutil\balutil.vcxproj">
+    <ProjectReference Include="..\..\bextutil\bextutil.vcxproj">
       <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project>
     </ProjectReference>
   </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />
+</Project>
diff --git a/src/api/burn/test/BextUtilUnitTest/packages.config b/src/api/burn/test/BextUtilUnitTest/packages.config
deleted file mode 100644
index 6d381fbe..00000000
--- a/src/api/burn/test/BextUtilUnitTest/packages.config
+++ /dev/null
@@ -1,15 +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. -->
-<packages>
-  <package id="WixBuildTools.TestSupport" version="4.0.50" />
-  <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-  <package id="xunit.abstractions" version="2.0.3" />
-  <package id="xunit.assert" version="2.4.1" />
-  <package id="xunit.core" version="2.4.1" />
-  <package id="xunit.extensibility.core" version="2.4.1" />
-  <package id="xunit.extensibility.execution" version="2.4.1" />
-  <package id="xunit.runner.msbuild" version="2.4.1" />
-  <package id="xunit.runner.visualstudio" version="2.4.1" />
-</packages>
\ No newline at end of file
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 53d82f7e..bdb6a829 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -14,8 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/api/wix/CSharp.Build.props b/src/api/wix/CSharp.Build.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/api/wix/CSharp.Build.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
-    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
-  </PropertyGroup>
-</Project>
diff --git a/src/api/wix/Directory.Build.props b/src/api/wix/Directory.Build.props
deleted file mode 100644
index b3c6287c..00000000
--- a/src/api/wix/Directory.Build.props
+++ /dev/null
@@ -1,27 +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. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
-    <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
-
-    <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
-    <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
-
-    <Authors>WiX Toolset Team</Authors>
-    <Company>WiX Toolset</Company>
-    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
-    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
-    <Product>WiX Toolset</Product>
-  </PropertyGroup>
-
-  <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
-  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
-</Project>
diff --git a/src/api/wix/Directory.Build.targets b/src/api/wix/Directory.Build.targets
deleted file mode 100644
index 2fcc765a..00000000
--- a/src/api/wix/Directory.Build.targets
+++ /dev/null
@@ -1,51 +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. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
-  then update all of the repos.
--->
-<!--
-  Replace PackageReferences with ProjectReferences when the projects can be found in .sln.
-  See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
--->
-<Project>
-  <PropertyGroup>
-    <ReplacePackageReferences>true</ReplacePackageReferences>
-    <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
-    <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
-  </PropertyGroup>
-
-  <Choose>
-    <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')">
-
-      <PropertyGroup>
-        <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent>
-        <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir>
-        <RegexPattern>(?&lt;="[PackageName]", ")(.*)(?=", ")</RegexPattern>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <!-- Keep the identity of the PackageReference -->
-        <SmartPackageReference Include="@(PackageReference)">
-          <PackageName>%(Identity)</PackageName>
-          <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution>
-        </SmartPackageReference>
-
-        <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function -->
-        <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))">
-          <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern>
-          <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath>
-        </PackageInSolution>
-
-        <ProjectReference  Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
-
-        <!-- Remove the package references that are now referenced as projects -->
-        <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
-      </ItemGroup>
-
-    </When>
-  </Choose>
-
-  <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
-  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
-</Project>
diff --git a/src/api/wix/Directory.csproj.props b/src/api/wix/Directory.csproj.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/api/wix/Directory.csproj.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
-    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
-  </PropertyGroup>
-</Project>
diff --git a/src/api/wix/Directory.csproj.targets b/src/api/wix/Directory.csproj.targets
deleted file mode 100644
index 623228ef..00000000
--- a/src/api/wix/Directory.csproj.targets
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<!--
-  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
-  then update all of the repos.
--->
-<Project>
-  <PropertyGroup>
-    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
-    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
-          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
-    <PropertyGroup>
-      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
-
-      <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-      <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
-      <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
-      <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    </PropertyGroup>
-  </Target>
-
-</Project>
diff --git a/src/api/wix/README-Extensibility.md b/src/api/wix/README-Extensibility.md
deleted file mode 100644
index 003acd4d..00000000
--- a/src/api/wix/README-Extensibility.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Extensibility
-WixToolset.Extensibility - interfaces to extend the WiX Toolset
diff --git a/src/api/wix/README.md b/src/api/wix/README.md
deleted file mode 100644
index 720632c9..00000000
--- a/src/api/wix/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Data
-WixToolset.Data - data model for WiX Toolset tools
-
diff --git a/src/api/wix/WixToolset.Data.v3.ncrunchsolution b/src/api/wix/WixToolset.Data.v3.ncrunchsolution
deleted file mode 100644
index 10420ac9..00000000
--- a/src/api/wix/WixToolset.Data.v3.ncrunchsolution
+++ /dev/null
@@ -1,6 +0,0 @@
-<SolutionConfiguration>
-  <Settings>
-    <AllowParallelTestExecution>True</AllowParallelTestExecution>
-    <SolutionConfigured>True</SolutionConfigured>
-  </Settings>
-</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
index 24b0917b..11c3fd98 100644
--- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
+++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
@@ -15,15 +15,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Compile Update="WixDataStrings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -37,4 +28,8 @@
       <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.IO.Compression" />
+  </ItemGroup>
 </Project>
diff --git a/src/api/wix/WixToolset.Extensibility.sln b/src/api/wix/WixToolset.Extensibility.sln
deleted file mode 100644
index 94ce905c..00000000
--- a/src/api/wix/WixToolset.Extensibility.sln
+++ /dev/null
@@ -1,36 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "src\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Debug|x64 = Debug|x64
-                Debug|x86 = Debug|x86
-                Release|Any CPU = Release|Any CPU
-                Release|x64 = Release|x64
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU
-                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {BB8820D5-723D-426D-B4A0-4D221603C5FA}
-        EndGlobalSection
-EndGlobal
diff --git a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index 8b18c0ed..38bec1b0 100644
--- a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -13,11 +13,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Data" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+    <ProjectReference Include="..\WixToolset.Data\WixToolset.Data.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/api/wix/WixToolset.Data.sln b/src/api/wix/api_wix.sln
index d8c62b1d..6b799e66 100644
--- a/src/api/wix/WixToolset.Data.sln
+++ b/src/api/wix/api_wix.sln
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "src\WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "src\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,6 +53,18 @@ Global
                 {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x64.Build.0 = Release|Any CPU
                 {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.ActiveCfg = Release|Any CPU
                 {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.Build.0 = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU
+                {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
diff --git a/src/api/wix/appveyor-Extensibility.cmd b/src/api/wix/appveyor-Extensibility.cmd
deleted file mode 100644
index e0dfe33f..00000000
--- a/src/api/wix/appveyor-Extensibility.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@setlocal
-@pushd %~dp0
-
-dotnet pack -c Release
-
-@popd
-@endlocal
\ No newline at end of file
diff --git a/src/api/wix/appveyor-Extensibility.yml b/src/api/wix/appveyor-Extensibility.yml
deleted file mode 100644
index 7c686b04..00000000
--- a/src/api/wix/appveyor-Extensibility.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-#
-#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
-#  then update all of the repos.
-
-branches:
-  only:
-    - master
-    - develop
-
-image: Visual Studio 2019
-
-version: 0.0.0.{build}
-configuration: Release
-
-environment:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  NUGET_XMLDOC_MODE: skip
-
-build_script:
-  - appveyor.cmd
-
-pull_requests:
-  do_not_increment_build_number: true
-
-nuget:
-  disable_publish_on_pr: true
-
-skip_branch_with_pr: true
-skip_tags: true
-
-artifacts:
-- path: build\Release\**\*.nupkg
-  name: nuget
-
-notifications:
-- provider: Slack
-  incoming_webhook:
-    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/api/wix/appveyor.cmd b/src/api/wix/appveyor.cmd
deleted file mode 100644
index 5e5debc9..00000000
--- a/src/api/wix/appveyor.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@setlocal
-@pushd %~dp0
-@set _C=Release
-@if /i "%1"=="debug" set _C=Debug
-
-:: Restore
-msbuild -p:Configuration=%_C% -t:Restore || exit /b
-
-:: Build
-msbuild -p:Configuration=%_C% || exit /b
-
-:: Test
-dotnet test -c %_C% --no-build || exit /b
-
-:: Pack
-msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack || exit /b
-
-@popd
-@endlocal
diff --git a/src/api/wix/appveyor.yml b/src/api/wix/appveyor.yml
deleted file mode 100644
index c53cc9cc..00000000
--- a/src/api/wix/appveyor.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-#
-#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
-#  then update all of the repos.
-
-branches:
-  only:
-    - master
-    - develop
-
-image: Visual Studio 2019
-
-version: 0.0.0.{build}
-configuration: Release
-
-environment:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  NUGET_XMLDOC_MODE: skip
-
-build_script:
-  - appveyor.cmd
-
-pull_requests:
-  do_not_increment_build_number: true
-
-nuget:
-  disable_publish_on_pr: true
-
-skip_branch_with_pr: true
-skip_tags: true
-
-artifacts:
-- path: build\Release\**\*.nupkg
-  name: nuget
-- path: build\Release\**\*.snupkg
-  name: snupkg
-
-notifications:
-- provider: Slack
-  incoming_webhook:
-    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/api/wix/nuget-Extensibility.config b/src/api/wix/nuget-Extensibility.config
deleted file mode 100644
index 6ab85be3..00000000
--- a/src/api/wix/nuget-Extensibility.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
-    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/src/api/wix/nuget.config b/src/api/wix/nuget.config
deleted file mode 100644
index d5ef8952..00000000
--- a/src/api/wix/nuget.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index fb0f8594..f6e10488 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -1,9 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-
     <IsPackable>false</IsPackable>
+    <SignOutput>false</SignOutput>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,9 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
   </ItemGroup>
-
 </Project>