Modernize tuple creation and update dependencies.

2 files changed, 7 insertions, 15 deletions

diff --git a/src/wixext/Tuples/FirewallTupleDefinitions.cs b/src/wixext/Tuples/FirewallTupleDefinitions.cs
index 79fc28cf..df595c18 100644
--- a/src/wixext/Tuples/FirewallTupleDefinitions.cs
+++ b/src/wixext/Tuples/FirewallTupleDefinitions.cs
@@ -15,7 +15,6 @@ namespace WixToolset.Firewall.Tuples
             FirewallTupleDefinitionNames.WixFirewallException,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.WixFirewallException), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.RemoteAddresses), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Port), IntermediateFieldType.String),
@@ -23,7 +22,7 @@ namespace WixToolset.Firewall.Tuples
                 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.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFirewallExceptionTupleFields.Description), IntermediateFieldType.String),
             },
             typeof(WixFirewallExceptionTuple));
diff --git a/src/wixext/Tuples/WixFirewallExceptionTuple.cs b/src/wixext/Tuples/WixFirewallExceptionTuple.cs
index 715a4b9b..3c7cda3a 100644
--- a/src/wixext/Tuples/WixFirewallExceptionTuple.cs
+++ b/src/wixext/Tuples/WixFirewallExceptionTuple.cs
@@ -6,7 +6,6 @@ namespace WixToolset.Firewall.Tuples
 
     public enum WixFirewallExceptionTupleFields
     {
-        WixFirewallException,
         Name,
         RemoteAddresses,
         Port,
@@ -14,7 +13,7 @@ namespace WixToolset.Firewall.Tuples
         Program,
         Attributes,
         Profile,
-        Component_,
+        ComponentRef,
         Description,
     }
 
@@ -30,12 +29,6 @@ namespace WixToolset.Firewall.Tuples
 
         public IntermediateField this[WixFirewallExceptionTupleFields index] => this.Fields[(int)index];
 
-        public string WixFirewallException
-        {
-            get => this.Fields[(int)WixFirewallExceptionTupleFields.WixFirewallException].AsString();
-            set => this.Set((int)WixFirewallExceptionTupleFields.WixFirewallException, value);
-        }
-
         public string Name
         {
             get => this.Fields[(int)WixFirewallExceptionTupleFields.Name].AsString();
@@ -54,9 +47,9 @@ namespace WixToolset.Firewall.Tuples
             set => this.Set((int)WixFirewallExceptionTupleFields.Port, value);
         }
 
-        public int Protocol
+        public int? Protocol
         {
-            get => this.Fields[(int)WixFirewallExceptionTupleFields.Protocol].AsNumber();
+            get => this.Fields[(int)WixFirewallExceptionTupleFields.Protocol].AsNullableNumber();
             set => this.Set((int)WixFirewallExceptionTupleFields.Protocol, value);
         }
 
@@ -78,10 +71,10 @@ namespace WixToolset.Firewall.Tuples
             set => this.Set((int)WixFirewallExceptionTupleFields.Profile, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => this.Fields[(int)WixFirewallExceptionTupleFields.Component_].AsString();
-            set => this.Set((int)WixFirewallExceptionTupleFields.Component_, value);
+            get => this.Fields[(int)WixFirewallExceptionTupleFields.ComponentRef].AsString();
+            set => this.Set((int)WixFirewallExceptionTupleFields.ComponentRef, value);
         }
 
         public string Description