aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-16 18:31:13 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-16 21:33:56 +1000
commitad9cdd7dc6faee762e06a8d3446fa68c74dd802d (patch)
tree48bf64bff5de8c4eeb339df42d40b956e9fc8ba4 /src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
parent4d96895a19c79ced1543d44e181527824c82c8e8 (diff)
downloadwix-ad9cdd7dc6faee762e06a8d3446fa68c74dd802d.tar.gz
wix-ad9cdd7dc6faee762e06a8d3446fa68c74dd802d.tar.bz2
wix-ad9cdd7dc6faee762e06a8d3446fa68c74dd802d.zip
Get Log/@Extension and Registration/@ProviderKey to match v3.
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