Update to latest tools.
Sean Hall committed
May 15, 2020 at 09:36 UTC
f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54
13 files changed
+8
-27
src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
-2
@@ -26,7 +26,6 @@ namespace WixToolsetTest.Bal
26
Path.Combine(bundleSourceFolder, "Bundle.wxs"),
27
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
28
"-intermediateFolder", intermediateFolder,
29
- "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"),
29
"-o", bundleFile,
30
});
31
compileResult.AssertSuccess();
@@ -52,7 +51,6 @@ namespace WixToolsetTest.Bal
51
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
52
"-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
53
"-intermediateFolder", intermediateFolder,
55
- "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"),
54
"-o", bundleFile,
55
});
56
Assert.Equal(6802, compileResult.ExitCode);
src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+1
-1
@@ -6,7 +6,7 @@
6
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7
</BootstrapperApplicationRef>
8
<Chain>
9
- <ExePackage SourceFile="runtimes\win-x86\native\wixnative.x86.exe" />
9
+ <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
10
</Chain>
11
</Bundle>
12
</Wix>
src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
-1
@@ -25,7 +25,6 @@
25
</ItemGroup>
26
27
<ItemGroup>
28
- <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
28
<PackageReference Include="WixToolset.Core" Version="4.0.*" />
29
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
30
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
-10
@@ -28,7 +28,6 @@ namespace WixToolsetTest.ManagedHost
28
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
29
"-intermediateFolder", intermediateFolder,
30
"-bindpath", baSourceFolder,
31
- "-burnStub", TestEngine.BurnStubFile,
31
"-o", bundleFile,
32
});
33
compileResult.AssertSuccess();
@@ -63,7 +62,6 @@ namespace WixToolsetTest.ManagedHost
62
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
63
"-intermediateFolder", intermediateFolder,
64
"-bindpath", baSourceFolder,
66
- "-burnStub", TestEngine.BurnStubFile,
65
"-o", bundleFile,
66
});
67
compileResult.AssertSuccess();
@@ -98,7 +96,6 @@ namespace WixToolsetTest.ManagedHost
96
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
97
"-intermediateFolder", intermediateFolder,
98
"-bindpath", baSourceFolder,
101
- "-burnStub", TestEngine.BurnStubFile,
99
"-o", bundleFile,
100
});
101
compileResult.AssertSuccess();
@@ -133,7 +130,6 @@ namespace WixToolsetTest.ManagedHost
130
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
131
"-intermediateFolder", intermediateFolder,
132
"-bindpath", baSourceFolder,
136
- "-burnStub", TestEngine.BurnStubFile,
133
"-o", bundleFile,
134
});
135
compileResult.AssertSuccess();
@@ -172,7 +168,6 @@ namespace WixToolsetTest.ManagedHost
168
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
169
"-intermediateFolder", intermediateFolder,
170
"-bindpath", baSourceFolder,
175
- "-burnStub", TestEngine.BurnStubFile,
171
"-o", bundleFile,
172
});
173
compileResult.AssertSuccess();
@@ -206,7 +201,6 @@ namespace WixToolsetTest.ManagedHost
201
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
202
"-intermediateFolder", intermediateFolder,
203
"-bindpath", baSourceFolder,
209
- "-burnStub", TestEngine.BurnStubFile,
204
"-o", bundleFile,
205
});
206
compileResult.AssertSuccess();
@@ -246,7 +240,6 @@ namespace WixToolsetTest.ManagedHost
240
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
241
"-intermediateFolder", intermediateFolder,
242
"-bindpath", baSourceFolder,
249
- "-burnStub", TestEngine.BurnStubFile,
243
"-o", bundleFile,
244
});
245
compileResult.AssertSuccess();
@@ -281,7 +274,6 @@ namespace WixToolsetTest.ManagedHost
274
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
275
"-intermediateFolder", intermediateFolder,
276
"-bindpath", baSourceFolder,
284
- "-burnStub", TestEngine.BurnStubFile,
277
"-o", bundleFile,
278
});
279
compileResult.AssertSuccess();
@@ -316,7 +308,6 @@ namespace WixToolsetTest.ManagedHost
308
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
309
"-intermediateFolder", intermediateFolder,
310
"-bindpath", baSourceFolder,
319
- "-burnStub", TestEngine.BurnStubFile,
311
"-o", bundleFile,
312
});
313
compileResult.AssertSuccess();
@@ -355,7 +346,6 @@ namespace WixToolsetTest.ManagedHost
346
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
347
"-intermediateFolder", intermediateFolder,
348
"-bindpath", baSourceFolder,
358
- "-burnStub", TestEngine.BurnStubFile,
349
"-o", bundleFile,
350
});
351
compileResult.AssertSuccess();
src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
-4
@@ -29,7 +29,6 @@ namespace WixToolsetTest.ManagedHost
29
"-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
30
"-intermediateFolder", intermediateFolder,
31
"-bindpath", baSourceFolder,
32
- "-burnStub", TestEngine.BurnStubFile,
32
"-o", bundleFile,
33
});
34
compileResult.AssertSuccess();
@@ -64,7 +63,6 @@ namespace WixToolsetTest.ManagedHost
63
"-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
64
"-intermediateFolder", intermediateFolder,
65
"-bindpath", baSourceFolder,
67
- "-burnStub", TestEngine.BurnStubFile,
66
"-o", bundleFile,
67
});
68
compileResult.AssertSuccess();
@@ -99,7 +97,6 @@ namespace WixToolsetTest.ManagedHost
97
"-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
98
"-intermediateFolder", intermediateFolder,
99
"-bindpath", baSourceFolder,
102
- "-burnStub", TestEngine.BurnStubFile,
100
"-o", bundleFile,
101
});
102
compileResult.AssertSuccess();
@@ -138,7 +135,6 @@ namespace WixToolsetTest.ManagedHost
135
"-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
136
"-intermediateFolder", intermediateFolder,
137
"-bindpath", baSourceFolder,
141
- "-burnStub", TestEngine.BurnStubFile,
138
"-o", bundleFile,
139
});
140
compileResult.AssertSuccess();
src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs
+1
-1
@@ -63,7 +63,7 @@
63
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
64
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' />
65
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' />
66
- <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' />
66
+ <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' />
67
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' />
68
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' />
69
<Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs
+1
-1
@@ -59,7 +59,7 @@
59
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' />
60
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
61
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' />
62
- <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' />
62
+ <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' />
63
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' />
64
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
65
<Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' />
src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs
+1
-1
@@ -63,7 +63,7 @@
63
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
64
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' />
65
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' />
66
- <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' />
66
+ <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' />
67
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' />
68
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' />
69
<Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs
+1
-1
@@ -59,7 +59,7 @@
59
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' />
60
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' />
61
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' />
62
- <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' />
62
+ <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' />
63
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' />
64
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' />
65
<Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' />
src/test/WixToolsetTest.ManagedHost/TestEngine.cs
-1
@@ -11,7 +11,6 @@ namespace WixToolsetTest.ManagedHost
11
public class TestEngine
12
{
13
private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe");
14
- public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe");
14
15
public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath)
16
{
src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
-1
@@ -63,7 +63,6 @@
63
</ItemGroup>
64
65
<ItemGroup>
66
- <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
66
<PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
67
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
68
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
src/wixlib/bal.wixproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8" ?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <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')" />
4
+ <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')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -57,7 +57,7 @@
57
<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>
58
</PropertyGroup>
59
<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'))" />
60
- <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'))" />
60
+ <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'))" />
61
</Target>
62
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
63
</Project>
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0101" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file