From fa0ca50300e55a730d1df33347559620edec99f3 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 31 Jan 2021 19:20:54 -0500
Subject: Remove Burn Authenticode. Fixes
 https://github.com/wixtoolset/issues/issues/6301.

---
 src/WixToolset.Data/Symbols/SymbolDefinitions.cs   |  4 --
 .../Symbols/WixBundleCatalogSymbol.cs              | 44 ----------------------
 .../Symbols/WixBundlePayloadSymbol.cs              | 28 --------------
 3 files changed, 76 deletions(-)
 delete mode 100644 src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs

(limited to 'src/WixToolset.Data/Symbols')

diff --git a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
index 771d1ec8..bed49b87 100644
--- a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -119,7 +119,6 @@ namespace WixToolset.Data
         WixBootstrapperApplicationDll,
         WixBuildInfo,
         WixBundle,
-        WixBundleCatalog,
         WixBundleContainer,
         WixBundleCustomData,
         WixBundleCustomDataAttribute,
@@ -543,9 +542,6 @@ namespace WixToolset.Data
                 case SymbolDefinitionType.WixBundle:
                     return SymbolDefinitions.WixBundle;
 
-                case SymbolDefinitionType.WixBundleCatalog:
-                    return SymbolDefinitions.WixBundleCatalog;
-
                 case SymbolDefinitionType.WixBundleContainer:
                     return SymbolDefinitions.WixBundleContainer;
 
diff --git a/src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs
deleted file mode 100644
index 48415228..00000000
--- a/src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    using WixToolset.Data.Symbols;
-
-    public static partial class SymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixBundleCatalog = new IntermediateSymbolDefinition(
-            SymbolDefinitionType.WixBundleCatalog,
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixBundleCatalogSymbolFields.PayloadRef), IntermediateFieldType.String),
-            },
-            typeof(WixBundleCatalogSymbol));
-    }
-}
-
-namespace WixToolset.Data.Symbols
-{
-    public enum WixBundleCatalogSymbolFields
-    {
-        PayloadRef,
-    }
-
-    public class WixBundleCatalogSymbol : IntermediateSymbol
-    {
-        public WixBundleCatalogSymbol() : base(SymbolDefinitions.WixBundleCatalog, null, null)
-        {
-        }
-
-        public WixBundleCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCatalog, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixBundleCatalogSymbolFields index] => this.Fields[(int)index];
-
-        public string PayloadRef
-        {
-            get => (string)this.Fields[(int)WixBundleCatalogSymbolFields.PayloadRef];
-            set => this.Set((int)WixBundleCatalogSymbolFields.PayloadRef, value);
-        }
-    }
-}
diff --git a/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs b/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
index 94a02af8..87880cc6 100644
--- a/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
+++ b/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
@@ -17,13 +17,11 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EnableSignatureValidation), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.CatalogRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
@@ -49,13 +47,11 @@ namespace WixToolset.Data.Symbols
         UnresolvedSourceFile,
         DisplayName,
         Description,
-        EnableSignatureValidation,
         FileSize,
         Version,
         Hash,
         PublicKey,
         Thumbprint,
-        CatalogRef,
         ContainerRef,
         PackageRef,
         ContentFile,
@@ -119,12 +115,6 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePayloadSymbolFields.Description, value);
         }
 
-        public bool EnableSignatureValidation
-        {
-            get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.EnableSignatureValidation];
-            set => this.Set((int)WixBundlePayloadSymbolFields.EnableSignatureValidation, value);
-        }
-
         public int? FileSize
         {
             get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize];
@@ -143,24 +133,6 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value);
         }
 
-        public string PublicKey
-        {
-            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PublicKey];
-            set => this.Set((int)WixBundlePayloadSymbolFields.PublicKey, value);
-        }
-
-        public string Thumbprint
-        {
-            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Thumbprint];
-            set => this.Set((int)WixBundlePayloadSymbolFields.Thumbprint, value);
-        }
-
-        public string CatalogRef
-        {
-            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.CatalogRef];
-            set => this.Set((int)WixBundlePayloadSymbolFields.CatalogRef, value);
-        }
-
         public string ContainerRef
         {
             get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef];
-- 
cgit v1.2.3-55-g6feb