From a75639ceaffcf5f56fa33094037bca86331d9ac0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 10 May 2020 09:07:42 +1000 Subject: Use WixToolset.Burn package to get rid of -burnStubPath. Stop using x86 stub for x64. --- src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 10 ---------- .../WixToolsetTest.CoreIntegration/BundleManifestFixture.cs | 6 ------ src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs | 2 -- 3 files changed, 18 deletions(-) (limited to 'src/test') diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 6e66aa74..acddd2d5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -19,7 +19,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildMultiFileBundle() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData\SimpleBundle"); using (var fs = new DisposableFileSystem()) @@ -35,7 +34,6 @@ namespace WixToolsetTest.CoreIntegration "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", Path.Combine(baseFolder, @"bin\test.exe") }); @@ -49,7 +47,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSimpleBundle() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData\SimpleBundle"); using (var fs = new DisposableFileSystem()) @@ -68,7 +65,6 @@ namespace WixToolsetTest.CoreIntegration "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", exePath, }); @@ -113,7 +109,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSimpleBundleUsingExtensionBA() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); var folder = TestData.Get(@"TestData\SimpleBundle"); @@ -130,7 +125,6 @@ namespace WixToolsetTest.CoreIntegration "-ext", extensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", Path.Combine(baseFolder, @"bin\test.exe") }); @@ -144,7 +138,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSingleExeBundle() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData"); using (var fs = new DisposableFileSystem()) @@ -161,7 +154,6 @@ namespace WixToolsetTest.CoreIntegration "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-bindpath", Path.Combine(folder, ".Data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", exePath, }); @@ -174,7 +166,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSingleExeRemotePayloadBundle() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData"); using (var fs = new DisposableFileSystem()) @@ -190,7 +181,6 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", exePath, }); diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs index 174ac21b..ebfdb872 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs @@ -15,7 +15,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void PopulatesManifestWithBundleExtension() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData"); using (var fs = new DisposableFileSystem()) @@ -35,7 +34,6 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", bundlePath }); @@ -63,7 +61,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void PopulatesManifestWithBundleExtensionSearches() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); var folder = TestData.Get(@"TestData"); @@ -85,7 +82,6 @@ namespace WixToolsetTest.CoreIntegration "-ext", extensionPath, "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", bundlePath }); @@ -117,7 +113,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void PopulatesManifestWithSetVariables() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData"); using (var fs = new DisposableFileSystem()) @@ -136,7 +131,6 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", bundlePath }); diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 44a0e283..f63d1144 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -17,7 +17,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSimpleBundleUsingWixlib() { - var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe"); var folder = TestData.Get(@"TestData\SimpleBundle"); using (var fs = new DisposableFileSystem()) @@ -43,7 +42,6 @@ namespace WixToolsetTest.CoreIntegration "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, - "-burnStub", burnStubPath, "-o", Path.Combine(baseFolder, @"bin\test.exe") }); -- cgit v1.2.3-55-g6feb