diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..a084e3d4
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "FSharp.fsacRuntime": "netcore"
+}
\ No newline at end of file
diff --git a/lib/net46/Microsoft.SqlServer.TransactSql.ScriptDom.dll b/lib/net46/Microsoft.SqlServer.TransactSql.ScriptDom.dll
new file mode 100644
index 00000000..91c855c8
Binary files /dev/null and b/lib/net46/Microsoft.SqlServer.TransactSql.ScriptDom.dll differ
diff --git a/lib/net46/Microsoft.SqlServer.Types.dll b/lib/net46/Microsoft.SqlServer.Types.dll
new file mode 100644
index 00000000..d27ef7e1
Binary files /dev/null and b/lib/net46/Microsoft.SqlServer.Types.dll differ
diff --git a/lib/netstandard2.0/Microsoft.SqlServer.TransactSql.ScriptDom.dll b/lib/netstandard2.0/Microsoft.SqlServer.TransactSql.ScriptDom.dll
new file mode 100644
index 00000000..34ac29d1
Binary files /dev/null and b/lib/netstandard2.0/Microsoft.SqlServer.TransactSql.ScriptDom.dll differ
diff --git a/lib/netstandard2.0/Microsoft.SqlServer.Types.dll b/lib/netstandard2.0/Microsoft.SqlServer.Types.dll
new file mode 100644
index 00000000..afa8eece
Binary files /dev/null and b/lib/netstandard2.0/Microsoft.SqlServer.Types.dll differ
diff --git a/netfx.props b/netfx.props
index 1f542a42..6d387f6a 100644
--- a/netfx.props
+++ b/netfx.props
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- F# TP SDK STUFF -->
   <PropertyGroup>
     <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
     <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
@@ -27,7 +26,6 @@
     <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
 
   </PropertyGroup>
-
   <ItemGroup>
     <!-- When using 'dotnet build' to compile against Mono reference assemblies it seems necessary to add some explicit references to some facade DLLs  -->
     <Reference Include="System.Runtime" Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND $(TargetFramework.StartsWith('net4'))" />
@@ -35,17 +33,10 @@
     
   </ItemGroup>
 
-  <!-- F# SQL CLIENT STUFF -->
-  <PropertyGroup Condition="$(TargetFramework) == 'net461'">
-    <!-- 
-    Microsoft.SqlServer.Types is currently not available for netstandard, 
-    USE_SQL_SERVER_TYPES_ASSEMBLY singles out code depending on it
-    -->
-    <DefineConstants>$(DefineConstants);USE_SQL_SERVER_TYPES_ASSEMBLY;USE_SYSTEM_DATA_COMMON_DBPROVIDERFACTORIES</DefineConstants>
+    <!-- F# SQL CLIENT STUFF -->
+  <PropertyGroup Condition="$(TargetFramework) != 'netcoreapp2.0'">
+    <!-- System.Data.Common.DbProviderFactories is not available for netstandard2.0 -->
+    <DefineConstants>$(DefineConstants);USE_SYSTEM_DATA_COMMON_DBPROVIDERFACTORIES</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-      <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' != 'net40'" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/paket.dependencies b/paket.dependencies
index 817aeeee..2e0cd8fa 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -19,18 +19,6 @@ group Build
 
 	nuget NuGet.CommandLine
 
-group DesignTime
-	source https://www.nuget.org/api/v2/
-	framework: >= net461,netstandard20
-	
-	nuget System.Configuration.ConfigurationManager
-	nuget System.Data.Common
-	nuget System.Data.SqlClient
-	nuget System.Runtime.Caching
-	nuget FSharp.Core
-	nuget Microsoft.SqlServer.TransactSql.ScriptDom
-	nuget Microsoft.SqlServer.Types
-	
 group Test
 	source https://www.nuget.org/api/v2/
 	framework: net461, netcoreapp2.0	
@@ -38,7 +26,7 @@ group Test
 	nuget FSharp.Core = 4.5.2
 	nuget System.Data.SqlClient
 	nuget System.Configuration.ConfigurationManager
-	
+
 	nuget Microsoft.SqlServer.Types ~> 12
 	nuget Newtonsoft.Json
 	nuget xunit = 2.4.1
diff --git a/paket.lock b/paket.lock
index bd57ac76..11c07147 100644
--- a/paket.lock
+++ b/paket.lock
@@ -21,121 +21,6 @@ NUGET
     RazorEngine (3.3)
       Microsoft.AspNet.Razor (>= 2.0.30506)
 
-GROUP DesignTime
-RESTRICTION: || (== netstandard2.0) (>= net461)
-NUGET
-  remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.6.2)
-    Microsoft.NETCore.Platforms (2.2) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.2)) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    Microsoft.NETCore.Targets (2.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.2)) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    Microsoft.SqlServer.TransactSql.ScriptDom (15.0.4200.1)
-    Microsoft.SqlServer.Types (14.0.1016.290)
-    Microsoft.Win32.Registry (4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net461) (< netstandard2.0)) (&& (>= monotouch) (>= net461)) (&& (< net46) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= xamarinios)) (&& (>= net461) (>= xamarinmac)) (&& (>= net461) (>= xamarintvos)) (&& (>= net461) (>= xamarinwatchos))
-      System.Memory (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net46) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-      System.Security.AccessControl (>= 4.5)
-      System.Security.Principal.Windows (>= 4.5)
-    runtime.native.System.Data.SqlClient.sni (4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (>= 4.4)
-      runtime.win-x64.runtime.native.System.Data.SqlClient.sni (>= 4.4)
-      runtime.win-x86.runtime.native.System.Data.SqlClient.sni (>= 4.4)
-    runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-    runtime.win-x64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-    runtime.win-x86.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-    System.Buffers (4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0))
-    System.Collections (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Configuration.ConfigurationManager (4.5)
-      System.Security.Cryptography.ProtectedData (>= 4.5) - restriction: == netstandard2.0
-      System.Security.Permissions (>= 4.5)
-    System.Data.Common (4.3)
-      System.Collections (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Globalization (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.IO (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Text.RegularExpressions (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Threading.Tasks (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-    System.Data.SqlClient (4.6)
-      Microsoft.Win32.Registry (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      runtime.native.System.Data.SqlClient.sni (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0))
-      System.Diagnostics.DiagnosticSource (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-      System.Memory (>= 4.5.1) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      System.Text.Encoding.CodePages (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-    System.Diagnostics.DiagnosticSource (4.5.1) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-    System.Globalization (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.IO (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Text.Encoding (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Threading.Tasks (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Memory (4.5.2) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-      System.Buffers (>= 4.4)
-      System.Numerics.Vectors (>= 4.4)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
-    System.Numerics.Vectors (4.5) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-    System.Reflection (4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.IO (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Reflection.Primitives (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Reflection.Primitives (4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Resources.ResourceManager (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Globalization (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Reflection (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Runtime (4.3.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (< net451) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.2)) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.2)) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Runtime.Caching (4.5)
-    System.Runtime.CompilerServices.Unsafe (4.5.2) - restriction: || (== netstandard2.0) (&& (>= monotouch) (>= net461) (>= netstandard2.0)) (&& (< net45) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (< netstandard1.1) (>= netstandard2.0)) (&& (>= net461) (>= netstandard2.0) (>= xamarintvos)) (&& (>= net461) (>= netstandard2.0) (>= xamarinwatchos)) (&& (>= net461) (>= uap10.1)) (&& (>= net461) (>= xamarinios)) (&& (>= net461) (>= xamarinmac))
-    System.Runtime.Extensions (4.3.1) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Security.AccessControl (4.5)
-      System.Security.Principal.Windows (>= 4.5)
-    System.Security.Cryptography.ProtectedData (4.5) - restriction: == netstandard2.0
-      System.Memory (>= 4.5) - restriction: || (== netstandard2.0) (&& (< net46) (>= net461) (>= netstandard2.0))
-    System.Security.Permissions (4.5)
-      System.Security.AccessControl (>= 4.5)
-    System.Security.Principal.Windows (4.5.1) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-    System.Text.Encoding (4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Text.Encoding.CodePages (4.5.1) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0))
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
-    System.Text.RegularExpressions (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      System.Collections (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Globalization (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.6)) (&& (>= net461) (>= netcoreapp1.1)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Threading (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Threading (4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Threading.Tasks (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-    System.Threading.Tasks (4.3) - restriction: || (== netstandard2.0) (&& (< net451) (>= net461))
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-      System.Runtime (>= 4.3) - restriction: || (== netstandard2.0) (&& (< net45) (>= net461)) (&& (>= net461) (< portable-net45+win8+wp8+wpa81))
-
 GROUP Net40
 RESTRICTION: == net40
 NUGET
@@ -662,53 +547,53 @@ NUGET
       Microsoft.NET.Test.Sdk (>= 15.0) - restriction: || (&& (== net461) (>= netcoreapp1.0)) (== netcoreapp2.0)
 
 GROUP TestProjects
-RESTRICTION: || (== netcoreapp2.0) (== netstandard2.0) (>= net40)
+RESTRICTION: || (== netstandard2.0) (>= net40) (>= netcoreapp2.0)
 NUGET
   remote: https://www.nuget.org/api/v2
     FSharp.Core (4.3.4)
-    Microsoft.NETCore.Platforms (2.1.1) - restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    Microsoft.Win32.Registry (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monoandroid) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos))
-      System.Memory (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
-      System.Security.AccessControl (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
-      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
-    runtime.native.System.Data.SqlClient.sni (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
+    Microsoft.NETCore.Platforms (2.1.1) - restriction: >= netcoreapp2.0
+    Microsoft.Win32.Registry (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monoandroid) (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= monotouch) (>= netcoreapp2.0)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= netcoreapp2.0) (>= xamarinios)) (&& (>= netcoreapp2.0) (>= xamarinmac)) (&& (>= netcoreapp2.0) (>= xamarintvos)) (&& (>= netcoreapp2.0) (>= xamarinwatchos))
+      System.Memory (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+      System.Security.AccessControl (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461) (>= netcoreapp2.0)
+      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461) (>= netcoreapp2.0)
+    runtime.native.System.Data.SqlClient.sni (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
       runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (>= 4.4)
       runtime.win-x64.runtime.native.System.Data.SqlClient.sni (>= 4.4)
       runtime.win-x86.runtime.native.System.Data.SqlClient.sni (>= 4.4)
-    runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    runtime.win-x64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    runtime.win-x86.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    System.Buffers (4.5) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0))
+    runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+    runtime.win-x64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+    runtime.win-x86.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+    System.Buffers (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
     System.Configuration.ConfigurationManager (4.5)
-      System.Security.Cryptography.ProtectedData (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net461) (>= netstandard2.0))
-      System.Security.Permissions (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
-    System.Data.Common (4.3) - restriction: || (&& (== netcoreapp2.0) (< netstandard1.2)) (&& (== netcoreapp2.0) (< netstandard1.3)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netstandard2.0) (< netstandard1.2)) (&& (== netstandard2.0) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< netstandard1.2) (>= portable-net451+win81+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard2.0) (>= win81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< net461) (< netstandard2.0))
-    System.Data.SqlClient (4.5.1)
-      Microsoft.Win32.Registry (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      runtime.native.System.Data.SqlClient.sni (>= 4.4) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0))
-      System.Data.Common (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netstandard1.2)) (&& (== netcoreapp2.0) (< netstandard1.3)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netstandard2.0) (< netstandard1.2)) (&& (== netstandard2.0) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< netstandard1.2) (>= portable-net451+win81+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard2.0) (>= win81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< net461) (< netstandard2.0))
-      System.Diagnostics.DiagnosticSource (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
-      System.Memory (>= 4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
-      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      System.Text.Encoding.CodePages (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    System.Diagnostics.DiagnosticSource (4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
-    System.Memory (4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
-      System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (< netstandard1.1)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461)
-      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (>= net461)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461)
-    System.Numerics.Vectors (4.5) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (>= net461)) (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= netstandard2.0) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-    System.Runtime.CompilerServices.Unsafe (4.5.2) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monotouch) (>= net40) (>= netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (< netstandard1.1) (>= netstandard2.0)) (&& (>= net40) (>= netstandard2.0) (>= xamarinmac)) (&& (>= net40) (>= netstandard2.0) (>= xamarintvos)) (&& (>= net40) (>= netstandard2.0) (>= xamarinwatchos)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net45) (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= net45) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
-    System.Security.AccessControl (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (>= net461)
-      Microsoft.NETCore.Platforms (>= 2.0) - restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (>= net461)
-    System.Security.Cryptography.ProtectedData (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net461) (>= netstandard2.0))
-      System.Memory (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0))
-    System.Security.Permissions (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
-      System.Security.AccessControl (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (>= netstandard2.0)) (>= net461)
-    System.Security.Principal.Windows (4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      Microsoft.NETCore.Platforms (>= 2.0) - restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (>= net40) (>= netcoreapp2.0))
-    System.Text.Encoding.CodePages (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      Microsoft.NETCore.Platforms (>= 2.0) - restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (>= net40) (>= netcoreapp2.0))
-      System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (>= net461)
+      System.Security.Cryptography.ProtectedData (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net461) (>= netstandard2.0)) (>= netcoreapp2.0)
+      System.Security.Permissions (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461) (>= netcoreapp2.0)
+    System.Data.Common (4.3) - restriction: || (&& (== netstandard2.0) (< netstandard1.2)) (&& (== netstandard2.0) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< netstandard1.2) (>= portable-net451+win81+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard2.0) (>= win81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< net461) (< netstandard2.0)) (&& (>= netcoreapp2.0) (< netstandard1.2)) (&& (>= netcoreapp2.0) (< netstandard1.3)) (&& (>= netcoreapp2.0) (< netstandard2.0))
+    System.Data.SqlClient (4.6.1)
+      Microsoft.Win32.Registry (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      runtime.native.System.Data.SqlClient.sni (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0))
+      System.Data.Common (>= 4.3) - restriction: || (&& (== netstandard2.0) (< netstandard1.2)) (&& (== netstandard2.0) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< netstandard1.2) (>= portable-net451+win81+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard2.0) (>= win81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< net461) (< netstandard2.0)) (&& (>= netcoreapp2.0) (< netstandard1.2)) (&& (>= netcoreapp2.0) (< netstandard1.3)) (&& (>= netcoreapp2.0) (< netstandard2.0))
+      System.Diagnostics.DiagnosticSource (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+      System.Memory (>= 4.5.1) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      System.Text.Encoding.CodePages (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+    System.Diagnostics.DiagnosticSource (4.5.1) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+    System.Memory (4.5.1) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+      System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= monotouch) (>= netcoreapp2.0)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461) (&& (>= netcoreapp2.0) (< netstandard1.1)) (&& (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= netcoreapp2.0) (>= xamarinios)) (&& (>= netcoreapp2.0) (>= xamarinmac)) (&& (>= netcoreapp2.0) (>= xamarintvos)) (&& (>= netcoreapp2.0) (>= xamarinwatchos))
+      System.Numerics.Vectors (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (>= net461)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= monotouch) (>= netcoreapp2.0)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (< netstandard1.1)) (&& (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= netcoreapp2.0) (>= uap10.1)) (&& (>= netcoreapp2.0) (>= xamarinios)) (&& (>= netcoreapp2.0) (>= xamarinmac)) (&& (>= netcoreapp2.0) (>= xamarintvos)) (&& (>= netcoreapp2.0) (>= xamarinwatchos))
+    System.Numerics.Vectors (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= netstandard2.0) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1)) (&& (>= netcoreapp2.0) (>= uap10.1))
+    System.Runtime.CompilerServices.Unsafe (4.5.2) - restriction: || (== netstandard2.0) (&& (>= monotouch) (>= net40) (>= netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (< netstandard1.1) (>= netstandard2.0)) (&& (>= net40) (>= netstandard2.0) (>= xamarintvos)) (&& (>= net40) (>= netstandard2.0) (>= xamarinwatchos)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net45) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= uap10.1)) (>= netcoreapp2.0)
+    System.Security.AccessControl (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (>= net461) (>= netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 2.0) - restriction: >= netcoreapp2.0
+      System.Security.Principal.Windows (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0)
+    System.Security.Cryptography.ProtectedData (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net461) (>= netstandard2.0)) (>= netcoreapp2.0)
+      System.Memory (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= netcoreapp2.0) (< netcoreapp2.1))
+    System.Security.Permissions (4.5) - restriction: || (== netstandard2.0) (&& (>= monoandroid) (>= net40)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (>= netstandard2.0)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461) (>= netcoreapp2.0)
+      System.Security.AccessControl (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0)
+    System.Security.Principal.Windows (4.5.1) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 2.0) - restriction: >= netcoreapp2.0
+    System.Text.Encoding.CodePages (4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (>= netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 2.0) - restriction: >= netcoreapp2.0
+      System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0)
diff --git a/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj b/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj
index 25e148c4..6103bbe2 100644
--- a/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj
+++ b/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>FSharp.Data.SqlClient.DesignTime</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -10,32 +10,23 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
-    
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net40'" />
-    <PackageReference Include="FSharp.Core" Version="4.3.4" Condition="'$(TargetFramework)' == 'net461'" />
-    <!--<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
-    
-    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="14.0.3811.1" />
-    <PackageReference Include="Microsoft.SqlServer.Types" Version="12.0.5000" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' == 'net461'" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' == 'netstandard'" />
-    
-    -->
-  </ItemGroup>
-  <!--<ItemGroup Condition="$(TargetFramework) == 'net40'">
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-   <ItemGroup>
-    <Reference Include="System.IdentityModel" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>-->
-  <ItemGroup Condition="$(TargetFramework) == 'net461'">
-    <Reference Include="System.Data" />
+    <PackageReference Include="FSharp.Core" Version="4.3.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
+    <Reference Include="Microsoft.SqlServer.Types" Condition="'$(TargetFramework)'=='net461'">
+      <HintPath>../../lib/net46/Microsoft.SqlServer.Types.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Condition="'$(TargetFramework)'=='net461'">
+      <HintPath>../../lib/net46/Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.Types" Condition="'$(TargetFramework)'!='net461'">
+      <HintPath>../../lib/netstandard2.0/Microsoft.SqlServer.Types.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Condition="'$(TargetFramework)'!='net461'">
+      <HintPath>../../lib/netstandard2.0/Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
@@ -70,17 +61,15 @@
   <Target Name="CopyAssembliesToTPFolder" AfterTargets="Build">
     <ItemGroup>
       <DesignTimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.DesignTime.*" />
-      <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />
-    </ItemGroup>
+      <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />      
+    </ItemGroup>   
     <Copy SourceFiles="@(DesignTimeAssemblies)" DestinationFolder="..\..\bin\typeproviders\fsharp41\$(TargetFramework)" />
   </Target>
-  <Target Name="CopyAssembliesToLegacyFolder" AfterTargets="Build" Condition="$(TargetFramework) == 'net40'">
+  <!-- <Target Name="CopyAssembliesToLegacyFolder" AfterTargets="Build" Condition="$(TargetFramework) == 'net40'">
     <ItemGroup>
       <DesignTimeAssemblies Include="$(OutputPath)\FSharp.Data.SqlClient.DesignTime.*" />
-      <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />
+      <DesignTimeAssemblies Include="$(OutputPath)\Microsoft.SqlServer.*.dll" />      
     </ItemGroup>
     <Copy SourceFiles="@(DesignTimeAssemblies)" DestinationFolder="..\..\bin\$(TargetFramework)" />
-  </Target>
-  
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  </Target> -->
 </Project>
\ No newline at end of file
diff --git a/src/SqlClient.DesignTime/SqlCommandProvider.fs b/src/SqlClient.DesignTime/SqlCommandProvider.fs
index 5ed49fed..cdc4229a 100644
--- a/src/SqlClient.DesignTime/SqlCommandProvider.fs
+++ b/src/SqlClient.DesignTime/SqlCommandProvider.fs
@@ -16,11 +16,10 @@ open ProviderImplementation.ProvidedTypes
 [<assembly:InternalsVisibleTo("SqlClient.DesignTime.Tests")>]
 do()
 
-#if USE_SQL_SERVER_TYPES_ASSEMBLY
 module X =
     // need to make sure microsoft.sqlserver.types is included as a referenced assembly
     let x = Microsoft.SqlServer.Types.SqlHierarchyId()
-#endif
+
 [<TypeProvider>]
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
 type SqlCommandProvider(config : TypeProviderConfig) as this = 
diff --git a/src/SqlClient.DesignTime/SqlEnumProvider.fs b/src/SqlClient.DesignTime/SqlEnumProvider.fs
index 8514de78..34718296 100644
--- a/src/SqlClient.DesignTime/SqlEnumProvider.fs
+++ b/src/SqlClient.DesignTime/SqlEnumProvider.fs
@@ -265,7 +265,6 @@ type SqlEnumProvider(config : TypeProviderConfig) as this =
 
         tempAssembly.AddTypes [ providedEnumType ]
         providedEnumType
-
 #endif
 
     //Quotation factories
diff --git a/src/SqlClient.DesignTime/paket.references b/src/SqlClient.DesignTime/paket.references
deleted file mode 100644
index d08f34d1..00000000
--- a/src/SqlClient.DesignTime/paket.references
+++ /dev/null
@@ -1,10 +0,0 @@
-group DesignTime
-
-System.Configuration.ConfigurationManager
-System.Data.Common
-System.Data.SqlClient
-System.Runtime.Caching
-Microsoft.SqlServer.TransactSql.ScriptDom
-Microsoft.SqlServer.Types
-
-
diff --git a/src/SqlClient/SqlClient.fsproj b/src/SqlClient/SqlClient.fsproj
index 2138aae6..0838bd6c 100644
--- a/src/SqlClient/SqlClient.fsproj
+++ b/src/SqlClient/SqlClient.fsproj
@@ -20,6 +20,7 @@
   <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.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' != 'net40'" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' != 'net40'" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
diff --git a/tests/SqlClient.Tests/TransactionTests.fs b/tests/SqlClient.Tests/TransactionTests.fs
index 7d31a560..e2d64940 100644
--- a/tests/SqlClient.Tests/TransactionTests.fs
+++ b/tests/SqlClient.Tests/TransactionTests.fs
@@ -120,7 +120,7 @@ let doNotOpenConnectionOnObjectForAsyncNonQuery() =
     use conn = new SqlConnection(ConnectionStrings.AdventureWorks)
     use cmd = new NonQuery(conn)
     // should unwrap the aggregateexception here; not taking that on right now
-    Assert.Throws<AggregateException>(fun() -> cmd.AsyncExecute() |> Async.RunSynchronously |> ignore)    
+    Assert.Throws<AggregateException>(fun() -> cmd.AsyncExecute() |> Async.RunSynchronously |> ignore)
     
 [<Fact>]
 let prematurelyOpenConnection() =