aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-01-31 19:20:54 -0500
committerBob Arnson <bob@firegiant.com>2021-01-31 19:22:43 -0500
commitfa0ca50300e55a730d1df33347559620edec99f3 (patch)
tree14907a19f2a4ada56ee3957fc62dd6e743077ede /src
parent37067209fa6defaecc877bab07262e9cf78088c5 (diff)
downloadwix-fa0ca50300e55a730d1df33347559620edec99f3.tar.gz
wix-fa0ca50300e55a730d1df33347559620edec99f3.tar.bz2
wix-fa0ca50300e55a730d1df33347559620edec99f3.zip
Remove Burn Authenticode. Fixes https://github.com/wixtoolset/issues/issues/6301.
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Data/ErrorMessages.cs12
-rw-r--r--src/WixToolset.Data/Symbols/SymbolDefinitions.cs4
-rw-r--r--src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs44
-rw-r--r--src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs28
4 files changed, 0 insertions, 88 deletions
diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index b2a32961..c69a675a 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -158,16 +158,6 @@ namespace WixToolset.Data
158 return Message(sourceLineNumbers, Ids.CannotReundefineVariable, "The variable '{0}' cannot be undefined because its already undefined.", variableName); 158 return Message(sourceLineNumbers, Ids.CannotReundefineVariable, "The variable '{0}' cannot be undefined because its already undefined.", variableName);
159 } 159 }
160 160
161 public static Message CatalogFileHashFailed(string fileName, int errorCode)
162 {
163 return Message(null, Ids.CatalogFileHashFailed, "Could not get hash of file '{0}'. Error: {2}.", fileName, errorCode);
164 }
165
166 public static Message CatalogVerificationFailed(string fileName)
167 {
168 return Message(null, Ids.CatalogVerificationFailed, "File '{0}' could not be verified with a catalog file.", fileName);
169 }
170
171 public static Message CheckBoxValueOnlyValidWithCheckBox(SourceLineNumber sourceLineNumbers, string elementName, string controlType) 161 public static Message CheckBoxValueOnlyValidWithCheckBox(SourceLineNumber sourceLineNumbers, string elementName, string controlType)
172 { 162 {
173 return Message(sourceLineNumbers, Ids.CheckBoxValueOnlyValidWithCheckBox, "A {0} element was specified with Type='{1}' and a CheckBoxValue. Check box values can only be specified with Type='CheckBox'.", elementName, controlType); 163 return Message(sourceLineNumbers, Ids.CheckBoxValueOnlyValidWithCheckBox, "A {0} element was specified with Type='{1}' and a CheckBoxValue. Check box values can only be specified with Type='CheckBox'.", elementName, controlType);
@@ -2656,8 +2646,6 @@ namespace WixToolset.Data
2656 MediaTableCollision = 357, 2646 MediaTableCollision = 357,
2657 InvalidCabinetTemplate = 358, 2647 InvalidCabinetTemplate = 358,
2658 MaximumUncompressedMediaSizeTooLarge = 359, 2648 MaximumUncompressedMediaSizeTooLarge = 359,
2659 CatalogVerificationFailed = 360,
2660 CatalogFileHashFailed = 361,
2661 ReservedNamespaceViolation = 362, 2649 ReservedNamespaceViolation = 362,
2662 PerUserButAllUsersEquals1 = 363, 2650 PerUserButAllUsersEquals1 = 363,
2663 UnsupportedAllUsersValue = 364, 2651 UnsupportedAllUsersValue = 364,
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
119 WixBootstrapperApplicationDll, 119 WixBootstrapperApplicationDll,
120 WixBuildInfo, 120 WixBuildInfo,
121 WixBundle, 121 WixBundle,
122 WixBundleCatalog,
123 WixBundleContainer, 122 WixBundleContainer,
124 WixBundleCustomData, 123 WixBundleCustomData,
125 WixBundleCustomDataAttribute, 124 WixBundleCustomDataAttribute,
@@ -543,9 +542,6 @@ namespace WixToolset.Data
543 case SymbolDefinitionType.WixBundle: 542 case SymbolDefinitionType.WixBundle:
544 return SymbolDefinitions.WixBundle; 543 return SymbolDefinitions.WixBundle;
545 544
546 case SymbolDefinitionType.WixBundleCatalog:
547 return SymbolDefinitions.WixBundleCatalog;
548
549 case SymbolDefinitionType.WixBundleContainer: 545 case SymbolDefinitionType.WixBundleContainer:
550 return SymbolDefinitions.WixBundleContainer; 546 return SymbolDefinitions.WixBundleContainer;
551 547
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 @@
1// 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.
2
3namespace WixToolset.Data
4{
5 using WixToolset.Data.Symbols;
6
7 public static partial class SymbolDefinitions
8 {
9 public static readonly IntermediateSymbolDefinition WixBundleCatalog = new IntermediateSymbolDefinition(
10 SymbolDefinitionType.WixBundleCatalog,
11 new[]
12 {
13 new IntermediateFieldDefinition(nameof(WixBundleCatalogSymbolFields.PayloadRef), IntermediateFieldType.String),
14 },
15 typeof(WixBundleCatalogSymbol));
16 }
17}
18
19namespace WixToolset.Data.Symbols
20{
21 public enum WixBundleCatalogSymbolFields
22 {
23 PayloadRef,
24 }
25
26 public class WixBundleCatalogSymbol : IntermediateSymbol
27 {
28 public WixBundleCatalogSymbol() : base(SymbolDefinitions.WixBundleCatalog, null, null)
29 {
30 }
31
32 public WixBundleCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCatalog, sourceLineNumber, id)
33 {
34 }
35
36 public IntermediateField this[WixBundleCatalogSymbolFields index] => this.Fields[(int)index];
37
38 public string PayloadRef
39 {
40 get => (string)this.Fields[(int)WixBundleCatalogSymbolFields.PayloadRef];
41 set => this.Set((int)WixBundleCatalogSymbolFields.PayloadRef, value);
42 }
43 }
44}
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
17 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EnableSignatureValidation), IntermediateFieldType.Bool),
21 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number), 20 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number),
22 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String), 21 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
23 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String), 22 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
24 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String), 23 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String),
25 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String), 24 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String),
26 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.CatalogRef), IntermediateFieldType.String),
27 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String), 25 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
28 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String), 26 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
29 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool), 27 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
@@ -49,13 +47,11 @@ namespace WixToolset.Data.Symbols
49 UnresolvedSourceFile, 47 UnresolvedSourceFile,
50 DisplayName, 48 DisplayName,
51 Description, 49 Description,
52 EnableSignatureValidation,
53 FileSize, 50 FileSize,
54 Version, 51 Version,
55 Hash, 52 Hash,
56 PublicKey, 53 PublicKey,
57 Thumbprint, 54 Thumbprint,
58 CatalogRef,
59 ContainerRef, 55 ContainerRef,
60 PackageRef, 56 PackageRef,
61 ContentFile, 57 ContentFile,
@@ -119,12 +115,6 @@ namespace WixToolset.Data.Symbols
119 set => this.Set((int)WixBundlePayloadSymbolFields.Description, value); 115 set => this.Set((int)WixBundlePayloadSymbolFields.Description, value);
120 } 116 }
121 117
122 public bool EnableSignatureValidation
123 {
124 get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.EnableSignatureValidation];
125 set => this.Set((int)WixBundlePayloadSymbolFields.EnableSignatureValidation, value);
126 }
127
128 public int? FileSize 118 public int? FileSize
129 { 119 {
130 get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize]; 120 get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize];
@@ -143,24 +133,6 @@ namespace WixToolset.Data.Symbols
143 set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value); 133 set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value);
144 } 134 }
145 135
146 public string PublicKey
147 {
148 get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PublicKey];
149 set => this.Set((int)WixBundlePayloadSymbolFields.PublicKey, value);
150 }
151
152 public string Thumbprint
153 {
154 get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Thumbprint];
155 set => this.Set((int)WixBundlePayloadSymbolFields.Thumbprint, value);
156 }
157
158 public string CatalogRef
159 {
160 get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.CatalogRef];
161 set => this.Set((int)WixBundlePayloadSymbolFields.CatalogRef, value);
162 }
163
164 public string ContainerRef 136 public string ContainerRef
165 { 137 {
166 get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef]; 138 get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef];