Get SqlClient and Design time project compiling

Author: daniellittledev

paket.dependencies

@@ -19,6 +19,12 @@ group Build
 
 	nuget NuGet.CommandLine
 
+group Library
+	source https://www.nuget.org/api/v2/
+	framework: >= netstandard20
+	nuget FSharp.Core
+	nuget Microsoft.Data.SqlClient
+
 group DesignTime
 	source https://www.nuget.org/api/v2/
 	framework: >= netstandard20

paket.lock

@@ -4,7 +4,7 @@ open System
 open System.Reflection
 open System.Data
 open Microsoft.Data.SqlClient
-open Microsoft.SqlServer.Server
+open Microsoft.Data.SqlClient.Server
 open System.Collections.Generic
 open System.Diagnostics
 open Microsoft.FSharp.Quotations

src/SqlClient.DesignTime/DesignTime.fs

@@ -36,6 +36,7 @@
   <ItemGroup Condition="$(TargetFramework) == 'net461'">
     <Reference Include="System.Data" />
   </ItemGroup>
+
   <ItemGroup>
     <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
@@ -68,20 +69,14 @@
     <None Include="Scripts\ReverseLineOrderForNotex.fsx" />
     <None Include="Scripts\XE.fsx" />
   </ItemGroup>
+  
   <Target Name="CopyAssembliesToTPFolder" AfterTargets="Build">
     <ItemGroup>
       <DesignTimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.DesignTime.*" />
       <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />
     </ItemGroup>
     <Copy SourceFiles="@(DesignTimeAssemblies)" DestinationFolder="..\..\bin\typeproviders\fsharp41\$(TargetFramework)" />
   </Target>
-  <Target Name="CopyAssembliesToLegacyFolder" AfterTargets="Build" Condition="$(TargetFramework) == 'net40'">
-    <ItemGroup>
-      <DesignTimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.DesignTime.*" />
-      <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />
-    </ItemGroup>
-    <Copy SourceFiles="@(DesignTimeAssemblies)" DestinationFolder="..\..\bin\$(TargetFramework)" />
-  </Target>
 
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\fsc.props" />
-  <Import Project="..\..\..\netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Lib</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
+  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DocumentationFile>.\bin\release\Lib.XML</DocumentationFile>
   </PropertyGroup>
+  
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Library1.fs" />
     <None Include="paket.references" />
     <None Include="Script.fsx" />
     <Content Include="App.config" />
   </ItemGroup>
+  
   <ItemGroup>
     <Reference Include="netstandard" />
     <Reference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlClient">
@@ -27,5 +32,6 @@
       <HintPath>..\..\..\bin\net40\FSharp.Data.SqlClient.dll</HintPath>
     </Reference>
   </ItemGroup>
+  
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SqlClient.TestProjects/Lib/Lib.fsproj

@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\fsc.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
+  
   <ItemGroup>
     <Reference Include="FSharp.Data.SqlClient">
       <HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
     </Reference>
   </ItemGroup>
+  
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="paket.references" />
   </ItemGroup>
+  
+  <ItemGroup />
+  
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/SqlClient.Tests.NetCoreApp.fsproj

@@ -11,23 +11,18 @@
     <WithLegacyNamespaces>true</WithLegacyNamespaces>
     <DefineConstants Condition="'$(WithLegacyNamespaces)'=='true'">$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
   </PropertyGroup>
+  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
+  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>..\..\bin\net40\FSharp.Data.SqlClient.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.XML</DocumentationFile>
   </PropertyGroup>
+  
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net40'" />
-    <PackageReference Include="FSharp.Core" Version="4.3.4" Condition="'$(TargetFramework)' != 'net40'" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' != 'net40'" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Extensions.fs" />
     <Compile Include="Shared.fs" />
@@ -37,10 +32,13 @@
     <Compile Include="ISqlCommand.fs" />
     <Compile Include="Runtime.fs" />
   </ItemGroup>
+  
   <Target Name="CopyAssemblies" AfterTargets="Build">
     <ItemGroup>
-      <RuntimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.*" /> 
-    </ItemGroup>    
+      <RuntimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.*" />
+    </ItemGroup>
     <Copy SourceFiles="@(RuntimeAssemblies)" DestinationFolder="..\..\bin\$(TargetFramework)" />
   </Target>
+  
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SqlClient/SqlClient.fsproj

@@ -0,0 +1,4 @@
+group Library
+
+FSharp.Core
+Microsoft.Data.SqlClient