Skip to content

Commit 48c5ec4

Browse files
committed
Merge branch 'master' into microsoft-data-sqlclient
# Conflicts: # RELEASE_NOTES.md # netfx.props # nuget/SqlClient.nuspec # paket.dependencies # paket.lock # src/SqlClient.DesignTime/AssemblyInfo.fs # src/SqlClient.Samples/WebApi.Controllers/App.config # src/SqlClient.Samples/WebApi/web.config # src/SqlClient.Samples/WpfDataBinding/App.config # src/SqlClient.TestProjects/Lib/Script.fsx # src/SqlClient/AssemblyInfo.fs # src/SqlClient/DataTable.fs
2 parents 327b102 + 32c5f4b commit 48c5ec4

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
* Using Microsoft.Data.SqlClient
44
* NET 8.0 compatibility
55

6+
#### 2.1.3 April 30, 2024
7+
8+
* Issue #440 Toolchain and SDK adjustments, deprecated runtime support for net40
9+
* Contributor: Tuomas Hietanen (https://github.com/Thorium)
10+
611
#### 2.1.2 May 08, 2022
712

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

src/SqlClient.Samples/WpfDataBinding/Program.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module FSharp.Data.Application
2-
2+
#nowarn "101"
33
//open WebApi
44
//let testExternalQuery = new DataAccess.QueryProducts()
55

0 commit comments

Comments
 (0)