From 1b4d8735b5778a144036c34176001fc641deee82 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 13 Apr 2020 20:19:20 +1000
Subject: Update dependencies.

---
 src/Cpp.Build.props                     | 18 ------------
 src/wixext/ComPlusTableDefinitions.cs   | 50 ++++++++++++++++-----------------
 src/wixext/Tuples/ComPlusMethodTuple.cs |  4 +--
 src/wixlib/complus.wixproj              |  4 +--
 src/wixlib/packages.config              |  2 +-
 5 files changed, 30 insertions(+), 48 deletions(-)

(limited to 'src')

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 827c071a..9551e76f 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -72,12 +72,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>
@@ -91,16 +85,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/ComPlusTableDefinitions.cs b/src/wixext/ComPlusTableDefinitions.cs
index 1d57b025..f2863cde 100644
--- a/src/wixext/ComPlusTableDefinitions.cs
+++ b/src/wixext/ComPlusTableDefinitions.cs
@@ -8,6 +8,7 @@ namespace WixToolset.ComPlus
     {
         public static readonly TableDefinition ComPlusPartition = new TableDefinition(
             "ComPlusPartition",
+            ComPlusTupleDefinitions.ComPlusPartition,
             new[]
             {
                 new ColumnDefinition("Partition", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -15,24 +16,24 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartition.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition(
             "ComPlusPartitionProperty",
+            ComPlusTupleDefinitions.ComPlusPartitionProperty,
             new[]
             {
                 new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition(
             "ComPlusPartitionRole",
+            ComPlusTupleDefinitions.ComPlusPartitionRole,
             new[]
             {
                 new ColumnDefinition("PartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -40,12 +41,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition(
             "ComPlusUserInPartitionRole",
+            ComPlusTupleDefinitions.ComPlusUserInPartitionRole,
             new[]
             {
                 new ColumnDefinition("UserInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -53,12 +54,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusUserInPartitionRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition(
             "ComPlusGroupInPartitionRole",
+            ComPlusTupleDefinitions.ComPlusGroupInPartitionRole,
             new[]
             {
                 new ColumnDefinition("GroupInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -66,12 +67,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusGroupInPartitionRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition(
             "ComPlusPartitionUser",
+            ComPlusTupleDefinitions.ComPlusPartitionUser,
             new[]
             {
                 new ColumnDefinition("PartitionUser", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -79,12 +80,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionUser.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusApplication = new TableDefinition(
             "ComPlusApplication",
+            ComPlusTupleDefinitions.ComPlusApplication,
             new[]
             {
                 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -93,24 +94,24 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplication.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition(
             "ComPlusApplicationProperty",
+            ComPlusTupleDefinitions.ComPlusApplicationProperty,
             new[]
             {
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition(
             "ComPlusApplicationRole",
+            ComPlusTupleDefinitions.ComPlusApplicationRole,
             new[]
             {
                 new ColumnDefinition("ApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -118,24 +119,24 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition(
             "ComPlusApplicationRoleProperty",
+            ComPlusTupleDefinitions.ComPlusApplicationRoleProperty,
             new[]
             {
                 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationRoleProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition(
             "ComPlusUserInApplicationRole",
+            ComPlusTupleDefinitions.ComPlusUserInApplicationRole,
             new[]
             {
                 new ColumnDefinition("UserInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -143,12 +144,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusUserInApplicationRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition(
             "ComPlusGroupInApplicationRole",
+            ComPlusTupleDefinitions.ComPlusGroupInApplicationRole,
             new[]
             {
                 new ColumnDefinition("GroupInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -156,12 +157,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusGroupInApplicationRole.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusAssembly = new TableDefinition(
             "ComPlusAssembly",
+            ComPlusTupleDefinitions.ComPlusAssembly,
             new[]
             {
                 new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -173,47 +174,47 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("PSDllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusAssembly.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition(
             "ComPlusAssemblyDependency",
+            ComPlusTupleDefinitions.ComPlusAssemblyDependency,
             new[]
             {
                 new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("RequiredAssembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusAssemblyDependency.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusComponent = new TableDefinition(
             "ComPlusComponent",
+            ComPlusTupleDefinitions.ComPlusComponent,
             new[]
             {
                 new ColumnDefinition("ComPlusComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("CLSID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusComponent.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition(
             "ComPlusComponentProperty",
+            ComPlusTupleDefinitions.ComPlusComponentProperty,
             new[]
             {
                 new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusComponentProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition(
             "ComPlusRoleForComponent",
+            ComPlusTupleDefinitions.ComPlusRoleForComponent,
             new[]
             {
                 new ColumnDefinition("RoleForComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -221,36 +222,36 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForComponent.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusInterface = new TableDefinition(
             "ComPlusInterface",
+            ComPlusTupleDefinitions.ComPlusInterface,
             new[]
             {
                 new ColumnDefinition("Interface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("IID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusInterface.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition(
             "ComPlusInterfaceProperty",
+            ComPlusTupleDefinitions.ComPlusInterfaceProperty,
             new[]
             {
                 new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusInterfaceProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition(
             "ComPlusRoleForInterface",
+            ComPlusTupleDefinitions.ComPlusRoleForInterface,
             new[]
             {
                 new ColumnDefinition("RoleForInterface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -258,12 +259,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForInterface.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusMethod = new TableDefinition(
             "ComPlusMethod",
+            ComPlusTupleDefinitions.ComPlusMethod,
             new[]
             {
                 new ColumnDefinition("Method", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -271,24 +272,24 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("Index", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
                 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusMethod.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition(
             "ComPlusMethodProperty",
+            ComPlusTupleDefinitions.ComPlusMethodProperty,
             new[]
             {
                 new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusMethodProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition(
             "ComPlusRoleForMethod",
+            ComPlusTupleDefinitions.ComPlusRoleForMethod,
             new[]
             {
                 new ColumnDefinition("RoleForMethod", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -296,12 +297,12 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForMethod.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition ComPlusSubscription = new TableDefinition(
             "ComPlusSubscription",
+            ComPlusTupleDefinitions.ComPlusSubscription,
             new[]
             {
                 new ColumnDefinition("Subscription", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -312,19 +313,18 @@ namespace WixToolset.ComPlus
                 new ColumnDefinition("EventCLSID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("PublisherID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusSubscription.Name,
             tupleIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition(
             "ComPlusSubscriptionProperty",
+            ComPlusTupleDefinitions.ComPlusSubscriptionProperty,
             new[]
             {
                 new ColumnDefinition("Subscription_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusSubscription", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
             },
-            tupleDefinitionName: ComPlusTupleDefinitions.ComPlusSubscriptionProperty.Name,
             tupleIdIsPrimaryKey: false
         );
 
diff --git a/src/wixext/Tuples/ComPlusMethodTuple.cs b/src/wixext/Tuples/ComPlusMethodTuple.cs
index c2fdada7..4cb451c2 100644
--- a/src/wixext/Tuples/ComPlusMethodTuple.cs
+++ b/src/wixext/Tuples/ComPlusMethodTuple.cs
@@ -48,9 +48,9 @@ namespace WixToolset.ComPlus.Tuples
             set => this.Set((int)ComPlusMethodTupleFields.InterfaceRef, value);
         }
 
-        public int Index
+        public int? Index
         {
-            get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNumber();
+            get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNullableNumber();
             set => this.Set((int)ComPlusMethodTupleFields.Index, value);
         }
 
diff --git a/src/wixlib/complus.wixproj b/src/wixlib/complus.wixproj
index 12da2f6a..f79ed450 100644
--- a/src/wixlib/complus.wixproj
+++ b/src/wixlib/complus.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>{E191E61E-E098-4F71-888F-51A79F952022}</ProjectGuid>
@@ -30,7 +30,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>
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
-- 
cgit v1.2.3-55-g6feb