From f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 15 May 2020 09:36:40 +1000
Subject: Update to latest tools.

---
 src/test/WixToolsetTest.Bal/BalExtensionFixture.cs             |  2 --
 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs       |  2 +-
 src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj          |  1 -
 src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs          | 10 ----------
 src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs          |  4 ----
 .../TestData/EarliestCoreMBA/HarvestedSCD.wxs                  |  2 +-
 .../TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs           |  2 +-
 .../TestData/LatestCoreMBA/HarvestedSCD.wxs                    |  2 +-
 .../TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs             |  2 +-
 src/test/WixToolsetTest.ManagedHost/TestEngine.cs              |  1 -
 .../WixToolsetTest.ManagedHost.csproj                          |  1 -
 src/wixlib/bal.wixproj                                         |  4 ++--
 src/wixlib/packages.config                                     |  2 +-
 13 files changed, 8 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
index 97ac68a7..18b4727f 100644
--- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
@@ -26,7 +26,6 @@ namespace WixToolsetTest.Bal
                     Path.Combine(bundleSourceFolder, "Bundle.wxs"),
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
-                    "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"),
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -52,7 +51,6 @@ namespace WixToolsetTest.Bal
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
-                    "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"),
                     "-o", bundleFile,
                 });
                 Assert.Equal(6802, compileResult.ExitCode);
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
index 45bb25d1..82b0434d 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
@@ -6,7 +6,7 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <ExePackage SourceFile="runtimes\win-x86\native\wixnative.x86.exe" />
+            <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
         </Chain>
     </Bundle>
 </Wix>
diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
index 19c86839..f970c2c8 100644
--- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index f33709ab..a2a9a107 100644
--- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -28,7 +28,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -63,7 +62,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -98,7 +96,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -133,7 +130,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -172,7 +168,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -206,7 +201,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -246,7 +240,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -281,7 +274,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -316,7 +308,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -355,7 +346,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
index 8b0a3691..45b3e9d0 100644
--- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -29,7 +29,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -64,7 +63,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -99,7 +97,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
@@ -138,7 +135,6 @@ namespace WixToolsetTest.ManagedHost
                     "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", baSourceFolder,
-                    "-burnStub", TestEngine.BurnStubFile,
                     "-o", bundleFile,
                 });
                 compileResult.AssertSuccess();
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs
index bb8d56aa..6699b094 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs
@@ -63,7 +63,7 @@
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' />
-      <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' />
+      <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs
index 336eef4c..7eb56061 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs
@@ -59,7 +59,7 @@
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' />
-      <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' />
+      <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
       <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' />
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs
index 09433669..35373631 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs
@@ -63,7 +63,7 @@
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' />
-      <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' />
+      <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs
index 58ba7b39..9076d2e6 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs
@@ -59,7 +59,7 @@
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' />
-      <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' />
+      <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
       <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' />
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
index cda32895..44538227 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -11,7 +11,6 @@ namespace WixToolsetTest.ManagedHost
     public class TestEngine
     {
         private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe");
-        public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe");
 
         public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath)
         {
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index ff472322..d446d3a1 100644
--- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -63,7 +63,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index a158cd81..23b52788 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">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -57,7 +57,7 @@
       <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-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\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 1e5a9850..9190b5d0 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-0086" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0101" developmentDependency="true" targetFramework="net40" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb