aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs')
-rw-r--r--src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 35c45fad..540c6288 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -94,7 +94,7 @@ namespace WixToolset.Core.Burn
94 // this behavior. 94 // this behavior.
95 var bundleTuple = this.GetSingleTuple<WixBundleTuple>(); 95 var bundleTuple = this.GetSingleTuple<WixBundleTuple>();
96 96
97 bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant(); 97 bundleTuple.ProviderKey = bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant();
98 98
99 bundleTuple.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user. 99 bundleTuple.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user.
100 100
@@ -376,7 +376,10 @@ namespace WixToolset.Core.Burn
376 var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades); 376 var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades);
377 command.Execute(); 377 command.Execute();
378 378
379 bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key. 379 if (!String.IsNullOrEmpty(command.BundleProviderKey))
380 {
381 bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key.
382 }
380 dependencyTuplesByKey = command.DependencyTuplesByKey; 383 dependencyTuplesByKey = command.DependencyTuplesByKey;
381 } 384 }
382 385