10 files changed, 40 insertions, 58 deletions

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/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs
index dd658be1..3602a5ea 100644
--- a/src/wixext/Tuples/SecureObjectsTuple.cs
+++ b/src/wixext/Tuples/SecureObjectsTuple.cs
@@ -72,9 +72,9 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)SecureObjectsTupleFields.User, value);
         }
 
-        public int Permission
+        public int? Permission
         {
-            get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNumber();
+            get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber();
             set => this.Set((int)SecureObjectsTupleFields.Permission, value);
         }
 
diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs
index e5fc3992..714396bc 100644
--- a/src/wixext/Tuples/ServiceConfigTuple.cs
+++ b/src/wixext/Tuples/ServiceConfigTuple.cs
@@ -92,15 +92,15 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value);
         }
 
-        public int ResetPeriodInDays
+        public int? ResetPeriodInDays
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNumber();
+            get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber();
             set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value);
         }
 
-        public int RestartServiceDelayInSeconds
+        public int? RestartServiceDelayInSeconds
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNumber();
+            get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber();
             set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value);
         }
 
diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs
index cc91c326..2deebbae 100644
--- a/src/wixext/Tuples/WixCloseApplicationTuple.cs
+++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs
@@ -76,9 +76,9 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value);
         }
 
@@ -88,15 +88,15 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)WixCloseApplicationTupleFields.Property, value);
         }
 
-        public int TerminateExitCode
+        public int? TerminateExitCode
         {
-            get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNumber();
+            get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber();
             set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value);
         }
 
-        public int Timeout
+        public int? Timeout
         {
-            get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNumber();
+            get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber();
             set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value);
         }
     }
diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs
index 935d9462..b0dff121 100644
--- a/src/wixext/Tuples/WixInternetShortcutTuple.cs
+++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs
@@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value);
         }
 
-        public int IconIndex
+        public int? IconIndex
         {
-            get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNumber();
+            get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber();
             set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value);
         }
     }
diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs
index 0eb49cac..291a686c 100644
--- a/src/wixext/Tuples/XmlConfigTuple.cs
+++ b/src/wixext/Tuples/XmlConfigTuple.cs
@@ -94,9 +94,9 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)XmlConfigTupleFields.ComponentRef, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)XmlConfigTupleFields.Sequence, value);
         }
     }
diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs
index e0b3bbd7..e44979ca 100644
--- a/src/wixext/Tuples/XmlFileTuple.cs
+++ b/src/wixext/Tuples/XmlFileTuple.cs
@@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)XmlFileTupleFields.ComponentRef, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)XmlFileTupleFields.Sequence, value);
         }
     }
diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs
index 78f21ebc..5e227a05 100644
--- a/src/wixext/UtilTableDefinitions.cs
+++ b/src/wixext/UtilTableDefinitions.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Util
     {
         public static readonly TableDefinition Wix4CloseApplication = new TableDefinition(
             "Wix4CloseApplication",
+            UtilTupleDefinitions.WixCloseApplication,
             new[]
             {
                 new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -20,12 +21,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."),
                 new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixCloseApplication.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition(
             "Wix4RemoveFolderEx",
+            UtilTupleDefinitions.WixRemoveFolderEx,
             new[]
             {
                 new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -33,12 +34,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixRemoveFolderEx.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4RestartResource = new TableDefinition(
             "Wix4RestartResource",
+            UtilTupleDefinitions.WixRestartResource,
             new[]
             {
                 new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column),
@@ -46,12 +47,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixRestartResource.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4FileShare = new TableDefinition(
             "Wix4FileShare",
+            UtilTupleDefinitions.FileShare,
             new[]
             {
                 new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column),
@@ -60,24 +61,24 @@ namespace WixToolset.Util
                 new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"),
                 new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: UtilTupleDefinitions.FileShare.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition(
             "Wix4FileSharePermissions",
+            UtilTupleDefinitions.FileSharePermissions,
             new[]
             {
                 new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"),
             },
-            tupleDefinitionName: UtilTupleDefinitions.FileSharePermissions.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4Group = new TableDefinition(
             "Wix4Group",
+            UtilTupleDefinitions.Group,
             new[]
             {
                 new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -85,12 +86,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: UtilTupleDefinitions.Group.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition(
             "Wix4InternetShortcut",
+            UtilTupleDefinitions.WixInternetShortcut,
             new[]
             {
                 new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -102,12 +103,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"),
                 new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixInternetShortcut.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition(
             "Wix4PerformanceCategory",
+            UtilTupleDefinitions.PerformanceCategory,
             new[]
             {
                 new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -116,47 +117,47 @@ namespace WixToolset.Util
                 new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."),
                 new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.PerformanceCategory.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4Perfmon = new TableDefinition(
             "Wix4Perfmon",
+            UtilTupleDefinitions.Perfmon,
             new[]
             {
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"),
             },
-            tupleDefinitionName: UtilTupleDefinitions.Perfmon.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition(
             "Wix4PerfmonManifest",
+            UtilTupleDefinitions.PerfmonManifest,
             new[]
             {
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"),
             },
-            tupleDefinitionName: UtilTupleDefinitions.PerfmonManifest.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4EventManifest = new TableDefinition(
             "Wix4EventManifest",
+            UtilTupleDefinitions.EventManifest,
             new[]
             {
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: UtilTupleDefinitions.EventManifest.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4SecureObject = new TableDefinition(
             "Wix4SecureObject",
+            UtilTupleDefinitions.SecureObjects,
             new[]
             {
                 new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column),
@@ -166,12 +167,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: UtilTupleDefinitions.SecureObjects.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition(
             "Wix4ServiceConfig",
+            UtilTupleDefinitions.ServiceConfig,
             new[]
             {
                 new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"),
@@ -185,12 +186,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."),
                 new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.ServiceConfig.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4TouchFile = new TableDefinition(
             "Wix4TouchFile",
+            UtilTupleDefinitions.WixTouchFile,
             new[]
             {
                 new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -198,12 +199,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixTouchFile.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4User = new TableDefinition(
             "Wix4User",
+            UtilTupleDefinitions.User,
             new[]
             {
                 new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -213,23 +214,23 @@ namespace WixToolset.Util
                 new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"),
             },
-            tupleDefinitionName: UtilTupleDefinitions.User.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4UserGroup = new TableDefinition(
             "Wix4UserGroup",
+            UtilTupleDefinitions.UserGroup,
             new[]
             {
                 new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: UtilTupleDefinitions.UserGroup.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition Wix4XmlFile = new TableDefinition(
             "Wix4XmlFile",
+            UtilTupleDefinitions.XmlFile,
             new[]
             {
                 new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -241,12 +242,12 @@ namespace WixToolset.Util
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.XmlFile.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4XmlConfig = new TableDefinition(
             "Wix4XmlConfig",
+            UtilTupleDefinitions.XmlConfig,
             new[]
             {
                 new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -259,18 +260,17 @@ namespace WixToolset.Util
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
             },
-            tupleDefinitionName: UtilTupleDefinitions.XmlConfig.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition Wix4FormatFile = new TableDefinition(
             "Wix4FormatFile",
+            UtilTupleDefinitions.WixFormatFiles,
             new[]
             {
                 new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: UtilTupleDefinitions.WixFormatFiles.Name,
             tupleIdIsPrimaryKey: false
         );
 
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index e1b601f6..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-0084" 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
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj
index 5b26e901..5f659529 100644
--- a/src/wixlib/util.wixproj
+++ b/src/wixlib/util.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-0084\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\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>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
@@ -50,7 +50,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-0084\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\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>