From 0a596a3cd67e5e7749cb529b3eb1ee2ea38901b3 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 13 Apr 2020 13:36:49 +1000
Subject: Fix changes to TableDefinition.

---
 src/test/Example.Extension/Example.Extension.csproj   | 6 +++++-
 src/test/Example.Extension/ExampleTableDefinitions.cs | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/test')

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),
-- 
cgit v1.2.3-55-g6feb