aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs')
-rw-r--r--src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs18
1 files changed, 4 insertions, 14 deletions
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
14 14
15 internal class CreateBundleExeCommand 15 internal class CreateBundleExeCommand
16 { 16 {
17 public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable<WixBundleContainerTuple> containers, string burnStubPath) 17 public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable<WixBundleContainerTuple> containers)
18 { 18 {
19 this.Messaging = messaging; 19 this.Messaging = messaging;
20 this.BackendHelper = backendHelper; 20 this.BackendHelper = backendHelper;
@@ -23,7 +23,6 @@ namespace WixToolset.Core.Burn.Bundles
23 this.BundleTuple = bundleTuple; 23 this.BundleTuple = bundleTuple;
24 this.UXContainer = uxContainer; 24 this.UXContainer = uxContainer;
25 this.Containers = containers; 25 this.Containers = containers;
26 this.BurnStubPath = burnStubPath;
27 } 26 }
28 27
29 public IFileTransfer Transfer { get; private set; } 28 public IFileTransfer Transfer { get; private set; }
@@ -42,23 +41,14 @@ namespace WixToolset.Core.Burn.Bundles
42 41
43 private IEnumerable<WixBundleContainerTuple> Containers { get; } 42 private IEnumerable<WixBundleContainerTuple> Containers { get; }
44 43
45 private string BurnStubPath { get; }
46
47 public void Execute() 44 public void Execute()
48 { 45 {
49 var bundleFilename = Path.GetFileName(this.OutputPath); 46 var bundleFilename = Path.GetFileName(this.OutputPath);
50 47
51 // Copy the burn.exe to a writable location then mark it to be moved to its final build location. Note 48 // Copy the burn.exe to a writable location then mark it to be moved to its final build location.
52 // that today, the x64 Burn uses the x86 stub.
53
54 var stubFile = this.BurnStubPath;
55 49
56 if (String.IsNullOrEmpty(stubFile)) 50 var stubPlatform = this.BundleTuple.Platform.ToString();
57 { 51 var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe");
58 var stubPlatform = (Platform.X64 == this.BundleTuple.Platform) ? "x86" : this.BundleTuple.Platform.ToString();
59
60 stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe");
61 }
62 52
63 var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); 53 var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename);
64 54