diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-15 09:36:40 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 22:01:33 +1000 |
| commit | f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54 (patch) | |
| tree | 5544ae0b067f963762b99a7853bd7c8d5afaa39a /src/test/WixToolsetTest.Bal | |
| parent | ae1751902076edfd8978b7fb42f24d3ac3f7ad55 (diff) | |
| download | wix-f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54.tar.gz wix-f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54.tar.bz2 wix-f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54.zip | |
Update to latest tools.
Diffstat (limited to 'src/test/WixToolsetTest.Bal')
| -rw-r--r-- | src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 1 |
3 files changed, 1 insertions, 4 deletions
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 | |||
| 26 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 26 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 27 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 27 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
| 28 | "-intermediateFolder", intermediateFolder, | 28 | "-intermediateFolder", intermediateFolder, |
| 29 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), | ||
| 30 | "-o", bundleFile, | 29 | "-o", bundleFile, |
| 31 | }); | 30 | }); |
| 32 | compileResult.AssertSuccess(); | 31 | compileResult.AssertSuccess(); |
| @@ -52,7 +51,6 @@ namespace WixToolsetTest.Bal | |||
| 52 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 51 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
| 53 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 52 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
| 54 | "-intermediateFolder", intermediateFolder, | 53 | "-intermediateFolder", intermediateFolder, |
| 55 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), | ||
| 56 | "-o", bundleFile, | 54 | "-o", bundleFile, |
| 57 | }); | 55 | }); |
| 58 | Assert.Equal(6802, compileResult.ExitCode); | 56 | 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 @@ | |||
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> | 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> |
| 7 | </BootstrapperApplicationRef> | 7 | </BootstrapperApplicationRef> |
| 8 | <Chain> | 8 | <Chain> |
| 9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.x86.exe" /> | 9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" /> |
| 10 | </Chain> | 10 | </Chain> |
| 11 | </Bundle> | 11 | </Bundle> |
| 12 | </Wix> | 12 | </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 @@ | |||
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 30 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 29 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
| 31 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 30 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
