The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 27, 2020 at 14:53 UTC
a89592813ea0400675c56d825fdd67f3cc4a8aaa
7 files changed
+120
-120
src/wixext/MsmqCompiler.cs
+11
-11
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
using WixToolset.Extensibility;
10
- using WixToolset.Msmq.Tuples;
10
+ using WixToolset.Msmq.Symbols;
11
12
/// <summary>
13
/// The compiler for the WiX Toolset MSMQ Extension.
@@ -221,7 +221,7 @@ namespace WixToolset.Msmq
221
}
222
}
223
224
- var tuple = section.AddTuple(new MessageQueueTuple(sourceLineNumbers, id)
224
+ var symbol = section.AddSymbol(new MessageQueueSymbol(sourceLineNumbers, id)
225
{
226
ComponentRef = componentId,
227
Label = label,
@@ -233,24 +233,24 @@ namespace WixToolset.Msmq
233
234
if (CompilerConstants.IntegerNotSet != basePriority)
235
{
236
- tuple.BasePriority = basePriority;
236
+ symbol.BasePriority = basePriority;
237
}
238
if (CompilerConstants.IntegerNotSet != journalQuota)
239
{
240
- tuple.JournalQuota = journalQuota;
240
+ symbol.JournalQuota = journalQuota;
241
}
242
243
if (CompilerConstants.IntegerNotSet != privLevel)
244
{
245
- tuple.PrivLevel = privLevel;
245
+ symbol.PrivLevel = privLevel;
246
}
247
if (CompilerConstants.IntegerNotSet != quota)
248
{
249
- tuple.Quota = quota;
249
+ symbol.Quota = quota;
250
}
251
252
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingInstall");
253
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingUninstall");
252
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall");
253
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall");
254
}
255
256
/// <summary>
@@ -283,7 +283,7 @@ namespace WixToolset.Msmq
283
this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
284
}
285
messageQueueId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
286
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqTupleDefinitions.MessageQueue, messageQueueId);
286
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqSymbolDefinitions.MessageQueue, messageQueueId);
287
break;
288
case "User":
289
if (null != group)
@@ -490,7 +490,7 @@ namespace WixToolset.Msmq
490
491
if (null != user)
492
{
493
- section.AddTuple(new MessageQueueUserPermissionTuple(sourceLineNumbers, id)
493
+ section.AddSymbol(new MessageQueueUserPermissionSymbol(sourceLineNumbers, id)
494
{
495
ComponentRef = componentId,
496
MessageQueueRef = messageQueueId,
@@ -500,7 +500,7 @@ namespace WixToolset.Msmq
500
}
501
if (null != group)
502
{
503
- section.AddTuple(new MessageQueueGroupPermissionTuple(sourceLineNumbers, id)
503
+ section.AddSymbol(new MessageQueueGroupPermissionSymbol(sourceLineNumbers, id)
504
{
505
ComponentRef = componentId,
506
MessageQueueRef = messageQueueId,
src/wixext/MsmqExtensionData.cs
+5
-5
@@ -16,15 +16,15 @@ namespace WixToolset.Msmq
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 = MsmqTupleDefinitions.ByName(name);
22
- return tupleDefinition != null;
21
+ symbolDefinition = MsmqSymbolDefinitions.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(MsmqExtensionData).Assembly, "WixToolset.Msmq.msmq.wixlib", tupleDefinitions);
27
+ return Intermediate.Load(typeof(MsmqExtensionData).Assembly, "WixToolset.Msmq.msmq.wixlib", symbolDefinitions);
28
}
29
}
30
}
src/wixext/MsmqTableDefinitions.cs
+6
-6
@@ -8,7 +8,7 @@ namespace WixToolset.Msmq
8
{
9
public static readonly TableDefinition MessageQueue = new TableDefinition(
10
"MessageQueue",
11
- MsmqTupleDefinitions.MessageQueue,
11
+ MsmqSymbolDefinitions.MessageQueue,
12
new[]
13
{
14
new ColumnDefinition("MessageQueue", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -23,12 +23,12 @@ namespace WixToolset.Msmq
23
new ColumnDefinition("ServiceTypeGuid", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
24
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
25
},
26
- tupleIdIsPrimaryKey: true
26
+ symbolIdIsPrimaryKey: true
27
);
28
29
public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
30
"MessageQueueUserPermission",
31
- MsmqTupleDefinitions.MessageQueueUserPermission,
31
+ MsmqSymbolDefinitions.MessageQueueUserPermission,
32
new[]
33
{
34
new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -37,12 +37,12 @@ namespace WixToolset.Msmq
37
new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
38
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
39
},
40
- tupleIdIsPrimaryKey: true
40
+ symbolIdIsPrimaryKey: true
41
);
42
43
public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
44
"MessageQueueGroupPermission",
45
- MsmqTupleDefinitions.MessageQueueGroupPermission,
45
+ MsmqSymbolDefinitions.MessageQueueGroupPermission,
46
new[]
47
{
48
new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -51,7 +51,7 @@ namespace WixToolset.Msmq
51
new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
52
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
53
},
54
- tupleIdIsPrimaryKey: true
54
+ symbolIdIsPrimaryKey: true
55
);
56
57
public static readonly TableDefinition[] All = new[]
src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs
+23
-23
@@ -3,28 +3,28 @@
3
namespace WixToolset.Msmq
4
{
5
using WixToolset.Data;
6
- using WixToolset.Msmq.Tuples;
6
+ using WixToolset.Msmq.Symbols;
7
8
- public static partial class MsmqTupleDefinitions
8
+ public static partial class MsmqSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition MessageQueueGroupPermission = new IntermediateTupleDefinition(
11
- MsmqTupleDefinitionType.MessageQueueGroupPermission.ToString(),
10
+ public static readonly IntermediateSymbolDefinition MessageQueueGroupPermission = new IntermediateSymbolDefinition(
11
+ MsmqSymbolDefinitionType.MessageQueueGroupPermission.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.GroupRef), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.Permissions), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.MessageQueueRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.GroupRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.Permissions), IntermediateFieldType.Number),
18
},
19
- typeof(MessageQueueGroupPermissionTuple));
19
+ typeof(MessageQueueGroupPermissionSymbol));
20
}
21
}
22
23
-namespace WixToolset.Msmq.Tuples
23
+namespace WixToolset.Msmq.Symbols
24
{
25
using WixToolset.Data;
26
27
- public enum MessageQueueGroupPermissionTupleFields
27
+ public enum MessageQueueGroupPermissionSymbolFields
28
{
29
ComponentRef,
30
MessageQueueRef,
@@ -32,40 +32,40 @@ namespace WixToolset.Msmq.Tuples
32
Permissions,
33
}
34
35
- public class MessageQueueGroupPermissionTuple : IntermediateTuple
35
+ public class MessageQueueGroupPermissionSymbol : IntermediateSymbol
36
{
37
- public MessageQueueGroupPermissionTuple() : base(MsmqTupleDefinitions.MessageQueueGroupPermission, null, null)
37
+ public MessageQueueGroupPermissionSymbol() : base(MsmqSymbolDefinitions.MessageQueueGroupPermission, null, null)
38
{
39
}
40
41
- public MessageQueueGroupPermissionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueueGroupPermission, sourceLineNumber, id)
41
+ public MessageQueueGroupPermissionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueueGroupPermission, sourceLineNumber, id)
42
{
43
}
44
45
- public IntermediateField this[MessageQueueGroupPermissionTupleFields index] => this.Fields[(int)index];
45
+ public IntermediateField this[MessageQueueGroupPermissionSymbolFields index] => this.Fields[(int)index];
46
47
public string ComponentRef
48
{
49
- get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.ComponentRef].AsString();
50
- set => this.Set((int)MessageQueueGroupPermissionTupleFields.ComponentRef, value);
49
+ get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.ComponentRef].AsString();
50
+ set => this.Set((int)MessageQueueGroupPermissionSymbolFields.ComponentRef, value);
51
}
52
53
public string MessageQueueRef
54
{
55
- get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.MessageQueueRef].AsString();
56
- set => this.Set((int)MessageQueueGroupPermissionTupleFields.MessageQueueRef, value);
55
+ get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.MessageQueueRef].AsString();
56
+ set => this.Set((int)MessageQueueGroupPermissionSymbolFields.MessageQueueRef, value);
57
}
58
59
public string GroupRef
60
{
61
- get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.GroupRef].AsString();
62
- set => this.Set((int)MessageQueueGroupPermissionTupleFields.GroupRef, value);
61
+ get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.GroupRef].AsString();
62
+ set => this.Set((int)MessageQueueGroupPermissionSymbolFields.GroupRef, value);
63
}
64
65
public int Permissions
66
{
67
- get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.Permissions].AsNumber();
68
- set => this.Set((int)MessageQueueGroupPermissionTupleFields.Permissions, value);
67
+ get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.Permissions].AsNumber();
68
+ set => this.Set((int)MessageQueueGroupPermissionSymbolFields.Permissions, value);
69
}
70
}
71
}
\ No newline at end of file
src/wixext/Tuples/MessageQueueTuple.cs
+41
-41
@@ -3,34 +3,34 @@
3
namespace WixToolset.Msmq
4
{
5
using WixToolset.Data;
6
- using WixToolset.Msmq.Tuples;
6
+ using WixToolset.Msmq.Symbols;
7
8
- public static partial class MsmqTupleDefinitions
8
+ public static partial class MsmqSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition MessageQueue = new IntermediateTupleDefinition(
11
- MsmqTupleDefinitionType.MessageQueue.ToString(),
10
+ public static readonly IntermediateSymbolDefinition MessageQueue = new IntermediateSymbolDefinition(
11
+ MsmqSymbolDefinitionType.MessageQueue.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.BasePriority), IntermediateFieldType.Number),
16
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.JournalQuota), IntermediateFieldType.Number),
17
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Label), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.MulticastAddress), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.PathName), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.PrivLevel), IntermediateFieldType.Number),
21
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Quota), IntermediateFieldType.Number),
22
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.ServiceTypeGuid), IntermediateFieldType.String),
23
- new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Attributes), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.BasePriority), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.JournalQuota), IntermediateFieldType.Number),
17
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Label), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.MulticastAddress), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.PathName), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.PrivLevel), IntermediateFieldType.Number),
21
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Quota), IntermediateFieldType.Number),
22
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.ServiceTypeGuid), IntermediateFieldType.String),
23
+ new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Attributes), IntermediateFieldType.Number),
24
},
25
- typeof(MessageQueueTuple));
25
+ typeof(MessageQueueSymbol));
26
}
27
}
28
29
-namespace WixToolset.Msmq.Tuples
29
+namespace WixToolset.Msmq.Symbols
30
{
31
using WixToolset.Data;
32
33
- public enum MessageQueueTupleFields
33
+ public enum MessageQueueSymbolFields
34
{
35
ComponentRef,
36
BasePriority,
@@ -44,76 +44,76 @@ namespace WixToolset.Msmq.Tuples
44
Attributes,
45
}
46
47
- public class MessageQueueTuple : IntermediateTuple
47
+ public class MessageQueueSymbol : IntermediateSymbol
48
{
49
- public MessageQueueTuple() : base(MsmqTupleDefinitions.MessageQueue, null, null)
49
+ public MessageQueueSymbol() : base(MsmqSymbolDefinitions.MessageQueue, null, null)
50
{
51
}
52
53
- public MessageQueueTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueue, sourceLineNumber, id)
53
+ public MessageQueueSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueue, sourceLineNumber, id)
54
{
55
}
56
57
- public IntermediateField this[MessageQueueTupleFields index] => this.Fields[(int)index];
57
+ public IntermediateField this[MessageQueueSymbolFields index] => this.Fields[(int)index];
58
59
public string ComponentRef
60
{
61
- get => this.Fields[(int)MessageQueueTupleFields.ComponentRef].AsString();
62
- set => this.Set((int)MessageQueueTupleFields.ComponentRef, value);
61
+ get => this.Fields[(int)MessageQueueSymbolFields.ComponentRef].AsString();
62
+ set => this.Set((int)MessageQueueSymbolFields.ComponentRef, value);
63
}
64
65
public int? BasePriority
66
{
67
- get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNullableNumber();
68
- set => this.Set((int)MessageQueueTupleFields.BasePriority, value);
67
+ get => this.Fields[(int)MessageQueueSymbolFields.BasePriority].AsNullableNumber();
68
+ set => this.Set((int)MessageQueueSymbolFields.BasePriority, value);
69
}
70
71
public int? JournalQuota
72
{
73
- get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNullableNumber();
74
- set => this.Set((int)MessageQueueTupleFields.JournalQuota, value);
73
+ get => this.Fields[(int)MessageQueueSymbolFields.JournalQuota].AsNullableNumber();
74
+ set => this.Set((int)MessageQueueSymbolFields.JournalQuota, value);
75
}
76
77
public string Label
78
{
79
- get => this.Fields[(int)MessageQueueTupleFields.Label].AsString();
80
- set => this.Set((int)MessageQueueTupleFields.Label, value);
79
+ get => this.Fields[(int)MessageQueueSymbolFields.Label].AsString();
80
+ set => this.Set((int)MessageQueueSymbolFields.Label, value);
81
}
82
83
public string MulticastAddress
84
{
85
- get => this.Fields[(int)MessageQueueTupleFields.MulticastAddress].AsString();
86
- set => this.Set((int)MessageQueueTupleFields.MulticastAddress, value);
85
+ get => this.Fields[(int)MessageQueueSymbolFields.MulticastAddress].AsString();
86
+ set => this.Set((int)MessageQueueSymbolFields.MulticastAddress, value);
87
}
88
89
public string PathName
90
{
91
- get => this.Fields[(int)MessageQueueTupleFields.PathName].AsString();
92
- set => this.Set((int)MessageQueueTupleFields.PathName, value);
91
+ get => this.Fields[(int)MessageQueueSymbolFields.PathName].AsString();
92
+ set => this.Set((int)MessageQueueSymbolFields.PathName, value);
93
}
94
95
public int? PrivLevel
96
{
97
- get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNullableNumber();
98
- set => this.Set((int)MessageQueueTupleFields.PrivLevel, value);
97
+ get => this.Fields[(int)MessageQueueSymbolFields.PrivLevel].AsNullableNumber();
98
+ set => this.Set((int)MessageQueueSymbolFields.PrivLevel, value);
99
}
100
101
public int? Quota
102
{
103
- get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNullableNumber();
104
- set => this.Set((int)MessageQueueTupleFields.Quota, value);
103
+ get => this.Fields[(int)MessageQueueSymbolFields.Quota].AsNullableNumber();
104
+ set => this.Set((int)MessageQueueSymbolFields.Quota, value);
105
}
106
107
public string ServiceTypeGuid
108
{
109
- get => this.Fields[(int)MessageQueueTupleFields.ServiceTypeGuid].AsString();
110
- set => this.Set((int)MessageQueueTupleFields.ServiceTypeGuid, value);
109
+ get => this.Fields[(int)MessageQueueSymbolFields.ServiceTypeGuid].AsString();
110
+ set => this.Set((int)MessageQueueSymbolFields.ServiceTypeGuid, value);
111
}
112
113
public int Attributes
114
{
115
- get => this.Fields[(int)MessageQueueTupleFields.Attributes].AsNumber();
116
- set => this.Set((int)MessageQueueTupleFields.Attributes, value);
115
+ get => this.Fields[(int)MessageQueueSymbolFields.Attributes].AsNumber();
116
+ set => this.Set((int)MessageQueueSymbolFields.Attributes, value);
117
}
118
}
119
}
\ No newline at end of file
src/wixext/Tuples/MessageQueueUserPermissionTuple.cs
+23
-23
@@ -3,28 +3,28 @@
3
namespace WixToolset.Msmq
4
{
5
using WixToolset.Data;
6
- using WixToolset.Msmq.Tuples;
6
+ using WixToolset.Msmq.Symbols;
7
8
- public static partial class MsmqTupleDefinitions
8
+ public static partial class MsmqSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition MessageQueueUserPermission = new IntermediateTupleDefinition(
11
- MsmqTupleDefinitionType.MessageQueueUserPermission.ToString(),
10
+ public static readonly IntermediateSymbolDefinition MessageQueueUserPermission = new IntermediateSymbolDefinition(
11
+ MsmqSymbolDefinitionType.MessageQueueUserPermission.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.ComponentRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.UserRef), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.Permissions), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.ComponentRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.MessageQueueRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.UserRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.Permissions), IntermediateFieldType.Number),
18
},
19
- typeof(MessageQueueUserPermissionTuple));
19
+ typeof(MessageQueueUserPermissionSymbol));
20
}
21
}
22
23
-namespace WixToolset.Msmq.Tuples
23
+namespace WixToolset.Msmq.Symbols
24
{
25
using WixToolset.Data;
26
27
- public enum MessageQueueUserPermissionTupleFields
27
+ public enum MessageQueueUserPermissionSymbolFields
28
{
29
ComponentRef,
30
MessageQueueRef,
@@ -32,40 +32,40 @@ namespace WixToolset.Msmq.Tuples
32
Permissions,
33
}
34
35
- public class MessageQueueUserPermissionTuple : IntermediateTuple
35
+ public class MessageQueueUserPermissionSymbol : IntermediateSymbol
36
{
37
- public MessageQueueUserPermissionTuple() : base(MsmqTupleDefinitions.MessageQueueUserPermission, null, null)
37
+ public MessageQueueUserPermissionSymbol() : base(MsmqSymbolDefinitions.MessageQueueUserPermission, null, null)
38
{
39
}
40
41
- public MessageQueueUserPermissionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueueUserPermission, sourceLineNumber, id)
41
+ public MessageQueueUserPermissionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueueUserPermission, sourceLineNumber, id)
42
{
43
}
44
45
- public IntermediateField this[MessageQueueUserPermissionTupleFields index] => this.Fields[(int)index];
45
+ public IntermediateField this[MessageQueueUserPermissionSymbolFields index] => this.Fields[(int)index];
46
47
public string ComponentRef
48
{
49
- get => this.Fields[(int)MessageQueueUserPermissionTupleFields.ComponentRef].AsString();
50
- set => this.Set((int)MessageQueueUserPermissionTupleFields.ComponentRef, value);
49
+ get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.ComponentRef].AsString();
50
+ set => this.Set((int)MessageQueueUserPermissionSymbolFields.ComponentRef, value);
51
}
52
53
public string MessageQueueRef
54
{
55
- get => this.Fields[(int)MessageQueueUserPermissionTupleFields.MessageQueueRef].AsString();
56
- set => this.Set((int)MessageQueueUserPermissionTupleFields.MessageQueueRef, value);
55
+ get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.MessageQueueRef].AsString();
56
+ set => this.Set((int)MessageQueueUserPermissionSymbolFields.MessageQueueRef, value);
57
}
58
59
public string UserRef
60
{
61
- get => this.Fields[(int)MessageQueueUserPermissionTupleFields.UserRef].AsString();
62
- set => this.Set((int)MessageQueueUserPermissionTupleFields.UserRef, value);
61
+ get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.UserRef].AsString();
62
+ set => this.Set((int)MessageQueueUserPermissionSymbolFields.UserRef, value);
63
}
64
65
public int Permissions
66
{
67
- get => this.Fields[(int)MessageQueueUserPermissionTupleFields.Permissions].AsNumber();
68
- set => this.Set((int)MessageQueueUserPermissionTupleFields.Permissions, value);
67
+ get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.Permissions].AsNumber();
68
+ set => this.Set((int)MessageQueueUserPermissionSymbolFields.Permissions, value);
69
}
70
}
71
}
\ No newline at end of file
src/wixext/Tuples/MsmqTupleDefinitions.cs
+11
-11
@@ -5,20 +5,20 @@ namespace WixToolset.Msmq
5
using System;
6
using WixToolset.Data;
7
8
- public enum MsmqTupleDefinitionType
8
+ public enum MsmqSymbolDefinitionType
9
{
10
MessageQueue,
11
MessageQueueGroupPermission,
12
MessageQueueUserPermission,
13
}
14
15
- public static partial class MsmqTupleDefinitions
15
+ public static partial class MsmqSymbolDefinitions
16
{
17
public static readonly Version Version = new Version("4.0.0");
18
19
- public static IntermediateTupleDefinition ByName(string name)
19
+ public static IntermediateSymbolDefinition ByName(string name)
20
{
21
- if (!Enum.TryParse(name, out MsmqTupleDefinitionType type))
21
+ if (!Enum.TryParse(name, out MsmqSymbolDefinitionType type))
22
{
23
return null;
24
}
@@ -26,18 +26,18 @@ namespace WixToolset.Msmq
26
return ByType(type);
27
}
28
29
- public static IntermediateTupleDefinition ByType(MsmqTupleDefinitionType type)
29
+ public static IntermediateSymbolDefinition ByType(MsmqSymbolDefinitionType type)
30
{
31
switch (type)
32
{
33
- case MsmqTupleDefinitionType.MessageQueue:
34
- return MsmqTupleDefinitions.MessageQueue;
33
+ case MsmqSymbolDefinitionType.MessageQueue:
34
+ return MsmqSymbolDefinitions.MessageQueue;
35
36
- case MsmqTupleDefinitionType.MessageQueueGroupPermission:
37
- return MsmqTupleDefinitions.MessageQueueGroupPermission;
36
+ case MsmqSymbolDefinitionType.MessageQueueGroupPermission:
37
+ return MsmqSymbolDefinitions.MessageQueueGroupPermission;
38
39
- case MsmqTupleDefinitionType.MessageQueueUserPermission:
40
- return MsmqTupleDefinitions.MessageQueueUserPermission;
39
+ case MsmqSymbolDefinitionType.MessageQueueUserPermission:
40
+ return MsmqSymbolDefinitions.MessageQueueUserPermission;
41
42
default:
43
throw new ArgumentOutOfRangeException(nameof(type));