Use netstandard20 for both lib and designtime

fsprojects · Apr 4, 2021 · 9feb156 · 9feb156
1 parent 55ff37f
commit 9feb156
Show file tree

Hide file tree

Showing 7 changed files with 740 additions and 569 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -27,14 +27,15 @@ group Library
 
 group DesignTime
 	source https://www.nuget.org/api/v2/
-	framework: >= netcoreapp2.2
+	framework: >= netstandard20
 	storage: none
-
+
+	nuget System.Runtime 4.3.1
 	nuget FSharp.Core = 4.5.2
-	nuget System.Configuration.ConfigurationManager
-	nuget System.Data.Common
-	nuget System.Runtime.Caching
-	nuget Microsoft.Data.SqlClient
+	nuget System.Configuration.ConfigurationManager 5.0.0
+	nuget System.Data.Common 4.3.0
+	nuget System.Runtime.Caching 5.0.0
+	nuget Microsoft.Data.SqlClient 2.1.2
 	nuget Microsoft.SqlServer.TransactSql.ScriptDom 150.4897.1
 	#nuget Microsoft.SqlServer.Types
 

diff --git a/paket.lock b/paket.lock
diff --git a/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj b/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>FSharp.Data.SqlClient.DesignTime</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/src/SqlClient.DesignTime/paket.references b/src/SqlClient.DesignTime/paket.references
@@ -1,5 +1,6 @@
 group DesignTime
 
+System.Runtime
 FSharp.Core
 System.Configuration.ConfigurationManager
 System.Data.Common

diff --git a/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs b/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs
@@ -3,7 +3,7 @@ open FSharp.Data
 
 [<Literal>]
 let Cnx = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
-
+(*
 type SingleColumnSelect = SqlEnumProvider<"SELECT Name FROM Purchasing.ShipMethod", Cnx>
 type TinyIntEnum = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), CAST(1 AS tinyint)), ('Two', CAST(2 AS tinyint))) AS T(Tag, Value)", Cnx, Kind = SqlEnumKind.CLI>
 type CurrencyCodeUOM = 
@@ -12,13 +12,17 @@ type CurrencyCodeUOM =
        FROM Sales.Currency 
        WHERE CurrencyCode IN ('USD', 'EUR', 'GBP')
    ", Cnx, Kind = SqlEnumKind.UnitsOfMeasure>
-
+*)
 [<EntryPoint>]
 let main _ =
     let get42 = new SqlCommandProvider<"SELECT 42", Cnx>(Cnx)
     get42.Execute() |> Seq.toArray |> printfn "SqlCommandTest: %A"
 
+
+    (*
     printfn "SqlEnum default test: %A" SingleColumnSelect.``CARGO TRANSPORT 5``
     printfn "SqlEnum CLI enum test: %A" TinyIntEnum.One
     printfn "SqlEnum UOM test: %A" 1m<CurrencyCodeUOM.USD>
+    *)
+
     0
diff --git a/tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj b/tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Data.SqlClient.DesignTime">
-      <HintPath>..\..\bin\typeproviders\netcoreapp2.2\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
+      <HintPath>..\..\bin\typeproviders\netstandard2.0\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

diff --git a/tests/SqlClient.Tests/SqlClient.Tests.fsproj b/tests/SqlClient.Tests/SqlClient.Tests.fsproj
@@ -51,7 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Data.SqlClient">
-      <HintPath>..\..\bin\netcoreapp2.2\FSharp.Data.SqlClient.dll</HintPath>
+      <HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="CopyCustomContent" AfterTargets="AfterBuild">