From ad9cdd7dc6faee762e06a8d3446fa68c74dd802d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 16 May 2020 18:31:13 +1000 Subject: Get Log/@Extension and Registration/@ProviderKey to match v3. --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs') 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 // this behavior. var bundleTuple = this.GetSingleTuple(); - bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant(); + bundleTuple.ProviderKey = bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant(); bundleTuple.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user. @@ -376,7 +376,10 @@ namespace WixToolset.Core.Burn var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades); command.Execute(); - bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key. + if (!String.IsNullOrEmpty(command.BundleProviderKey)) + { + bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key. + } dependencyTuplesByKey = command.DependencyTuplesByKey; } -- cgit v1.2.3-55-g6feb