Remove Burn Authenticode. Fixes https://github.com/wixtoolset/issues/issues/6301.
Bob Arnson committed
Jan 31, 2021 at 19:20 UTC
fa0ca50300e55a730d1df33347559620edec99f3
4 files changed
-88
src/WixToolset.Data/ErrorMessages.cs
-12
@@ -158,16 +158,6 @@ namespace WixToolset.Data
158
return Message(sourceLineNumbers, Ids.CannotReundefineVariable, "The variable '{0}' cannot be undefined because its already undefined.", variableName);
159
}
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
-
161
public static Message CheckBoxValueOnlyValidWithCheckBox(SourceLineNumber sourceLineNumbers, string elementName, string controlType)
162
{
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
2646
MediaTableCollision = 357,
2647
InvalidCabinetTemplate = 358,
2648
MaximumUncompressedMediaSizeTooLarge = 359,
2659
- CatalogVerificationFailed = 360,
2660
- CatalogFileHashFailed = 361,
2649
ReservedNamespaceViolation = 362,
2650
PerUserButAllUsersEquals1 = 363,
2651
UnsupportedAllUsersValue = 364,
src/WixToolset.Data/Symbols/SymbolDefinitions.cs
-4
@@ -119,7 +119,6 @@ namespace WixToolset.Data
119
WixBootstrapperApplicationDll,
120
WixBuildInfo,
121
WixBundle,
122
- WixBundleCatalog,
122
WixBundleContainer,
123
WixBundleCustomData,
124
WixBundleCustomDataAttribute,
@@ -543,9 +542,6 @@ namespace WixToolset.Data
542
case SymbolDefinitionType.WixBundle:
543
return SymbolDefinitions.WixBundle;
544
546
- case SymbolDefinitionType.WixBundleCatalog:
547
- return SymbolDefinitions.WixBundleCatalog;
548
-
545
case SymbolDefinitionType.WixBundleContainer:
546
return SymbolDefinitions.WixBundleContainer;
547
src/WixToolset.Data/Symbols/WixBundleCatalogSymbol.cs
deleted
-44
@@ -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
-
3
-namespace 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
-
19
-namespace 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
-}
src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
-28
@@ -17,13 +17,11 @@ namespace WixToolset.Data
17
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EnableSignatureValidation), IntermediateFieldType.Bool),
20
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number),
21
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
22
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
23
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String),
24
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String),
26
- new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.CatalogRef), IntermediateFieldType.String),
25
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
26
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
27
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
@@ -49,13 +47,11 @@ namespace WixToolset.Data.Symbols
47
UnresolvedSourceFile,
48
DisplayName,
49
Description,
52
- EnableSignatureValidation,
50
FileSize,
51
Version,
52
Hash,
53
PublicKey,
54
Thumbprint,
58
- CatalogRef,
55
ContainerRef,
56
PackageRef,
57
ContentFile,
@@ -119,12 +115,6 @@ namespace WixToolset.Data.Symbols
115
set => this.Set((int)WixBundlePayloadSymbolFields.Description, value);
116
}
117
122
- public bool EnableSignatureValidation
123
- {
124
- get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.EnableSignatureValidation];
125
- set => this.Set((int)WixBundlePayloadSymbolFields.EnableSignatureValidation, value);
126
- }
127
-
118
public int? FileSize
119
{
120
get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize];
@@ -143,24 +133,6 @@ namespace WixToolset.Data.Symbols
133
set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value);
134
}
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
-
136
public string ContainerRef
137
{
138
get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef];