The Great Tuple to Symbol Rename (tm)

6 files changed, 69 insertions, 69 deletions

diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index e47990db..bc64add2 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Http
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Http.Tuples;
+    using WixToolset.Http.Symbols;
 
     /// <summary>
     /// The compiler for the WiX Toolset Http Extension.
@@ -169,7 +169,7 @@ namespace WixToolset.Http
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new WixHttpUrlReservationTuple(sourceLineNumbers, id)
+                section.AddSymbol(new WixHttpUrlReservationSymbol(sourceLineNumbers, id)
                 {
                     HandleExisting = handleExisting,
                     Sddl = sddl,
@@ -180,14 +180,14 @@ namespace WixToolset.Http
                 if (this.Context.Platform == Platform.ARM)
                 {
                     // Ensure ARM version of the CA is referenced.
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
                 }
                 else
                 {
                     // All other supported platforms use x86.
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
                 }
             }
         }
@@ -205,7 +205,7 @@ namespace WixToolset.Http
             var securityPrincipal = defaultSecurityPrincipal;
             var rights = HttpConstants.GENERIC_ALL;
             string rightsValue = null;
-            
+
             foreach (var attrib in node.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -263,7 +263,7 @@ namespace WixToolset.Http
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new WixHttpUrlAceTuple(sourceLineNumbers, id)
+                section.AddSymbol(new WixHttpUrlAceSymbol(sourceLineNumbers, id)
                 {
                     WixHttpUrlReservationRef = urlReservationId,
                     SecurityPrincipal = securityPrincipal,
diff --git a/src/wixext/HttpExtensionData.cs b/src/wixext/HttpExtensionData.cs
index 2ae4a911..04e3dcee 100644
--- a/src/wixext/HttpExtensionData.cs
+++ b/src/wixext/HttpExtensionData.cs
@@ -16,15 +16,15 @@ namespace WixToolset.Http
         /// <value>The default culture.</value>
         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 = HttpTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = HttpSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
 
-        public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(HttpExtensionData).Assembly, "WixToolset.Http.http.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(HttpExtensionData).Assembly, "WixToolset.Http.http.wixlib", symbolDefinitions);
         }
     }
 }
diff --git a/src/wixext/HttpTableDefinitions.cs b/src/wixext/HttpTableDefinitions.cs
index 2ec26b63..0665ce8d 100644
--- a/src/wixext/HttpTableDefinitions.cs
+++ b/src/wixext/HttpTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Http
     {
         public static readonly TableDefinition WixHttpUrlReservation = new TableDefinition(
             "WixHttpUrlReservation",
-            HttpTupleDefinitions.WixHttpUrlReservation,
+            HttpSymbolDefinitions.WixHttpUrlReservation,
             new[]
             {
                 new ColumnDefinition("WixHttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -17,12 +17,12 @@ namespace WixToolset.Http
                 new ColumnDefinition("Url", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "URL to be reserved.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing the component that controls the URL reservation.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition WixHttpUrlAce = new TableDefinition(
             "WixHttpUrlAce",
-            HttpTupleDefinitions.WixHttpUrlAce,
+            HttpSymbolDefinitions.WixHttpUrlAce,
             new[]
             {
                 new ColumnDefinition("WixHttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -30,7 +30,7 @@ namespace WixToolset.Http
                 new ColumnDefinition("SecurityPrincipal", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The security principal for this ACE.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Rights", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1073741824, description: "The rights for this ACE."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition[] All = new[]
diff --git a/src/wixext/Tuples/HttpTupleDefinitions.cs b/src/wixext/Tuples/HttpTupleDefinitions.cs
index 11305d2a..a6deb307 100644
--- a/src/wixext/Tuples/HttpTupleDefinitions.cs
+++ b/src/wixext/Tuples/HttpTupleDefinitions.cs
@@ -5,19 +5,19 @@ namespace WixToolset.Http
     using System;
     using WixToolset.Data;
 
-    public enum HttpTupleDefinitionType
+    public enum HttpSymbolDefinitionType
     {
         WixHttpUrlAce,
         WixHttpUrlReservation,
     }
 
-    public static partial class HttpTupleDefinitions
+    public static partial class HttpSymbolDefinitions
     {
         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 HttpTupleDefinitionType type))
+            if (!Enum.TryParse(name, out HttpSymbolDefinitionType type))
             {
                 return null;
             }
@@ -25,15 +25,15 @@ namespace WixToolset.Http
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(HttpTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(HttpSymbolDefinitionType type)
         {
             switch (type)
             {
-                case HttpTupleDefinitionType.WixHttpUrlAce:
-                    return HttpTupleDefinitions.WixHttpUrlAce;
+                case HttpSymbolDefinitionType.WixHttpUrlAce:
+                    return HttpSymbolDefinitions.WixHttpUrlAce;
 
-                case HttpTupleDefinitionType.WixHttpUrlReservation:
-                    return HttpTupleDefinitions.WixHttpUrlReservation;
+                case HttpSymbolDefinitionType.WixHttpUrlReservation:
+                    return HttpSymbolDefinitions.WixHttpUrlReservation;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/wixext/Tuples/WixHttpUrlAceTuple.cs b/src/wixext/Tuples/WixHttpUrlAceTuple.cs
index f605c217..1d57bd52 100644
--- a/src/wixext/Tuples/WixHttpUrlAceTuple.cs
+++ b/src/wixext/Tuples/WixHttpUrlAceTuple.cs
@@ -3,61 +3,61 @@
 namespace WixToolset.Http
 {
     using WixToolset.Data;
-    using WixToolset.Http.Tuples;
+    using WixToolset.Http.Symbols;
 
-    public static partial class HttpTupleDefinitions
+    public static partial class HttpSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixHttpUrlAce = new IntermediateTupleDefinition(
-            HttpTupleDefinitionType.WixHttpUrlAce.ToString(),
+        public static readonly IntermediateSymbolDefinition WixHttpUrlAce = new IntermediateSymbolDefinition(
+            HttpSymbolDefinitionType.WixHttpUrlAce.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.WixHttpUrlReservationRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.SecurityPrincipal), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.Rights), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.SecurityPrincipal), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlAceSymbolFields.Rights), IntermediateFieldType.Number),
             },
-            typeof(WixHttpUrlAceTuple));
+            typeof(WixHttpUrlAceSymbol));
     }
 }
 
-namespace WixToolset.Http.Tuples
+namespace WixToolset.Http.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixHttpUrlAceTupleFields
+    public enum WixHttpUrlAceSymbolFields
     {
         WixHttpUrlReservationRef,
         SecurityPrincipal,
         Rights,
     }
 
-    public class WixHttpUrlAceTuple : IntermediateTuple
+    public class WixHttpUrlAceSymbol : IntermediateSymbol
     {
-        public WixHttpUrlAceTuple() : base(HttpTupleDefinitions.WixHttpUrlAce, null, null)
+        public WixHttpUrlAceSymbol() : base(HttpSymbolDefinitions.WixHttpUrlAce, null, null)
         {
         }
 
-        public WixHttpUrlAceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpTupleDefinitions.WixHttpUrlAce, sourceLineNumber, id)
+        public WixHttpUrlAceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.WixHttpUrlAce, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixHttpUrlAceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixHttpUrlAceSymbolFields index] => this.Fields[(int)index];
 
         public string WixHttpUrlReservationRef
         {
-            get => this.Fields[(int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef].AsString();
-            set => this.Set((int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef, value);
+            get => this.Fields[(int)WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef].AsString();
+            set => this.Set((int)WixHttpUrlAceSymbolFields.WixHttpUrlReservationRef, value);
         }
 
         public string SecurityPrincipal
         {
-            get => this.Fields[(int)WixHttpUrlAceTupleFields.SecurityPrincipal].AsString();
-            set => this.Set((int)WixHttpUrlAceTupleFields.SecurityPrincipal, value);
+            get => this.Fields[(int)WixHttpUrlAceSymbolFields.SecurityPrincipal].AsString();
+            set => this.Set((int)WixHttpUrlAceSymbolFields.SecurityPrincipal, value);
         }
 
         public int Rights
         {
-            get => this.Fields[(int)WixHttpUrlAceTupleFields.Rights].AsNumber();
-            set => this.Set((int)WixHttpUrlAceTupleFields.Rights, value);
+            get => this.Fields[(int)WixHttpUrlAceSymbolFields.Rights].AsNumber();
+            set => this.Set((int)WixHttpUrlAceSymbolFields.Rights, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixHttpUrlReservationTuple.cs b/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
index d7dbb0a5..4bdc2fee 100644
--- a/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
+++ b/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
@@ -3,28 +3,28 @@
 namespace WixToolset.Http
 {
     using WixToolset.Data;
-    using WixToolset.Http.Tuples;
+    using WixToolset.Http.Symbols;
 
-    public static partial class HttpTupleDefinitions
+    public static partial class HttpSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixHttpUrlReservation = new IntermediateTupleDefinition(
-            HttpTupleDefinitionType.WixHttpUrlReservation.ToString(),
+        public static readonly IntermediateSymbolDefinition WixHttpUrlReservation = new IntermediateSymbolDefinition(
+            HttpSymbolDefinitionType.WixHttpUrlReservation.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.HandleExisting), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.Sddl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.Url), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.HandleExisting), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.Sddl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.Url), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(WixHttpUrlReservationTuple));
+            typeof(WixHttpUrlReservationSymbol));
     }
 }
 
-namespace WixToolset.Http.Tuples
+namespace WixToolset.Http.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixHttpUrlReservationTupleFields
+    public enum WixHttpUrlReservationSymbolFields
     {
         HandleExisting,
         Sddl,
@@ -32,40 +32,40 @@ namespace WixToolset.Http.Tuples
         ComponentRef,
     }
 
-    public class WixHttpUrlReservationTuple : IntermediateTuple
+    public class WixHttpUrlReservationSymbol : IntermediateSymbol
     {
-        public WixHttpUrlReservationTuple() : base(HttpTupleDefinitions.WixHttpUrlReservation, null, null)
+        public WixHttpUrlReservationSymbol() : base(HttpSymbolDefinitions.WixHttpUrlReservation, null, null)
         {
         }
 
-        public WixHttpUrlReservationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpTupleDefinitions.WixHttpUrlReservation, sourceLineNumber, id)
+        public WixHttpUrlReservationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.WixHttpUrlReservation, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixHttpUrlReservationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixHttpUrlReservationSymbolFields index] => this.Fields[(int)index];
 
         public int HandleExisting
         {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.HandleExisting].AsNumber();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.HandleExisting, value);
+            get => this.Fields[(int)WixHttpUrlReservationSymbolFields.HandleExisting].AsNumber();
+            set => this.Set((int)WixHttpUrlReservationSymbolFields.HandleExisting, value);
         }
 
         public string Sddl
         {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.Sddl].AsString();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.Sddl, value);
+            get => this.Fields[(int)WixHttpUrlReservationSymbolFields.Sddl].AsString();
+            set => this.Set((int)WixHttpUrlReservationSymbolFields.Sddl, value);
         }
 
         public string Url
         {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.Url].AsString();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.Url, value);
+            get => this.Fields[(int)WixHttpUrlReservationSymbolFields.Url].AsString();
+            set => this.Set((int)WixHttpUrlReservationSymbolFields.Url, value);
         }
 
         public string ComponentRef
         {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.ComponentRef].AsString();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.ComponentRef, value);
+            get => this.Fields[(int)WixHttpUrlReservationSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)WixHttpUrlReservationSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file