From 0878f2e11bafb2f1e6f992fff6c49d859a4e569f Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 31 Jan 2021 19:23:33 -0500 Subject: Remove Burn Authenticode Fixes https://github.com/wixtoolset/issues/issues/6301 --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 11 +---------- .../Bind/GenerateManifestDataFromIRCommand.cs | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'src/WixToolset.Core.Burn/Bind') diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index 2c8231f8..dea1f47d 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -340,15 +340,6 @@ namespace WixToolset.Core.Burn command.Execute(); } - // If catalog files exist, non-embedded payloads should validate with the catalogs. - var catalogs = section.Symbols.OfType().ToList(); - - if (catalogs.Count > 0) - { - var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadSymbols.Values); - command.Execute(); - } - if (this.Messaging.EncounteredError) { return; @@ -456,7 +447,7 @@ namespace WixToolset.Core.Burn { var executableName = Path.GetFileName(this.OutputPath); - var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, catalogs, this.IntermediateFolder); + var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, this.IntermediateFolder); command.Execute(); manifestPath = command.OutputPath; diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs index 24a4ae67..93a1a0bc 100644 --- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs @@ -63,7 +63,6 @@ namespace WixToolset.Core.Burn.Bind case SymbolDefinitionType.WixBootstrapperApplication: case SymbolDefinitionType.WixBootstrapperApplicationDll: case SymbolDefinitionType.WixBundle: - case SymbolDefinitionType.WixBundleCatalog: case SymbolDefinitionType.WixBundleContainer: case SymbolDefinitionType.WixBundleCustomDataAttribute: case SymbolDefinitionType.WixBundleExePackage: -- cgit v1.2.3-55-g6feb