From d6fe720a1d06030afecef83b9b4a7650b08c8dca Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:54:19 -0700 Subject: The Great Tuple to Symbol File Rename (tm) --- src/wixext/Symbols/NetFxNativeImageSymbol.cs | 58 ++++++++++++++++++++++++++++ src/wixext/Symbols/NetfxSymbolDefinitions.cs | 26 +++++++++++++ src/wixext/Tuples/NetFxNativeImageTuple.cs | 58 ---------------------------- src/wixext/Tuples/NetfxTupleDefinitions.cs | 26 ------------- 4 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 src/wixext/Symbols/NetFxNativeImageSymbol.cs create mode 100644 src/wixext/Symbols/NetfxSymbolDefinitions.cs delete mode 100644 src/wixext/Tuples/NetFxNativeImageTuple.cs delete mode 100644 src/wixext/Tuples/NetfxTupleDefinitions.cs (limited to 'src/wixext') diff --git a/src/wixext/Symbols/NetFxNativeImageSymbol.cs b/src/wixext/Symbols/NetFxNativeImageSymbol.cs new file mode 100644 index 00000000..3803abd6 --- /dev/null +++ b/src/wixext/Symbols/NetFxNativeImageSymbol.cs @@ -0,0 +1,58 @@ +// 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.Symbols +{ + using WixToolset.Data; + + public enum NetFxNativeImageSymbolFields + { + FileRef, + Priority, + Attributes, + ApplicationFileRef, + ApplicationBaseDirectoryRef, + } + + public class NetFxNativeImageSymbol : IntermediateSymbol + { + public NetFxNativeImageSymbol() : base(NetfxSymbolDefinitions.NetFxNativeImage, null, null) + { + } + + public NetFxNativeImageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNativeImage, sourceLineNumber, id) + { + } + + public IntermediateField this[NetFxNativeImageSymbolFields index] => this.Fields[(int)index]; + + public string FileRef + { + get => this.Fields[(int)NetFxNativeImageSymbolFields.FileRef].AsString(); + set => this.Set((int)NetFxNativeImageSymbolFields.FileRef, value); + } + + public int Priority + { + get => this.Fields[(int)NetFxNativeImageSymbolFields.Priority].AsNumber(); + set => this.Set((int)NetFxNativeImageSymbolFields.Priority, value); + } + + public int Attributes + { + get => this.Fields[(int)NetFxNativeImageSymbolFields.Attributes].AsNumber(); + set => this.Set((int)NetFxNativeImageSymbolFields.Attributes, value); + } + + public string ApplicationFileRef + { + get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationFileRef].AsString(); + set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationFileRef, value); + } + + public string ApplicationBaseDirectoryRef + { + 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/Symbols/NetfxSymbolDefinitions.cs b/src/wixext/Symbols/NetfxSymbolDefinitions.cs new file mode 100644 index 00000000..3c0f1176 --- /dev/null +++ b/src/wixext/Symbols/NetfxSymbolDefinitions.cs @@ -0,0 +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.Symbols +{ + using WixToolset.Data; + + public static class NetfxSymbolDefinitionNames + { + public static string NetFxNativeImage { get; } = "NetFxNativeImage"; + } + + public static class NetfxSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition( + NetfxSymbolDefinitionNames.NetFxNativeImage, + new[] + { + 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(NetFxNativeImageSymbol)); + } +} diff --git a/src/wixext/Tuples/NetFxNativeImageTuple.cs b/src/wixext/Tuples/NetFxNativeImageTuple.cs deleted file mode 100644 index 3803abd6..00000000 --- a/src/wixext/Tuples/NetFxNativeImageTuple.cs +++ /dev/null @@ -1,58 +0,0 @@ -// 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.Symbols -{ - using WixToolset.Data; - - public enum NetFxNativeImageSymbolFields - { - FileRef, - Priority, - Attributes, - ApplicationFileRef, - ApplicationBaseDirectoryRef, - } - - public class NetFxNativeImageSymbol : IntermediateSymbol - { - public NetFxNativeImageSymbol() : base(NetfxSymbolDefinitions.NetFxNativeImage, null, null) - { - } - - public NetFxNativeImageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNativeImage, sourceLineNumber, id) - { - } - - public IntermediateField this[NetFxNativeImageSymbolFields index] => this.Fields[(int)index]; - - public string FileRef - { - get => this.Fields[(int)NetFxNativeImageSymbolFields.FileRef].AsString(); - set => this.Set((int)NetFxNativeImageSymbolFields.FileRef, value); - } - - public int Priority - { - get => this.Fields[(int)NetFxNativeImageSymbolFields.Priority].AsNumber(); - set => this.Set((int)NetFxNativeImageSymbolFields.Priority, value); - } - - public int Attributes - { - get => this.Fields[(int)NetFxNativeImageSymbolFields.Attributes].AsNumber(); - set => this.Set((int)NetFxNativeImageSymbolFields.Attributes, value); - } - - public string ApplicationFileRef - { - get => this.Fields[(int)NetFxNativeImageSymbolFields.ApplicationFileRef].AsString(); - set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationFileRef, value); - } - - public string ApplicationBaseDirectoryRef - { - 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 deleted file mode 100644 index 3c0f1176..00000000 --- a/src/wixext/Tuples/NetfxTupleDefinitions.cs +++ /dev/null @@ -1,26 +0,0 @@ -// 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.Symbols -{ - using WixToolset.Data; - - public static class NetfxSymbolDefinitionNames - { - public static string NetFxNativeImage { get; } = "NetFxNativeImage"; - } - - public static class NetfxSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition( - NetfxSymbolDefinitionNames.NetFxNativeImage, - new[] - { - 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(NetFxNativeImageSymbol)); - } -} -- cgit v1.2.3-55-g6feb