From 791dc1830bd79c5dfdbb5147da6096678d811248 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Tue, 11 Sep 2018 14:46:01 +0100
Subject: [PATCH] adjust build process

---
 src/DesignTime/DesignTime.fsproj      |  3 +--
 src/Runtime/FSharp.Data.Npgsql.nuspec |  4 ++++
 src/Runtime/Runtime.fsproj            | 13 +++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/DesignTime/DesignTime.fsproj b/src/DesignTime/DesignTime.fsproj
index e1c700c..6633230 100644
--- a/src/DesignTime/DesignTime.fsproj
+++ b/src/DesignTime/DesignTime.fsproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition="'$(Configuration)'=='Debug'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(Configuration)'=='Release'">netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <AssemblyName>FSharp.Data.Npgsql.DesignTime</AssemblyName>
     <DefineConstants>NO_GENERATIVE</DefineConstants>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/src/Runtime/FSharp.Data.Npgsql.nuspec b/src/Runtime/FSharp.Data.Npgsql.nuspec
index 8786a7c..3324c00 100644
--- a/src/Runtime/FSharp.Data.Npgsql.nuspec
+++ b/src/Runtime/FSharp.Data.Npgsql.nuspec
@@ -22,6 +22,10 @@
   <files>
     <file src="bin\Release\net461\*.dll" target="lib\net461" />
     <file src="bin\Release\netstandard2.0\*.dll" target="lib\netstandard2.0" />
+    
+    <!-- we could omit FSharp.Core.dll here -->
+    <file src="bin\Release\typeproviders\fsharp41\netcoreapp2.0\*.dll" target="typeproviders\fsharp41\netcoreapp2.0" />
+    <file src="bin\Release\typeproviders\fsharp41\net461\*.dll" target="typeproviders\fsharp41\net461" />
   </files>
 </package>
 
diff --git a/src/Runtime/Runtime.fsproj b/src/Runtime/Runtime.fsproj
index b66ab05..faf1338 100644
--- a/src/Runtime/Runtime.fsproj
+++ b/src/Runtime/Runtime.fsproj
@@ -42,14 +42,19 @@
   </ItemGroup>
 
   <Target Name="BeforeBuild">
-    <MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />
+    <MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netcoreapp2.0" />
+    <MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net461" />
   </Target>
 
   <Target Name="AfterBuild">
-    <CreateItem Include="..\DesignTime\bin\$(Configuration)\$(TargetFramework)\*.dll;..\DesignTime\bin\$(Configuration)\$(TargetFramework)\*.pdb">
-      <Output TaskParameter="Include" ItemName="DesignTimeBinaries" />
+    <CreateItem Include="..\DesignTime\bin\$(Configuration)\netcoreapp2.0\*.dll;..\DesignTime\bin\$(Configuration)\netcoreapp2.0\*.pdb">
+      <Output TaskParameter="Include" ItemName="DesignTimeBinaries1" />
     </CreateItem>
-    <Copy SourceFiles="@(DesignTimeBinaries)" DestinationFolder="$(OutputPath)" />
+    <CreateItem Include="..\DesignTime\bin\$(Configuration)\net461\*.dll;..\DesignTime\bin\$(Configuration)\net461\*.pdb">
+      <Output TaskParameter="Include" ItemName="DesignTimeBinaries2" />
+    </CreateItem>
+    <Copy SourceFiles="@(DesignTimeBinaries1)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/netcoreapp2.0" />
+    <Copy SourceFiles="@(DesignTimeBinaries2)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/net461" />
   </Target>
 
   <Target Name="IncludeAllDlls">