From 1ee38ea389f84217d13dd707208e4ec6e332a507 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 11 Dec 2019 20:58:44 +1100
Subject: Update dependencies.

---
 src/Samples/bafunctions/bafunctions.vcxproj        |  8 +++----
 src/Samples/bafunctions/packages.config            |  4 ++--
 src/mbahost/mbahost.cpp                            |  6 ++---
 src/mbahost/mbahost.vcxproj                        | 17 +++++++++-----
 src/mbahost/packages.config                        |  6 +++--
 .../TestManagedBootstrapperApplication.h           |  3 ++-
 .../TestManagedBootstrapperApplicationFactory.h    |  2 +-
 .../WixToolset.BootstrapperCore.config             | 26 ----------------------
 .../WixToolset.Mba.Core.config                     | 26 ++++++++++++++++++++++
 .../WixToolsetTest.MbaHost.vcxproj                 | 15 ++++++++-----
 src/test/WixToolsetTest.MbaHost/packages.config    |  6 +++--
 src/wixlib/Mba.wxs                                 |  1 +
 src/wixstdba/packages.config                       |  4 ++--
 src/wixstdba/wixstdba.vcxproj                      |  8 +++----
 14 files changed, 74 insertions(+), 58 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config
 create mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config

(limited to 'src')

diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index e4988019..5550ff60 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -2,8 +2,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.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
-  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -57,8 +57,8 @@
     <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.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config
index 107f25c4..7c46d4c5 100644
--- a/src/Samples/bafunctions/packages.config
+++ b/src/Samples/bafunctions/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.9" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp
index d3737c06..444a95a8 100644
--- a/src/mbahost/mbahost.cpp
+++ b/src/mbahost/mbahost.cpp
@@ -1,7 +1,7 @@
 // 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.
 
 #include "precomp.h"
-#include <WixToolset.BootstrapperCore.h> // includes the generated assembly name macros.
+#include <WixToolset.Mba.Core.h> // includes the generated assembly name macros.
 #include "BalBaseBootstrapperApplicationProc.h"
 
 static const DWORD NET452_RELEASE = 379893;
@@ -185,7 +185,7 @@ static HRESULT GetAppDomain(
     hr = GetAppBase(&sczAppBase);
     ExitOnFailure(hr, "Failed to get the host base path.");
 
-    hr = PathConcat(sczAppBase, L"WixToolset.BootstrapperCore.config", &sczConfigPath);
+    hr = PathConcat(sczAppBase, L"WixToolset.Mba.Core.config", &sczConfigPath);
     ExitOnFailure(hr, "Failed to get the full path to the application configuration file.");
 
     // Check that the supported framework is installed.
@@ -557,7 +557,7 @@ static HRESULT CreateManagedBootstrapperApplicationFactory(
     bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME);
     ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory.");
 
-    bstrTypeName = ::SysAllocString(L"WixToolset.BootstrapperCore.BootstrapperApplicationFactory");
+    bstrTypeName = ::SysAllocString(L"WixToolset.Mba.Core.BootstrapperApplicationFactory");
     ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory.");
 
     hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj);
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
index ff486d54..c7a0b69f 100644
--- a/src/mbahost/mbahost.vcxproj
+++ b/src/mbahost/mbahost.vcxproj
@@ -2,8 +2,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.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -50,8 +50,15 @@
     <None Include="packages.config" />
   </ItemGroup>
 
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\packages\WixToolset.Mba.Core.4.0.9\build\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <ItemGroup>
-    <MbaHostDependency Include="..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll" />
+    <MbaHostDependency Include="..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll" />
+    <MbaHostDependency Include="..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -60,8 +67,8 @@
     <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.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
index 107f25c4..c616685e 100644
--- a/src/mbahost/packages.config
+++ b/src/mbahost/packages.config
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.9" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.Mba.Core" version="4.0.9" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
index 910d39bd..8142b26c 100644
--- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
+++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
@@ -9,11 +9,12 @@ namespace Native
 {
     using namespace System;
     using namespace WixToolset::BootstrapperCore;
+    using namespace WixToolset::Mba::Core;
 
     public ref class TestManagedBootstrapperApplication : BootstrapperApplication
     {
     public:
-        TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::IEngine^ engine)
+        TestManagedBootstrapperApplication(WixToolset::Mba::Core::IEngine^ engine)
             : BootstrapperApplication(engine)
         {
 
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
index 0f30ff2d..86f6e3cb 100644
--- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
+++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
@@ -8,7 +8,7 @@ namespace MbaHost
 namespace Native
 {
     using namespace System;
-    using namespace WixToolset::BootstrapperCore;
+    using namespace WixToolset::Mba::Core;
 
     public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory
     {
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config
deleted file mode 100644
index b4c67a82..00000000
--- a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config
+++ /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. -->
-
-
-<configuration>
-    <configSections>
-        <sectionGroup name="wix.bootstrapper" type="WixToolset.BootstrapperCore.BootstrapperSectionGroup, WixToolset.BootstrapperCore">
-            <section name="host" type="WixToolset.BootstrapperCore.HostSection, WixToolset.BootstrapperCore" />
-        </sectionGroup>
-    </configSections>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" />
-        <supportedRuntime version="v2.0.50727" />
-    </startup>
-    <wix.bootstrapper>
-        <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
-        <!--
-        <supportedFramework version="v4\Client" />
-        <supportedFramework version="v3.5" />
-        <supportedFramework version="v3.0" />
-        -->
-
-        <!-- Example only. Replace the host/@assemblyName attribute with assembly that implements BootstrapperApplication. -->
-        <host assemblyName="WixToolsetTest.MbaHost" />
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config
new file mode 100644
index 00000000..18bfbfc2
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<configuration>
+    <configSections>
+        <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Core.BootstrapperSectionGroup, WixToolset.Mba.Core">
+            <section name="host" type="WixToolset.Mba.Core.HostSection, WixToolset.Mba.Core" />
+        </sectionGroup>
+    </configSections>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v2.0.50727" />
+    </startup>
+    <wix.bootstrapper>
+        <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
+        <!--
+        <supportedFramework version="v4\Client" />
+        <supportedFramework version="v3.5" />
+        <supportedFramework version="v3.0" />
+        -->
+
+        <!-- Example only. Replace the host/@assemblyName attribute with assembly that implements IBootstrapperApplicationFactory. -->
+        <host assemblyName="WixToolsetTest.MbaHost" />
+    </wix.bootstrapper>
+</configuration>
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
index 854bc6cf..b82f9194 100644
--- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
+++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
@@ -1,8 +1,8 @@
 <?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.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
-  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
   <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
@@ -48,7 +48,7 @@
   <ItemGroup>
     <None Include="packages.config" />
     <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="WixToolset.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="WixToolset.Mba.Core.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -66,7 +66,10 @@
       <HintPath>..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
     <Reference Include="WixToolset.BootstrapperCore">
-      <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+      <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+    </Reference>
+    <Reference Include="WixToolset.Mba.Core">
+      <HintPath>..\..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -82,8 +85,8 @@
     <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.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config
index 466226a5..c0615f19 100644
--- a/src/test/WixToolsetTest.MbaHost/packages.config
+++ b/src/test/WixToolsetTest.MbaHost/packages.config
@@ -8,7 +8,9 @@
   <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net461" />
   <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" />
   <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" />
-  <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="net461" />
+  <package id="WixToolset.BalUtil" version="4.0.9" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.8" targetFramework="net461" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.Mba.Core" version="4.0.9" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs
index dab533ca..05b57100 100644
--- a/src/wixlib/Mba.wxs
+++ b/src/wixlib/Mba.wxs
@@ -41,6 +41,7 @@
     <Fragment>
         <PayloadGroup Id='Mba'>
             <Payload Compressed='yes' SourceFile='WixToolset.BootstrapperCore.dll' />
+            <Payload Compressed='yes' SourceFile='WixToolset.Mba.Core.dll' />
             <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='mbapreq.dll' />
         </PayloadGroup>
     </Fragment>
diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config
index 107f25c4..7c46d4c5 100644
--- a/src/wixstdba/packages.config
+++ b/src/wixstdba/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.9" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj
index 8f3b4204..c3d3ede7 100644
--- a/src/wixstdba/wixstdba.vcxproj
+++ b/src/wixstdba/wixstdba.vcxproj
@@ -2,8 +2,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.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
     <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.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.9\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
-- 
cgit v1.2.3-55-g6feb