From 20572fec71899df1a19f5759c64984b6ea9b20df Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:53:23 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/wixext/NetFxCompiler.cs | 8 ++++---- src/wixext/NetFxExtensionData.cs | 12 +++++------ src/wixext/NetfxTableDefinitions.cs | 6 +++--- src/wixext/Tuples/NetFxNativeImageTuple.cs | 32 +++++++++++++++--------------- src/wixext/Tuples/NetfxTupleDefinitions.cs | 22 ++++++++++---------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs index e12cca6b..14efe95d 100644 --- a/src/wixext/NetFxCompiler.cs +++ b/src/wixext/NetFxCompiler.cs @@ -8,7 +8,7 @@ namespace WixToolset.Netfx using WixToolset.Data; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; - using WixToolset.Netfx.Tuples; + using WixToolset.Netfx.Symbols; /// /// The compiler for the WiX Toolset .NET Framework Extension. @@ -75,7 +75,7 @@ namespace WixToolset.Netfx // See if a formatted value is specified. if (-1 == appBaseDirectory.IndexOf("[", StringComparison.Ordinal)) { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, appBaseDirectory); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, appBaseDirectory); } break; case "AssemblyApplication": @@ -84,7 +84,7 @@ namespace WixToolset.Netfx // See if a formatted value is specified. if (-1 == assemblyApplication.IndexOf("[", StringComparison.Ordinal)) { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, assemblyApplication); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, assemblyApplication); } break; case "Debug": @@ -149,7 +149,7 @@ namespace WixToolset.Netfx if (!this.Messaging.EncounteredError) { - section.AddTuple(new NetFxNativeImageTuple(sourceLineNumbers, id) + section.AddSymbol(new NetFxNativeImageSymbol(sourceLineNumbers, id) { FileRef = fileId, Priority = priority, diff --git a/src/wixext/NetFxExtensionData.cs b/src/wixext/NetFxExtensionData.cs index b68741fd..0a24ef1e 100644 --- a/src/wixext/NetFxExtensionData.cs +++ b/src/wixext/NetFxExtensionData.cs @@ -4,22 +4,22 @@ namespace WixToolset.Netfx { using WixToolset.Data; using WixToolset.Extensibility; - using WixToolset.Netfx.Tuples; + using WixToolset.Netfx.Symbols; /// /// The WiX Toolset .NET Framework Extension. /// public sealed class NetfxExtensionData : BaseExtensionData { - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = (name == NetfxTupleDefinitionNames.NetFxNativeImage) ? NetfxTupleDefinitions.NetFxNativeImage : null; - return tupleDefinition != null; + symbolDefinition = (name == NetfxSymbolDefinitionNames.NetFxNativeImage) ? NetfxSymbolDefinitions.NetFxNativeImage : null; + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(NetfxExtensionData).Assembly, "WixToolset.Netfx.netfx.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(NetfxExtensionData).Assembly, "WixToolset.Netfx.netfx.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/NetfxTableDefinitions.cs b/src/wixext/NetfxTableDefinitions.cs index a94b0d2f..1b2a4d21 100644 --- a/src/wixext/NetfxTableDefinitions.cs +++ b/src/wixext/NetfxTableDefinitions.cs @@ -3,13 +3,13 @@ namespace WixToolset.Netfx { using WixToolset.Data.WindowsInstaller; - using WixToolset.Netfx.Tuples; + using WixToolset.Netfx.Symbols; public static class NetfxTableDefinitions { public static readonly TableDefinition NetFxNativeImage = new TableDefinition( "Wix4NetFxNativeImage", - NetfxTupleDefinitions.NetFxNativeImage, + NetfxSymbolDefinitions.NetFxNativeImage, new[] { new ColumnDefinition("Wix4NetFxNativeImage", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -19,7 +19,7 @@ namespace WixToolset.Netfx new ColumnDefinition("File_Application", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The application which loads this assembly.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Directory_ApplicationBase", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The directory containing the application which loads this assembly.", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition[] All = new[] diff --git a/src/wixext/Tuples/NetFxNativeImageTuple.cs b/src/wixext/Tuples/NetFxNativeImageTuple.cs index 51211f75..3803abd6 100644 --- a/src/wixext/Tuples/NetFxNativeImageTuple.cs +++ b/src/wixext/Tuples/NetFxNativeImageTuple.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -namespace WixToolset.Netfx.Tuples +namespace WixToolset.Netfx.Symbols { using WixToolset.Data; - public enum NetFxNativeImageTupleFields + public enum NetFxNativeImageSymbolFields { FileRef, Priority, @@ -13,46 +13,46 @@ namespace WixToolset.Netfx.Tuples ApplicationBaseDirectoryRef, } - public class NetFxNativeImageTuple : IntermediateTuple + public class NetFxNativeImageSymbol : IntermediateSymbol { - public NetFxNativeImageTuple() : base(NetfxTupleDefinitions.NetFxNativeImage, null, null) + public NetFxNativeImageSymbol() : base(NetfxSymbolDefinitions.NetFxNativeImage, null, null) { } - public NetFxNativeImageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxTupleDefinitions.NetFxNativeImage, sourceLineNumber, id) + public NetFxNativeImageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNativeImage, sourceLineNumber, id) { } - public IntermediateField this[NetFxNativeImageTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[NetFxNativeImageSymbolFields index] => this.Fields[(int)index]; public string FileRef { - get => this.Fields[(int)NetFxNativeImageTupleFields.FileRef].AsString(); - set => this.Set((int)NetFxNativeImageTupleFields.FileRef, value); + get => this.Fields[(int)NetFxNativeImageSymbolFields.FileRef].AsString(); + set => this.Set((int)NetFxNativeImageSymbolFields.FileRef, value); } public int Priority { - get => this.Fields[(int)NetFxNativeImageTupleFields.Priority].AsNumber(); - set => this.Set((int)NetFxNativeImageTupleFields.Priority, value); + get => this.Fields[(int)NetFxNativeImageSymbolFields.Priority].AsNumber(); + set => this.Set((int)NetFxNativeImageSymbolFields.Priority, value); } public int Attributes { - get => this.Fields[(int)NetFxNativeImageTupleFields.Attributes].AsNumber(); - set => this.Set((int)NetFxNativeImageTupleFields.Attributes, value); + get => this.Fields[(int)NetFxNativeImageSymbolFields.Attributes].AsNumber(); + set => this.Set((int)NetFxNativeImageSymbolFields.Attributes, value); } public string ApplicationFileRef { - get => this.Fields[(int)NetFxNativeImageTupleFields.ApplicationFileRef].AsString(); - set => this.Set((int)NetFxNativeImageTupleFields.ApplicationFileRef, value); + get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationFileRef].AsString(); + set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationFileRef, value); } public string ApplicationBaseDirectoryRef { - get => this.Fields[(int)NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef].AsString(); - set => this.Set((int)NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef, value); + get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef].AsString(); + set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/NetfxTupleDefinitions.cs b/src/wixext/Tuples/NetfxTupleDefinitions.cs index 9b617279..3c0f1176 100644 --- a/src/wixext/Tuples/NetfxTupleDefinitions.cs +++ b/src/wixext/Tuples/NetfxTupleDefinitions.cs @@ -1,26 +1,26 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -namespace WixToolset.Netfx.Tuples +namespace WixToolset.Netfx.Symbols { using WixToolset.Data; - public static class NetfxTupleDefinitionNames + public static class NetfxSymbolDefinitionNames { public static string NetFxNativeImage { get; } = "NetFxNativeImage"; } - public static class NetfxTupleDefinitions + public static class NetfxSymbolDefinitions { - public static readonly IntermediateTupleDefinition NetFxNativeImage = new IntermediateTupleDefinition( - NetfxTupleDefinitionNames.NetFxNativeImage, + public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition( + NetfxSymbolDefinitionNames.NetFxNativeImage, new[] { - new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.FileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.Priority), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.ApplicationFileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.FileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Priority), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationFileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String), }, - typeof(NetFxNativeImageTuple)); + typeof(NetFxNativeImageSymbol)); } } -- cgit v1.2.3-55-g6feb