The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 27, 2020 at 14:34 UTC
f8c8adbe2c753ce6448369c49e87f9ff937af344
6 files changed
+69
-69
src/wixext/HttpCompiler.cs
+8
-8
@@ -7,7 +7,7 @@ namespace WixToolset.Http
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
using WixToolset.Extensibility;
10
- using WixToolset.Http.Tuples;
10
+ using WixToolset.Http.Symbols;
11
12
/// <summary>
13
/// The compiler for the WiX Toolset Http Extension.
@@ -169,7 +169,7 @@ namespace WixToolset.Http
169
170
if (!this.Messaging.EncounteredError)
171
{
172
- section.AddTuple(new WixHttpUrlReservationTuple(sourceLineNumbers, id)
172
+ section.AddSymbol(new WixHttpUrlReservationSymbol(sourceLineNumbers, id)
173
{
174
HandleExisting = handleExisting,
175
Sddl = sddl,
@@ -180,14 +180,14 @@ namespace WixToolset.Http
180
if (this.Context.Platform == Platform.ARM)
181
{
182
// Ensure ARM version of the CA is referenced.
183
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
184
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
183
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
184
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
185
}
186
else
187
{
188
// All other supported platforms use x86.
189
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
190
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
189
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
190
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
191
}
192
}
193
}
@@ -205,7 +205,7 @@ namespace WixToolset.Http
205
var securityPrincipal = defaultSecurityPrincipal;
206
var rights = HttpConstants.GENERIC_ALL;
207
string rightsValue = null;
208
-
208
+
209
foreach (var attrib in node.Attributes())
210
{
211
if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -263,7 +263,7 @@ namespace WixToolset.Http
263
264
if (!this.Messaging.EncounteredError)
265
{
266
- section.AddTuple(new WixHttpUrlAceTuple(sourceLineNumbers, id)
266
+ section.AddSymbol(new WixHttpUrlAceSymbol(sourceLineNumbers, id)
267
{
268
WixHttpUrlReservationRef = urlReservationId,
269
SecurityPrincipal = securityPrincipal,
src/wixext/HttpExtensionData.cs
+5
-5
@@ -16,15 +16,15 @@ namespace WixToolset.Http
16
/// <value>The default culture.</value>
17
public override string DefaultCulture => "en-US";
18
19
- public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
19
+ public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20
{
21
- tupleDefinition = HttpTupleDefinitions.ByName(name);
22
- return tupleDefinition != null;
21
+ symbolDefinition = HttpSymbolDefinitions.ByName(name);
22
+ return symbolDefinition != null;
23
}
24
25
- public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
25
+ public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
26
{
27
- return Intermediate.Load(typeof(HttpExtensionData).Assembly, "WixToolset.Http.http.wixlib", tupleDefinitions);
27
+ return Intermediate.Load(typeof(HttpExtensionData).Assembly, "WixToolset.Http.http.wixlib", symbolDefinitions);
28
}
29
}
30
}
src/wixext/HttpTableDefinitions.cs
+4
-4
@@ -8,7 +8,7 @@ namespace WixToolset.Http
8
{
9
public static readonly TableDefinition WixHttpUrlReservation = new TableDefinition(
10
"WixHttpUrlReservation",
11
- HttpTupleDefinitions.WixHttpUrlReservation,
11
+ HttpSymbolDefinitions.WixHttpUrlReservation,
12
new[]
13
{
14
new ColumnDefinition("WixHttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -17,12 +17,12 @@ namespace WixToolset.Http
17
new ColumnDefinition("Url", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "URL to be reserved.", modularizeType: ColumnModularizeType.Property),
18
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing the component that controls the URL reservation.", modularizeType: ColumnModularizeType.Column),
19
},
20
- tupleIdIsPrimaryKey: true
20
+ symbolIdIsPrimaryKey: true
21
);
22
23
public static readonly TableDefinition WixHttpUrlAce = new TableDefinition(
24
"WixHttpUrlAce",
25
- HttpTupleDefinitions.WixHttpUrlAce,
25
+ HttpSymbolDefinitions.WixHttpUrlAce,
26
new[]
27
{
28
new ColumnDefinition("WixHttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -30,7 +30,7 @@ namespace WixToolset.Http
30
new ColumnDefinition("SecurityPrincipal", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The security principal for this ACE.", modularizeType: ColumnModularizeType.Property),
31
new ColumnDefinition("Rights", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1073741824, description: "The rights for this ACE."),
32
},
33
- tupleIdIsPrimaryKey: true
33
+ symbolIdIsPrimaryKey: true
34
);
35
36
public static readonly TableDefinition[] All = new[]
src/wixext/Tuples/HttpTupleDefinitions.cs
+9
-9
@@ -5,19 +5,19 @@ namespace WixToolset.Http
5
using System;
6
using WixToolset.Data;
7
8
- public enum HttpTupleDefinitionType
8
+ public enum HttpSymbolDefinitionType
9
{
10
WixHttpUrlAce,
11
WixHttpUrlReservation,
12
}
13
14
- public static partial class HttpTupleDefinitions
14
+ public static partial class HttpSymbolDefinitions
15
{
16
public static readonly Version Version = new Version("4.0.0");
17
18
- public static IntermediateTupleDefinition ByName(string name)
18
+ public static IntermediateSymbolDefinition ByName(string name)
19
{
20
- if (!Enum.TryParse(name, out HttpTupleDefinitionType type))
20
+ if (!Enum.TryParse(name, out HttpSymbolDefinitionType type))
21
{
22
return null;
23
}
@@ -25,15 +25,15 @@ namespace WixToolset.Http
25
return ByType(type);
26
}
27
28
- public static IntermediateTupleDefinition ByType(HttpTupleDefinitionType type)
28
+ public static IntermediateSymbolDefinition ByType(HttpSymbolDefinitionType type)
29
{
30
switch (type)
31
{
32
- case HttpTupleDefinitionType.WixHttpUrlAce:
33
- return HttpTupleDefinitions.WixHttpUrlAce;
32
+ case HttpSymbolDefinitionType.WixHttpUrlAce:
33
+ return HttpSymbolDefinitions.WixHttpUrlAce;
34
35
- case HttpTupleDefinitionType.WixHttpUrlReservation:
36
- return HttpTupleDefinitions.WixHttpUrlReservation;
35
+ case HttpSymbolDefinitionType.WixHttpUrlReservation:
36
+ return HttpSymbolDefinitions.WixHttpUrlReservation;
37
38
default:
39
throw new ArgumentOutOfRangeException(nameof(type));
src/wixext/Tuples/WixHttpUrlAceTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Http
4
{
5
using WixToolset.Data;
6
- using WixToolset.Http.Tuples;
6
+ using WixToolset.Http.Symbols;
7
8
- public static partial class HttpTupleDefinitions
8
+ public static partial class HttpSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixHttpUrlAce = new IntermediateTupleDefinition(
11
- HttpTupleDefinitionType.WixHttpUrlAce.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixHttpUrlAce = new IntermediateSymbolDefinition(
11
+ HttpSymbolDefinitionType.WixHttpUrlAce.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.WixHttpUrlReservationRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.SecurityPrincipal), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.Rights), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.SecurityPrincipal), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.Rights), IntermediateFieldType.Number),
17
},
18
- typeof(WixHttpUrlAceTuple));
18
+ typeof(WixHttpUrlAceSymbol));
19
}
20
}
21
22
-namespace WixToolset.Http.Tuples
22
+namespace WixToolset.Http.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum WixHttpUrlAceTupleFields
26
+ public enum WixHttpUrlAceSymbolFields
27
{
28
WixHttpUrlReservationRef,
29
SecurityPrincipal,
30
Rights,
31
}
32
33
- public class WixHttpUrlAceTuple : IntermediateTuple
33
+ public class WixHttpUrlAceSymbol : IntermediateSymbol
34
{
35
- public WixHttpUrlAceTuple() : base(HttpTupleDefinitions.WixHttpUrlAce, null, null)
35
+ public WixHttpUrlAceSymbol() : base(HttpSymbolDefinitions.WixHttpUrlAce, null, null)
36
{
37
}
38
39
- public WixHttpUrlAceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpTupleDefinitions.WixHttpUrlAce, sourceLineNumber, id)
39
+ public WixHttpUrlAceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.WixHttpUrlAce, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[WixHttpUrlAceTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[WixHttpUrlAceSymbolFields index] => this.Fields[(int)index];
44
45
public string WixHttpUrlReservationRef
46
{
47
- get => this.Fields[(int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef].AsString();
48
- set => this.Set((int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef, value);
47
+ get => this.Fields[(int)WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef].AsString();
48
+ set => this.Set((int)WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef, value);
49
}
50
51
public string SecurityPrincipal
52
{
53
- get => this.Fields[(int)WixHttpUrlAceTupleFields.SecurityPrincipal].AsString();
54
- set => this.Set((int)WixHttpUrlAceTupleFields.SecurityPrincipal, value);
53
+ get => this.Fields[(int)WixHttpUrlAceSymbolFields.SecurityPrincipal].AsString();
54
+ set => this.Set((int)WixHttpUrlAceSymbolFields.SecurityPrincipal, value);
55
}
56
57
public int Rights
58
{
59
- get => this.Fields[(int)WixHttpUrlAceTupleFields.Rights].AsNumber();
60
- set => this.Set((int)WixHttpUrlAceTupleFields.Rights, value);
59
+ get => this.Fields[(int)WixHttpUrlAceSymbolFields.Rights].AsNumber();
60
+ set => this.Set((int)WixHttpUrlAceSymbolFields.Rights, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/WixHttpUrlReservationTuple.cs
+23
-23
@@ -3,28 +3,28 @@
3
namespace WixToolset.Http
4
{
5
using WixToolset.Data;
6
- using WixToolset.Http.Tuples;
6
+ using WixToolset.Http.Symbols;
7
8
- public static partial class HttpTupleDefinitions
8
+ public static partial class HttpSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixHttpUrlReservation = new IntermediateTupleDefinition(
11
- HttpTupleDefinitionType.WixHttpUrlReservation.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixHttpUrlReservation = new IntermediateSymbolDefinition(
11
+ HttpSymbolDefinitionType.WixHttpUrlReservation.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.HandleExisting), IntermediateFieldType.Number),
15
- new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.Sddl), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.Url), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.ComponentRef), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.HandleExisting), IntermediateFieldType.Number),
15
+ new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.Sddl), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.Url), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.ComponentRef), IntermediateFieldType.String),
18
},
19
- typeof(WixHttpUrlReservationTuple));
19
+ typeof(WixHttpUrlReservationSymbol));
20
}
21
}
22
23
-namespace WixToolset.Http.Tuples
23
+namespace WixToolset.Http.Symbols
24
{
25
using WixToolset.Data;
26
27
- public enum WixHttpUrlReservationTupleFields
27
+ public enum WixHttpUrlReservationSymbolFields
28
{
29
HandleExisting,
30
Sddl,
@@ -32,40 +32,40 @@ namespace WixToolset.Http.Tuples
32
ComponentRef,
33
}
34
35
- public class WixHttpUrlReservationTuple : IntermediateTuple
35
+ public class WixHttpUrlReservationSymbol : IntermediateSymbol
36
{
37
- public WixHttpUrlReservationTuple() : base(HttpTupleDefinitions.WixHttpUrlReservation, null, null)
37
+ public WixHttpUrlReservationSymbol() : base(HttpSymbolDefinitions.WixHttpUrlReservation, null, null)
38
{
39
}
40
41
- public WixHttpUrlReservationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpTupleDefinitions.WixHttpUrlReservation, sourceLineNumber, id)
41
+ public WixHttpUrlReservationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.WixHttpUrlReservation, sourceLineNumber, id)
42
{
43
}
44
45
- public IntermediateField this[WixHttpUrlReservationTupleFields index] => this.Fields[(int)index];
45
+ public IntermediateField this[WixHttpUrlReservationSymbolFields index] => this.Fields[(int)index];
46
47
public int HandleExisting
48
{
49
- get => this.Fields[(int)WixHttpUrlReservationTupleFields.HandleExisting].AsNumber();
50
- set => this.Set((int)WixHttpUrlReservationTupleFields.HandleExisting, value);
49
+ get => this.Fields[(int)WixHttpUrlReservationSymbolFields.HandleExisting].AsNumber();
50
+ set => this.Set((int)WixHttpUrlReservationSymbolFields.HandleExisting, value);
51
}
52
53
public string Sddl
54
{
55
- get => this.Fields[(int)WixHttpUrlReservationTupleFields.Sddl].AsString();
56
- set => this.Set((int)WixHttpUrlReservationTupleFields.Sddl, value);
55
+ get => this.Fields[(int)WixHttpUrlReservationSymbolFields.Sddl].AsString();
56
+ set => this.Set((int)WixHttpUrlReservationSymbolFields.Sddl, value);
57
}
58
59
public string Url
60
{
61
- get => this.Fields[(int)WixHttpUrlReservationTupleFields.Url].AsString();
62
- set => this.Set((int)WixHttpUrlReservationTupleFields.Url, value);
61
+ get => this.Fields[(int)WixHttpUrlReservationSymbolFields.Url].AsString();
62
+ set => this.Set((int)WixHttpUrlReservationSymbolFields.Url, value);
63
}
64
65
public string ComponentRef
66
{
67
- get => this.Fields[(int)WixHttpUrlReservationTupleFields.ComponentRef].AsString();
68
- set => this.Set((int)WixHttpUrlReservationTupleFields.ComponentRef, value);
67
+ get => this.Fields[(int)WixHttpUrlReservationSymbolFields.ComponentRef].AsString();
68
+ set => this.Set((int)WixHttpUrlReservationSymbolFields.ComponentRef, value);
69
}
70
}
71
}
\ No newline at end of file