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. --- .../Bundles/CreateBundleExeCommand.cs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs') diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index 53636509..03102d5e 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs @@ -14,7 +14,7 @@ namespace WixToolset.Core.Burn.Bundles internal class CreateBundleExeCommand { - public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable containers, string burnStubPath) + public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable containers) { this.Messaging = messaging; this.BackendHelper = backendHelper; @@ -23,7 +23,6 @@ namespace WixToolset.Core.Burn.Bundles this.BundleTuple = bundleTuple; this.UXContainer = uxContainer; this.Containers = containers; - this.BurnStubPath = burnStubPath; } public IFileTransfer Transfer { get; private set; } @@ -42,23 +41,14 @@ namespace WixToolset.Core.Burn.Bundles private IEnumerable Containers { get; } - private string BurnStubPath { get; } - public void Execute() { var bundleFilename = Path.GetFileName(this.OutputPath); - // Copy the burn.exe to a writable location then mark it to be moved to its final build location. Note - // that today, the x64 Burn uses the x86 stub. - - var stubFile = this.BurnStubPath; + // Copy the burn.exe to a writable location then mark it to be moved to its final build location. - if (String.IsNullOrEmpty(stubFile)) - { - var stubPlatform = (Platform.X64 == this.BundleTuple.Platform) ? "x86" : this.BundleTuple.Platform.ToString(); - - stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); - } + var stubPlatform = this.BundleTuple.Platform.ToString(); + var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); -- cgit v1.2.3-55-g6feb