13 files changed, 85 insertions, 98 deletions

diff --git a/appveyor.yml b/appveyor.yml
index bbf880f0..7c686b04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,11 @@
 #  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
 #  then update all of the repos.
 
+branches:
+  only:
+    - master
+    - develop
+
 image: Visual Studio 2019
 
 version: 0.0.0.{build}
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 44a042c7..9b7a1bb5 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -70,12 +70,6 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
     <ClCompile>
       <Optimization>MinSpace</Optimization>
@@ -89,16 +83,4 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
-    <Link>
-      <KeyFile>$(LinkKeyFile)</KeyFile>
-      <DelaySign>$(LinkDelaySign)</DelaySign>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs b/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs
index 5aa3f866..685e7126 100644
--- a/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Iis/IisExtensionFixture.cs
@@ -20,7 +20,7 @@ namespace WixToolsetTest.Iis
             Assert.Equal(new[]
             {
                 "IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0",
-            }, results.OrderBy(s => s).ToArray());
+            }, results);
         }
 
         private static void Build(string[] args)
diff --git a/src/wixext/IisTableDefinitions.cs b/src/wixext/IisTableDefinitions.cs
index eebfd26a..6c887e96 100644
--- a/src/wixext/IisTableDefinitions.cs
+++ b/src/wixext/IisTableDefinitions.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Iis
     {
         public static readonly TableDefinition Certificate = new TableDefinition(
             "Certificate",
+            IisTupleDefinitions.Certificate,
             new[]
             {
                 new ColumnDefinition("Certificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Identifier for the certificate in the package.", modularizeType: ColumnModularizeType.Column),
@@ -20,34 +21,34 @@ namespace WixToolset.Iis
                 new ColumnDefinition("CertificatePath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Property to path of certificate.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("PFXPassword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Hidden property to a pfx password", modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: "Certificate",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition CertificateHash = new TableDefinition(
             "CertificateHash",
+            IisTupleDefinitions.CertificateHash,
             new[]
             {
                 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Foreign key to certificate in Certificate table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Hash", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Base64 encoded SHA1 hash of certificate populated at run-time."),
             },
-            tupleDefinitionName: "CertificateHash",
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition(
             "IIsWebSiteCertificates",
+            IisTupleDefinitions.IIsWebSiteCertificates,
             new[]
             {
                 new ColumnDefinition("Web_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebSite", keyColumn: 1, description: "The index into the IIsWebSite table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Certificate", keyColumn: 1, description: "The index into the Certificate table.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: "IIsWebSiteCertificates",
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsAppPool = new TableDefinition(
             "IIsAppPool",
+            IisTupleDefinitions.IIsAppPool,
             new[]
             {
                 new ColumnDefinition("AppPool", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for apppool", modularizeType: ColumnModularizeType.Column),
@@ -67,12 +68,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("ManagedRuntimeVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the .NET Framework version to be used by the application pool."),
                 new ColumnDefinition("ManagedPipelineMode", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the request-processing mode that is used to process requests for managed content."),
             },
-            tupleDefinitionName: "IIsAppPool",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsMimeMap = new TableDefinition(
             "IIsMimeMap",
+            IisTupleDefinitions.IIsMimeMap,
             new[]
             {
                 new ColumnDefinition("MimeMap", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Mime Map definitions", modularizeType: ColumnModularizeType.Column),
@@ -81,12 +82,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("MimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Mime-type covered by the MimeMap."),
                 new ColumnDefinition("Extension", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Extension covered by the MimeMap."),
             },
-            tupleDefinitionName: "IIsMimeMap",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsProperty = new TableDefinition(
             "IIsProperty",
+            IisTupleDefinitions.IIsProperty,
             new[]
             {
                 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique name of the IIsProperty"),
@@ -94,12 +95,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attributes of the IIsProperty (unused)"),
                 new ColumnDefinition("Value", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Value of the IIsProperty"),
             },
-            tupleDefinitionName: "IIsProperty",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebDirProperties = new TableDefinition(
             "IIsWebDirProperties",
+            IisTupleDefinitions.IIsWebDirProperties,
             new[]
             {
                 new ColumnDefinition("DirProperties", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Web Properties", modularizeType: ColumnModularizeType.Column),
@@ -118,12 +119,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("AccessSSLFlags", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies AccessSSLFlags IIS metabase property."),
                 new ColumnDefinition("AuthenticationProviders", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Comma delimited list, in order of precedence, of Windows authentication providers that IIS will attempt to use: NTLM, Kerberos, Negotiate, and others."),
             },
-            tupleDefinitionName: "IIsWebDirProperties",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebAddress = new TableDefinition(
             "IIsWebAddress",
+            IisTupleDefinitions.IIsWebAddress,
             new[]
             {
                 new ColumnDefinition("Address", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -133,12 +134,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Header", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Special header information for the web site"),
                 new ColumnDefinition("Secure", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether SSL is used to communicate with web site"),
             },
-            tupleDefinitionName: "IIsWebAddress",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebSite = new TableDefinition(
             "IIsWebSite",
+            IisTupleDefinitions.IIsWebSite,
             new[]
             {
                 new ColumnDefinition("Web", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -155,12 +156,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Log_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, keyTable: "IIsWebLog", keyColumn: 1, description: "Foreign key reference to IIsWebLog data", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Id", ColumnType.String, 74, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional number or formatted value that resolves to number that acts as the WebSite Id."),
             },
-            tupleDefinitionName: "IIsWebSite",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebApplication = new TableDefinition(
             "IIsWebApplication",
+            IisTupleDefinitions.IIsWebApplication,
             new[]
             {
                 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for ASP Application", modularizeType: ColumnModularizeType.Column),
@@ -176,12 +177,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("ClientDebugging", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether to allow ASP client-side script debugging"),
                 new ColumnDefinition("AppPool_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsAppPool", keyColumn: 1, description: "App Pool this application should run under", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: "IIsWebApplication",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition(
             "IIsWebApplicationExtension",
+            IisTupleDefinitions.IIsWebApplicationExtension,
             new[]
             {
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the web site", modularizeType: ColumnModularizeType.Column),
@@ -190,12 +191,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Executable", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Path to extension (usually file property: [#file])", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "1;4;5", description: "Attributes for extension: 1 == Script, 4 == Check Path Info"),
             },
-            tupleDefinitionName: "IIsWebApplicationExtension",
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsFilter = new TableDefinition(
             "IIsFilter",
+            IisTupleDefinitions.IIsFilter,
             new[]
             {
                 new ColumnDefinition("Filter", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -207,12 +208,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "What do all these numbers mean?"),
                 new ColumnDefinition("LoadOrder", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "-1 == last in order, 0 == first in order, # == place in order"),
             },
-            tupleDefinitionName: "IIsFilter",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebDir = new TableDefinition(
             "IIsWebDir",
+            IisTupleDefinitions.IIsWebDir,
             new[]
             {
                 new ColumnDefinition("WebDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -222,12 +223,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory. This column is currently unused, but maintained for compatibility reasons.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: "IIsWebDir",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebError = new TableDefinition(
             "IIsWebError",
+            IisTupleDefinitions.IIsWebError,
             new[]
             {
                 new ColumnDefinition("ErrorCode", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 400, maxValue: 599, description: "HTTP status code indicating error."),
@@ -237,12 +238,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("File", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Path to file for this custom error (usually file property: [#file]).  Must be null if URL is not null."),
                 new ColumnDefinition("URL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "URL for this custom error.  Must be null if File is not null."),
             },
-            tupleDefinitionName: "IIsWebError",
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsHttpHeader = new TableDefinition(
             "IIsHttpHeader",
+            IisTupleDefinitions.IIsHttpHeader,
             new[]
             {
                 new ColumnDefinition("HttpHeader", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -253,12 +254,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 0, description: "Attributes for HTTP Header: none"),
                 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to add the HTTP Headers."),
             },
-            tupleDefinitionName: "IIsHttpHeader",
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition(
             "IIsWebServiceExtension",
+            IisTupleDefinitions.IIsWebServiceExtension,
             new[]
             {
                 new ColumnDefinition("WebServiceExtension", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -268,12 +269,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Group", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "String used to identify groups of extensions.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Attributes for WebServiceExtension: 1 = Allow, 2 = UIDeletable"),
             },
-            tupleDefinitionName: "IIsWebServiceExtension",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition(
             "IIsWebVirtualDir",
+            IisTupleDefinitions.IIsWebVirtualDir,
             new[]
             {
                 new ColumnDefinition("VirtualDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -284,18 +285,17 @@ namespace WixToolset.Iis
                 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: "IIsWebVirtualDir",
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebLog = new TableDefinition(
             "IIsWebLog",
+            IisTupleDefinitions.IIsWebLog,
             new[]
             {
                 new ColumnDefinition("Log", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Format", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Type of log format"),
             },
-            tupleDefinitionName: "IIsWebLog",
             tupleIdIsPrimaryKey: true
         );
 
diff --git a/src/wixext/Tuples/IIsAppPoolTuple.cs b/src/wixext/Tuples/IIsAppPoolTuple.cs
index d14ec7ad..ee8dca51 100644
--- a/src/wixext/Tuples/IIsAppPoolTuple.cs
+++ b/src/wixext/Tuples/IIsAppPoolTuple.cs
@@ -90,15 +90,15 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsAppPoolTupleFields.UserRef, value);
         }
 
-        public int RecycleMinutes
+        public int? RecycleMinutes
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.RecycleMinutes, value);
         }
 
-        public int RecycleRequests
+        public int? RecycleRequests
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.RecycleRequests, value);
         }
 
@@ -108,15 +108,15 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsAppPoolTupleFields.RecycleTimes, value);
         }
 
-        public int IdleTimeout
+        public int? IdleTimeout
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.IdleTimeout, value);
         }
 
-        public int QueueLimit
+        public int? QueueLimit
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.QueueLimit, value);
         }
 
@@ -126,21 +126,21 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsAppPoolTupleFields.CPUMon, value);
         }
 
-        public int MaxProc
+        public int? MaxProc
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.MaxProc, value);
         }
 
-        public int VirtualMemory
+        public int? VirtualMemory
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.VirtualMemory, value);
         }
 
-        public int PrivateMemory
+        public int? PrivateMemory
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNumber();
+            get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNullableNumber();
             set => this.Set((int)IIsAppPoolTupleFields.PrivateMemory, value);
         }
 
diff --git a/src/wixext/Tuples/IIsFilterTuple.cs b/src/wixext/Tuples/IIsFilterTuple.cs
index 5dda8878..e681a235 100644
--- a/src/wixext/Tuples/IIsFilterTuple.cs
+++ b/src/wixext/Tuples/IIsFilterTuple.cs
@@ -86,9 +86,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsFilterTupleFields.Flags, value);
         }
 
-        public int LoadOrder
+        public int? LoadOrder
         {
-            get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNumber();
+            get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNullableNumber();
             set => this.Set((int)IIsFilterTupleFields.LoadOrder, value);
         }
     }
diff --git a/src/wixext/Tuples/IIsHttpHeaderTuple.cs b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
index 3d0e029c..43ebbe16 100644
--- a/src/wixext/Tuples/IIsHttpHeaderTuple.cs
+++ b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
@@ -86,9 +86,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsHttpHeaderTupleFields.Attributes, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)IIsHttpHeaderTupleFields.Sequence, value);
         }
     }
diff --git a/src/wixext/Tuples/IIsWebAddressTuple.cs b/src/wixext/Tuples/IIsWebAddressTuple.cs
index 603f62cb..b6e61ccc 100644
--- a/src/wixext/Tuples/IIsWebAddressTuple.cs
+++ b/src/wixext/Tuples/IIsWebAddressTuple.cs
@@ -70,9 +70,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebAddressTupleFields.Header, value);
         }
 
-        public int Secure
+        public int? Secure
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNumber();
+            get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNullableNumber();
             set => this.Set((int)IIsWebAddressTupleFields.Secure, value);
         }
     }
diff --git a/src/wixext/Tuples/IIsWebApplicationTuple.cs b/src/wixext/Tuples/IIsWebApplicationTuple.cs
index 6af3a2f7..31ea955e 100644
--- a/src/wixext/Tuples/IIsWebApplicationTuple.cs
+++ b/src/wixext/Tuples/IIsWebApplicationTuple.cs
@@ -70,27 +70,27 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebApplicationTupleFields.Isolation, value);
         }
 
-        public int AllowSessions
+        public int? AllowSessions
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.AllowSessions, value);
         }
 
-        public int SessionTimeout
+        public int? SessionTimeout
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.SessionTimeout, value);
         }
 
-        public int Buffer
+        public int? Buffer
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.Buffer, value);
         }
 
-        public int ParentPaths
+        public int? ParentPaths
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.ParentPaths, value);
         }
 
@@ -100,21 +100,21 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebApplicationTupleFields.DefaultScript, value);
         }
 
-        public int ScriptTimeout
+        public int? ScriptTimeout
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.ScriptTimeout, value);
         }
 
-        public int ServerDebugging
+        public int? ServerDebugging
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.ServerDebugging, value);
         }
 
-        public int ClientDebugging
+        public int? ClientDebugging
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNumber();
+            get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNullableNumber();
             set => this.Set((int)IIsWebApplicationTupleFields.ClientDebugging, value);
         }
 
diff --git a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
index 1c7cd8bf..48e2c932 100644
--- a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
+++ b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
@@ -64,15 +64,15 @@ namespace WixToolset.Iis.Tuples
 
         public IntermediateField this[IIsWebDirPropertiesTupleFields index] => this.Fields[(int)index];
 
-        public int Access
+        public int? Access
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.Access, value);
         }
 
-        public int Authorization
+        public int? Authorization
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.Authorization, value);
         }
 
@@ -82,21 +82,21 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebDirPropertiesTupleFields.AnonymousUserRef, value);
         }
 
-        public int IIsControlledPassword
+        public int? IIsControlledPassword
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.IIsControlledPassword, value);
         }
 
-        public int LogVisits
+        public int? LogVisits
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.LogVisits, value);
         }
 
-        public int Index
+        public int? Index
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.Index, value);
         }
 
@@ -106,9 +106,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebDirPropertiesTupleFields.DefaultDoc, value);
         }
 
-        public int AspDetailedError
+        public int? AspDetailedError
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.AspDetailedError, value);
         }
 
@@ -118,9 +118,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebDirPropertiesTupleFields.HttpExpires, value);
         }
 
-        public int CacheControlMaxAge
+        public int? CacheControlMaxAge
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge, value);
         }
 
@@ -130,15 +130,15 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlCustom, value);
         }
 
-        public int NoCustomError
+        public int? NoCustomError
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.NoCustomError, value);
         }
 
-        public int AccessSSLFlags
+        public int? AccessSSLFlags
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNumber();
+            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNullableNumber();
             set => this.Set((int)IIsWebDirPropertiesTupleFields.AccessSSLFlags, value);
         }
 
diff --git a/src/wixext/Tuples/IIsWebSiteTuple.cs b/src/wixext/Tuples/IIsWebSiteTuple.cs
index 610f1c59..1cce69fb 100644
--- a/src/wixext/Tuples/IIsWebSiteTuple.cs
+++ b/src/wixext/Tuples/IIsWebSiteTuple.cs
@@ -72,9 +72,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebSiteTupleFields.Description, value);
         }
 
-        public int ConnectionTimeout
+        public int? ConnectionTimeout
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNumber();
+            get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNullableNumber();
             set => this.Set((int)IIsWebSiteTupleFields.ConnectionTimeout, value);
         }
 
@@ -84,9 +84,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebSiteTupleFields.DirectoryRef, value);
         }
 
-        public int State
+        public int? State
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNumber();
+            get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNullableNumber();
             set => this.Set((int)IIsWebSiteTupleFields.State, value);
         }
 
@@ -114,9 +114,9 @@ namespace WixToolset.Iis.Tuples
             set => this.Set((int)IIsWebSiteTupleFields.ApplicationRef, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)IIsWebSiteTupleFields.Sequence, value);
         }
 
diff --git a/src/wixlib/iis.wixproj b/src/wixlib/iis.wixproj
index 79403583..f3adff1c 100644
--- a/src/wixlib/iis.wixproj
+++ b/src/wixlib/iis.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}</ProjectGuid>
@@ -38,7 +38,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
   </Target>
   <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index d73f4d3a..1e5a9850 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0083" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
 </packages>
\ No newline at end of file