From f456ade18faf212b6b48719c4801a8eecc55a890 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 27 Jun 2020 13:45:21 -0700
Subject: The Great Tuple to Symbol File Rename (tm)

---
 src/wixext/Symbols/FirewallSymbolDefinitions.cs  |  39 ++++++++
 src/wixext/Symbols/WixFirewallExceptionSymbol.cs | 119 +++++++++++++++++++++++
 src/wixext/Tuples/FirewallTupleDefinitions.cs    |  39 --------
 src/wixext/Tuples/WixFirewallExceptionTuple.cs   | 119 -----------------------
 4 files changed, 158 insertions(+), 158 deletions(-)
 create mode 100644 src/wixext/Symbols/FirewallSymbolDefinitions.cs
 create mode 100644 src/wixext/Symbols/WixFirewallExceptionSymbol.cs
 delete mode 100644 src/wixext/Tuples/FirewallTupleDefinitions.cs
 delete mode 100644 src/wixext/Tuples/WixFirewallExceptionTuple.cs

(limited to 'src')

diff --git a/src/wixext/Symbols/FirewallSymbolDefinitions.cs b/src/wixext/Symbols/FirewallSymbolDefinitions.cs
new file mode 100644
index 00000000..887893c7
--- /dev/null
+++ b/src/wixext/Symbols/FirewallSymbolDefinitions.cs
@@ -0,0 +1,39 @@
+// 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.Firewall
+{
+    using System;
+    using WixToolset.Data;
+
+    public enum FirewallSymbolDefinitionType
+    {
+        WixFirewallException,
+    }
+
+    public static partial class FirewallSymbolDefinitions
+    {
+        public static readonly Version Version = new Version("4.0.0");
+
+        public static IntermediateSymbolDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out FirewallSymbolDefinitionType type))
+            {
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateSymbolDefinition ByType(FirewallSymbolDefinitionType type)
+        {
+            switch (type)
+            {
+                case FirewallSymbolDefinitionType.WixFirewallException:
+                    return FirewallSymbolDefinitions.WixFirewallException;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+    }
+}
diff --git a/src/wixext/Symbols/WixFirewallExceptionSymbol.cs b/src/wixext/Symbols/WixFirewallExceptionSymbol.cs
new file mode 100644
index 00000000..620de969
--- /dev/null
+++ b/src/wixext/Symbols/WixFirewallExceptionSymbol.cs
@@ -0,0 +1,119 @@
+// 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.Firewall
+{
+    using WixToolset.Data;
+    using WixToolset.Firewall.Symbols;
+
+    public static partial class FirewallSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixFirewallException = new IntermediateSymbolDefinition(
+            FirewallSymbolDefinitionType.WixFirewallException.ToString(),
+            new[]
+            {
+                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(WixFirewallExceptionSymbol));
+    }
+}
+
+namespace WixToolset.Firewall.Symbols
+{
+    using WixToolset.Data;
+
+    public enum WixFirewallExceptionSymbolFields
+    {
+        Name,
+        RemoteAddresses,
+        Port,
+        Protocol,
+        Program,
+        Attributes,
+        Profile,
+        ComponentRef,
+        Description,
+        Direction,
+    }
+
+    public class WixFirewallExceptionSymbol : IntermediateSymbol
+    {
+        public WixFirewallExceptionSymbol() : base(FirewallSymbolDefinitions.WixFirewallException, null, null)
+        {
+        }
+
+        public WixFirewallExceptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(FirewallSymbolDefinitions.WixFirewallException, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFirewallExceptionSymbolFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Name].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Name, value);
+        }
+
+        public string RemoteAddresses
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.RemoteAddresses].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.RemoteAddresses, value);
+        }
+
+        public string Port
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Port].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Port, value);
+        }
+
+        public int? Protocol
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Protocol].AsNullableNumber();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Protocol, value);
+        }
+
+        public string Program
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Program].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Program, value);
+        }
+
+        public int Attributes
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Attributes, value);
+        }
+
+        public int Profile
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Profile].AsNumber();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Profile, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.ComponentRef, value);
+        }
+
+        public string Description
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Description].AsString();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Description, value);
+        }
+
+        public int Direction
+        {
+            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Direction].AsNumber();
+            set => this.Set((int)WixFirewallExceptionSymbolFields.Direction, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/FirewallTupleDefinitions.cs b/src/wixext/Tuples/FirewallTupleDefinitions.cs
deleted file mode 100644
index 887893c7..00000000
--- a/src/wixext/Tuples/FirewallTupleDefinitions.cs
+++ /dev/null
@@ -1,39 +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.Firewall
-{
-    using System;
-    using WixToolset.Data;
-
-    public enum FirewallSymbolDefinitionType
-    {
-        WixFirewallException,
-    }
-
-    public static partial class FirewallSymbolDefinitions
-    {
-        public static readonly Version Version = new Version("4.0.0");
-
-        public static IntermediateSymbolDefinition ByName(string name)
-        {
-            if (!Enum.TryParse(name, out FirewallSymbolDefinitionType type))
-            {
-                return null;
-            }
-
-            return ByType(type);
-        }
-
-        public static IntermediateSymbolDefinition ByType(FirewallSymbolDefinitionType type)
-        {
-            switch (type)
-            {
-                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
deleted file mode 100644
index 620de969..00000000
--- a/src/wixext/Tuples/WixFirewallExceptionTuple.cs
+++ /dev/null
@@ -1,119 +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.Firewall
-{
-    using WixToolset.Data;
-    using WixToolset.Firewall.Symbols;
-
-    public static partial class FirewallSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixFirewallException = new IntermediateSymbolDefinition(
-            FirewallSymbolDefinitionType.WixFirewallException.ToString(),
-            new[]
-            {
-                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(WixFirewallExceptionSymbol));
-    }
-}
-
-namespace WixToolset.Firewall.Symbols
-{
-    using WixToolset.Data;
-
-    public enum WixFirewallExceptionSymbolFields
-    {
-        Name,
-        RemoteAddresses,
-        Port,
-        Protocol,
-        Program,
-        Attributes,
-        Profile,
-        ComponentRef,
-        Description,
-        Direction,
-    }
-
-    public class WixFirewallExceptionSymbol : IntermediateSymbol
-    {
-        public WixFirewallExceptionSymbol() : base(FirewallSymbolDefinitions.WixFirewallException, null, null)
-        {
-        }
-
-        public WixFirewallExceptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(FirewallSymbolDefinitions.WixFirewallException, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixFirewallExceptionSymbolFields index] => this.Fields[(int)index];
-
-        public string Name
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Name].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Name, value);
-        }
-
-        public string RemoteAddresses
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.RemoteAddresses].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.RemoteAddresses, value);
-        }
-
-        public string Port
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Port].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Port, value);
-        }
-
-        public int? Protocol
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Protocol].AsNullableNumber();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Protocol, value);
-        }
-
-        public string Program
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Program].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Program, value);
-        }
-
-        public int Attributes
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Attributes].AsNumber();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Attributes, value);
-        }
-
-        public int Profile
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Profile].AsNumber();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Profile, value);
-        }
-
-        public string ComponentRef
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.ComponentRef].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.ComponentRef, value);
-        }
-
-        public string Description
-        {
-            get => this.Fields[(int)WixFirewallExceptionSymbolFields.Description].AsString();
-            set => this.Set((int)WixFirewallExceptionSymbolFields.Description, value);
-        }
-
-        public int Direction
-        {
-            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