22 files changed, 49 insertions, 52 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index 295607cb..95b09f81 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -7,12 +7,10 @@ nuget restore || exit /b
 msbuild -p:Configuration=%_C% -t:Restore || exit /b
 msbuild -p:Configuration=%_C% || exit /b
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
 msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
 msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
-msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj || exit /b
-dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
 @popd
 @endlocal
 \ No newline at end of file
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index 92637507..d35c85c0 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -2,9 +2,9 @@
 <!-- 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.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <TargetName>BAFunctions</TargetName>
    <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -57,9 +57,9 @@
    <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.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.30\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>
 </Project>
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/Samples/bafunctions/packages.config
+++ b/src/Samples/bafunctions/packages.config
@@ -2,6 +2,6 @@
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
index 09580c2d..627ea67a 100644
--- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
+++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
@@ -7,6 +7,7 @@
    <RootNamespace>WixToolset.Dnc.Host</RootNamespace>
    <Description>WiX Toolset .NET Core BA Host</Description>
    <Title>WiX Toolset .NET Core BA Host</Title>
+    <DebugType>embedded</DebugType>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
index 2c912f3d..0fedd9dc 100644
--- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
@@ -11,6 +11,7 @@
    <NoWarn>0693;1591</NoWarn>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <Description>Managed Bootstrapper Application entry point</Description>
+    <DebugType>embedded</DebugType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugSymbols>true</DebugSymbols>
@@ -44,7 +45,7 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
    <Reference Include="WixToolset.Mba.Core">
-      <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll</HintPath>
+      <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.31\lib\net20\WixToolset.Mba.Core.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config
index 73365d26..d1b22e73 100644
--- a/src/WixToolset.Mba.Host/packages.config
+++ b/src/WixToolset.Mba.Host/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
-  <package id="WixToolset.Mba.Core" version="4.0.26" targetFramework="net20" />
+  <package id="WixToolset.Mba.Core" version="4.0.31" targetFramework="net20" />
 </packages>
 \ No newline at end of file
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index 0fd7d9e5..6bab8063 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -1,9 +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.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -17,7 +17,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <TargetName>dnchost</TargetName>
    <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile>
@@ -69,9 +69,9 @@
    <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.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\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>
 </Project>
 \ No newline at end of file
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index e52c0a7a..f1e2c54b 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -3,6 +3,6 @@
  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
index 4071942c..45fef1a1 100644
--- a/src/mbahost/mbahost.vcxproj
+++ b/src/mbahost/mbahost.vcxproj
@@ -2,9 +2,9 @@
 <!-- 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.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <TargetName>mbahost</TargetName>
    <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
@@ -68,9 +68,9 @@
    <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.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\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>
 </Project>
 \ No newline at end of file
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/mbahost/packages.config
+++ b/src/mbahost/packages.config
@@ -2,6 +2,6 @@
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 7fc831d1..b2c7dd29 100644
--- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -13,6 +13,6 @@
  <ItemGroup>
    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 04f4f9d1..958047b0 100644
--- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -15,6 +15,6 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 2c702a3b..1f61d9d1 100644
--- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -10,7 +10,7 @@
  <ItemGroup>
    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" PrivateAssets="All" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" PrivateAssets="All" />
  </ItemGroup>
  <ItemGroup>
diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index ad599e23..dc2b8a5f 100644
--- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -18,6 +18,6 @@
  <ItemGroup>
    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index b863618a..7fb3b3aa 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -1,9 +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.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
  <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -68,8 +68,8 @@
      <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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
  </Target>
 </Project>
 \ No newline at end of file
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/test/examples/TestEngine/packages.config
+++ b/src/test/examples/TestEngine/packages.config
@@ -2,6 +2,6 @@
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index fd03209f..393b403e 100644
--- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -11,6 +11,6 @@
  <ItemGroup>
    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj
index aef4c4d9..aa3c4033 100644
--- a/src/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/wixext/WixToolset.Bal.wixext.csproj
@@ -9,6 +9,7 @@
    <Title>WiX Toolset Bal Extension</Title>
    <IsTool>true</IsTool>
    <ContentTargetFolders>build</ContentTargetFolders>
+    <DebugType>embedded</DebugType>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="$(MSBuildThisFileName).targets" />
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index ae8559d5..c23af015 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,7 +1,7 @@
 <?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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" />
  <Import Project="..\FindLocalWix.props" />
  <PropertyGroup>
    <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -48,16 +48,12 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
  <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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props'))" />
  </Target>
  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 8ffe0d58..f37af421 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0137" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0139" developmentDependency="true" targetFramework="net40" />
 </packages>
 \ No newline at end of file
diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/wixstdba/packages.config
+++ b/src/wixstdba/packages.config
@@ -2,6 +2,6 @@
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj
index 6698c192..7d116490 100644
--- a/src/wixstdba/wixstdba.vcxproj
+++ b/src/wixstdba/wixstdba.vcxproj
@@ -2,9 +2,9 @@
 <!-- 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.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <TargetName>WixStdBA</TargetName>
    <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile>
@@ -107,9 +107,9 @@ 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.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\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>
 </Project>
 \ No newline at end of file