5 files changed, 10 insertions, 5 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
index 024857ab..eba7bdbe 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
@@ -230,7 +230,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 columns.Add(columnDefinition);
             }
 
-            var customTable = new TableDefinition(tuple.Id.Id, columns, tuple.Unreal);
+            var customTable = new TableDefinition(tuple.Id.Id, null, columns, tuple.Unreal);
             return customTable;
         }
     }
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 1f43a025..d5601fad 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -421,7 +421,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                 }
             }
 
-            return new TableDefinition(tableName, columns, false);
+            return new TableDefinition(tableName, null, columns, false);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
index 753b8b34..a923a8cc 100644
--- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
@@ -21,7 +21,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
         {
-            var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name);
+            var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinition?.Name == tuple.Definition.Name);
             if (tableDefinition == null)
             {
                 return false;
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index 7f375cb6..fe05fcb2 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -6,9 +6,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
+    <CompileWixlibExePath>$(OutputPath)net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Try to hack around VS up-to-date detection -->
+    <Content Include="$(CompileWixlibExePath)" CopyToOutputDirectory="PreserveNewest">
+      <Visible>false</Visible>
+    </Content>
     <ExtensionWxs Include="Data\example.wxs" />
   </ItemGroup>
 
@@ -24,7 +29,6 @@
 
   <Target Name="SetExtensionWixlib">
     <PropertyGroup>
-      <CompileWixlibExePath>$(OutputPath)..\net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
       <WixlibPath>$(IntermediateOutputPath)Example.wixlib</WixlibPath>
     </PropertyGroup>
 
diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
index 3532ffc3..f204e5b6 100644
--- a/src/test/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTableDefinitions.cs
@@ -8,17 +8,18 @@ namespace Example.Extension
     {
         public static readonly TableDefinition ExampleTable = new TableDefinition(
             "Wix4Example",
+            ExampleTupleDefinitions.Example,
             new[]
             {
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
             },
-            tupleDefinitionName: ExampleTupleDefinitions.Example.Name,
             tupleIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition NotInAll = new TableDefinition(
             "TableDefinitionNotExposedByExtension",
+            null,
             new[]
             {
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),