@joebigelow / wix / commits / 0e893c29

The Great Tuple to Symbol Rename (tm)

Rob Mensching committed Jun 27, 2020 at 02:38 UTC 0e893c29361702470b84ced8d43929ae70a4a9ea
29 files changed +668 -668
src/wixext/ComPlusCompiler.cs
+40 -40
@@ -5,7 +5,7 @@ namespace WixToolset.ComPlus
5 using System;
6 using System.Collections.Generic;
7 using System.Xml.Linq;
8 - using WixToolset.ComPlus.Tuples;
8 + using WixToolset.ComPlus.Symbols;
9 using WixToolset.Data;
10 using WixToolset.Extensibility;
11
@@ -213,7 +213,7 @@ namespace WixToolset.ComPlus
213 }
214 }
215
216 - section.AddTuple(new ComPlusPartitionTuple(sourceLineNumbers, key)
216 + section.AddSymbol(new ComPlusPartitionSymbol(sourceLineNumbers, key)
217 {
218 ComponentRef = componentKey,
219 PartitionId = id,
@@ -222,7 +222,7 @@ namespace WixToolset.ComPlus
222
223 foreach (var kvp in properties)
224 {
225 - section.AddTuple(new ComPlusPartitionPropertyTuple(sourceLineNumbers)
225 + section.AddSymbol(new ComPlusPartitionPropertySymbol(sourceLineNumbers)
226 {
227 PartitionRef = key?.Id,
228 Name = kvp.Key,
@@ -264,7 +264,7 @@ namespace WixToolset.ComPlus
264 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
265 }
266 partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
267 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey);
267 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
268 break;
269 case "Name":
270 name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -308,7 +308,7 @@ namespace WixToolset.ComPlus
308 }
309 }
310
311 - section.AddTuple(new ComPlusPartitionRoleTuple(sourceLineNumbers, key)
311 + section.AddSymbol(new ComPlusPartitionRoleSymbol(sourceLineNumbers, key)
312 {
313 PartitionRef = partitionKey,
314 Name = name,
@@ -343,7 +343,7 @@ namespace WixToolset.ComPlus
343 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
344 }
345 partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
346 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartitionRole, partitionRoleKey);
346 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey);
347 break;
348 case "User":
349 user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -365,7 +365,7 @@ namespace WixToolset.ComPlus
365 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole"));
366 }
367
368 - section.AddTuple(new ComPlusUserInPartitionRoleTuple(sourceLineNumbers, key)
368 + section.AddSymbol(new ComPlusUserInPartitionRoleSymbol(sourceLineNumbers, key)
369 {
370 PartitionRoleRef = partitionRoleKey,
371 ComponentRef = componentKey,
@@ -401,7 +401,7 @@ namespace WixToolset.ComPlus
401 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
402 }
403 partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
404 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartitionRole, partitionRoleKey);
404 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey);
405 break;
406 case "Group":
407 group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -423,7 +423,7 @@ namespace WixToolset.ComPlus
423 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole"));
424 }
425
426 - section.AddTuple(new ComPlusGroupInPartitionRoleTuple(sourceLineNumbers, key)
426 + section.AddSymbol(new ComPlusGroupInPartitionRoleSymbol(sourceLineNumbers, key)
427 {
428 PartitionRoleRef = partitionRoleKey,
429 ComponentRef = componentKey,
@@ -458,7 +458,7 @@ namespace WixToolset.ComPlus
458 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
459 }
460 partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
461 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey);
461 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
462 break;
463 case "User":
464 user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -480,7 +480,7 @@ namespace WixToolset.ComPlus
480 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Partition"));
481 }
482
483 - section.AddTuple(new ComPlusPartitionUserTuple(sourceLineNumbers, key)
483 + section.AddSymbol(new ComPlusPartitionUserSymbol(sourceLineNumbers, key)
484 {
485 PartitionRef = partitionKey,
486 ComponentRef = componentKey,
@@ -519,7 +519,7 @@ namespace WixToolset.ComPlus
519 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
520 }
521 partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
522 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey);
522 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
523 break;
524 case "ApplicationId":
525 id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
@@ -981,7 +981,7 @@ namespace WixToolset.ComPlus
981 }
982 }
983
984 - section.AddTuple(new ComPlusApplicationTuple(sourceLineNumbers, key)
984 + section.AddSymbol(new ComPlusApplicationSymbol(sourceLineNumbers, key)
985 {
986 PartitionRef = partitionKey,
987 ComponentRef = componentKey,
@@ -991,7 +991,7 @@ namespace WixToolset.ComPlus
991
992 foreach (var kvp in properties)
993 {
994 - section.AddTuple(new ComPlusApplicationPropertyTuple(sourceLineNumbers)
994 + section.AddSymbol(new ComPlusApplicationPropertySymbol(sourceLineNumbers)
995 {
996 ApplicationRef = key?.Id,
997 Name = kvp.Key,
@@ -1035,7 +1035,7 @@ namespace WixToolset.ComPlus
1035 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1036 }
1037 applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1038 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplication, applicationKey);
1038 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey);
1039 break;
1040 case "Name":
1041 name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1086,7 +1086,7 @@ namespace WixToolset.ComPlus
1086 }
1087 }
1088
1089 - section.AddTuple(new ComPlusApplicationRoleTuple(sourceLineNumbers, key)
1089 + section.AddSymbol(new ComPlusApplicationRoleSymbol(sourceLineNumbers, key)
1090 {
1091 ApplicationRef = applicationKey,
1092 ComponentRef = componentKey,
@@ -1095,7 +1095,7 @@ namespace WixToolset.ComPlus
1095
1096 foreach (var kvp in properties)
1097 {
1098 - section.AddTuple(new ComPlusApplicationRolePropertyTuple(sourceLineNumbers)
1098 + section.AddSymbol(new ComPlusApplicationRolePropertySymbol(sourceLineNumbers)
1099 {
1100 ApplicationRoleRef = key?.Id,
1101 Name = kvp.Key,
@@ -1132,7 +1132,7 @@ namespace WixToolset.ComPlus
1132 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1133 }
1134 applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1135 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplicationRole, applicationRoleKey);
1135 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey);
1136 break;
1137 case "User":
1138 user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1154,7 +1154,7 @@ namespace WixToolset.ComPlus
1154 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole"));
1155 }
1156
1157 - section.AddTuple(new ComPlusUserInApplicationRoleTuple(sourceLineNumbers, key)
1157 + section.AddSymbol(new ComPlusUserInApplicationRoleSymbol(sourceLineNumbers, key)
1158 {
1159 ApplicationRoleRef = applicationRoleKey,
1160 ComponentRef = componentKey,
@@ -1190,7 +1190,7 @@ namespace WixToolset.ComPlus
1190 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1191 }
1192 applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1193 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplicationRole, applicationRoleKey);
1193 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey);
1194 break;
1195 case "Group":
1196 group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1212,7 +1212,7 @@ namespace WixToolset.ComPlus
1212 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole"));
1213 }
1214
1215 - section.AddTuple(new ComPlusGroupInApplicationRoleTuple(sourceLineNumbers, key)
1215 + section.AddSymbol(new ComPlusGroupInApplicationRoleSymbol(sourceLineNumbers, key)
1216 {
1217 ApplicationRoleRef = applicationRoleKey,
1218 ComponentRef = componentKey,
@@ -1254,7 +1254,7 @@ namespace WixToolset.ComPlus
1254 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1255 }
1256 applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1257 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplication, applicationKey);
1257 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey);
1258 break;
1259 case "AssemblyName":
1260 assemblyName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1374,7 +1374,7 @@ namespace WixToolset.ComPlus
1374 this.Messaging.Write(ComPlusWarnings.MissingComponents(sourceLineNumbers));
1375 }
1376
1377 - section.AddTuple(new ComPlusAssemblyTuple(sourceLineNumbers, key)
1377 + section.AddSymbol(new ComPlusAssemblySymbol(sourceLineNumbers, key)
1378 {
1379 ApplicationRef = applicationKey,
1380 ComponentRef = componentKey,
@@ -1419,7 +1419,7 @@ namespace WixToolset.ComPlus
1419 }
1420 }
1421
1422 - section.AddTuple(new ComPlusAssemblyDependencyTuple(sourceLineNumbers)
1422 + section.AddSymbol(new ComPlusAssemblyDependencySymbol(sourceLineNumbers)
1423 {
1424 AssemblyRef = assemblyKey,
1425 RequiredAssemblyRef = requiredAssemblyKey,
@@ -1643,7 +1643,7 @@ namespace WixToolset.ComPlus
1643 }
1644 }
1645
1646 - section.AddTuple(new ComPlusComponentTuple(sourceLineNumbers, key)
1646 + section.AddSymbol(new ComPlusComponentSymbol(sourceLineNumbers, key)
1647 {
1648 AssemblyRef = assemblyKey,
1649 CLSID = clsid,
@@ -1651,7 +1651,7 @@ namespace WixToolset.ComPlus
1651
1652 foreach (var kvp in properties)
1653 {
1654 - section.AddTuple(new ComPlusComponentPropertyTuple(sourceLineNumbers)
1654 + section.AddSymbol(new ComPlusComponentPropertySymbol(sourceLineNumbers)
1655 {
1656 ComPlusComponentRef = key?.Id,
1657 Name = kvp.Key,
@@ -1688,7 +1688,7 @@ namespace WixToolset.ComPlus
1688 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1689 }
1690 cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1691 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusComponent, cpcomponentKey);
1691 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey);
1692 break;
1693 case "ApplicationRole":
1694 applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1709,7 +1709,7 @@ namespace WixToolset.ComPlus
1709 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Component"));
1710 }
1711
1712 - section.AddTuple(new ComPlusRoleForComponentTuple(sourceLineNumbers, key)
1712 + section.AddSymbol(new ComPlusRoleForComponentSymbol(sourceLineNumbers, key)
1713 {
1714 ComPlusComponentRef = cpcomponentKey,
1715 ApplicationRoleRef = applicationRoleKey,
@@ -1785,7 +1785,7 @@ namespace WixToolset.ComPlus
1785 }
1786 }
1787
1788 - section.AddTuple(new ComPlusInterfaceTuple(sourceLineNumbers, key)
1788 + section.AddSymbol(new ComPlusInterfaceSymbol(sourceLineNumbers, key)
1789 {
1790 ComPlusComponentRef = cpcomponentKey,
1791 IID = iid,
@@ -1793,7 +1793,7 @@ namespace WixToolset.ComPlus
1793
1794 foreach (var kvp in properties)
1795 {
1796 - section.AddTuple(new ComPlusInterfacePropertyTuple(sourceLineNumbers)
1796 + section.AddSymbol(new ComPlusInterfacePropertySymbol(sourceLineNumbers)
1797 {
1798 InterfaceRef = key?.Id,
1799 Name = kvp.Key,
@@ -1830,7 +1830,7 @@ namespace WixToolset.ComPlus
1830 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1831 }
1832 interfaceKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1833 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusInterface, interfaceKey);
1833 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusInterface, interfaceKey);
1834 break;
1835 case "ApplicationRole":
1836 applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1851,7 +1851,7 @@ namespace WixToolset.ComPlus
1851 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Interface"));
1852 }
1853
1854 - section.AddTuple(new ComPlusRoleForInterfaceTuple(sourceLineNumbers, key)
1854 + section.AddSymbol(new ComPlusRoleForInterfaceSymbol(sourceLineNumbers, key)
1855 {
1856 InterfaceRef = interfaceKey,
1857 ApplicationRoleRef = applicationRoleKey,
@@ -1932,7 +1932,7 @@ namespace WixToolset.ComPlus
1932 this.Messaging.Write(ComPlusErrors.RequiredAttribute(sourceLineNumbers, node.Name.LocalName, "Index", "Name"));
1933 }
1934
1935 - var tuple = section.AddTuple(new ComPlusMethodTuple(sourceLineNumbers, key)
1935 + var symbol = section.AddSymbol(new ComPlusMethodSymbol(sourceLineNumbers, key)
1936 {
1937 InterfaceRef = interfaceKey,
1938 Name = name,
@@ -1940,12 +1940,12 @@ namespace WixToolset.ComPlus
1940
1941 if (CompilerConstants.IntegerNotSet != index)
1942 {
1943 - tuple.Index = index;
1943 + symbol.Index = index;
1944 }
1945
1946 foreach (var kvp in properties)
1947 {
1948 - section.AddTuple(new ComPlusMethodPropertyTuple(sourceLineNumbers)
1948 + section.AddSymbol(new ComPlusMethodPropertySymbol(sourceLineNumbers)
1949 {
1950 MethodRef = key?.Id,
1951 Name = kvp.Key,
@@ -1982,7 +1982,7 @@ namespace WixToolset.ComPlus
1982 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
1983 }
1984 methodKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
1985 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusMethod, methodKey);
1985 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusMethod, methodKey);
1986 break;
1987 case "ApplicationRole":
1988 applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -2003,7 +2003,7 @@ namespace WixToolset.ComPlus
2003 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Method"));
2004 }
2005
2006 - section.AddTuple(new ComPlusRoleForMethodTuple(sourceLineNumbers, key)
2006 + section.AddSymbol(new ComPlusRoleForMethodSymbol(sourceLineNumbers, key)
2007 {
2008 MethodRef = methodKey,
2009 ApplicationRoleRef = applicationRoleKey,
@@ -2044,7 +2044,7 @@ namespace WixToolset.ComPlus
2044 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
2045 }
2046 cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
2047 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusComponent, cpcomponentKey);
2047 + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey);
2048 break;
2049 case "SubscriptionId":
2050 id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
@@ -2109,7 +2109,7 @@ namespace WixToolset.ComPlus
2109
2110 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
2111
2112 - section.AddTuple(new ComPlusSubscriptionTuple(sourceLineNumbers, key)
2112 + section.AddSymbol(new ComPlusSubscriptionSymbol(sourceLineNumbers, key)
2113 {
2114 Subscription = key?.Id,
2115 ComPlusComponentRef = cpcomponentKey,
@@ -2122,7 +2122,7 @@ namespace WixToolset.ComPlus
2122
2123 foreach (var kvp in properties)
2124 {
2125 - section.AddTuple(new ComPlusSubscriptionPropertyTuple(sourceLineNumbers)
2125 + section.AddSymbol(new ComPlusSubscriptionPropertySymbol(sourceLineNumbers)
2126 {
2127 SubscriptionRef = key?.Id,
2128 Name = kvp.Key,
src/wixext/ComPlusExtensionData.cs
+5 -5
@@ -16,15 +16,15 @@ namespace WixToolset.ComPlus
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 = ComPlusTupleDefinitions.ByName(name);
22 - return tupleDefinition != null;
21 + symbolDefinition = ComPlusSymbolDefinitions.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(ComPlusExtensionData).Assembly, "WixToolset.ComPlus.complus.wixlib", tupleDefinitions);
27 + return Intermediate.Load(typeof(ComPlusExtensionData).Assembly, "WixToolset.ComPlus.complus.wixlib", symbolDefinitions);
28 }
29 }
30 }
src/wixext/ComPlusTableDefinitions.cs
+50 -50
@@ -8,7 +8,7 @@ namespace WixToolset.ComPlus
8 {
9 public static readonly TableDefinition ComPlusPartition = new TableDefinition(
10 "ComPlusPartition",
11 - ComPlusTupleDefinitions.ComPlusPartition,
11 + ComPlusSymbolDefinitions.ComPlusPartition,
12 new[]
13 {
14 new ColumnDefinition("Partition", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -16,24 +16,24 @@ namespace WixToolset.ComPlus
16 new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
17 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
18 },
19 - tupleIdIsPrimaryKey: true
19 + symbolIdIsPrimaryKey: true
20 );
21
22 public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition(
23 "ComPlusPartitionProperty",
24 - ComPlusTupleDefinitions.ComPlusPartitionProperty,
24 + ComPlusSymbolDefinitions.ComPlusPartitionProperty,
25 new[]
26 {
27 new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
28 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
29 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
30 },
31 - tupleIdIsPrimaryKey: false
31 + symbolIdIsPrimaryKey: false
32 );
33
34 public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition(
35 "ComPlusPartitionRole",
36 - ComPlusTupleDefinitions.ComPlusPartitionRole,
36 + ComPlusSymbolDefinitions.ComPlusPartitionRole,
37 new[]
38 {
39 new ColumnDefinition("PartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -41,12 +41,12 @@ namespace WixToolset.ComPlus
41 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
42 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
43 },
44 - tupleIdIsPrimaryKey: true
44 + symbolIdIsPrimaryKey: true
45 );
46
47 public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition(
48 "ComPlusUserInPartitionRole",
49 - ComPlusTupleDefinitions.ComPlusUserInPartitionRole,
49 + ComPlusSymbolDefinitions.ComPlusUserInPartitionRole,
50 new[]
51 {
52 new ColumnDefinition("UserInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -54,12 +54,12 @@ namespace WixToolset.ComPlus
54 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
55 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
56 },
57 - tupleIdIsPrimaryKey: true
57 + symbolIdIsPrimaryKey: true
58 );
59
60 public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition(
61 "ComPlusGroupInPartitionRole",
62 - ComPlusTupleDefinitions.ComPlusGroupInPartitionRole,
62 + ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole,
63 new[]
64 {
65 new ColumnDefinition("GroupInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -67,12 +67,12 @@ namespace WixToolset.ComPlus
67 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
68 new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
69 },
70 - tupleIdIsPrimaryKey: true
70 + symbolIdIsPrimaryKey: true
71 );
72
73 public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition(
74 "ComPlusPartitionUser",
75 - ComPlusTupleDefinitions.ComPlusPartitionUser,
75 + ComPlusSymbolDefinitions.ComPlusPartitionUser,
76 new[]
77 {
78 new ColumnDefinition("PartitionUser", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -80,12 +80,12 @@ namespace WixToolset.ComPlus
80 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
81 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
82 },
83 - tupleIdIsPrimaryKey: true
83 + symbolIdIsPrimaryKey: true
84 );
85
86 public static readonly TableDefinition ComPlusApplication = new TableDefinition(
87 "ComPlusApplication",
88 - ComPlusTupleDefinitions.ComPlusApplication,
88 + ComPlusSymbolDefinitions.ComPlusApplication,
89 new[]
90 {
91 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -94,24 +94,24 @@ namespace WixToolset.ComPlus
94 new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
95 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
96 },
97 - tupleIdIsPrimaryKey: true
97 + symbolIdIsPrimaryKey: true
98 );
99
100 public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition(
101 "ComPlusApplicationProperty",
102 - ComPlusTupleDefinitions.ComPlusApplicationProperty,
102 + ComPlusSymbolDefinitions.ComPlusApplicationProperty,
103 new[]
104 {
105 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
106 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
107 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
108 },
109 - tupleIdIsPrimaryKey: false
109 + symbolIdIsPrimaryKey: false
110 );
111
112 public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition(
113 "ComPlusApplicationRole",
114 - ComPlusTupleDefinitions.ComPlusApplicationRole,
114 + ComPlusSymbolDefinitions.ComPlusApplicationRole,
115 new[]
116 {
117 new ColumnDefinition("ApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -119,24 +119,24 @@ namespace WixToolset.ComPlus
119 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
120 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
121 },
122 - tupleIdIsPrimaryKey: true
122 + symbolIdIsPrimaryKey: true
123 );
124
125 public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition(
126 "ComPlusApplicationRoleProperty",
127 - ComPlusTupleDefinitions.ComPlusApplicationRoleProperty,
127 + ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty,
128 new[]
129 {
130 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
131 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
132 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
133 },
134 - tupleIdIsPrimaryKey: false
134 + symbolIdIsPrimaryKey: false
135 );
136
137 public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition(
138 "ComPlusUserInApplicationRole",
139 - ComPlusTupleDefinitions.ComPlusUserInApplicationRole,
139 + ComPlusSymbolDefinitions.ComPlusUserInApplicationRole,
140 new[]
141 {
142 new ColumnDefinition("UserInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -144,12 +144,12 @@ namespace WixToolset.ComPlus
144 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
145 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
146 },
147 - tupleIdIsPrimaryKey: true
147 + symbolIdIsPrimaryKey: true
148 );
149
150 public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition(
151 "ComPlusGroupInApplicationRole",
152 - ComPlusTupleDefinitions.ComPlusGroupInApplicationRole,
152 + ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole,
153 new[]
154 {
155 new ColumnDefinition("GroupInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -157,12 +157,12 @@ namespace WixToolset.ComPlus
157 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
158 new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
159 },
160 - tupleIdIsPrimaryKey: true
160 + symbolIdIsPrimaryKey: true
161 );
162
163 public static readonly TableDefinition ComPlusAssembly = new TableDefinition(
164 "ComPlusAssembly",
165 - ComPlusTupleDefinitions.ComPlusAssembly,
165 + ComPlusSymbolDefinitions.ComPlusAssembly,
166 new[]
167 {
168 new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -174,47 +174,47 @@ namespace WixToolset.ComPlus
174 new ColumnDefinition("PSDllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
175 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
176 },
177 - tupleIdIsPrimaryKey: true
177 + symbolIdIsPrimaryKey: true
178 );
179
180 public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition(
181 "ComPlusAssemblyDependency",
182 - ComPlusTupleDefinitions.ComPlusAssemblyDependency,
182 + ComPlusSymbolDefinitions.ComPlusAssemblyDependency,
183 new[]
184 {
185 new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
186 new ColumnDefinition("RequiredAssembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
187 },
188 - tupleIdIsPrimaryKey: false
188 + symbolIdIsPrimaryKey: false
189 );
190
191 public static readonly TableDefinition ComPlusComponent = new TableDefinition(
192 "ComPlusComponent",
193 - ComPlusTupleDefinitions.ComPlusComponent,
193 + ComPlusSymbolDefinitions.ComPlusComponent,
194 new[]
195 {
196 new ColumnDefinition("ComPlusComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
197 new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
198 new ColumnDefinition("CLSID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
199 },
200 - tupleIdIsPrimaryKey: true
200 + symbolIdIsPrimaryKey: true
201 );
202
203 public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition(
204 "ComPlusComponentProperty",
205 - ComPlusTupleDefinitions.ComPlusComponentProperty,
205 + ComPlusSymbolDefinitions.ComPlusComponentProperty,
206 new[]
207 {
208 new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
209 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
210 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
211 },
212 - tupleIdIsPrimaryKey: false
212 + symbolIdIsPrimaryKey: false
213 );
214
215 public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition(
216 "ComPlusRoleForComponent",
217 - ComPlusTupleDefinitions.ComPlusRoleForComponent,
217 + ComPlusSymbolDefinitions.ComPlusRoleForComponent,
218 new[]
219 {
220 new ColumnDefinition("RoleForComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -222,36 +222,36 @@ namespace WixToolset.ComPlus
222 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
223 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
224 },
225 - tupleIdIsPrimaryKey: true
225 + symbolIdIsPrimaryKey: true
226 );
227
228 public static readonly TableDefinition ComPlusInterface = new TableDefinition(
229 "ComPlusInterface",
230 - ComPlusTupleDefinitions.ComPlusInterface,
230 + ComPlusSymbolDefinitions.ComPlusInterface,
231 new[]
232 {
233 new ColumnDefinition("Interface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
234 new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
235 new ColumnDefinition("IID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
236 },
237 - tupleIdIsPrimaryKey: true
237 + symbolIdIsPrimaryKey: true
238 );
239
240 public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition(
241 "ComPlusInterfaceProperty",
242 - ComPlusTupleDefinitions.ComPlusInterfaceProperty,
242 + ComPlusSymbolDefinitions.ComPlusInterfaceProperty,
243 new[]
244 {
245 new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
246 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
247 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
248 },
249 - tupleIdIsPrimaryKey: false
249 + symbolIdIsPrimaryKey: false
250 );
251
252 public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition(
253 "ComPlusRoleForInterface",
254 - ComPlusTupleDefinitions.ComPlusRoleForInterface,
254 + ComPlusSymbolDefinitions.ComPlusRoleForInterface,
255 new[]
256 {
257 new ColumnDefinition("RoleForInterface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -259,12 +259,12 @@ namespace WixToolset.ComPlus
259 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
260 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
261 },
262 - tupleIdIsPrimaryKey: true
262 + symbolIdIsPrimaryKey: true
263 );
264
265 public static readonly TableDefinition ComPlusMethod = new TableDefinition(
266 "ComPlusMethod",
267 - ComPlusTupleDefinitions.ComPlusMethod,
267 + ComPlusSymbolDefinitions.ComPlusMethod,
268 new[]
269 {
270 new ColumnDefinition("Method", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -272,24 +272,24 @@ namespace WixToolset.ComPlus
272 new ColumnDefinition("Index", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
273 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
274 },
275 - tupleIdIsPrimaryKey: true
275 + symbolIdIsPrimaryKey: true
276 );
277
278 public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition(
279 "ComPlusMethodProperty",
280 - ComPlusTupleDefinitions.ComPlusMethodProperty,
280 + ComPlusSymbolDefinitions.ComPlusMethodProperty,
281 new[]
282 {
283 new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
284 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
285 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
286 },
287 - tupleIdIsPrimaryKey: false
287 + symbolIdIsPrimaryKey: false
288 );
289
290 public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition(
291 "ComPlusRoleForMethod",
292 - ComPlusTupleDefinitions.ComPlusRoleForMethod,
292 + ComPlusSymbolDefinitions.ComPlusRoleForMethod,
293 new[]
294 {
295 new ColumnDefinition("RoleForMethod", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -297,12 +297,12 @@ namespace WixToolset.ComPlus
297 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
298 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
299 },
300 - tupleIdIsPrimaryKey: true
300 + symbolIdIsPrimaryKey: true
301 );
302
303 public static readonly TableDefinition ComPlusSubscription = new TableDefinition(
304 "ComPlusSubscription",
305 - ComPlusTupleDefinitions.ComPlusSubscription,
305 + ComPlusSymbolDefinitions.ComPlusSubscription,
306 new[]
307 {
308 new ColumnDefinition("Subscription", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -313,19 +313,19 @@ namespace WixToolset.ComPlus
313 new ColumnDefinition("EventCLSID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
314 new ColumnDefinition("PublisherID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
315 },
316 - tupleIdIsPrimaryKey: false
316 + symbolIdIsPrimaryKey: false
317 );
318
319 public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition(
320 "ComPlusSubscriptionProperty",
321 - ComPlusTupleDefinitions.ComPlusSubscriptionProperty,
321 + ComPlusSymbolDefinitions.ComPlusSubscriptionProperty,
322 new[]
323 {
324 new ColumnDefinition("Subscription_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusSubscription", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
325 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
326 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
327 },
328 - tupleIdIsPrimaryKey: false
328 + symbolIdIsPrimaryKey: false
329 );
330
331 public static readonly TableDefinition[] All = new[]
src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusApplicationProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusApplicationProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusApplicationProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusApplicationProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.ApplicationRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.ApplicationRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusApplicationPropertyTuple));
18 + typeof(ComPlusApplicationPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusApplicationPropertyTupleFields
26 + public enum ComPlusApplicationPropertySymbolFields
27 {
28 ApplicationRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusApplicationPropertyTuple : IntermediateTuple
33 + public class ComPlusApplicationPropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusApplicationPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, null, null)
35 + public ComPlusApplicationPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, null, null)
36 {
37 }
38
39 - public ComPlusApplicationPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, sourceLineNumber, id)
39 + public ComPlusApplicationPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusApplicationPropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusApplicationPropertySymbolFields index] => this.Fields[(int)index];
44
45 public string ApplicationRef
46 {
47 - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.ApplicationRef].AsString();
48 - set => this.Set((int)ComPlusApplicationPropertyTupleFields.ApplicationRef, value);
47 + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.ApplicationRef].AsString();
48 + set => this.Set((int)ComPlusApplicationPropertySymbolFields.ApplicationRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusApplicationPropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusApplicationPropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusApplicationPropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusApplicationPropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusApplicationRoleProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusApplicationRoleProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusApplicationRolePropertyTuple));
18 + typeof(ComPlusApplicationRolePropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusApplicationRolePropertyTupleFields
26 + public enum ComPlusApplicationRolePropertySymbolFields
27 {
28 ApplicationRoleRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusApplicationRolePropertyTuple : IntermediateTuple
33 + public class ComPlusApplicationRolePropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusApplicationRolePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, null, null)
35 + public ComPlusApplicationRolePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, null, null)
36 {
37 }
38
39 - public ComPlusApplicationRolePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id)
39 + public ComPlusApplicationRolePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusApplicationRolePropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusApplicationRolePropertySymbolFields index] => this.Fields[(int)index];
44
45 public string ApplicationRoleRef
46 {
47 - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef].AsString();
48 - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef, value);
47 + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef].AsString();
48 + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusApplicationRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusApplicationRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusApplicationRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusApplicationRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusApplicationRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ApplicationRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ApplicationRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.Name), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusApplicationRoleTuple));
18 + typeof(ComPlusApplicationRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusApplicationRoleTupleFields
26 + public enum ComPlusApplicationRoleSymbolFields
27 {
28 ApplicationRef,
29 ComponentRef,
30 Name,
31 }
32
33 - public class ComPlusApplicationRoleTuple : IntermediateTuple
33 + public class ComPlusApplicationRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRole, null, null)
35 + public ComPlusApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, null, null)
36 {
37 }
38
39 - public ComPlusApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRole, sourceLineNumber, id)
39 + public ComPlusApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusApplicationRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusApplicationRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string ApplicationRef
46 {
47 - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ApplicationRef].AsString();
48 - set => this.Set((int)ComPlusApplicationRoleTupleFields.ApplicationRef, value);
47 + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ApplicationRef].AsString();
48 + set => this.Set((int)ComPlusApplicationRoleSymbolFields.ApplicationRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusApplicationRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusApplicationRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string Name
58 {
59 - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Name].AsString();
60 - set => this.Set((int)ComPlusApplicationRoleTupleFields.Name, value);
59 + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.Name].AsString();
60 + set => this.Set((int)ComPlusApplicationRoleSymbolFields.Name, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusApplicationTuple.cs
+23 -23
@@ -3,28 +3,28 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusApplication = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusApplication.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusApplication = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusApplication.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.PartitionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ApplicationId), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.PartitionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ApplicationId), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.Name), IntermediateFieldType.String),
18 },
19 - typeof(ComPlusApplicationTuple));
19 + typeof(ComPlusApplicationSymbol));
20 }
21 }
22
23 -namespace WixToolset.ComPlus.Tuples
23 +namespace WixToolset.ComPlus.Symbols
24 {
25 using WixToolset.Data;
26
27 - public enum ComPlusApplicationTupleFields
27 + public enum ComPlusApplicationSymbolFields
28 {
29 PartitionRef,
30 ComponentRef,
@@ -32,40 +32,40 @@ namespace WixToolset.ComPlus.Tuples
32 Name,
33 }
34
35 - public class ComPlusApplicationTuple : IntermediateTuple
35 + public class ComPlusApplicationSymbol : IntermediateSymbol
36 {
37 - public ComPlusApplicationTuple() : base(ComPlusTupleDefinitions.ComPlusApplication, null, null)
37 + public ComPlusApplicationSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplication, null, null)
38 {
39 }
40
41 - public ComPlusApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplication, sourceLineNumber, id)
41 + public ComPlusApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplication, sourceLineNumber, id)
42 {
43 }
44
45 - public IntermediateField this[ComPlusApplicationTupleFields index] => this.Fields[(int)index];
45 + public IntermediateField this[ComPlusApplicationSymbolFields index] => this.Fields[(int)index];
46
47 public string PartitionRef
48 {
49 - get => this.Fields[(int)ComPlusApplicationTupleFields.PartitionRef].AsString();
50 - set => this.Set((int)ComPlusApplicationTupleFields.PartitionRef, value);
49 + get => this.Fields[(int)ComPlusApplicationSymbolFields.PartitionRef].AsString();
50 + set => this.Set((int)ComPlusApplicationSymbolFields.PartitionRef, value);
51 }
52
53 public string ComponentRef
54 {
55 - get => this.Fields[(int)ComPlusApplicationTupleFields.ComponentRef].AsString();
56 - set => this.Set((int)ComPlusApplicationTupleFields.ComponentRef, value);
55 + get => this.Fields[(int)ComPlusApplicationSymbolFields.ComponentRef].AsString();
56 + set => this.Set((int)ComPlusApplicationSymbolFields.ComponentRef, value);
57 }
58
59 public string ApplicationId
60 {
61 - get => this.Fields[(int)ComPlusApplicationTupleFields.ApplicationId].AsString();
62 - set => this.Set((int)ComPlusApplicationTupleFields.ApplicationId, value);
61 + get => this.Fields[(int)ComPlusApplicationSymbolFields.ApplicationId].AsString();
62 + set => this.Set((int)ComPlusApplicationSymbolFields.ApplicationId, value);
63 }
64
65 public string Name
66 {
67 - get => this.Fields[(int)ComPlusApplicationTupleFields.Name].AsString();
68 - set => this.Set((int)ComPlusApplicationTupleFields.Name, value);
67 + get => this.Fields[(int)ComPlusApplicationSymbolFields.Name].AsString();
68 + set => this.Set((int)ComPlusApplicationSymbolFields.Name, value);
69 }
70 }
71 }
\ No newline at end of file
src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs
+17 -17
@@ -3,53 +3,53 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusAssemblyDependency = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusAssemblyDependency.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusAssemblyDependency = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusAssemblyDependency.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.AssemblyRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.AssemblyRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef), IntermediateFieldType.String),
16 },
17 - typeof(ComPlusAssemblyDependencyTuple));
17 + typeof(ComPlusAssemblyDependencySymbol));
18 }
19 }
20
21 -namespace WixToolset.ComPlus.Tuples
21 +namespace WixToolset.ComPlus.Symbols
22 {
23 using WixToolset.Data;
24
25 - public enum ComPlusAssemblyDependencyTupleFields
25 + public enum ComPlusAssemblyDependencySymbolFields
26 {
27 AssemblyRef,
28 RequiredAssemblyRef,
29 }
30
31 - public class ComPlusAssemblyDependencyTuple : IntermediateTuple
31 + public class ComPlusAssemblyDependencySymbol : IntermediateSymbol
32 {
33 - public ComPlusAssemblyDependencyTuple() : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, null, null)
33 + public ComPlusAssemblyDependencySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, null, null)
34 {
35 }
36
37 - public ComPlusAssemblyDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id)
37 + public ComPlusAssemblyDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id)
38 {
39 }
40
41 - public IntermediateField this[ComPlusAssemblyDependencyTupleFields index] => this.Fields[(int)index];
41 + public IntermediateField this[ComPlusAssemblyDependencySymbolFields index] => this.Fields[(int)index];
42
43 public string AssemblyRef
44 {
45 - get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.AssemblyRef].AsString();
46 - set => this.Set((int)ComPlusAssemblyDependencyTupleFields.AssemblyRef, value);
45 + get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.AssemblyRef].AsString();
46 + set => this.Set((int)ComPlusAssemblyDependencySymbolFields.AssemblyRef, value);
47 }
48
49 public string RequiredAssemblyRef
50 {
51 - get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef].AsString();
52 - set => this.Set((int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef, value);
51 + get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef].AsString();
52 + set => this.Set((int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef, value);
53 }
54 }
55 }
\ No newline at end of file
src/wixext/Tuples/ComPlusAssemblyTuple.cs
+32 -32
@@ -3,31 +3,31 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusAssembly = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusAssembly.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusAssembly = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusAssembly.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ApplicationRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.AssemblyName), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.DllPath), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.TlbPath), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.PSDllPath), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Attributes), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ApplicationRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.AssemblyName), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.DllPath), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.TlbPath), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.PSDllPath), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.Attributes), IntermediateFieldType.Number),
21 },
22 - typeof(ComPlusAssemblyTuple));
22 + typeof(ComPlusAssemblySymbol));
23 }
24 }
25
26 -namespace WixToolset.ComPlus.Tuples
26 +namespace WixToolset.ComPlus.Symbols
27 {
28 using WixToolset.Data;
29
30 - public enum ComPlusAssemblyTupleFields
30 + public enum ComPlusAssemblySymbolFields
31 {
32 ApplicationRef,
33 ComponentRef,
@@ -38,58 +38,58 @@ namespace WixToolset.ComPlus.Tuples
38 Attributes,
39 }
40
41 - public class ComPlusAssemblyTuple : IntermediateTuple
41 + public class ComPlusAssemblySymbol : IntermediateSymbol
42 {
43 - public ComPlusAssemblyTuple() : base(ComPlusTupleDefinitions.ComPlusAssembly, null, null)
43 + public ComPlusAssemblySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssembly, null, null)
44 {
45 }
46
47 - public ComPlusAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssembly, sourceLineNumber, id)
47 + public ComPlusAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssembly, sourceLineNumber, id)
48 {
49 }
50
51 - public IntermediateField this[ComPlusAssemblyTupleFields index] => this.Fields[(int)index];
51 + public IntermediateField this[ComPlusAssemblySymbolFields index] => this.Fields[(int)index];
52
53 public string ApplicationRef
54 {
55 - get => this.Fields[(int)ComPlusAssemblyTupleFields.ApplicationRef].AsString();
56 - set => this.Set((int)ComPlusAssemblyTupleFields.ApplicationRef, value);
55 + get => this.Fields[(int)ComPlusAssemblySymbolFields.ApplicationRef].AsString();
56 + set => this.Set((int)ComPlusAssemblySymbolFields.ApplicationRef, value);
57 }
58
59 public string ComponentRef
60 {
61 - get => this.Fields[(int)ComPlusAssemblyTupleFields.ComponentRef].AsString();
62 - set => this.Set((int)ComPlusAssemblyTupleFields.ComponentRef, value);
61 + get => this.Fields[(int)ComPlusAssemblySymbolFields.ComponentRef].AsString();
62 + set => this.Set((int)ComPlusAssemblySymbolFields.ComponentRef, value);
63 }
64
65 public string AssemblyName
66 {
67 - get => this.Fields[(int)ComPlusAssemblyTupleFields.AssemblyName].AsString();
68 - set => this.Set((int)ComPlusAssemblyTupleFields.AssemblyName, value);
67 + get => this.Fields[(int)ComPlusAssemblySymbolFields.AssemblyName].AsString();
68 + set => this.Set((int)ComPlusAssemblySymbolFields.AssemblyName, value);
69 }
70
71 public string DllPath
72 {
73 - get => this.Fields[(int)ComPlusAssemblyTupleFields.DllPath].AsString();
74 - set => this.Set((int)ComPlusAssemblyTupleFields.DllPath, value);
73 + get => this.Fields[(int)ComPlusAssemblySymbolFields.DllPath].AsString();
74 + set => this.Set((int)ComPlusAssemblySymbolFields.DllPath, value);
75 }
76
77 public string TlbPath
78 {
79 - get => this.Fields[(int)ComPlusAssemblyTupleFields.TlbPath].AsString();
80 - set => this.Set((int)ComPlusAssemblyTupleFields.TlbPath, value);
79 + get => this.Fields[(int)ComPlusAssemblySymbolFields.TlbPath].AsString();
80 + set => this.Set((int)ComPlusAssemblySymbolFields.TlbPath, value);
81 }
82
83 public string PSDllPath
84 {
85 - get => this.Fields[(int)ComPlusAssemblyTupleFields.PSDllPath].AsString();
86 - set => this.Set((int)ComPlusAssemblyTupleFields.PSDllPath, value);
85 + get => this.Fields[(int)ComPlusAssemblySymbolFields.PSDllPath].AsString();
86 + set => this.Set((int)ComPlusAssemblySymbolFields.PSDllPath, value);
87 }
88
89 public int Attributes
90 {
91 - get => this.Fields[(int)ComPlusAssemblyTupleFields.Attributes].AsNumber();
92 - set => this.Set((int)ComPlusAssemblyTupleFields.Attributes, value);
91 + get => this.Fields[(int)ComPlusAssemblySymbolFields.Attributes].AsNumber();
92 + set => this.Set((int)ComPlusAssemblySymbolFields.Attributes, value);
93 }
94 }
95 }
\ No newline at end of file
src/wixext/Tuples/ComPlusComponentPropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusComponentProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusComponentProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusComponentProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusComponentProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusComponentPropertyTuple));
18 + typeof(ComPlusComponentPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusComponentPropertyTupleFields
26 + public enum ComPlusComponentPropertySymbolFields
27 {
28 ComPlusComponentRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusComponentPropertyTuple : IntermediateTuple
33 + public class ComPlusComponentPropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusComponentPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusComponentProperty, null, null)
35 + public ComPlusComponentPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, null, null)
36 {
37 }
38
39 - public ComPlusComponentPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponentProperty, sourceLineNumber, id)
39 + public ComPlusComponentPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusComponentPropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusComponentPropertySymbolFields index] => this.Fields[(int)index];
44
45 public string ComPlusComponentRef
46 {
47 - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef].AsString();
48 - set => this.Set((int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef, value);
47 + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef].AsString();
48 + set => this.Set((int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusComponentPropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusComponentPropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusComponentPropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusComponentPropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusComponentTuple.cs
+17 -17
@@ -3,53 +3,53 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusComponent = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusComponent.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusComponent = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusComponent.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.AssemblyRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.CLSID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.AssemblyRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.CLSID), IntermediateFieldType.String),
16 },
17 - typeof(ComPlusComponentTuple));
17 + typeof(ComPlusComponentSymbol));
18 }
19 }
20
21 -namespace WixToolset.ComPlus.Tuples
21 +namespace WixToolset.ComPlus.Symbols
22 {
23 using WixToolset.Data;
24
25 - public enum ComPlusComponentTupleFields
25 + public enum ComPlusComponentSymbolFields
26 {
27 AssemblyRef,
28 CLSID,
29 }
30
31 - public class ComPlusComponentTuple : IntermediateTuple
31 + public class ComPlusComponentSymbol : IntermediateSymbol
32 {
33 - public ComPlusComponentTuple() : base(ComPlusTupleDefinitions.ComPlusComponent, null, null)
33 + public ComPlusComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusComponent, null, null)
34 {
35 }
36
37 - public ComPlusComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponent, sourceLineNumber, id)
37 + public ComPlusComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponent, sourceLineNumber, id)
38 {
39 }
40
41 - public IntermediateField this[ComPlusComponentTupleFields index] => this.Fields[(int)index];
41 + public IntermediateField this[ComPlusComponentSymbolFields index] => this.Fields[(int)index];
42
43 public string AssemblyRef
44 {
45 - get => this.Fields[(int)ComPlusComponentTupleFields.AssemblyRef].AsString();
46 - set => this.Set((int)ComPlusComponentTupleFields.AssemblyRef, value);
45 + get => this.Fields[(int)ComPlusComponentSymbolFields.AssemblyRef].AsString();
46 + set => this.Set((int)ComPlusComponentSymbolFields.AssemblyRef, value);
47 }
48
49 public string CLSID
50 {
51 - get => this.Fields[(int)ComPlusComponentTupleFields.CLSID].AsString();
52 - set => this.Set((int)ComPlusComponentTupleFields.CLSID, value);
51 + get => this.Fields[(int)ComPlusComponentSymbolFields.CLSID].AsString();
52 + set => this.Set((int)ComPlusComponentSymbolFields.CLSID, value);
53 }
54 }
55 }
\ No newline at end of file
src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusGroupInApplicationRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusGroupInApplicationRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.GroupRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.GroupRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusGroupInApplicationRoleTuple));
18 + typeof(ComPlusGroupInApplicationRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusGroupInApplicationRoleTupleFields
26 + public enum ComPlusGroupInApplicationRoleSymbolFields
27 {
28 ApplicationRoleRef,
29 ComponentRef,
30 GroupRef,
31 }
32
33 - public class ComPlusGroupInApplicationRoleTuple : IntermediateTuple
33 + public class ComPlusGroupInApplicationRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusGroupInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, null, null)
35 + public ComPlusGroupInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, null, null)
36 {
37 }
38
39 - public ComPlusGroupInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id)
39 + public ComPlusGroupInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusGroupInApplicationRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusGroupInApplicationRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string ApplicationRoleRef
46 {
47 - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef].AsString();
48 - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef, value);
47 + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef].AsString();
48 + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string GroupRef
58 {
59 - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.GroupRef].AsString();
60 - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.GroupRef, value);
59 + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef].AsString();
60 + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusGroupInPartitionRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusGroupInPartitionRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.GroupRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusGroupInPartitionRoleTuple));
18 + typeof(ComPlusGroupInPartitionRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusGroupInPartitionRoleTupleFields
26 + public enum ComPlusGroupInPartitionRoleSymbolFields
27 {
28 PartitionRoleRef,
29 ComponentRef,
30 GroupRef,
31 }
32
33 - public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple
33 + public class ComPlusGroupInPartitionRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusGroupInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, null, null)
35 + public ComPlusGroupInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, null, null)
36 {
37 }
38
39 - public ComPlusGroupInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id)
39 + public ComPlusGroupInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusGroupInPartitionRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string PartitionRoleRef
46 {
47 - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef].AsString();
48 - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef, value);
47 + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef].AsString();
48 + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string GroupRef
58 {
59 - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupRef].AsString();
60 - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupRef, value);
59 + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef].AsString();
60 + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusInterfaceProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusInterfaceProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusInterfaceProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusInterfaceProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.InterfaceRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.InterfaceRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusInterfacePropertyTuple));
18 + typeof(ComPlusInterfacePropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusInterfacePropertyTupleFields
26 + public enum ComPlusInterfacePropertySymbolFields
27 {
28 InterfaceRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusInterfacePropertyTuple : IntermediateTuple
33 + public class ComPlusInterfacePropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusInterfacePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, null, null)
35 + public ComPlusInterfacePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, null, null)
36 {
37 }
38
39 - public ComPlusInterfacePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id)
39 + public ComPlusInterfacePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusInterfacePropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusInterfacePropertySymbolFields index] => this.Fields[(int)index];
44
45 public string InterfaceRef
46 {
47 - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.InterfaceRef].AsString();
48 - set => this.Set((int)ComPlusInterfacePropertyTupleFields.InterfaceRef, value);
47 + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.InterfaceRef].AsString();
48 + set => this.Set((int)ComPlusInterfacePropertySymbolFields.InterfaceRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusInterfacePropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusInterfacePropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusInterfacePropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusInterfacePropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusInterfaceTuple.cs
+17 -17
@@ -3,53 +3,53 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusInterface = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusInterface.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusInterface = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusInterface.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.IID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.IID), IntermediateFieldType.String),
16 },
17 - typeof(ComPlusInterfaceTuple));
17 + typeof(ComPlusInterfaceSymbol));
18 }
19 }
20
21 -namespace WixToolset.ComPlus.Tuples
21 +namespace WixToolset.ComPlus.Symbols
22 {
23 using WixToolset.Data;
24
25 - public enum ComPlusInterfaceTupleFields
25 + public enum ComPlusInterfaceSymbolFields
26 {
27 ComPlusComponentRef,
28 IID,
29 }
30
31 - public class ComPlusInterfaceTuple : IntermediateTuple
31 + public class ComPlusInterfaceSymbol : IntermediateSymbol
32 {
33 - public ComPlusInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusInterface, null, null)
33 + public ComPlusInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusInterface, null, null)
34 {
35 }
36
37 - public ComPlusInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterface, sourceLineNumber, id)
37 + public ComPlusInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterface, sourceLineNumber, id)
38 {
39 }
40
41 - public IntermediateField this[ComPlusInterfaceTupleFields index] => this.Fields[(int)index];
41 + public IntermediateField this[ComPlusInterfaceSymbolFields index] => this.Fields[(int)index];
42
43 public string ComPlusComponentRef
44 {
45 - get => this.Fields[(int)ComPlusInterfaceTupleFields.ComPlusComponentRef].AsString();
46 - set => this.Set((int)ComPlusInterfaceTupleFields.ComPlusComponentRef, value);
45 + get => this.Fields[(int)ComPlusInterfaceSymbolFields.ComPlusComponentRef].AsString();
46 + set => this.Set((int)ComPlusInterfaceSymbolFields.ComPlusComponentRef, value);
47 }
48
49 public string IID
50 {
51 - get => this.Fields[(int)ComPlusInterfaceTupleFields.IID].AsString();
52 - set => this.Set((int)ComPlusInterfaceTupleFields.IID, value);
51 + get => this.Fields[(int)ComPlusInterfaceSymbolFields.IID].AsString();
52 + set => this.Set((int)ComPlusInterfaceSymbolFields.IID, value);
53 }
54 }
55 }
\ No newline at end of file
src/wixext/Tuples/ComPlusMethodPropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusMethodProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusMethodProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusMethodProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusMethodProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.MethodRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.MethodRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusMethodPropertyTuple));
18 + typeof(ComPlusMethodPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusMethodPropertyTupleFields
26 + public enum ComPlusMethodPropertySymbolFields
27 {
28 MethodRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusMethodPropertyTuple : IntermediateTuple
33 + public class ComPlusMethodPropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusMethodPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusMethodProperty, null, null)
35 + public ComPlusMethodPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, null, null)
36 {
37 }
38
39 - public ComPlusMethodPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethodProperty, sourceLineNumber, id)
39 + public ComPlusMethodPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusMethodPropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusMethodPropertySymbolFields index] => this.Fields[(int)index];
44
45 public string MethodRef
46 {
47 - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.MethodRef].AsString();
48 - set => this.Set((int)ComPlusMethodPropertyTupleFields.MethodRef, value);
47 + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.MethodRef].AsString();
48 + set => this.Set((int)ComPlusMethodPropertySymbolFields.MethodRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusMethodPropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusMethodPropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusMethodPropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusMethodPropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusMethodTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusMethod = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusMethod.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusMethod = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusMethod.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.InterfaceRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Index), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.InterfaceRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Index), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Name), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusMethodTuple));
18 + typeof(ComPlusMethodSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusMethodTupleFields
26 + public enum ComPlusMethodSymbolFields
27 {
28 InterfaceRef,
29 Index,
30 Name,
31 }
32
33 - public class ComPlusMethodTuple : IntermediateTuple
33 + public class ComPlusMethodSymbol : IntermediateSymbol
34 {
35 - public ComPlusMethodTuple() : base(ComPlusTupleDefinitions.ComPlusMethod, null, null)
35 + public ComPlusMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusMethod, null, null)
36 {
37 }
38
39 - public ComPlusMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethod, sourceLineNumber, id)
39 + public ComPlusMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethod, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusMethodTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusMethodSymbolFields index] => this.Fields[(int)index];
44
45 public string InterfaceRef
46 {
47 - get => this.Fields[(int)ComPlusMethodTupleFields.InterfaceRef].AsString();
48 - set => this.Set((int)ComPlusMethodTupleFields.InterfaceRef, value);
47 + get => this.Fields[(int)ComPlusMethodSymbolFields.InterfaceRef].AsString();
48 + set => this.Set((int)ComPlusMethodSymbolFields.InterfaceRef, value);
49 }
50
51 public int? Index
52 {
53 - get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNullableNumber();
54 - set => this.Set((int)ComPlusMethodTupleFields.Index, value);
53 + get => this.Fields[(int)ComPlusMethodSymbolFields.Index].AsNullableNumber();
54 + set => this.Set((int)ComPlusMethodSymbolFields.Index, value);
55 }
56
57 public string Name
58 {
59 - get => this.Fields[(int)ComPlusMethodTupleFields.Name].AsString();
60 - set => this.Set((int)ComPlusMethodTupleFields.Name, value);
59 + get => this.Fields[(int)ComPlusMethodSymbolFields.Name].AsString();
60 + set => this.Set((int)ComPlusMethodSymbolFields.Name, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusPartitionProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusPartitionProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusPartitionProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusPartitionProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.PartitionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.PartitionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusPartitionPropertyTuple));
18 + typeof(ComPlusPartitionPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusPartitionPropertyTupleFields
26 + public enum ComPlusPartitionPropertySymbolFields
27 {
28 PartitionRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusPartitionPropertyTuple : IntermediateTuple
33 + public class ComPlusPartitionPropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusPartitionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, null, null)
35 + public ComPlusPartitionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, null, null)
36 {
37 }
38
39 - public ComPlusPartitionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, sourceLineNumber, id)
39 + public ComPlusPartitionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusPartitionPropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusPartitionPropertySymbolFields index] => this.Fields[(int)index];
44
45 public string PartitionRef
46 {
47 - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.PartitionRef].AsString();
48 - set => this.Set((int)ComPlusPartitionPropertyTupleFields.PartitionRef, value);
47 + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.PartitionRef].AsString();
48 + set => this.Set((int)ComPlusPartitionPropertySymbolFields.PartitionRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusPartitionPropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusPartitionPropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusPartitionPropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusPartitionPropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusPartitionRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusPartitionRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusPartitionRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusPartitionRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusPartitionRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.PartitionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.PartitionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.Name), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusPartitionRoleTuple));
18 + typeof(ComPlusPartitionRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusPartitionRoleTupleFields
26 + public enum ComPlusPartitionRoleSymbolFields
27 {
28 PartitionRef,
29 ComponentRef,
30 Name,
31 }
32
33 - public class ComPlusPartitionRoleTuple : IntermediateTuple
33 + public class ComPlusPartitionRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionRole, null, null)
35 + public ComPlusPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, null, null)
36 {
37 }
38
39 - public ComPlusPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionRole, sourceLineNumber, id)
39 + public ComPlusPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusPartitionRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusPartitionRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string PartitionRef
46 {
47 - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.PartitionRef].AsString();
48 - set => this.Set((int)ComPlusPartitionRoleTupleFields.PartitionRef, value);
47 + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.PartitionRef].AsString();
48 + set => this.Set((int)ComPlusPartitionRoleSymbolFields.PartitionRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusPartitionRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusPartitionRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string Name
58 {
59 - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Name].AsString();
60 - set => this.Set((int)ComPlusPartitionRoleTupleFields.Name, value);
59 + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.Name].AsString();
60 + set => this.Set((int)ComPlusPartitionRoleSymbolFields.Name, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusPartitionTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusPartition = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusPartition.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusPartition = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusPartition.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.ComponentRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.PartitionId), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.ComponentRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.PartitionId), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.Name), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusPartitionTuple));
18 + typeof(ComPlusPartitionSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusPartitionTupleFields
26 + public enum ComPlusPartitionSymbolFields
27 {
28 ComponentRef,
29 PartitionId,
30 Name,
31 }
32
33 - public class ComPlusPartitionTuple : IntermediateTuple
33 + public class ComPlusPartitionSymbol : IntermediateSymbol
34 {
35 - public ComPlusPartitionTuple() : base(ComPlusTupleDefinitions.ComPlusPartition, null, null)
35 + public ComPlusPartitionSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartition, null, null)
36 {
37 }
38
39 - public ComPlusPartitionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartition, sourceLineNumber, id)
39 + public ComPlusPartitionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartition, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusPartitionTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusPartitionSymbolFields index] => this.Fields[(int)index];
44
45 public string ComponentRef
46 {
47 - get => this.Fields[(int)ComPlusPartitionTupleFields.ComponentRef].AsString();
48 - set => this.Set((int)ComPlusPartitionTupleFields.ComponentRef, value);
47 + get => this.Fields[(int)ComPlusPartitionSymbolFields.ComponentRef].AsString();
48 + set => this.Set((int)ComPlusPartitionSymbolFields.ComponentRef, value);
49 }
50
51 public string PartitionId
52 {
53 - get => this.Fields[(int)ComPlusPartitionTupleFields.PartitionId].AsString();
54 - set => this.Set((int)ComPlusPartitionTupleFields.PartitionId, value);
53 + get => this.Fields[(int)ComPlusPartitionSymbolFields.PartitionId].AsString();
54 + set => this.Set((int)ComPlusPartitionSymbolFields.PartitionId, value);
55 }
56
57 public string Name
58 {
59 - get => this.Fields[(int)ComPlusPartitionTupleFields.Name].AsString();
60 - set => this.Set((int)ComPlusPartitionTupleFields.Name, value);
59 + get => this.Fields[(int)ComPlusPartitionSymbolFields.Name].AsString();
60 + set => this.Set((int)ComPlusPartitionSymbolFields.Name, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusPartitionUserTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusPartitionUser = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusPartitionUser.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusPartitionUser = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusPartitionUser.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.PartitionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.UserRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.PartitionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.UserRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusPartitionUserTuple));
18 + typeof(ComPlusPartitionUserSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusPartitionUserTupleFields
26 + public enum ComPlusPartitionUserSymbolFields
27 {
28 PartitionRef,
29 ComponentRef,
30 UserRef,
31 }
32
33 - public class ComPlusPartitionUserTuple : IntermediateTuple
33 + public class ComPlusPartitionUserSymbol : IntermediateSymbol
34 {
35 - public ComPlusPartitionUserTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionUser, null, null)
35 + public ComPlusPartitionUserSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, null, null)
36 {
37 }
38
39 - public ComPlusPartitionUserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionUser, sourceLineNumber, id)
39 + public ComPlusPartitionUserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusPartitionUserTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusPartitionUserSymbolFields index] => this.Fields[(int)index];
44
45 public string PartitionRef
46 {
47 - get => this.Fields[(int)ComPlusPartitionUserTupleFields.PartitionRef].AsString();
48 - set => this.Set((int)ComPlusPartitionUserTupleFields.PartitionRef, value);
47 + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.PartitionRef].AsString();
48 + set => this.Set((int)ComPlusPartitionUserSymbolFields.PartitionRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusPartitionUserTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusPartitionUserTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusPartitionUserSymbolFields.ComponentRef, value);
55 }
56
57 public string UserRef
58 {
59 - get => this.Fields[(int)ComPlusPartitionUserTupleFields.UserRef].AsString();
60 - set => this.Set((int)ComPlusPartitionUserTupleFields.UserRef, value);
59 + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.UserRef].AsString();
60 + set => this.Set((int)ComPlusPartitionUserSymbolFields.UserRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusRoleForComponentTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusRoleForComponent = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusRoleForComponent.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusRoleForComponent = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusRoleForComponent.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusRoleForComponentTuple));
18 + typeof(ComPlusRoleForComponentSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusRoleForComponentTupleFields
26 + public enum ComPlusRoleForComponentSymbolFields
27 {
28 ComPlusComponentRef,
29 ApplicationRoleRef,
30 ComponentRef,
31 }
32
33 - public class ComPlusRoleForComponentTuple : IntermediateTuple
33 + public class ComPlusRoleForComponentSymbol : IntermediateSymbol
34 {
35 - public ComPlusRoleForComponentTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, null, null)
35 + public ComPlusRoleForComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, null, null)
36 {
37 }
38
39 - public ComPlusRoleForComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, sourceLineNumber, id)
39 + public ComPlusRoleForComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusRoleForComponentTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusRoleForComponentSymbolFields index] => this.Fields[(int)index];
44
45 public string ComPlusComponentRef
46 {
47 - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef].AsString();
48 - set => this.Set((int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef, value);
47 + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef].AsString();
48 + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef, value);
49 }
50
51 public string ApplicationRoleRef
52 {
53 - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef].AsString();
54 - set => this.Set((int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef, value);
53 + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef].AsString();
54 + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef, value);
55 }
56
57 public string ComponentRef
58 {
59 - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComponentRef].AsString();
60 - set => this.Set((int)ComPlusRoleForComponentTupleFields.ComponentRef, value);
59 + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComponentRef].AsString();
60 + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComponentRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusRoleForInterface = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusRoleForInterface.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusRoleForInterface = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusRoleForInterface.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.InterfaceRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.InterfaceRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ComponentRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusRoleForInterfaceTuple));
18 + typeof(ComPlusRoleForInterfaceSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusRoleForInterfaceTupleFields
26 + public enum ComPlusRoleForInterfaceSymbolFields
27 {
28 InterfaceRef,
29 ApplicationRoleRef,
30 ComponentRef,
31 }
32
33 - public class ComPlusRoleForInterfaceTuple : IntermediateTuple
33 + public class ComPlusRoleForInterfaceSymbol : IntermediateSymbol
34 {
35 - public ComPlusRoleForInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, null, null)
35 + public ComPlusRoleForInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, null, null)
36 {
37 }
38
39 - public ComPlusRoleForInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, sourceLineNumber, id)
39 + public ComPlusRoleForInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusRoleForInterfaceTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusRoleForInterfaceSymbolFields index] => this.Fields[(int)index];
44
45 public string InterfaceRef
46 {
47 - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.InterfaceRef].AsString();
48 - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.InterfaceRef, value);
47 + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef].AsString();
48 + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef, value);
49 }
50
51 public string ApplicationRoleRef
52 {
53 - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef].AsString();
54 - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef, value);
53 + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef].AsString();
54 + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef, value);
55 }
56
57 public string ComponentRef
58 {
59 - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ComponentRef].AsString();
60 - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ComponentRef, value);
59 + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ComponentRef].AsString();
60 + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ComponentRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusRoleForMethodTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusRoleForMethod = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusRoleForMethod.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusRoleForMethod = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusRoleForMethod.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.MethodRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.MethodRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ComponentRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusRoleForMethodTuple));
18 + typeof(ComPlusRoleForMethodSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusRoleForMethodTupleFields
26 + public enum ComPlusRoleForMethodSymbolFields
27 {
28 MethodRef,
29 ApplicationRoleRef,
30 ComponentRef,
31 }
32
33 - public class ComPlusRoleForMethodTuple : IntermediateTuple
33 + public class ComPlusRoleForMethodSymbol : IntermediateSymbol
34 {
35 - public ComPlusRoleForMethodTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, null, null)
35 + public ComPlusRoleForMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, null, null)
36 {
37 }
38
39 - public ComPlusRoleForMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, sourceLineNumber, id)
39 + public ComPlusRoleForMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusRoleForMethodTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusRoleForMethodSymbolFields index] => this.Fields[(int)index];
44
45 public string MethodRef
46 {
47 - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.MethodRef].AsString();
48 - set => this.Set((int)ComPlusRoleForMethodTupleFields.MethodRef, value);
47 + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.MethodRef].AsString();
48 + set => this.Set((int)ComPlusRoleForMethodSymbolFields.MethodRef, value);
49 }
50
51 public string ApplicationRoleRef
52 {
53 - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef].AsString();
54 - set => this.Set((int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef, value);
53 + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef].AsString();
54 + set => this.Set((int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef, value);
55 }
56
57 public string ComponentRef
58 {
59 - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ComponentRef].AsString();
60 - set => this.Set((int)ComPlusRoleForMethodTupleFields.ComponentRef, value);
59 + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ComponentRef].AsString();
60 + set => this.Set((int)ComPlusRoleForMethodSymbolFields.ComponentRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusSubscriptionProperty = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusSubscriptionProperty.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusSubscriptionProperty = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.SubscriptionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.SubscriptionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusSubscriptionPropertyTuple));
18 + typeof(ComPlusSubscriptionPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusSubscriptionPropertyTupleFields
26 + public enum ComPlusSubscriptionPropertySymbolFields
27 {
28 SubscriptionRef,
29 Name,
30 Value,
31 }
32
33 - public class ComPlusSubscriptionPropertyTuple : IntermediateTuple
33 + public class ComPlusSubscriptionPropertySymbol : IntermediateSymbol
34 {
35 - public ComPlusSubscriptionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, null, null)
35 + public ComPlusSubscriptionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, null, null)
36 {
37 }
38
39 - public ComPlusSubscriptionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id)
39 + public ComPlusSubscriptionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusSubscriptionPropertyTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusSubscriptionPropertySymbolFields index] => this.Fields[(int)index];
44
45 public string SubscriptionRef
46 {
47 - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef].AsString();
48 - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef, value);
47 + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef].AsString();
48 + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef, value);
49 }
50
51 public string Name
52 {
53 - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Name].AsString();
54 - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Name, value);
53 + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Name].AsString();
54 + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Name, value);
55 }
56
57 public string Value
58 {
59 - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Value].AsString();
60 - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Value, value);
59 + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Value].AsString();
60 + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Value, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusSubscriptionTuple.cs
+32 -32
@@ -3,31 +3,31 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusSubscription = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusSubscription.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusSubscription = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusSubscription.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Subscription), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComponentRef), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.SubscriptionId), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Name), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.EventCLSID), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.PublisherID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Subscription), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComponentRef), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.SubscriptionId), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Name), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.EventCLSID), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.PublisherID), IntermediateFieldType.String),
21 },
22 - typeof(ComPlusSubscriptionTuple));
22 + typeof(ComPlusSubscriptionSymbol));
23 }
24 }
25
26 -namespace WixToolset.ComPlus.Tuples
26 +namespace WixToolset.ComPlus.Symbols
27 {
28 using WixToolset.Data;
29
30 - public enum ComPlusSubscriptionTupleFields
30 + public enum ComPlusSubscriptionSymbolFields
31 {
32 Subscription,
33 ComPlusComponentRef,
@@ -38,58 +38,58 @@ namespace WixToolset.ComPlus.Tuples
38 PublisherID,
39 }
40
41 - public class ComPlusSubscriptionTuple : IntermediateTuple
41 + public class ComPlusSubscriptionSymbol : IntermediateSymbol
42 {
43 - public ComPlusSubscriptionTuple() : base(ComPlusTupleDefinitions.ComPlusSubscription, null, null)
43 + public ComPlusSubscriptionSymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscription, null, null)
44 {
45 }
46
47 - public ComPlusSubscriptionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscription, sourceLineNumber, id)
47 + public ComPlusSubscriptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscription, sourceLineNumber, id)
48 {
49 }
50
51 - public IntermediateField this[ComPlusSubscriptionTupleFields index] => this.Fields[(int)index];
51 + public IntermediateField this[ComPlusSubscriptionSymbolFields index] => this.Fields[(int)index];
52
53 public string Subscription
54 {
55 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.Subscription].AsString();
56 - set => this.Set((int)ComPlusSubscriptionTupleFields.Subscription, value);
55 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Subscription].AsString();
56 + set => this.Set((int)ComPlusSubscriptionSymbolFields.Subscription, value);
57 }
58
59 public string ComPlusComponentRef
60 {
61 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComPlusComponentRef].AsString();
62 - set => this.Set((int)ComPlusSubscriptionTupleFields.ComPlusComponentRef, value);
61 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef].AsString();
62 + set => this.Set((int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef, value);
63 }
64
65 public string ComponentRef
66 {
67 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComponentRef].AsString();
68 - set => this.Set((int)ComPlusSubscriptionTupleFields.ComponentRef, value);
67 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComponentRef].AsString();
68 + set => this.Set((int)ComPlusSubscriptionSymbolFields.ComponentRef, value);
69 }
70
71 public string SubscriptionId
72 {
73 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.SubscriptionId].AsString();
74 - set => this.Set((int)ComPlusSubscriptionTupleFields.SubscriptionId, value);
73 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.SubscriptionId].AsString();
74 + set => this.Set((int)ComPlusSubscriptionSymbolFields.SubscriptionId, value);
75 }
76
77 public string Name
78 {
79 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.Name].AsString();
80 - set => this.Set((int)ComPlusSubscriptionTupleFields.Name, value);
79 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Name].AsString();
80 + set => this.Set((int)ComPlusSubscriptionSymbolFields.Name, value);
81 }
82
83 public string EventCLSID
84 {
85 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.EventCLSID].AsString();
86 - set => this.Set((int)ComPlusSubscriptionTupleFields.EventCLSID, value);
85 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.EventCLSID].AsString();
86 + set => this.Set((int)ComPlusSubscriptionSymbolFields.EventCLSID, value);
87 }
88
89 public string PublisherID
90 {
91 - get => this.Fields[(int)ComPlusSubscriptionTupleFields.PublisherID].AsString();
92 - set => this.Set((int)ComPlusSubscriptionTupleFields.PublisherID, value);
91 + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.PublisherID].AsString();
92 + set => this.Set((int)ComPlusSubscriptionSymbolFields.PublisherID, value);
93 }
94 }
95 }
\ No newline at end of file
src/wixext/Tuples/ComPlusTupleDefinitions.cs
+55 -55
@@ -5,7 +5,7 @@ namespace WixToolset.ComPlus
5 using System;
6 using WixToolset.Data;
7
8 - public enum ComPlusTupleDefinitionType
8 + public enum ComPlusSymbolDefinitionType
9 {
10 ComPlusApplication,
11 ComPlusApplicationProperty,
@@ -34,13 +34,13 @@ namespace WixToolset.ComPlus
34 ComPlusUserInPartitionRole,
35 }
36
37 - public static partial class ComPlusTupleDefinitions
37 + public static partial class ComPlusSymbolDefinitions
38 {
39 public static readonly Version Version = new Version("4.0.0");
40
41 - public static IntermediateTupleDefinition ByName(string name)
41 + public static IntermediateSymbolDefinition ByName(string name)
42 {
43 - if (!Enum.TryParse(name, out ComPlusTupleDefinitionType type))
43 + if (!Enum.TryParse(name, out ComPlusSymbolDefinitionType type))
44 {
45 return null;
46 }
@@ -48,84 +48,84 @@ namespace WixToolset.ComPlus
48 return ByType(type);
49 }
50
51 - public static IntermediateTupleDefinition ByType(ComPlusTupleDefinitionType type)
51 + public static IntermediateSymbolDefinition ByType(ComPlusSymbolDefinitionType type)
52 {
53 switch (type)
54 {
55 - case ComPlusTupleDefinitionType.ComPlusApplication:
56 - return ComPlusTupleDefinitions.ComPlusApplication;
55 + case ComPlusSymbolDefinitionType.ComPlusApplication:
56 + return ComPlusSymbolDefinitions.ComPlusApplication;
57
58 - case ComPlusTupleDefinitionType.ComPlusApplicationProperty:
59 - return ComPlusTupleDefinitions.ComPlusApplicationProperty;
58 + case ComPlusSymbolDefinitionType.ComPlusApplicationProperty:
59 + return ComPlusSymbolDefinitions.ComPlusApplicationProperty;
60
61 - case ComPlusTupleDefinitionType.ComPlusApplicationRole:
62 - return ComPlusTupleDefinitions.ComPlusApplicationRole;
61 + case ComPlusSymbolDefinitionType.ComPlusApplicationRole:
62 + return ComPlusSymbolDefinitions.ComPlusApplicationRole;
63
64 - case ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty:
65 - return ComPlusTupleDefinitions.ComPlusApplicationRoleProperty;
64 + case ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty:
65 + return ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty;
66
67 - case ComPlusTupleDefinitionType.ComPlusAssembly:
68 - return ComPlusTupleDefinitions.ComPlusAssembly;
67 + case ComPlusSymbolDefinitionType.ComPlusAssembly:
68 + return ComPlusSymbolDefinitions.ComPlusAssembly;
69
70 - case ComPlusTupleDefinitionType.ComPlusAssemblyDependency:
71 - return ComPlusTupleDefinitions.ComPlusAssemblyDependency;
70 + case ComPlusSymbolDefinitionType.ComPlusAssemblyDependency:
71 + return ComPlusSymbolDefinitions.ComPlusAssemblyDependency;
72
73 - case ComPlusTupleDefinitionType.ComPlusComponent:
74 - return ComPlusTupleDefinitions.ComPlusComponent;
73 + case ComPlusSymbolDefinitionType.ComPlusComponent:
74 + return ComPlusSymbolDefinitions.ComPlusComponent;
75
76 - case ComPlusTupleDefinitionType.ComPlusComponentProperty:
77 - return ComPlusTupleDefinitions.ComPlusComponentProperty;
76 + case ComPlusSymbolDefinitionType.ComPlusComponentProperty:
77 + return ComPlusSymbolDefinitions.ComPlusComponentProperty;
78
79 - case ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole:
80 - return ComPlusTupleDefinitions.ComPlusGroupInApplicationRole;
79 + case ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole:
80 + return ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole;
81
82 - case ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole:
83 - return ComPlusTupleDefinitions.ComPlusGroupInPartitionRole;
82 + case ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole:
83 + return ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole;
84
85 - case ComPlusTupleDefinitionType.ComPlusInterface:
86 - return ComPlusTupleDefinitions.ComPlusInterface;
85 + case ComPlusSymbolDefinitionType.ComPlusInterface:
86 + return ComPlusSymbolDefinitions.ComPlusInterface;
87
88 - case ComPlusTupleDefinitionType.ComPlusInterfaceProperty:
89 - return ComPlusTupleDefinitions.ComPlusInterfaceProperty;
88 + case ComPlusSymbolDefinitionType.ComPlusInterfaceProperty:
89 + return ComPlusSymbolDefinitions.ComPlusInterfaceProperty;
90
91 - case ComPlusTupleDefinitionType.ComPlusMethod:
92 - return ComPlusTupleDefinitions.ComPlusMethod;
91 + case ComPlusSymbolDefinitionType.ComPlusMethod:
92 + return ComPlusSymbolDefinitions.ComPlusMethod;
93
94 - case ComPlusTupleDefinitionType.ComPlusMethodProperty:
95 - return ComPlusTupleDefinitions.ComPlusMethodProperty;
94 + case ComPlusSymbolDefinitionType.ComPlusMethodProperty:
95 + return ComPlusSymbolDefinitions.ComPlusMethodProperty;
96
97 - case ComPlusTupleDefinitionType.ComPlusPartition:
98 - return ComPlusTupleDefinitions.ComPlusPartition;
97 + case ComPlusSymbolDefinitionType.ComPlusPartition:
98 + return ComPlusSymbolDefinitions.ComPlusPartition;
99
100 - case ComPlusTupleDefinitionType.ComPlusPartitionProperty:
101 - return ComPlusTupleDefinitions.ComPlusPartitionProperty;
100 + case ComPlusSymbolDefinitionType.ComPlusPartitionProperty:
101 + return ComPlusSymbolDefinitions.ComPlusPartitionProperty;
102
103 - case ComPlusTupleDefinitionType.ComPlusPartitionRole:
104 - return ComPlusTupleDefinitions.ComPlusPartitionRole;
103 + case ComPlusSymbolDefinitionType.ComPlusPartitionRole:
104 + return ComPlusSymbolDefinitions.ComPlusPartitionRole;
105
106 - case ComPlusTupleDefinitionType.ComPlusPartitionUser:
107 - return ComPlusTupleDefinitions.ComPlusPartitionUser;
106 + case ComPlusSymbolDefinitionType.ComPlusPartitionUser:
107 + return ComPlusSymbolDefinitions.ComPlusPartitionUser;
108
109 - case ComPlusTupleDefinitionType.ComPlusRoleForComponent:
110 - return ComPlusTupleDefinitions.ComPlusRoleForComponent;
109 + case ComPlusSymbolDefinitionType.ComPlusRoleForComponent:
110 + return ComPlusSymbolDefinitions.ComPlusRoleForComponent;
111
112 - case ComPlusTupleDefinitionType.ComPlusRoleForInterface:
113 - return ComPlusTupleDefinitions.ComPlusRoleForInterface;
112 + case ComPlusSymbolDefinitionType.ComPlusRoleForInterface:
113 + return ComPlusSymbolDefinitions.ComPlusRoleForInterface;
114
115 - case ComPlusTupleDefinitionType.ComPlusRoleForMethod:
116 - return ComPlusTupleDefinitions.ComPlusRoleForMethod;
115 + case ComPlusSymbolDefinitionType.ComPlusRoleForMethod:
116 + return ComPlusSymbolDefinitions.ComPlusRoleForMethod;
117
118 - case ComPlusTupleDefinitionType.ComPlusSubscription:
119 - return ComPlusTupleDefinitions.ComPlusSubscription;
118 + case ComPlusSymbolDefinitionType.ComPlusSubscription:
119 + return ComPlusSymbolDefinitions.ComPlusSubscription;
120
121 - case ComPlusTupleDefinitionType.ComPlusSubscriptionProperty:
122 - return ComPlusTupleDefinitions.ComPlusSubscriptionProperty;
121 + case ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty:
122 + return ComPlusSymbolDefinitions.ComPlusSubscriptionProperty;
123
124 - case ComPlusTupleDefinitionType.ComPlusUserInApplicationRole:
125 - return ComPlusTupleDefinitions.ComPlusUserInApplicationRole;
124 + case ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole:
125 + return ComPlusSymbolDefinitions.ComPlusUserInApplicationRole;
126
127 - case ComPlusTupleDefinitionType.ComPlusUserInPartitionRole:
128 - return ComPlusTupleDefinitions.ComPlusUserInPartitionRole;
127 + case ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole:
128 + return ComPlusSymbolDefinitions.ComPlusUserInPartitionRole;
129
130 default:
131 throw new ArgumentOutOfRangeException(nameof(type));
src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusUserInApplicationRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusUserInApplicationRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusUserInApplicationRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.UserRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.UserRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusUserInApplicationRoleTuple));
18 + typeof(ComPlusUserInApplicationRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusUserInApplicationRoleTupleFields
26 + public enum ComPlusUserInApplicationRoleSymbolFields
27 {
28 ApplicationRoleRef,
29 ComponentRef,
30 UserRef,
31 }
32
33 - public class ComPlusUserInApplicationRoleTuple : IntermediateTuple
33 + public class ComPlusUserInApplicationRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusUserInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, null, null)
35 + public ComPlusUserInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, null, null)
36 {
37 }
38
39 - public ComPlusUserInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id)
39 + public ComPlusUserInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusUserInApplicationRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusUserInApplicationRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string ApplicationRoleRef
46 {
47 - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef].AsString();
48 - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef, value);
47 + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef].AsString();
48 + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string UserRef
58 {
59 - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.UserRef].AsString();
60 - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.UserRef, value);
59 + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.UserRef].AsString();
60 + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.UserRef, value);
61 }
62 }
63 }
\ No newline at end of file
src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs
+20 -20
@@ -3,61 +3,61 @@
3 namespace WixToolset.ComPlus
4 {
5 using WixToolset.Data;
6 - using WixToolset.ComPlus.Tuples;
6 + using WixToolset.ComPlus.Symbols;
7
8 - public static partial class ComPlusTupleDefinitions
8 + public static partial class ComPlusSymbolDefinitions
9 {
10 - public static readonly IntermediateTupleDefinition ComPlusUserInPartitionRole = new IntermediateTupleDefinition(
11 - ComPlusTupleDefinitionType.ComPlusUserInPartitionRole.ToString(),
10 + public static readonly IntermediateSymbolDefinition ComPlusUserInPartitionRole = new IntermediateSymbolDefinition(
11 + ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole.ToString(),
12 new[]
13 {
14 - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.UserRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.UserRef), IntermediateFieldType.String),
17 },
18 - typeof(ComPlusUserInPartitionRoleTuple));
18 + typeof(ComPlusUserInPartitionRoleSymbol));
19 }
20 }
21
22 -namespace WixToolset.ComPlus.Tuples
22 +namespace WixToolset.ComPlus.Symbols
23 {
24 using WixToolset.Data;
25
26 - public enum ComPlusUserInPartitionRoleTupleFields
26 + public enum ComPlusUserInPartitionRoleSymbolFields
27 {
28 PartitionRoleRef,
29 ComponentRef,
30 UserRef,
31 }
32
33 - public class ComPlusUserInPartitionRoleTuple : IntermediateTuple
33 + public class ComPlusUserInPartitionRoleSymbol : IntermediateSymbol
34 {
35 - public ComPlusUserInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, null, null)
35 + public ComPlusUserInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, null, null)
36 {
37 }
38
39 - public ComPlusUserInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id)
39 + public ComPlusUserInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id)
40 {
41 }
42
43 - public IntermediateField this[ComPlusUserInPartitionRoleTupleFields index] => this.Fields[(int)index];
43 + public IntermediateField this[ComPlusUserInPartitionRoleSymbolFields index] => this.Fields[(int)index];
44
45 public string PartitionRoleRef
46 {
47 - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef].AsString();
48 - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef, value);
47 + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef].AsString();
48 + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef, value);
49 }
50
51 public string ComponentRef
52 {
53 - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.ComponentRef].AsString();
54 - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.ComponentRef, value);
53 + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef].AsString();
54 + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef, value);
55 }
56
57 public string UserRef
58 {
59 - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.UserRef].AsString();
60 - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.UserRef, value);
59 + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.UserRef].AsString();
60 + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.UserRef, value);
61 }
62 }
63 }
\ No newline at end of file