Skip to content

Commit 3200cd5

Browse files
ThoriumThorium
committed
Microsoft.Data.SqlClient changes
1 parent 92c5691 commit 3200cd5

32 files changed

+7992
-1536
lines changed

‎RELEASE_NOTES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 2.2.0 April 30, 2025
2+
3+
* Using Microsoft.Data.SqlClient
4+
* NET 8.0 compatibility
5+
16
#### 2.1.2 May 08, 2022
27

38
* Issue #420 fix "TVP Column Ordering is incorrect as of version 2.1.0"

‎TestProjects.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2041
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.9.34310.174
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{E35ED000-5A6C-49E1-82CF-55CB8C16C2AB}"
77
ProjectSection(SolutionItems) = preProject

‎build/build.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ Target.create "NuGet" (fun _ ->
314314
ReleaseNotes = releaseNotes
315315
Tags = tags
316316
OutputPath = "nuget"
317-
ToolPath = nugetPath
317+
//ToolPath = nugetPath
318318
AccessKey = Fake.Core.Environment.environVarOrDefault "nugetkey" ""
319319
Publish = Fake.Core.Environment.hasEnvironVar "nugetkey"
320320
Dependencies = [] })

‎build/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ FSharp.Core
1414
FSharp.Formatting
1515
NuGet.CommandLine
1616
System.Data.SqlClient
17+
System.Configuration.ConfigurationManager

‎global.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎netfx.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ItemGroup>
3737

3838
<!-- F# SQL CLIENT STUFF -->
39-
<PropertyGroup Condition="$(TargetFramework) == 'net462'">
39+
<PropertyGroup Condition="$(TargetFramework) != 'netstandard2.0'">
4040
<!--
4141
Microsoft.SqlServer.Types is currently not available for netstandard,
4242
USE_SQL_SERVER_TYPES_ASSEMBLY singles out code depending on it
@@ -46,7 +46,7 @@
4646

4747
<ItemGroup>
4848
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" Condition="'$(TargetFramework)' != 'net462'" />
49-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
49+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
5050
</ItemGroup>
5151

5252
</Project>

‎nuget/SqlClient.nuspec‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,22 @@
2424
<dependencies>
2525
<group targetFramework="net462">
2626
<dependency id="FSharp.Core" version="8.0.301" />
27-
<dependency id="Microsoft.Data.SqlClient" version="6.0.1" />
27+
<dependency id="Microsoft.Data.SqlClient" version="5.2.2" />
28+
<dependency id="Microsoft.Identity.Client" version="4.71" />
2829
</group>
2930
<group targetFramework="netstandard2.0">
3031
<dependency id="FSharp.Core" version="8.0.301" />
3132
<dependency id="System.Data.SqlClient" version="4.9.0" />
32-
<dependency id="Microsoft.Data.SqlClient" version="6.0.1" />
33-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" />
33+
<dependency id="Microsoft.Data.SqlClient" version="5.2.2" />
34+
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" />
35+
<dependency id="Microsoft.Identity.Client" version="4.71" />
3436
</group>
3537
<group targetFramework="net8.0">
3638
<dependency id="FSharp.Core" version="8.0.301" />
3739
<dependency id="System.Data.SqlClient" version="4.9.0" />
38-
<dependency id="Microsoft.Data.SqlClient" version="6.0.1" />
39-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" />
40+
<dependency id="Microsoft.Data.SqlClient" version="5.2.2" />
41+
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" />
42+
<dependency id="Microsoft.Identity.Client" version="4.71" />
4043
</group>
4144
</dependencies>
4245
</metadata>

‎paket.dependencies‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ group Build
2626
nuget NuGet.CommandLine
2727
nuget System.Data.SqlClient
2828

29-
nuget System.Configuration.ConfigurationManager
29+
nuget System.Configuration.ConfigurationManager 8.0.0
3030

3131
group Docs
3232
source https://www.nuget.org/api/v2/
@@ -39,11 +39,10 @@ group Docs
3939

4040
group DesignTime
4141
source https://www.nuget.org/api/v2/
42-
framework: >= net462, >= netstandard20, net8.0
4342
storage: none
4443

45-
nuget Microsoft.Data.SqlClient 6.0.1
46-
nuget System.Configuration.ConfigurationManager 9.0.4
44+
nuget Microsoft.Data.SqlClient 5.2.2
45+
nuget System.Configuration.ConfigurationManager 8.0.0
4746
nuget System.Data.Common
4847
nuget System.Data.SqlClient
4948
nuget System.Runtime.Caching
@@ -57,9 +56,9 @@ group Test
5756
source https://www.nuget.org/api/v2/
5857

5958
nuget FSharp.Core redirects:force
60-
nuget Microsoft.Data.SqlClient 6.0.1
59+
nuget Microsoft.Data.SqlClient 5.2.2
6160
nuget System.Data.SqlClient
62-
nuget System.Configuration.ConfigurationManager
61+
nuget System.Configuration.ConfigurationManager 8.0.0
6362

6463
nuget Microsoft.SqlServer.Types
6564
nuget Newtonsoft.Json
@@ -70,32 +69,29 @@ group Test
7069

7170
group Net40
7271
source https://www.nuget.org/api/v2/
73-
framework: net462
7472
storage: none
7573

7674
nuget FSharp.Core = 8.0.301
77-
nuget Microsoft.Data.SqlClient 6.0.1
78-
nuget System.Configuration.ConfigurationManager 9.0.4
75+
nuget Microsoft.Data.SqlClient 5.2.2
76+
nuget System.Configuration.ConfigurationManager 8.0.0
7977
nuget Microsoft.SqlServer.Server
8078
nuget System.Text.Json
8179
nuget System.Data.SqlClient
8280

8381
group TestProjects
8482
source https://www.nuget.org/api/v2/
85-
framework: >= net462, >= netcoreapp2.0, >= netstandard2.0, net8.0
8683
storage: none
8784

8885
nuget FSharp.Core = 8.0.301
89-
nuget Microsoft.Data.SqlClient 6.0.1
86+
nuget Microsoft.Data.SqlClient 5.2.2
9087

9188
nuget System.Data.SqlClient
92-
nuget System.Configuration.ConfigurationManager
89+
nuget System.Configuration.ConfigurationManager 8.0.0
9390
nuget System.Text.Json
9491
nuget Microsoft.SqlServer.Server
9592

9693
group Samples
9794
source https://www.nuget.org/api/v2/
98-
framework: >= net462, >= netcoreapp2.0, >= netstandard2.0, net8.0
9995
redirects: on
10096

10197
nuget FSharp.Core = 8.0.301 redirects: force
@@ -105,7 +101,7 @@ group Samples
105101
nuget Microsoft.AspNet.WebApi.Core
106102
nuget Microsoft.AspNet.WebApi.WebHost
107103
nuget System.Data.SqlClient
108-
nuget Microsoft.Data.SqlClient 6.0.1
104+
nuget Microsoft.Data.SqlClient 5.2.2
109105
nuget Microsoft.SqlServer.Types
110106

111107
nuget Newtonsoft.Json redirects: force

0 commit comments

Comments
 (0)