From e1e1af1d3940e983bc727bf91a0952840171a279 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 22 Apr 2021 17:30:29 -0500 Subject: Add multiple attached containers error and empty container warning. #6144 --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (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 b24481dc..83cc0a67 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -452,7 +452,7 @@ namespace WixToolset.Core.Burn WixBundleContainerSymbol uxContainer; IEnumerable uxPayloads; { - var command = new CreateNonUXContainers(this.BackendHelper, section, bundleApplicationDllSymbol, containers.Values, payloadSymbols, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel); + var command = new CreateNonUXContainers(this.BackendHelper, this.Messaging, bundleApplicationDllSymbol, containers.Values, payloadSymbols, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel); command.Execute(); fileTransfers.AddRange(command.FileTransfers); @@ -462,6 +462,11 @@ namespace WixToolset.Core.Burn uxPayloads = command.UXContainerPayloads; } + if (this.Messaging.EncounteredError) + { + return; + } + // Resolve the download URLs now that we have all of the containers and payloads calculated. { var command = new ResolveDownloadUrlsCommand(this.Messaging, this.BackendExtensions, containers.Values, payloadSymbols); -- cgit v1.2.3-55-g6feb