Rename WixProductTagSymbol to WixPackageTagSymbol
Rob Mensching committed
Feb 23, 2022 at 15:16 UTC
a19f847fe38ad9df88a0dc61ec2caa8ea0cd507f
7 files changed
+76
-76
src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
+3
-3
@@ -179,7 +179,7 @@ namespace WixToolset.Data
179
WixPatchRef,
180
WixPatchTarget,
181
WixProductSearch,
182
- WixProductTag,
182
+ WixPackageTag,
183
WixProperty,
184
WixRegistrySearch,
185
WixRelatedBundle,
@@ -729,8 +729,8 @@ namespace WixToolset.Data
729
case SymbolDefinitionType.WixProductSearch:
730
return SymbolDefinitions.WixProductSearch;
731
732
- case SymbolDefinitionType.WixProductTag:
733
- return SymbolDefinitions.WixProductTag;
732
+ case SymbolDefinitionType.WixPackageTag:
733
+ return SymbolDefinitions.WixPackageTag;
734
735
case SymbolDefinitionType.WixProperty:
736
return SymbolDefinitions.WixProperty;
src/api/wix/WixToolset.Data/Symbols/WixPackageTagSymbol.cs
new
+68
@@ -0,0 +1,68 @@
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 WixPackageTag = new IntermediateSymbolDefinition(
10
+ SymbolDefinitionType.WixPackageTag,
11
+ new[]
12
+ {
13
+ new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.FileRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Regid), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Name), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Attributes), IntermediateFieldType.Number)
17
+ },
18
+ typeof(WixPackageTagSymbol));
19
+ }
20
+}
21
+
22
+namespace WixToolset.Data.Symbols
23
+{
24
+ public enum WixPackageTagSymbolFields
25
+ {
26
+ FileRef,
27
+ Regid,
28
+ Name,
29
+ Attributes
30
+ }
31
+
32
+ public class WixPackageTagSymbol : IntermediateSymbol
33
+ {
34
+ public WixPackageTagSymbol() : base(SymbolDefinitions.WixPackageTag, null, null)
35
+ {
36
+ }
37
+
38
+ public WixPackageTagSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPackageTag, sourceLineNumber, id)
39
+ {
40
+ }
41
+
42
+ public IntermediateField this[WixPackageTagSymbolFields index] => this.Fields[(int)index];
43
+
44
+ public string FileRef
45
+ {
46
+ get => this.Fields[(int)WixPackageTagSymbolFields.FileRef].AsString();
47
+ set => this.Set((int)WixPackageTagSymbolFields.FileRef, value);
48
+ }
49
+
50
+ public string Regid
51
+ {
52
+ get => this.Fields[(int)WixPackageTagSymbolFields.Regid].AsString();
53
+ set => this.Set((int)WixPackageTagSymbolFields.Regid, value);
54
+ }
55
+
56
+ public string Name
57
+ {
58
+ get => this.Fields[(int)WixPackageTagSymbolFields.Name].AsString();
59
+ set => this.Set((int)WixPackageTagSymbolFields.Name, value);
60
+ }
61
+
62
+ public int Attributes
63
+ {
64
+ get => this.Fields[(int)WixPackageTagSymbolFields.Attributes].AsNumber();
65
+ set => this.Set((int)WixPackageTagSymbolFields.Attributes, value);
66
+ }
67
+ }
68
+}
src/api/wix/WixToolset.Data/Symbols/WixProductTagSymbol.cs
deleted
-68
@@ -1,68 +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 WixProductTag = new IntermediateSymbolDefinition(
10
- SymbolDefinitionType.WixProductTag,
11
- new[]
12
- {
13
- new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.FileRef), IntermediateFieldType.String),
14
- new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Regid), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Name), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Attributes), IntermediateFieldType.Number)
17
- },
18
- typeof(WixProductTagSymbol));
19
- }
20
-}
21
-
22
-namespace WixToolset.Data.Symbols
23
-{
24
- public enum WixProductTagSymbolFields
25
- {
26
- FileRef,
27
- Regid,
28
- Name,
29
- Attributes
30
- }
31
-
32
- public class WixProductTagSymbol : IntermediateSymbol
33
- {
34
- public WixProductTagSymbol() : base(SymbolDefinitions.WixProductTag, null, null)
35
- {
36
- }
37
-
38
- public WixProductTagSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProductTag, sourceLineNumber, id)
39
- {
40
- }
41
-
42
- public IntermediateField this[WixProductTagSymbolFields index] => this.Fields[(int)index];
43
-
44
- public string FileRef
45
- {
46
- get => this.Fields[(int)WixProductTagSymbolFields.FileRef].AsString();
47
- set => this.Set((int)WixProductTagSymbolFields.FileRef, value);
48
- }
49
-
50
- public string Regid
51
- {
52
- get => this.Fields[(int)WixProductTagSymbolFields.Regid].AsString();
53
- set => this.Set((int)WixProductTagSymbolFields.Regid, value);
54
- }
55
-
56
- public string Name
57
- {
58
- get => this.Fields[(int)WixProductTagSymbolFields.Name].AsString();
59
- set => this.Set((int)WixProductTagSymbolFields.Name, value);
60
- }
61
-
62
- public int Attributes
63
- {
64
- get => this.Fields[(int)WixProductTagSymbolFields.Attributes].AsNumber();
65
- set => this.Set((int)WixProductTagSymbolFields.Attributes, value);
66
- }
67
- }
68
-}
src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+1
-1
@@ -257,7 +257,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
257
// Process SoftwareTags in MSI packages.
258
if (SectionType.Product == section.Type)
259
{
260
- var softwareTags = section.Symbols.OfType<WixProductTagSymbol>().ToList();
260
+ var softwareTags = section.Symbols.OfType<WixPackageTagSymbol>().ToList();
261
262
if (softwareTags.Any())
263
{
src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+1
-1
@@ -250,7 +250,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
250
case SymbolDefinitionType.WixPatchRef:
251
case SymbolDefinitionType.WixPatchTarget:
252
case SymbolDefinitionType.WixProperty:
253
- case SymbolDefinitionType.WixProductTag:
253
+ case SymbolDefinitionType.WixPackageTag:
254
case SymbolDefinitionType.WixSimpleReference:
255
case SymbolDefinitionType.WixSuppressAction:
256
case SymbolDefinitionType.WixSuppressModularization:
src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPackageSoftwareTagsCommand.cs
+2
-2
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
14
15
internal class ProcessPackageSoftwareTagsCommand
16
{
17
- public ProcessPackageSoftwareTagsCommand(IntermediateSection section, IBackendHelper backendHelper, IEnumerable<WixProductTagSymbol> softwareTags, string intermediateFolder)
17
+ public ProcessPackageSoftwareTagsCommand(IntermediateSection section, IBackendHelper backendHelper, IEnumerable<WixPackageTagSymbol> softwareTags, string intermediateFolder)
18
{
19
this.Section = section;
20
this.BackendHelper = backendHelper;
@@ -28,7 +28,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
28
29
private IBackendHelper BackendHelper { get; }
30
31
- private IEnumerable<WixProductTagSymbol> SoftwareTags { get; }
31
+ private IEnumerable<WixPackageTagSymbol> SoftwareTags { get; }
32
33
public IReadOnlyCollection<ITrackedFile> TrackedFiles { get; private set; }
34
src/wix/WixToolset.Core/Compiler_Tag.cs
+1
-1
@@ -249,7 +249,7 @@ namespace WixToolset.Core
249
this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, null, ComplexReferenceChildType.Component, id.Id, true);
250
251
this.Core.EnsureTable(sourceLineNumbers, "SoftwareIdentificationTag");
252
- this.Core.AddSymbol(new WixProductTagSymbol(sourceLineNumbers, id)
252
+ this.Core.AddSymbol(new WixPackageTagSymbol(sourceLineNumbers, id)
253
{
254
FileRef = id.Id,
255
Regid = regid,