From 0e893c29361702470b84ced8d43929ae70a4a9ea Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 02:38:04 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/wixext/ComPlusCompiler.cs | 80 +++++++-------- src/wixext/ComPlusExtensionData.cs | 10 +- src/wixext/ComPlusTableDefinitions.cs | 100 +++++++++---------- .../Tuples/ComPlusApplicationPropertyTuple.cs | 40 ++++---- .../Tuples/ComPlusApplicationRolePropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusApplicationRoleTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusApplicationTuple.cs | 46 ++++----- .../Tuples/ComPlusAssemblyDependencyTuple.cs | 34 +++---- src/wixext/Tuples/ComPlusAssemblyTuple.cs | 64 ++++++------ src/wixext/Tuples/ComPlusComponentPropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusComponentTuple.cs | 34 +++---- .../Tuples/ComPlusGroupInApplicationRoleTuple.cs | 40 ++++---- .../Tuples/ComPlusGroupInPartitionRoleTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusInterfaceTuple.cs | 34 +++---- src/wixext/Tuples/ComPlusMethodPropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusMethodTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusPartitionRoleTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusPartitionTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusPartitionUserTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusRoleForComponentTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusRoleForMethodTuple.cs | 40 ++++---- .../Tuples/ComPlusSubscriptionPropertyTuple.cs | 40 ++++---- src/wixext/Tuples/ComPlusSubscriptionTuple.cs | 64 ++++++------ src/wixext/Tuples/ComPlusTupleDefinitions.cs | 110 ++++++++++----------- .../Tuples/ComPlusUserInApplicationRoleTuple.cs | 40 ++++---- .../Tuples/ComPlusUserInPartitionRoleTuple.cs | 40 ++++---- 29 files changed, 668 insertions(+), 668 deletions(-) (limited to 'src') diff --git a/src/wixext/ComPlusCompiler.cs b/src/wixext/ComPlusCompiler.cs index 9230cdb1..8df98bdf 100644 --- a/src/wixext/ComPlusCompiler.cs +++ b/src/wixext/ComPlusCompiler.cs @@ -5,7 +5,7 @@ namespace WixToolset.ComPlus using System; using System.Collections.Generic; using System.Xml.Linq; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; using WixToolset.Data; using WixToolset.Extensibility; @@ -213,7 +213,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusPartitionTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusPartitionSymbol(sourceLineNumbers, key) { ComponentRef = componentKey, PartitionId = id, @@ -222,7 +222,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusPartitionPropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusPartitionPropertySymbol(sourceLineNumbers) { PartitionRef = key?.Id, Name = kvp.Key, @@ -264,7 +264,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey); break; case "Name": name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -308,7 +308,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusPartitionRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusPartitionRoleSymbol(sourceLineNumbers, key) { PartitionRef = partitionKey, Name = name, @@ -343,7 +343,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartitionRole, partitionRoleKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey); break; case "User": user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -365,7 +365,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole")); } - section.AddTuple(new ComPlusUserInPartitionRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusUserInPartitionRoleSymbol(sourceLineNumbers, key) { PartitionRoleRef = partitionRoleKey, ComponentRef = componentKey, @@ -401,7 +401,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartitionRole, partitionRoleKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey); break; case "Group": group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -423,7 +423,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole")); } - section.AddTuple(new ComPlusGroupInPartitionRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusGroupInPartitionRoleSymbol(sourceLineNumbers, key) { PartitionRoleRef = partitionRoleKey, ComponentRef = componentKey, @@ -458,7 +458,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey); break; case "User": user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -480,7 +480,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Partition")); } - section.AddTuple(new ComPlusPartitionUserTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusPartitionUserSymbol(sourceLineNumbers, key) { PartitionRef = partitionKey, ComponentRef = componentKey, @@ -519,7 +519,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusPartition, partitionKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey); break; case "ApplicationId": id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib)); @@ -981,7 +981,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusApplicationTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusApplicationSymbol(sourceLineNumbers, key) { PartitionRef = partitionKey, ComponentRef = componentKey, @@ -991,7 +991,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusApplicationPropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusApplicationPropertySymbol(sourceLineNumbers) { ApplicationRef = key?.Id, Name = kvp.Key, @@ -1035,7 +1035,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplication, applicationKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey); break; case "Name": name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1086,7 +1086,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusApplicationRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusApplicationRoleSymbol(sourceLineNumbers, key) { ApplicationRef = applicationKey, ComponentRef = componentKey, @@ -1095,7 +1095,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusApplicationRolePropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusApplicationRolePropertySymbol(sourceLineNumbers) { ApplicationRoleRef = key?.Id, Name = kvp.Key, @@ -1132,7 +1132,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplicationRole, applicationRoleKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey); break; case "User": user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1154,7 +1154,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole")); } - section.AddTuple(new ComPlusUserInApplicationRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusUserInApplicationRoleSymbol(sourceLineNumbers, key) { ApplicationRoleRef = applicationRoleKey, ComponentRef = componentKey, @@ -1190,7 +1190,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplicationRole, applicationRoleKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey); break; case "Group": group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1212,7 +1212,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole")); } - section.AddTuple(new ComPlusGroupInApplicationRoleTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusGroupInApplicationRoleSymbol(sourceLineNumbers, key) { ApplicationRoleRef = applicationRoleKey, ComponentRef = componentKey, @@ -1254,7 +1254,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusApplication, applicationKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey); break; case "AssemblyName": assemblyName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1374,7 +1374,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ComPlusWarnings.MissingComponents(sourceLineNumbers)); } - section.AddTuple(new ComPlusAssemblyTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusAssemblySymbol(sourceLineNumbers, key) { ApplicationRef = applicationKey, ComponentRef = componentKey, @@ -1419,7 +1419,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusAssemblyDependencyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusAssemblyDependencySymbol(sourceLineNumbers) { AssemblyRef = assemblyKey, RequiredAssemblyRef = requiredAssemblyKey, @@ -1643,7 +1643,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusComponentTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusComponentSymbol(sourceLineNumbers, key) { AssemblyRef = assemblyKey, CLSID = clsid, @@ -1651,7 +1651,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusComponentPropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusComponentPropertySymbol(sourceLineNumbers) { ComPlusComponentRef = key?.Id, Name = kvp.Key, @@ -1688,7 +1688,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusComponent, cpcomponentKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey); break; case "ApplicationRole": applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1709,7 +1709,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Component")); } - section.AddTuple(new ComPlusRoleForComponentTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusRoleForComponentSymbol(sourceLineNumbers, key) { ComPlusComponentRef = cpcomponentKey, ApplicationRoleRef = applicationRoleKey, @@ -1785,7 +1785,7 @@ namespace WixToolset.ComPlus } } - section.AddTuple(new ComPlusInterfaceTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusInterfaceSymbol(sourceLineNumbers, key) { ComPlusComponentRef = cpcomponentKey, IID = iid, @@ -1793,7 +1793,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusInterfacePropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusInterfacePropertySymbol(sourceLineNumbers) { InterfaceRef = key?.Id, Name = kvp.Key, @@ -1830,7 +1830,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } interfaceKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusInterface, interfaceKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusInterface, interfaceKey); break; case "ApplicationRole": applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -1851,7 +1851,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Interface")); } - section.AddTuple(new ComPlusRoleForInterfaceTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusRoleForInterfaceSymbol(sourceLineNumbers, key) { InterfaceRef = interfaceKey, ApplicationRoleRef = applicationRoleKey, @@ -1932,7 +1932,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ComPlusErrors.RequiredAttribute(sourceLineNumbers, node.Name.LocalName, "Index", "Name")); } - var tuple = section.AddTuple(new ComPlusMethodTuple(sourceLineNumbers, key) + var symbol = section.AddSymbol(new ComPlusMethodSymbol(sourceLineNumbers, key) { InterfaceRef = interfaceKey, Name = name, @@ -1940,12 +1940,12 @@ namespace WixToolset.ComPlus if (CompilerConstants.IntegerNotSet != index) { - tuple.Index = index; + symbol.Index = index; } foreach (var kvp in properties) { - section.AddTuple(new ComPlusMethodPropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusMethodPropertySymbol(sourceLineNumbers) { MethodRef = key?.Id, Name = kvp.Key, @@ -1982,7 +1982,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } methodKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusMethod, methodKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusMethod, methodKey); break; case "ApplicationRole": applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); @@ -2003,7 +2003,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Method")); } - section.AddTuple(new ComPlusRoleForMethodTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusRoleForMethodSymbol(sourceLineNumbers, key) { MethodRef = methodKey, ApplicationRoleRef = applicationRoleKey, @@ -2044,7 +2044,7 @@ namespace WixToolset.ComPlus this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusTupleDefinitions.ComPlusComponent, cpcomponentKey); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey); break; case "SubscriptionId": id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib)); @@ -2109,7 +2109,7 @@ namespace WixToolset.ComPlus this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - section.AddTuple(new ComPlusSubscriptionTuple(sourceLineNumbers, key) + section.AddSymbol(new ComPlusSubscriptionSymbol(sourceLineNumbers, key) { Subscription = key?.Id, ComPlusComponentRef = cpcomponentKey, @@ -2122,7 +2122,7 @@ namespace WixToolset.ComPlus foreach (var kvp in properties) { - section.AddTuple(new ComPlusSubscriptionPropertyTuple(sourceLineNumbers) + section.AddSymbol(new ComPlusSubscriptionPropertySymbol(sourceLineNumbers) { SubscriptionRef = key?.Id, Name = kvp.Key, diff --git a/src/wixext/ComPlusExtensionData.cs b/src/wixext/ComPlusExtensionData.cs index 954e89f6..9cd5341e 100644 --- a/src/wixext/ComPlusExtensionData.cs +++ b/src/wixext/ComPlusExtensionData.cs @@ -16,15 +16,15 @@ namespace WixToolset.ComPlus /// The default culture. public override string DefaultCulture => "en-US"; - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = ComPlusTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = ComPlusSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(ComPlusExtensionData).Assembly, "WixToolset.ComPlus.complus.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(ComPlusExtensionData).Assembly, "WixToolset.ComPlus.complus.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/ComPlusTableDefinitions.cs b/src/wixext/ComPlusTableDefinitions.cs index f2863cde..565e1d44 100644 --- a/src/wixext/ComPlusTableDefinitions.cs +++ b/src/wixext/ComPlusTableDefinitions.cs @@ -8,7 +8,7 @@ namespace WixToolset.ComPlus { public static readonly TableDefinition ComPlusPartition = new TableDefinition( "ComPlusPartition", - ComPlusTupleDefinitions.ComPlusPartition, + ComPlusSymbolDefinitions.ComPlusPartition, new[] { new ColumnDefinition("Partition", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -16,24 +16,24 @@ namespace WixToolset.ComPlus new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition( "ComPlusPartitionProperty", - ComPlusTupleDefinitions.ComPlusPartitionProperty, + ComPlusSymbolDefinitions.ComPlusPartitionProperty, new[] { new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition( "ComPlusPartitionRole", - ComPlusTupleDefinitions.ComPlusPartitionRole, + ComPlusSymbolDefinitions.ComPlusPartitionRole, new[] { new ColumnDefinition("PartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -41,12 +41,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition( "ComPlusUserInPartitionRole", - ComPlusTupleDefinitions.ComPlusUserInPartitionRole, + ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, new[] { new ColumnDefinition("UserInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -54,12 +54,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition( "ComPlusGroupInPartitionRole", - ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, + ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, new[] { new ColumnDefinition("GroupInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -67,12 +67,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition( "ComPlusPartitionUser", - ComPlusTupleDefinitions.ComPlusPartitionUser, + ComPlusSymbolDefinitions.ComPlusPartitionUser, new[] { new ColumnDefinition("PartitionUser", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -80,12 +80,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusApplication = new TableDefinition( "ComPlusApplication", - ComPlusTupleDefinitions.ComPlusApplication, + ComPlusSymbolDefinitions.ComPlusApplication, new[] { new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -94,24 +94,24 @@ namespace WixToolset.ComPlus new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition( "ComPlusApplicationProperty", - ComPlusTupleDefinitions.ComPlusApplicationProperty, + ComPlusSymbolDefinitions.ComPlusApplicationProperty, new[] { new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition( "ComPlusApplicationRole", - ComPlusTupleDefinitions.ComPlusApplicationRole, + ComPlusSymbolDefinitions.ComPlusApplicationRole, new[] { new ColumnDefinition("ApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -119,24 +119,24 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition( "ComPlusApplicationRoleProperty", - ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, + ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, new[] { new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition( "ComPlusUserInApplicationRole", - ComPlusTupleDefinitions.ComPlusUserInApplicationRole, + ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, new[] { new ColumnDefinition("UserInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -144,12 +144,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition( "ComPlusGroupInApplicationRole", - ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, + ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, new[] { new ColumnDefinition("GroupInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -157,12 +157,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusAssembly = new TableDefinition( "ComPlusAssembly", - ComPlusTupleDefinitions.ComPlusAssembly, + ComPlusSymbolDefinitions.ComPlusAssembly, new[] { new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -174,47 +174,47 @@ namespace WixToolset.ComPlus new ColumnDefinition("PSDllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition( "ComPlusAssemblyDependency", - ComPlusTupleDefinitions.ComPlusAssemblyDependency, + ComPlusSymbolDefinitions.ComPlusAssemblyDependency, new[] { new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("RequiredAssembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusComponent = new TableDefinition( "ComPlusComponent", - ComPlusTupleDefinitions.ComPlusComponent, + ComPlusSymbolDefinitions.ComPlusComponent, new[] { new ColumnDefinition("ComPlusComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("CLSID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition( "ComPlusComponentProperty", - ComPlusTupleDefinitions.ComPlusComponentProperty, + ComPlusSymbolDefinitions.ComPlusComponentProperty, new[] { new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition( "ComPlusRoleForComponent", - ComPlusTupleDefinitions.ComPlusRoleForComponent, + ComPlusSymbolDefinitions.ComPlusRoleForComponent, new[] { new ColumnDefinition("RoleForComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -222,36 +222,36 @@ namespace WixToolset.ComPlus new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusInterface = new TableDefinition( "ComPlusInterface", - ComPlusTupleDefinitions.ComPlusInterface, + ComPlusSymbolDefinitions.ComPlusInterface, new[] { new ColumnDefinition("Interface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("IID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition( "ComPlusInterfaceProperty", - ComPlusTupleDefinitions.ComPlusInterfaceProperty, + ComPlusSymbolDefinitions.ComPlusInterfaceProperty, new[] { new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition( "ComPlusRoleForInterface", - ComPlusTupleDefinitions.ComPlusRoleForInterface, + ComPlusSymbolDefinitions.ComPlusRoleForInterface, new[] { new ColumnDefinition("RoleForInterface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -259,12 +259,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusMethod = new TableDefinition( "ComPlusMethod", - ComPlusTupleDefinitions.ComPlusMethod, + ComPlusSymbolDefinitions.ComPlusMethod, new[] { new ColumnDefinition("Method", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -272,24 +272,24 @@ namespace WixToolset.ComPlus new ColumnDefinition("Index", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown), new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition( "ComPlusMethodProperty", - ComPlusTupleDefinitions.ComPlusMethodProperty, + ComPlusSymbolDefinitions.ComPlusMethodProperty, new[] { new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition( "ComPlusRoleForMethod", - ComPlusTupleDefinitions.ComPlusRoleForMethod, + ComPlusSymbolDefinitions.ComPlusRoleForMethod, new[] { new ColumnDefinition("RoleForMethod", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -297,12 +297,12 @@ namespace WixToolset.ComPlus new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition ComPlusSubscription = new TableDefinition( "ComPlusSubscription", - ComPlusTupleDefinitions.ComPlusSubscription, + ComPlusSymbolDefinitions.ComPlusSubscription, new[] { new ColumnDefinition("Subscription", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), @@ -313,19 +313,19 @@ namespace WixToolset.ComPlus new ColumnDefinition("EventCLSID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("PublisherID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition( "ComPlusSubscriptionProperty", - ComPlusTupleDefinitions.ComPlusSubscriptionProperty, + ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, new[] { new ColumnDefinition("Subscription_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusSubscription", keyColumn: 1, modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition[] All = new[] diff --git a/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs index b73dca76..6d1e2d28 100644 --- a/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusApplicationProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusApplicationProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusApplicationProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusApplicationProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.ApplicationRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.ApplicationRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusApplicationPropertyTuple)); + typeof(ComPlusApplicationPropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusApplicationPropertyTupleFields + public enum ComPlusApplicationPropertySymbolFields { ApplicationRef, Name, Value, } - public class ComPlusApplicationPropertyTuple : IntermediateTuple + public class ComPlusApplicationPropertySymbol : IntermediateSymbol { - public ComPlusApplicationPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, null, null) + public ComPlusApplicationPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, null, null) { } - public ComPlusApplicationPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, sourceLineNumber, id) + public ComPlusApplicationPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusApplicationPropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusApplicationPropertySymbolFields index] => this.Fields[(int)index]; public string ApplicationRef { - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.ApplicationRef].AsString(); - set => this.Set((int)ComPlusApplicationPropertyTupleFields.ApplicationRef, value); + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.ApplicationRef].AsString(); + set => this.Set((int)ComPlusApplicationPropertySymbolFields.ApplicationRef, value); } public string Name { - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusApplicationPropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusApplicationPropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusApplicationPropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusApplicationPropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs index 19da706b..3b957899 100644 --- a/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusApplicationRoleProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusApplicationRoleProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusApplicationRolePropertyTuple)); + typeof(ComPlusApplicationRolePropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusApplicationRolePropertyTupleFields + public enum ComPlusApplicationRolePropertySymbolFields { ApplicationRoleRef, Name, Value, } - public class ComPlusApplicationRolePropertyTuple : IntermediateTuple + public class ComPlusApplicationRolePropertySymbol : IntermediateSymbol { - public ComPlusApplicationRolePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, null, null) + public ComPlusApplicationRolePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, null, null) { } - public ComPlusApplicationRolePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id) + public ComPlusApplicationRolePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusApplicationRolePropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusApplicationRolePropertySymbolFields index] => this.Fields[(int)index]; public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef, value); } public string Name { - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs index bd9cdcf8..84028ee3 100644 --- a/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusApplicationRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusApplicationRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusApplicationRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusApplicationRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ApplicationRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ApplicationRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.Name), IntermediateFieldType.String), }, - typeof(ComPlusApplicationRoleTuple)); + typeof(ComPlusApplicationRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusApplicationRoleTupleFields + public enum ComPlusApplicationRoleSymbolFields { ApplicationRef, ComponentRef, Name, } - public class ComPlusApplicationRoleTuple : IntermediateTuple + public class ComPlusApplicationRoleSymbol : IntermediateSymbol { - public ComPlusApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRole, null, null) + public ComPlusApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, null, null) { } - public ComPlusApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRole, sourceLineNumber, id) + public ComPlusApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusApplicationRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusApplicationRoleSymbolFields index] => this.Fields[(int)index]; public string ApplicationRef { - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ApplicationRef].AsString(); - set => this.Set((int)ComPlusApplicationRoleTupleFields.ApplicationRef, value); + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ApplicationRef].AsString(); + set => this.Set((int)ComPlusApplicationRoleSymbolFields.ApplicationRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusApplicationRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusApplicationRoleSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Name].AsString(); - set => this.Set((int)ComPlusApplicationRoleTupleFields.Name, value); + get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusApplicationRoleSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusApplicationTuple.cs b/src/wixext/Tuples/ComPlusApplicationTuple.cs index 7420b538..ce541e43 100644 --- a/src/wixext/Tuples/ComPlusApplicationTuple.cs +++ b/src/wixext/Tuples/ComPlusApplicationTuple.cs @@ -3,28 +3,28 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusApplication = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusApplication.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusApplication = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusApplication.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.PartitionRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ApplicationId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.PartitionRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ApplicationId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.Name), IntermediateFieldType.String), }, - typeof(ComPlusApplicationTuple)); + typeof(ComPlusApplicationSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusApplicationTupleFields + public enum ComPlusApplicationSymbolFields { PartitionRef, ComponentRef, @@ -32,40 +32,40 @@ namespace WixToolset.ComPlus.Tuples Name, } - public class ComPlusApplicationTuple : IntermediateTuple + public class ComPlusApplicationSymbol : IntermediateSymbol { - public ComPlusApplicationTuple() : base(ComPlusTupleDefinitions.ComPlusApplication, null, null) + public ComPlusApplicationSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplication, null, null) { } - public ComPlusApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplication, sourceLineNumber, id) + public ComPlusApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplication, sourceLineNumber, id) { } - public IntermediateField this[ComPlusApplicationTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusApplicationSymbolFields index] => this.Fields[(int)index]; public string PartitionRef { - get => this.Fields[(int)ComPlusApplicationTupleFields.PartitionRef].AsString(); - set => this.Set((int)ComPlusApplicationTupleFields.PartitionRef, value); + get => this.Fields[(int)ComPlusApplicationSymbolFields.PartitionRef].AsString(); + set => this.Set((int)ComPlusApplicationSymbolFields.PartitionRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusApplicationTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusApplicationTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusApplicationSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusApplicationSymbolFields.ComponentRef, value); } public string ApplicationId { - get => this.Fields[(int)ComPlusApplicationTupleFields.ApplicationId].AsString(); - set => this.Set((int)ComPlusApplicationTupleFields.ApplicationId, value); + get => this.Fields[(int)ComPlusApplicationSymbolFields.ApplicationId].AsString(); + set => this.Set((int)ComPlusApplicationSymbolFields.ApplicationId, value); } public string Name { - get => this.Fields[(int)ComPlusApplicationTupleFields.Name].AsString(); - set => this.Set((int)ComPlusApplicationTupleFields.Name, value); + get => this.Fields[(int)ComPlusApplicationSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusApplicationSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs index f57f0d0a..549d53e4 100644 --- a/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs +++ b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusAssemblyDependency = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusAssemblyDependency.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusAssemblyDependency = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusAssemblyDependency.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.AssemblyRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.AssemblyRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef), IntermediateFieldType.String), }, - typeof(ComPlusAssemblyDependencyTuple)); + typeof(ComPlusAssemblyDependencySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusAssemblyDependencyTupleFields + public enum ComPlusAssemblyDependencySymbolFields { AssemblyRef, RequiredAssemblyRef, } - public class ComPlusAssemblyDependencyTuple : IntermediateTuple + public class ComPlusAssemblyDependencySymbol : IntermediateSymbol { - public ComPlusAssemblyDependencyTuple() : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, null, null) + public ComPlusAssemblyDependencySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, null, null) { } - public ComPlusAssemblyDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id) + public ComPlusAssemblyDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id) { } - public IntermediateField this[ComPlusAssemblyDependencyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusAssemblyDependencySymbolFields index] => this.Fields[(int)index]; public string AssemblyRef { - get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.AssemblyRef].AsString(); - set => this.Set((int)ComPlusAssemblyDependencyTupleFields.AssemblyRef, value); + get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.AssemblyRef].AsString(); + set => this.Set((int)ComPlusAssemblyDependencySymbolFields.AssemblyRef, value); } public string RequiredAssemblyRef { - get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef].AsString(); - set => this.Set((int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef, value); + get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef].AsString(); + set => this.Set((int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusAssemblyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyTuple.cs index c4593cad..1329df30 100644 --- a/src/wixext/Tuples/ComPlusAssemblyTuple.cs +++ b/src/wixext/Tuples/ComPlusAssemblyTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusAssembly = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusAssembly.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusAssembly = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusAssembly.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ApplicationRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.AssemblyName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.DllPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.TlbPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.PSDllPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ApplicationRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.AssemblyName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.DllPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.TlbPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.PSDllPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(ComPlusAssemblyTuple)); + typeof(ComPlusAssemblySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusAssemblyTupleFields + public enum ComPlusAssemblySymbolFields { ApplicationRef, ComponentRef, @@ -38,58 +38,58 @@ namespace WixToolset.ComPlus.Tuples Attributes, } - public class ComPlusAssemblyTuple : IntermediateTuple + public class ComPlusAssemblySymbol : IntermediateSymbol { - public ComPlusAssemblyTuple() : base(ComPlusTupleDefinitions.ComPlusAssembly, null, null) + public ComPlusAssemblySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssembly, null, null) { } - public ComPlusAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssembly, sourceLineNumber, id) + public ComPlusAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssembly, sourceLineNumber, id) { } - public IntermediateField this[ComPlusAssemblyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusAssemblySymbolFields index] => this.Fields[(int)index]; public string ApplicationRef { - get => this.Fields[(int)ComPlusAssemblyTupleFields.ApplicationRef].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.ApplicationRef, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.ApplicationRef].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.ApplicationRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusAssemblyTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.ComponentRef, value); } public string AssemblyName { - get => this.Fields[(int)ComPlusAssemblyTupleFields.AssemblyName].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.AssemblyName, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.AssemblyName].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.AssemblyName, value); } public string DllPath { - get => this.Fields[(int)ComPlusAssemblyTupleFields.DllPath].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.DllPath, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.DllPath].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.DllPath, value); } public string TlbPath { - get => this.Fields[(int)ComPlusAssemblyTupleFields.TlbPath].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.TlbPath, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.TlbPath].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.TlbPath, value); } public string PSDllPath { - get => this.Fields[(int)ComPlusAssemblyTupleFields.PSDllPath].AsString(); - set => this.Set((int)ComPlusAssemblyTupleFields.PSDllPath, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.PSDllPath].AsString(); + set => this.Set((int)ComPlusAssemblySymbolFields.PSDllPath, value); } public int Attributes { - get => this.Fields[(int)ComPlusAssemblyTupleFields.Attributes].AsNumber(); - set => this.Set((int)ComPlusAssemblyTupleFields.Attributes, value); + get => this.Fields[(int)ComPlusAssemblySymbolFields.Attributes].AsNumber(); + set => this.Set((int)ComPlusAssemblySymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs b/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs index 4de5a032..b1d85b60 100644 --- a/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusComponentProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusComponentProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusComponentProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusComponentProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.ComPlusComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.ComPlusComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusComponentPropertyTuple)); + typeof(ComPlusComponentPropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusComponentPropertyTupleFields + public enum ComPlusComponentPropertySymbolFields { ComPlusComponentRef, Name, Value, } - public class ComPlusComponentPropertyTuple : IntermediateTuple + public class ComPlusComponentPropertySymbol : IntermediateSymbol { - public ComPlusComponentPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusComponentProperty, null, null) + public ComPlusComponentPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, null, null) { } - public ComPlusComponentPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponentProperty, sourceLineNumber, id) + public ComPlusComponentPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusComponentPropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusComponentPropertySymbolFields index] => this.Fields[(int)index]; public string ComPlusComponentRef { - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef].AsString(); - set => this.Set((int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef, value); + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef].AsString(); + set => this.Set((int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef, value); } public string Name { - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusComponentPropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusComponentPropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusComponentPropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusComponentPropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusComponentTuple.cs b/src/wixext/Tuples/ComPlusComponentTuple.cs index 70a17a5d..020b754c 100644 --- a/src/wixext/Tuples/ComPlusComponentTuple.cs +++ b/src/wixext/Tuples/ComPlusComponentTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusComponent = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusComponent.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusComponent = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusComponent.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.AssemblyRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.CLSID), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.AssemblyRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.CLSID), IntermediateFieldType.String), }, - typeof(ComPlusComponentTuple)); + typeof(ComPlusComponentSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusComponentTupleFields + public enum ComPlusComponentSymbolFields { AssemblyRef, CLSID, } - public class ComPlusComponentTuple : IntermediateTuple + public class ComPlusComponentSymbol : IntermediateSymbol { - public ComPlusComponentTuple() : base(ComPlusTupleDefinitions.ComPlusComponent, null, null) + public ComPlusComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusComponent, null, null) { } - public ComPlusComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponent, sourceLineNumber, id) + public ComPlusComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponent, sourceLineNumber, id) { } - public IntermediateField this[ComPlusComponentTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusComponentSymbolFields index] => this.Fields[(int)index]; public string AssemblyRef { - get => this.Fields[(int)ComPlusComponentTupleFields.AssemblyRef].AsString(); - set => this.Set((int)ComPlusComponentTupleFields.AssemblyRef, value); + get => this.Fields[(int)ComPlusComponentSymbolFields.AssemblyRef].AsString(); + set => this.Set((int)ComPlusComponentSymbolFields.AssemblyRef, value); } public string CLSID { - get => this.Fields[(int)ComPlusComponentTupleFields.CLSID].AsString(); - set => this.Set((int)ComPlusComponentTupleFields.CLSID, value); + get => this.Fields[(int)ComPlusComponentSymbolFields.CLSID].AsString(); + set => this.Set((int)ComPlusComponentSymbolFields.CLSID, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs index df61d3d4..d6b91e99 100644 --- a/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusGroupInApplicationRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusGroupInApplicationRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.GroupRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.GroupRef), IntermediateFieldType.String), }, - typeof(ComPlusGroupInApplicationRoleTuple)); + typeof(ComPlusGroupInApplicationRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusGroupInApplicationRoleTupleFields + public enum ComPlusGroupInApplicationRoleSymbolFields { ApplicationRoleRef, ComponentRef, GroupRef, } - public class ComPlusGroupInApplicationRoleTuple : IntermediateTuple + public class ComPlusGroupInApplicationRoleSymbol : IntermediateSymbol { - public ComPlusGroupInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, null, null) + public ComPlusGroupInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, null, null) { } - public ComPlusGroupInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id) + public ComPlusGroupInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusGroupInApplicationRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusGroupInApplicationRoleSymbolFields index] => this.Fields[(int)index]; public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef, value); } public string GroupRef { - get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.GroupRef].AsString(); - set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.GroupRef, value); + get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef].AsString(); + set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs index 507e9cdc..da70de9f 100644 --- a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusGroupInPartitionRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusGroupInPartitionRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.GroupRef), IntermediateFieldType.String), }, - typeof(ComPlusGroupInPartitionRoleTuple)); + typeof(ComPlusGroupInPartitionRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusGroupInPartitionRoleTupleFields + public enum ComPlusGroupInPartitionRoleSymbolFields { PartitionRoleRef, ComponentRef, GroupRef, } - public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple + public class ComPlusGroupInPartitionRoleSymbol : IntermediateSymbol { - public ComPlusGroupInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, null, null) + public ComPlusGroupInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, null, null) { } - public ComPlusGroupInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id) + public ComPlusGroupInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusGroupInPartitionRoleSymbolFields index] => this.Fields[(int)index]; public string PartitionRoleRef { - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef].AsString(); - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef, value); + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef].AsString(); + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef, value); } public string GroupRef { - get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupRef].AsString(); - set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupRef, value); + get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef].AsString(); + set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs index 699c9597..2ed4ce18 100644 --- a/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusInterfaceProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusInterfaceProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusInterfaceProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusInterfaceProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.InterfaceRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.InterfaceRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusInterfacePropertyTuple)); + typeof(ComPlusInterfacePropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusInterfacePropertyTupleFields + public enum ComPlusInterfacePropertySymbolFields { InterfaceRef, Name, Value, } - public class ComPlusInterfacePropertyTuple : IntermediateTuple + public class ComPlusInterfacePropertySymbol : IntermediateSymbol { - public ComPlusInterfacePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, null, null) + public ComPlusInterfacePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, null, null) { } - public ComPlusInterfacePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id) + public ComPlusInterfacePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusInterfacePropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusInterfacePropertySymbolFields index] => this.Fields[(int)index]; public string InterfaceRef { - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.InterfaceRef].AsString(); - set => this.Set((int)ComPlusInterfacePropertyTupleFields.InterfaceRef, value); + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.InterfaceRef].AsString(); + set => this.Set((int)ComPlusInterfacePropertySymbolFields.InterfaceRef, value); } public string Name { - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusInterfacePropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusInterfacePropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusInterfacePropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusInterfacePropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusInterfaceTuple.cs b/src/wixext/Tuples/ComPlusInterfaceTuple.cs index 42d41ded..f875b424 100644 --- a/src/wixext/Tuples/ComPlusInterfaceTuple.cs +++ b/src/wixext/Tuples/ComPlusInterfaceTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusInterface = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusInterface.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusInterface = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusInterface.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.ComPlusComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.IID), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.ComPlusComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.IID), IntermediateFieldType.String), }, - typeof(ComPlusInterfaceTuple)); + typeof(ComPlusInterfaceSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusInterfaceTupleFields + public enum ComPlusInterfaceSymbolFields { ComPlusComponentRef, IID, } - public class ComPlusInterfaceTuple : IntermediateTuple + public class ComPlusInterfaceSymbol : IntermediateSymbol { - public ComPlusInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusInterface, null, null) + public ComPlusInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusInterface, null, null) { } - public ComPlusInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterface, sourceLineNumber, id) + public ComPlusInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterface, sourceLineNumber, id) { } - public IntermediateField this[ComPlusInterfaceTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusInterfaceSymbolFields index] => this.Fields[(int)index]; public string ComPlusComponentRef { - get => this.Fields[(int)ComPlusInterfaceTupleFields.ComPlusComponentRef].AsString(); - set => this.Set((int)ComPlusInterfaceTupleFields.ComPlusComponentRef, value); + get => this.Fields[(int)ComPlusInterfaceSymbolFields.ComPlusComponentRef].AsString(); + set => this.Set((int)ComPlusInterfaceSymbolFields.ComPlusComponentRef, value); } public string IID { - get => this.Fields[(int)ComPlusInterfaceTupleFields.IID].AsString(); - set => this.Set((int)ComPlusInterfaceTupleFields.IID, value); + get => this.Fields[(int)ComPlusInterfaceSymbolFields.IID].AsString(); + set => this.Set((int)ComPlusInterfaceSymbolFields.IID, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs b/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs index 9582ff88..65b17ea4 100644 --- a/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusMethodProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusMethodProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusMethodProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusMethodProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.MethodRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.MethodRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusMethodPropertyTuple)); + typeof(ComPlusMethodPropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusMethodPropertyTupleFields + public enum ComPlusMethodPropertySymbolFields { MethodRef, Name, Value, } - public class ComPlusMethodPropertyTuple : IntermediateTuple + public class ComPlusMethodPropertySymbol : IntermediateSymbol { - public ComPlusMethodPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusMethodProperty, null, null) + public ComPlusMethodPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, null, null) { } - public ComPlusMethodPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethodProperty, sourceLineNumber, id) + public ComPlusMethodPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusMethodPropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusMethodPropertySymbolFields index] => this.Fields[(int)index]; public string MethodRef { - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.MethodRef].AsString(); - set => this.Set((int)ComPlusMethodPropertyTupleFields.MethodRef, value); + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.MethodRef].AsString(); + set => this.Set((int)ComPlusMethodPropertySymbolFields.MethodRef, value); } public string Name { - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusMethodPropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusMethodPropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusMethodPropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusMethodPropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusMethodTuple.cs b/src/wixext/Tuples/ComPlusMethodTuple.cs index 4cb451c2..9959a56f 100644 --- a/src/wixext/Tuples/ComPlusMethodTuple.cs +++ b/src/wixext/Tuples/ComPlusMethodTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusMethod = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusMethod.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusMethod = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusMethod.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.InterfaceRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Index), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.InterfaceRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Index), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Name), IntermediateFieldType.String), }, - typeof(ComPlusMethodTuple)); + typeof(ComPlusMethodSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusMethodTupleFields + public enum ComPlusMethodSymbolFields { InterfaceRef, Index, Name, } - public class ComPlusMethodTuple : IntermediateTuple + public class ComPlusMethodSymbol : IntermediateSymbol { - public ComPlusMethodTuple() : base(ComPlusTupleDefinitions.ComPlusMethod, null, null) + public ComPlusMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusMethod, null, null) { } - public ComPlusMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethod, sourceLineNumber, id) + public ComPlusMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethod, sourceLineNumber, id) { } - public IntermediateField this[ComPlusMethodTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusMethodSymbolFields index] => this.Fields[(int)index]; public string InterfaceRef { - get => this.Fields[(int)ComPlusMethodTupleFields.InterfaceRef].AsString(); - set => this.Set((int)ComPlusMethodTupleFields.InterfaceRef, value); + get => this.Fields[(int)ComPlusMethodSymbolFields.InterfaceRef].AsString(); + set => this.Set((int)ComPlusMethodSymbolFields.InterfaceRef, value); } public int? Index { - get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNullableNumber(); - set => this.Set((int)ComPlusMethodTupleFields.Index, value); + get => this.Fields[(int)ComPlusMethodSymbolFields.Index].AsNullableNumber(); + set => this.Set((int)ComPlusMethodSymbolFields.Index, value); } public string Name { - get => this.Fields[(int)ComPlusMethodTupleFields.Name].AsString(); - set => this.Set((int)ComPlusMethodTupleFields.Name, value); + get => this.Fields[(int)ComPlusMethodSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusMethodSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs index 9c834601..e42feae2 100644 --- a/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusPartitionProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusPartitionProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusPartitionProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusPartitionProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.PartitionRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.PartitionRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusPartitionPropertyTuple)); + typeof(ComPlusPartitionPropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusPartitionPropertyTupleFields + public enum ComPlusPartitionPropertySymbolFields { PartitionRef, Name, Value, } - public class ComPlusPartitionPropertyTuple : IntermediateTuple + public class ComPlusPartitionPropertySymbol : IntermediateSymbol { - public ComPlusPartitionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, null, null) + public ComPlusPartitionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, null, null) { } - public ComPlusPartitionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, sourceLineNumber, id) + public ComPlusPartitionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusPartitionPropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusPartitionPropertySymbolFields index] => this.Fields[(int)index]; public string PartitionRef { - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.PartitionRef].AsString(); - set => this.Set((int)ComPlusPartitionPropertyTupleFields.PartitionRef, value); + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.PartitionRef].AsString(); + set => this.Set((int)ComPlusPartitionPropertySymbolFields.PartitionRef, value); } public string Name { - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusPartitionPropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusPartitionPropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusPartitionPropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusPartitionPropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs index 51865b7d..23293d93 100644 --- a/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusPartitionRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusPartitionRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusPartitionRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusPartitionRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.PartitionRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.PartitionRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.Name), IntermediateFieldType.String), }, - typeof(ComPlusPartitionRoleTuple)); + typeof(ComPlusPartitionRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusPartitionRoleTupleFields + public enum ComPlusPartitionRoleSymbolFields { PartitionRef, ComponentRef, Name, } - public class ComPlusPartitionRoleTuple : IntermediateTuple + public class ComPlusPartitionRoleSymbol : IntermediateSymbol { - public ComPlusPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionRole, null, null) + public ComPlusPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, null, null) { } - public ComPlusPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionRole, sourceLineNumber, id) + public ComPlusPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusPartitionRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusPartitionRoleSymbolFields index] => this.Fields[(int)index]; public string PartitionRef { - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.PartitionRef].AsString(); - set => this.Set((int)ComPlusPartitionRoleTupleFields.PartitionRef, value); + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.PartitionRef].AsString(); + set => this.Set((int)ComPlusPartitionRoleSymbolFields.PartitionRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusPartitionRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusPartitionRoleSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Name].AsString(); - set => this.Set((int)ComPlusPartitionRoleTupleFields.Name, value); + get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusPartitionRoleSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusPartitionTuple.cs b/src/wixext/Tuples/ComPlusPartitionTuple.cs index 0b7417dd..c60fca40 100644 --- a/src/wixext/Tuples/ComPlusPartitionTuple.cs +++ b/src/wixext/Tuples/ComPlusPartitionTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusPartition = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusPartition.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusPartition = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusPartition.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.PartitionId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.PartitionId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.Name), IntermediateFieldType.String), }, - typeof(ComPlusPartitionTuple)); + typeof(ComPlusPartitionSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusPartitionTupleFields + public enum ComPlusPartitionSymbolFields { ComponentRef, PartitionId, Name, } - public class ComPlusPartitionTuple : IntermediateTuple + public class ComPlusPartitionSymbol : IntermediateSymbol { - public ComPlusPartitionTuple() : base(ComPlusTupleDefinitions.ComPlusPartition, null, null) + public ComPlusPartitionSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartition, null, null) { } - public ComPlusPartitionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartition, sourceLineNumber, id) + public ComPlusPartitionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartition, sourceLineNumber, id) { } - public IntermediateField this[ComPlusPartitionTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusPartitionSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)ComPlusPartitionTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusPartitionTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusPartitionSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusPartitionSymbolFields.ComponentRef, value); } public string PartitionId { - get => this.Fields[(int)ComPlusPartitionTupleFields.PartitionId].AsString(); - set => this.Set((int)ComPlusPartitionTupleFields.PartitionId, value); + get => this.Fields[(int)ComPlusPartitionSymbolFields.PartitionId].AsString(); + set => this.Set((int)ComPlusPartitionSymbolFields.PartitionId, value); } public string Name { - get => this.Fields[(int)ComPlusPartitionTupleFields.Name].AsString(); - set => this.Set((int)ComPlusPartitionTupleFields.Name, value); + get => this.Fields[(int)ComPlusPartitionSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusPartitionSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusPartitionUserTuple.cs b/src/wixext/Tuples/ComPlusPartitionUserTuple.cs index 052b1746..c4d52f54 100644 --- a/src/wixext/Tuples/ComPlusPartitionUserTuple.cs +++ b/src/wixext/Tuples/ComPlusPartitionUserTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusPartitionUser = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusPartitionUser.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusPartitionUser = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusPartitionUser.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.PartitionRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.PartitionRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.UserRef), IntermediateFieldType.String), }, - typeof(ComPlusPartitionUserTuple)); + typeof(ComPlusPartitionUserSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusPartitionUserTupleFields + public enum ComPlusPartitionUserSymbolFields { PartitionRef, ComponentRef, UserRef, } - public class ComPlusPartitionUserTuple : IntermediateTuple + public class ComPlusPartitionUserSymbol : IntermediateSymbol { - public ComPlusPartitionUserTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionUser, null, null) + public ComPlusPartitionUserSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, null, null) { } - public ComPlusPartitionUserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionUser, sourceLineNumber, id) + public ComPlusPartitionUserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, sourceLineNumber, id) { } - public IntermediateField this[ComPlusPartitionUserTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusPartitionUserSymbolFields index] => this.Fields[(int)index]; public string PartitionRef { - get => this.Fields[(int)ComPlusPartitionUserTupleFields.PartitionRef].AsString(); - set => this.Set((int)ComPlusPartitionUserTupleFields.PartitionRef, value); + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.PartitionRef].AsString(); + set => this.Set((int)ComPlusPartitionUserSymbolFields.PartitionRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusPartitionUserTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusPartitionUserTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusPartitionUserSymbolFields.ComponentRef, value); } public string UserRef { - get => this.Fields[(int)ComPlusPartitionUserTupleFields.UserRef].AsString(); - set => this.Set((int)ComPlusPartitionUserTupleFields.UserRef, value); + get => this.Fields[(int)ComPlusPartitionUserSymbolFields.UserRef].AsString(); + set => this.Set((int)ComPlusPartitionUserSymbolFields.UserRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs b/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs index 8cf0b8d5..2d9968ee 100644 --- a/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs +++ b/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusRoleForComponent = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusRoleForComponent.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusRoleForComponent = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusRoleForComponent.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComPlusComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComPlusComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComponentRef), IntermediateFieldType.String), }, - typeof(ComPlusRoleForComponentTuple)); + typeof(ComPlusRoleForComponentSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusRoleForComponentTupleFields + public enum ComPlusRoleForComponentSymbolFields { ComPlusComponentRef, ApplicationRoleRef, ComponentRef, } - public class ComPlusRoleForComponentTuple : IntermediateTuple + public class ComPlusRoleForComponentSymbol : IntermediateSymbol { - public ComPlusRoleForComponentTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, null, null) + public ComPlusRoleForComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, null, null) { } - public ComPlusRoleForComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, sourceLineNumber, id) + public ComPlusRoleForComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, sourceLineNumber, id) { } - public IntermediateField this[ComPlusRoleForComponentTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusRoleForComponentSymbolFields index] => this.Fields[(int)index]; public string ComPlusComponentRef { - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef].AsString(); - set => this.Set((int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef, value); + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef].AsString(); + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef, value); } public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusRoleForComponentTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs index c6c5ae6b..b77bd215 100644 --- a/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs +++ b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusRoleForInterface = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusRoleForInterface.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusRoleForInterface = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusRoleForInterface.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.InterfaceRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.InterfaceRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ComponentRef), IntermediateFieldType.String), }, - typeof(ComPlusRoleForInterfaceTuple)); + typeof(ComPlusRoleForInterfaceSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusRoleForInterfaceTupleFields + public enum ComPlusRoleForInterfaceSymbolFields { InterfaceRef, ApplicationRoleRef, ComponentRef, } - public class ComPlusRoleForInterfaceTuple : IntermediateTuple + public class ComPlusRoleForInterfaceSymbol : IntermediateSymbol { - public ComPlusRoleForInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, null, null) + public ComPlusRoleForInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, null, null) { } - public ComPlusRoleForInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, sourceLineNumber, id) + public ComPlusRoleForInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, sourceLineNumber, id) { } - public IntermediateField this[ComPlusRoleForInterfaceTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusRoleForInterfaceSymbolFields index] => this.Fields[(int)index]; public string InterfaceRef { - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.InterfaceRef].AsString(); - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.InterfaceRef, value); + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef].AsString(); + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef, value); } public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs b/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs index 89268a33..9ba9d03b 100644 --- a/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs +++ b/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusRoleForMethod = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusRoleForMethod.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusRoleForMethod = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusRoleForMethod.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.MethodRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.MethodRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ComponentRef), IntermediateFieldType.String), }, - typeof(ComPlusRoleForMethodTuple)); + typeof(ComPlusRoleForMethodSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusRoleForMethodTupleFields + public enum ComPlusRoleForMethodSymbolFields { MethodRef, ApplicationRoleRef, ComponentRef, } - public class ComPlusRoleForMethodTuple : IntermediateTuple + public class ComPlusRoleForMethodSymbol : IntermediateSymbol { - public ComPlusRoleForMethodTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, null, null) + public ComPlusRoleForMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, null, null) { } - public ComPlusRoleForMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, sourceLineNumber, id) + public ComPlusRoleForMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, sourceLineNumber, id) { } - public IntermediateField this[ComPlusRoleForMethodTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusRoleForMethodSymbolFields index] => this.Fields[(int)index]; public string MethodRef { - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.MethodRef].AsString(); - set => this.Set((int)ComPlusRoleForMethodTupleFields.MethodRef, value); + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.MethodRef].AsString(); + set => this.Set((int)ComPlusRoleForMethodSymbolFields.MethodRef, value); } public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusRoleForMethodTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusRoleForMethodSymbolFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs index f9b4137a..af995c3d 100644 --- a/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs +++ b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusSubscriptionProperty = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusSubscriptionProperty.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusSubscriptionProperty = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.SubscriptionRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.SubscriptionRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Value), IntermediateFieldType.String), }, - typeof(ComPlusSubscriptionPropertyTuple)); + typeof(ComPlusSubscriptionPropertySymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusSubscriptionPropertyTupleFields + public enum ComPlusSubscriptionPropertySymbolFields { SubscriptionRef, Name, Value, } - public class ComPlusSubscriptionPropertyTuple : IntermediateTuple + public class ComPlusSubscriptionPropertySymbol : IntermediateSymbol { - public ComPlusSubscriptionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, null, null) + public ComPlusSubscriptionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, null, null) { } - public ComPlusSubscriptionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id) + public ComPlusSubscriptionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id) { } - public IntermediateField this[ComPlusSubscriptionPropertyTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusSubscriptionPropertySymbolFields index] => this.Fields[(int)index]; public string SubscriptionRef { - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef].AsString(); - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef, value); + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef].AsString(); + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef, value); } public string Name { - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Name].AsString(); - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Name, value); + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Name].AsString(); + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Name, value); } public string Value { - get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Value].AsString(); - set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Value, value); + get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Value].AsString(); + set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Value, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusSubscriptionTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionTuple.cs index 2389101a..24d3f92e 100644 --- a/src/wixext/Tuples/ComPlusSubscriptionTuple.cs +++ b/src/wixext/Tuples/ComPlusSubscriptionTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusSubscription = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusSubscription.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusSubscription = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusSubscription.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Subscription), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComPlusComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.SubscriptionId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.EventCLSID), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.PublisherID), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Subscription), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComPlusComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.SubscriptionId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.EventCLSID), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.PublisherID), IntermediateFieldType.String), }, - typeof(ComPlusSubscriptionTuple)); + typeof(ComPlusSubscriptionSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusSubscriptionTupleFields + public enum ComPlusSubscriptionSymbolFields { Subscription, ComPlusComponentRef, @@ -38,58 +38,58 @@ namespace WixToolset.ComPlus.Tuples PublisherID, } - public class ComPlusSubscriptionTuple : IntermediateTuple + public class ComPlusSubscriptionSymbol : IntermediateSymbol { - public ComPlusSubscriptionTuple() : base(ComPlusTupleDefinitions.ComPlusSubscription, null, null) + public ComPlusSubscriptionSymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscription, null, null) { } - public ComPlusSubscriptionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscription, sourceLineNumber, id) + public ComPlusSubscriptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscription, sourceLineNumber, id) { } - public IntermediateField this[ComPlusSubscriptionTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusSubscriptionSymbolFields index] => this.Fields[(int)index]; public string Subscription { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.Subscription].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.Subscription, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Subscription].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.Subscription, value); } public string ComPlusComponentRef { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComPlusComponentRef].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.ComPlusComponentRef, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.ComponentRef, value); } public string SubscriptionId { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.SubscriptionId].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.SubscriptionId, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.SubscriptionId].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.SubscriptionId, value); } public string Name { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.Name].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.Name, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Name].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.Name, value); } public string EventCLSID { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.EventCLSID].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.EventCLSID, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.EventCLSID].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.EventCLSID, value); } public string PublisherID { - get => this.Fields[(int)ComPlusSubscriptionTupleFields.PublisherID].AsString(); - set => this.Set((int)ComPlusSubscriptionTupleFields.PublisherID, value); + get => this.Fields[(int)ComPlusSubscriptionSymbolFields.PublisherID].AsString(); + set => this.Set((int)ComPlusSubscriptionSymbolFields.PublisherID, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusTupleDefinitions.cs b/src/wixext/Tuples/ComPlusTupleDefinitions.cs index 1019c046..407b9c14 100644 --- a/src/wixext/Tuples/ComPlusTupleDefinitions.cs +++ b/src/wixext/Tuples/ComPlusTupleDefinitions.cs @@ -5,7 +5,7 @@ namespace WixToolset.ComPlus using System; using WixToolset.Data; - public enum ComPlusTupleDefinitionType + public enum ComPlusSymbolDefinitionType { ComPlusApplication, ComPlusApplicationProperty, @@ -34,13 +34,13 @@ namespace WixToolset.ComPlus ComPlusUserInPartitionRole, } - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { public static readonly Version Version = new Version("4.0.0"); - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!Enum.TryParse(name, out ComPlusTupleDefinitionType type)) + if (!Enum.TryParse(name, out ComPlusSymbolDefinitionType type)) { return null; } @@ -48,84 +48,84 @@ namespace WixToolset.ComPlus return ByType(type); } - public static IntermediateTupleDefinition ByType(ComPlusTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(ComPlusSymbolDefinitionType type) { switch (type) { - case ComPlusTupleDefinitionType.ComPlusApplication: - return ComPlusTupleDefinitions.ComPlusApplication; + case ComPlusSymbolDefinitionType.ComPlusApplication: + return ComPlusSymbolDefinitions.ComPlusApplication; - case ComPlusTupleDefinitionType.ComPlusApplicationProperty: - return ComPlusTupleDefinitions.ComPlusApplicationProperty; + case ComPlusSymbolDefinitionType.ComPlusApplicationProperty: + return ComPlusSymbolDefinitions.ComPlusApplicationProperty; - case ComPlusTupleDefinitionType.ComPlusApplicationRole: - return ComPlusTupleDefinitions.ComPlusApplicationRole; + case ComPlusSymbolDefinitionType.ComPlusApplicationRole: + return ComPlusSymbolDefinitions.ComPlusApplicationRole; - case ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty: - return ComPlusTupleDefinitions.ComPlusApplicationRoleProperty; + case ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty: + return ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty; - case ComPlusTupleDefinitionType.ComPlusAssembly: - return ComPlusTupleDefinitions.ComPlusAssembly; + case ComPlusSymbolDefinitionType.ComPlusAssembly: + return ComPlusSymbolDefinitions.ComPlusAssembly; - case ComPlusTupleDefinitionType.ComPlusAssemblyDependency: - return ComPlusTupleDefinitions.ComPlusAssemblyDependency; + case ComPlusSymbolDefinitionType.ComPlusAssemblyDependency: + return ComPlusSymbolDefinitions.ComPlusAssemblyDependency; - case ComPlusTupleDefinitionType.ComPlusComponent: - return ComPlusTupleDefinitions.ComPlusComponent; + case ComPlusSymbolDefinitionType.ComPlusComponent: + return ComPlusSymbolDefinitions.ComPlusComponent; - case ComPlusTupleDefinitionType.ComPlusComponentProperty: - return ComPlusTupleDefinitions.ComPlusComponentProperty; + case ComPlusSymbolDefinitionType.ComPlusComponentProperty: + return ComPlusSymbolDefinitions.ComPlusComponentProperty; - case ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole: - return ComPlusTupleDefinitions.ComPlusGroupInApplicationRole; + case ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole: + return ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole; - case ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole: - return ComPlusTupleDefinitions.ComPlusGroupInPartitionRole; + case ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole: + return ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole; - case ComPlusTupleDefinitionType.ComPlusInterface: - return ComPlusTupleDefinitions.ComPlusInterface; + case ComPlusSymbolDefinitionType.ComPlusInterface: + return ComPlusSymbolDefinitions.ComPlusInterface; - case ComPlusTupleDefinitionType.ComPlusInterfaceProperty: - return ComPlusTupleDefinitions.ComPlusInterfaceProperty; + case ComPlusSymbolDefinitionType.ComPlusInterfaceProperty: + return ComPlusSymbolDefinitions.ComPlusInterfaceProperty; - case ComPlusTupleDefinitionType.ComPlusMethod: - return ComPlusTupleDefinitions.ComPlusMethod; + case ComPlusSymbolDefinitionType.ComPlusMethod: + return ComPlusSymbolDefinitions.ComPlusMethod; - case ComPlusTupleDefinitionType.ComPlusMethodProperty: - return ComPlusTupleDefinitions.ComPlusMethodProperty; + case ComPlusSymbolDefinitionType.ComPlusMethodProperty: + return ComPlusSymbolDefinitions.ComPlusMethodProperty; - case ComPlusTupleDefinitionType.ComPlusPartition: - return ComPlusTupleDefinitions.ComPlusPartition; + case ComPlusSymbolDefinitionType.ComPlusPartition: + return ComPlusSymbolDefinitions.ComPlusPartition; - case ComPlusTupleDefinitionType.ComPlusPartitionProperty: - return ComPlusTupleDefinitions.ComPlusPartitionProperty; + case ComPlusSymbolDefinitionType.ComPlusPartitionProperty: + return ComPlusSymbolDefinitions.ComPlusPartitionProperty; - case ComPlusTupleDefinitionType.ComPlusPartitionRole: - return ComPlusTupleDefinitions.ComPlusPartitionRole; + case ComPlusSymbolDefinitionType.ComPlusPartitionRole: + return ComPlusSymbolDefinitions.ComPlusPartitionRole; - case ComPlusTupleDefinitionType.ComPlusPartitionUser: - return ComPlusTupleDefinitions.ComPlusPartitionUser; + case ComPlusSymbolDefinitionType.ComPlusPartitionUser: + return ComPlusSymbolDefinitions.ComPlusPartitionUser; - case ComPlusTupleDefinitionType.ComPlusRoleForComponent: - return ComPlusTupleDefinitions.ComPlusRoleForComponent; + case ComPlusSymbolDefinitionType.ComPlusRoleForComponent: + return ComPlusSymbolDefinitions.ComPlusRoleForComponent; - case ComPlusTupleDefinitionType.ComPlusRoleForInterface: - return ComPlusTupleDefinitions.ComPlusRoleForInterface; + case ComPlusSymbolDefinitionType.ComPlusRoleForInterface: + return ComPlusSymbolDefinitions.ComPlusRoleForInterface; - case ComPlusTupleDefinitionType.ComPlusRoleForMethod: - return ComPlusTupleDefinitions.ComPlusRoleForMethod; + case ComPlusSymbolDefinitionType.ComPlusRoleForMethod: + return ComPlusSymbolDefinitions.ComPlusRoleForMethod; - case ComPlusTupleDefinitionType.ComPlusSubscription: - return ComPlusTupleDefinitions.ComPlusSubscription; + case ComPlusSymbolDefinitionType.ComPlusSubscription: + return ComPlusSymbolDefinitions.ComPlusSubscription; - case ComPlusTupleDefinitionType.ComPlusSubscriptionProperty: - return ComPlusTupleDefinitions.ComPlusSubscriptionProperty; + case ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty: + return ComPlusSymbolDefinitions.ComPlusSubscriptionProperty; - case ComPlusTupleDefinitionType.ComPlusUserInApplicationRole: - return ComPlusTupleDefinitions.ComPlusUserInApplicationRole; + case ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole: + return ComPlusSymbolDefinitions.ComPlusUserInApplicationRole; - case ComPlusTupleDefinitionType.ComPlusUserInPartitionRole: - return ComPlusTupleDefinitions.ComPlusUserInPartitionRole; + case ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole: + return ComPlusSymbolDefinitions.ComPlusUserInPartitionRole; default: throw new ArgumentOutOfRangeException(nameof(type)); diff --git a/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs index 2836951b..1f2e01b2 100644 --- a/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusUserInApplicationRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusUserInApplicationRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusUserInApplicationRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.UserRef), IntermediateFieldType.String), }, - typeof(ComPlusUserInApplicationRoleTuple)); + typeof(ComPlusUserInApplicationRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusUserInApplicationRoleTupleFields + public enum ComPlusUserInApplicationRoleSymbolFields { ApplicationRoleRef, ComponentRef, UserRef, } - public class ComPlusUserInApplicationRoleTuple : IntermediateTuple + public class ComPlusUserInApplicationRoleSymbol : IntermediateSymbol { - public ComPlusUserInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, null, null) + public ComPlusUserInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, null, null) { } - public ComPlusUserInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id) + public ComPlusUserInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusUserInApplicationRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusUserInApplicationRoleSymbolFields index] => this.Fields[(int)index]; public string ApplicationRoleRef { - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef].AsString(); - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef, value); + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef].AsString(); + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef, value); } public string UserRef { - get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.UserRef].AsString(); - set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.UserRef, value); + get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.UserRef].AsString(); + set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.UserRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs index 77850648..10df94bf 100644 --- a/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs +++ b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.ComPlus { using WixToolset.Data; - using WixToolset.ComPlus.Tuples; + using WixToolset.ComPlus.Symbols; - public static partial class ComPlusTupleDefinitions + public static partial class ComPlusSymbolDefinitions { - public static readonly IntermediateTupleDefinition ComPlusUserInPartitionRole = new IntermediateTupleDefinition( - ComPlusTupleDefinitionType.ComPlusUserInPartitionRole.ToString(), + public static readonly IntermediateSymbolDefinition ComPlusUserInPartitionRole = new IntermediateSymbolDefinition( + ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.UserRef), IntermediateFieldType.String), }, - typeof(ComPlusUserInPartitionRoleTuple)); + typeof(ComPlusUserInPartitionRoleSymbol)); } } -namespace WixToolset.ComPlus.Tuples +namespace WixToolset.ComPlus.Symbols { using WixToolset.Data; - public enum ComPlusUserInPartitionRoleTupleFields + public enum ComPlusUserInPartitionRoleSymbolFields { PartitionRoleRef, ComponentRef, UserRef, } - public class ComPlusUserInPartitionRoleTuple : IntermediateTuple + public class ComPlusUserInPartitionRoleSymbol : IntermediateSymbol { - public ComPlusUserInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, null, null) + public ComPlusUserInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, null, null) { } - public ComPlusUserInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id) + public ComPlusUserInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id) { } - public IntermediateField this[ComPlusUserInPartitionRoleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ComPlusUserInPartitionRoleSymbolFields index] => this.Fields[(int)index]; public string PartitionRoleRef { - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef].AsString(); - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef, value); + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef].AsString(); + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef, value); } public string ComponentRef { - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.ComponentRef].AsString(); - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.ComponentRef, value); + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef, value); } public string UserRef { - get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.UserRef].AsString(); - set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.UserRef, value); + get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.UserRef].AsString(); + set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.UserRef, value); } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb