Skip to content

Commit 9feb156

Browse files
Use netstandard20 for both lib and designtime
1 parent 55ff37f commit 9feb156

File tree

7 files changed

+740
-569
lines changed

7 files changed

+740
-569
lines changed

paket.dependencies

+7-6
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ group Library
2727

2828
group DesignTime
2929
source https://www.nuget.org/api/v2/
30-
framework: >= netcoreapp2.2
30+
framework: >= netstandard20
3131
storage: none
32-
32+
33+
nuget System.Runtime 4.3.1
3334
nuget FSharp.Core = 4.5.2
34-
nuget System.Configuration.ConfigurationManager
35-
nuget System.Data.Common
36-
nuget System.Runtime.Caching
37-
nuget Microsoft.Data.SqlClient
35+
nuget System.Configuration.ConfigurationManager 5.0.0
36+
nuget System.Data.Common 4.3.0
37+
nuget System.Runtime.Caching 5.0.0
38+
nuget Microsoft.Data.SqlClient 2.1.2
3839
nuget Microsoft.SqlServer.TransactSql.ScriptDom 150.4897.1
3940
#nuget Microsoft.SqlServer.Types
4041

paket.lock

+723-558
Large diffs are not rendered by default.

src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<AssemblyName>FSharp.Data.SqlClient.DesignTime</AssemblyName>
66
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

src/SqlClient.DesignTime/paket.references

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
group DesignTime
22

3+
System.Runtime
34
FSharp.Core
45
System.Configuration.ConfigurationManager
56
System.Data.Common

src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ open FSharp.Data
33

44
[<Literal>]
55
let Cnx = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
6-
6+
(*
77
type SingleColumnSelect = SqlEnumProvider<"SELECT Name FROM Purchasing.ShipMethod", Cnx>
88
type TinyIntEnum = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), CAST(1 AS tinyint)), ('Two', CAST(2 AS tinyint))) AS T(Tag, Value)", Cnx, Kind = SqlEnumKind.CLI>
99
type CurrencyCodeUOM =
@@ -12,13 +12,17 @@ type CurrencyCodeUOM =
1212
FROM Sales.Currency
1313
WHERE CurrencyCode IN ('USD', 'EUR', 'GBP')
1414
", Cnx, Kind = SqlEnumKind.UnitsOfMeasure>
15-
15+
*)
1616
[<EntryPoint>]
1717
let main _ =
1818
let get42 = new SqlCommandProvider<"SELECT 42", Cnx>(Cnx)
1919
get42.Execute() |> Seq.toArray |> printfn "SqlCommandTest: %A"
2020

21+
22+
(*
2123
printfn "SqlEnum default test: %A" SingleColumnSelect.``CARGO TRANSPORT 5``
2224
printfn "SqlEnum CLI enum test: %A" TinyIntEnum.One
2325
printfn "SqlEnum UOM test: %A" 1m<CurrencyCodeUOM.USD>
26+
*)
27+
2428
0

tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616
<ItemGroup>
1717
<Reference Include="FSharp.Data.SqlClient.DesignTime">
18-
<HintPath>..\..\bin\typeproviders\netcoreapp2.2\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
18+
<HintPath>..\..\bin\typeproviders\netstandard2.0\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
1919
</Reference>
2020
</ItemGroup>
2121
<Import Project="..\..\.paket\Paket.Restore.targets" />

tests/SqlClient.Tests/SqlClient.Tests.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</ItemGroup>
5252
<ItemGroup>
5353
<Reference Include="FSharp.Data.SqlClient">
54-
<HintPath>..\..\bin\netcoreapp2.2\FSharp.Data.SqlClient.dll</HintPath>
54+
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
5555
</Reference>
5656
</ItemGroup>
5757
<Target Name="CopyCustomContent" AfterTargets="AfterBuild">

0 commit comments

Comments
 (0)