From 96e0350bc4fc4ca5a7ae61145599f90b7fbf8d9b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 13:44:44 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/wixext/FirewallCompiler.cs | 16 ++--- src/wixext/FirewallExtensionData.cs | 10 ++-- src/wixext/FirewallTableDefinitions.cs | 4 +- src/wixext/Tuples/FirewallTupleDefinitions.cs | 14 ++--- src/wixext/Tuples/WixFirewallExceptionTuple.cs | 82 +++++++++++++------------- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/wixext/FirewallCompiler.cs b/src/wixext/FirewallCompiler.cs index 900af7aa..aefc7f2c 100644 --- a/src/wixext/FirewallCompiler.cs +++ b/src/wixext/FirewallCompiler.cs @@ -8,7 +8,7 @@ namespace WixToolset.Firewall using WixToolset.Data; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; - using WixToolset.Firewall.Tuples; + using WixToolset.Firewall.Symbols; /// /// The compiler for the WiX Toolset Firewall Extension. @@ -259,7 +259,7 @@ namespace WixToolset.Firewall fileId = file; } - var tuple = section.AddTuple(new WixFirewallExceptionTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new WixFirewallExceptionSymbol(sourceLineNumbers, id) { Name = name, RemoteAddresses = remoteAddresses, @@ -271,7 +271,7 @@ namespace WixToolset.Firewall if (!String.IsNullOrEmpty(port)) { - tuple.Port = port; + symbol.Port = port; if (!protocol.HasValue) { @@ -282,22 +282,22 @@ namespace WixToolset.Firewall if (protocol.HasValue) { - tuple.Protocol = protocol.Value; + symbol.Protocol = protocol.Value; } if (!String.IsNullOrEmpty(fileId)) { - tuple.Program = $"[#{fileId}]"; - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, fileId); + symbol.Program = $"[#{fileId}]"; + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, fileId); } else if (!String.IsNullOrEmpty(program)) { - tuple.Program = program; + symbol.Program = program; } if (CompilerConstants.IntegerNotSet != attributes) { - tuple.Attributes = attributes; + symbol.Attributes = attributes; } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); diff --git a/src/wixext/FirewallExtensionData.cs b/src/wixext/FirewallExtensionData.cs index 44cae0d6..7481d993 100644 --- a/src/wixext/FirewallExtensionData.cs +++ b/src/wixext/FirewallExtensionData.cs @@ -9,15 +9,15 @@ namespace WixToolset.Firewall { 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 = FirewallTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = FirewallSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(FirewallExtensionData).Assembly, "WixToolset.Firewall.firewall.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(FirewallExtensionData).Assembly, "WixToolset.Firewall.firewall.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/FirewallTableDefinitions.cs b/src/wixext/FirewallTableDefinitions.cs index 068fe696..eae897d5 100644 --- a/src/wixext/FirewallTableDefinitions.cs +++ b/src/wixext/FirewallTableDefinitions.cs @@ -8,7 +8,7 @@ namespace WixToolset.Firewall { public static readonly TableDefinition WixFirewallException = new TableDefinition( "WixFirewallException", - FirewallTupleDefinitions.WixFirewallException, + FirewallSymbolDefinitions.WixFirewallException, new[] { new ColumnDefinition("WixFirewallException", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -23,7 +23,7 @@ namespace WixToolset.Firewall new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Description displayed in Windows Firewall manager for this firewall rule."), new ColumnDefinition("Direction", ColumnType.Number, 1, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 1, maxValue: 2, description: "Direction (1=in; 2=out)"), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition[] All = new[] diff --git a/src/wixext/Tuples/FirewallTupleDefinitions.cs b/src/wixext/Tuples/FirewallTupleDefinitions.cs index 2710380e..887893c7 100644 --- a/src/wixext/Tuples/FirewallTupleDefinitions.cs +++ b/src/wixext/Tuples/FirewallTupleDefinitions.cs @@ -5,18 +5,18 @@ namespace WixToolset.Firewall using System; using WixToolset.Data; - public enum FirewallTupleDefinitionType + public enum FirewallSymbolDefinitionType { WixFirewallException, } - public static partial class FirewallTupleDefinitions + public static partial class FirewallSymbolDefinitions { 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 FirewallTupleDefinitionType type)) + if (!Enum.TryParse(name, out FirewallSymbolDefinitionType type)) { return null; } @@ -24,12 +24,12 @@ namespace WixToolset.Firewall return ByType(type); } - public static IntermediateTupleDefinition ByType(FirewallTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(FirewallSymbolDefinitionType type) { switch (type) { - case FirewallTupleDefinitionType.WixFirewallException: - return FirewallTupleDefinitions.WixFirewallException; + case FirewallSymbolDefinitionType.WixFirewallException: + return FirewallSymbolDefinitions.WixFirewallException; default: throw new ArgumentOutOfRangeException(nameof(type)); diff --git a/src/wixext/Tuples/WixFirewallExceptionTuple.cs b/src/wixext/Tuples/WixFirewallExceptionTuple.cs index d34b8207..620de969 100644 --- a/src/wixext/Tuples/WixFirewallExceptionTuple.cs +++ b/src/wixext/Tuples/WixFirewallExceptionTuple.cs @@ -3,34 +3,34 @@ namespace WixToolset.Firewall { using WixToolset.Data; - using WixToolset.Firewall.Tuples; + using WixToolset.Firewall.Symbols; - public static partial class FirewallTupleDefinitions + public static partial class FirewallSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixFirewallException = new IntermediateTupleDefinition( - FirewallTupleDefinitionType.WixFirewallException.ToString(), + public static readonly IntermediateSymbolDefinition WixFirewallException = new IntermediateSymbolDefinition( + FirewallSymbolDefinitionType.WixFirewallException.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.RemoteAddresses), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Port), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Protocol), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Program), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Profile), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Direction), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.RemoteAddresses), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Port), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Protocol), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Program), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Profile), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFirewallExceptionSymbolFields.Direction), IntermediateFieldType.Number), }, - typeof(WixFirewallExceptionTuple)); + typeof(WixFirewallExceptionSymbol)); } } -namespace WixToolset.Firewall.Tuples +namespace WixToolset.Firewall.Symbols { using WixToolset.Data; - public enum WixFirewallExceptionTupleFields + public enum WixFirewallExceptionSymbolFields { Name, RemoteAddresses, @@ -44,76 +44,76 @@ namespace WixToolset.Firewall.Tuples Direction, } - public class WixFirewallExceptionTuple : IntermediateTuple + public class WixFirewallExceptionSymbol : IntermediateSymbol { - public WixFirewallExceptionTuple() : base(FirewallTupleDefinitions.WixFirewallException, null, null) + public WixFirewallExceptionSymbol() : base(FirewallSymbolDefinitions.WixFirewallException, null, null) { } - public WixFirewallExceptionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(FirewallTupleDefinitions.WixFirewallException, sourceLineNumber, id) + public WixFirewallExceptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(FirewallSymbolDefinitions.WixFirewallException, sourceLineNumber, id) { } - public IntermediateField this[WixFirewallExceptionTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixFirewallExceptionSymbolFields index] => this.Fields[(int)index]; public string Name { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Name].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.Name, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Name].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Name, value); } public string RemoteAddresses { - get => this.Fields[(int)WixFirewallExceptionTupleFields.RemoteAddresses].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.RemoteAddresses, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.RemoteAddresses].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.RemoteAddresses, value); } public string Port { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Port].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.Port, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Port].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Port, value); } public int? Protocol { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Protocol].AsNullableNumber(); - set => this.Set((int)WixFirewallExceptionTupleFields.Protocol, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Protocol].AsNullableNumber(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Protocol, value); } public string Program { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Program].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.Program, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Program].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Program, value); } public int Attributes { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixFirewallExceptionTupleFields.Attributes, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Attributes, value); } public int Profile { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Profile].AsNumber(); - set => this.Set((int)WixFirewallExceptionTupleFields.Profile, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Profile].AsNumber(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Profile, value); } public string ComponentRef { - get => this.Fields[(int)WixFirewallExceptionTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.ComponentRef, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.ComponentRef, value); } public string Description { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Description].AsString(); - set => this.Set((int)WixFirewallExceptionTupleFields.Description, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Description].AsString(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Description, value); } public int Direction { - get => this.Fields[(int)WixFirewallExceptionTupleFields.Direction].AsNumber(); - set => this.Set((int)WixFirewallExceptionTupleFields.Direction, value); + get => this.Fields[(int)WixFirewallExceptionSymbolFields.Direction].AsNumber(); + set => this.Set((int)WixFirewallExceptionSymbolFields.Direction, value); } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb