Modernize HttpCompiler and tuples.

2 files changed, 10 insertions, 26 deletions

diff --git a/src/wixext/Tuples/WixHttpUrlAceTuple.cs b/src/wixext/Tuples/WixHttpUrlAceTuple.cs
index 3e0006a0..f605c217 100644
--- a/src/wixext/Tuples/WixHttpUrlAceTuple.cs
+++ b/src/wixext/Tuples/WixHttpUrlAceTuple.cs
@@ -11,8 +11,7 @@ namespace WixToolset.Http
             HttpTupleDefinitionType.WixHttpUrlAce.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.WixHttpUrlAce), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.WixHttpUrlReservation_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.WixHttpUrlReservationRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.SecurityPrincipal), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixHttpUrlAceTupleFields.Rights), IntermediateFieldType.Number),
             },
@@ -26,8 +25,7 @@ namespace WixToolset.Http.Tuples
 
     public enum WixHttpUrlAceTupleFields
     {
-        WixHttpUrlAce,
-        WixHttpUrlReservation_,
+        WixHttpUrlReservationRef,
         SecurityPrincipal,
         Rights,
     }
@@ -44,16 +42,10 @@ namespace WixToolset.Http.Tuples
 
         public IntermediateField this[WixHttpUrlAceTupleFields index] => this.Fields[(int)index];
 
-        public string WixHttpUrlAce
+        public string WixHttpUrlReservationRef
         {
-            get => this.Fields[(int)WixHttpUrlAceTupleFields.WixHttpUrlAce].AsString();
-            set => this.Set((int)WixHttpUrlAceTupleFields.WixHttpUrlAce, value);
-        }
-
-        public string WixHttpUrlReservation_
-        {
-            get => this.Fields[(int)WixHttpUrlAceTupleFields.WixHttpUrlReservation_].AsString();
-            set => this.Set((int)WixHttpUrlAceTupleFields.WixHttpUrlReservation_, value);
+            get => this.Fields[(int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef].AsString();
+            set => this.Set((int)WixHttpUrlAceTupleFields.WixHttpUrlReservationRef, value);
         }
 
         public string SecurityPrincipal
diff --git a/src/wixext/Tuples/WixHttpUrlReservationTuple.cs b/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
index 7a251f3d..d7dbb0a5 100644
--- a/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
+++ b/src/wixext/Tuples/WixHttpUrlReservationTuple.cs
@@ -11,11 +11,10 @@ namespace WixToolset.Http
             HttpTupleDefinitionType.WixHttpUrlReservation.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.WixHttpUrlReservation), IntermediateFieldType.String),
                 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.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixHttpUrlReservationTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(WixHttpUrlReservationTuple));
     }
@@ -27,11 +26,10 @@ namespace WixToolset.Http.Tuples
 
     public enum WixHttpUrlReservationTupleFields
     {
-        WixHttpUrlReservation,
         HandleExisting,
         Sddl,
         Url,
-        Component_,
+        ComponentRef,
     }
 
     public class WixHttpUrlReservationTuple : IntermediateTuple
@@ -46,12 +44,6 @@ namespace WixToolset.Http.Tuples
 
         public IntermediateField this[WixHttpUrlReservationTupleFields index] => this.Fields[(int)index];
 
-        public string WixHttpUrlReservation
-        {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.WixHttpUrlReservation].AsString();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.WixHttpUrlReservation, value);
-        }
-
         public int HandleExisting
         {
             get => this.Fields[(int)WixHttpUrlReservationTupleFields.HandleExisting].AsNumber();
@@ -70,10 +62,10 @@ namespace WixToolset.Http.Tuples
             set => this.Set((int)WixHttpUrlReservationTupleFields.Url, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => this.Fields[(int)WixHttpUrlReservationTupleFields.Component_].AsString();
-            set => this.Set((int)WixHttpUrlReservationTupleFields.Component_, value);
+            get => this.Fields[(int)WixHttpUrlReservationTupleFields.ComponentRef].AsString();
+            set => this.Set((int)WixHttpUrlReservationTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file