Skip to content

Commit 7d0b623

Browse files
committed
.Net 10 targets, minor dependency cleanup
1 parent da1c756 commit 7d0b623

71 files changed

Lines changed: 444 additions & 1118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"paket": {
20-
"version": "8.1.0-alpha004",
20+
"version": "10.3.1",
2121
"commands": [
2222
"paket"
2323
],
@@ -59,11 +59,11 @@
5959
"rollForward": false
6060
},
6161
"fake-cli": {
62-
"version": "6.1.3",
62+
"version": "6.1.4",
6363
"commands": [
6464
"fake"
6565
],
6666
"rollForward": false
6767
}
6868
}
69-
}
69+
}

docs/RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.5.20 - 26.05.2026
2+
* NET 10 libraries Added
3+
14
### 1.5.19 - 07.04.2026
25
* Added support for code-blocks (record fix) for new FSharp.Core 10.1
36

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.100",
4+
"rollForward": "latestMinor"
5+
}
6+
}

paket.dependencies

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 8.1.0
1+
version 10.3.1
22
source https://api.nuget.org/v3/index.json
33
storage: none
44

@@ -19,14 +19,15 @@ nuget Microsoft.Data.SQLite 2.0
1919
nuget Microsoft.Data.SqlClient 5.2.2
2020
nuget System.Memory
2121
nuget System.Runtime.Loader 4.3
22-
nuget System.Text.Encodings.Web 9.0.4
22+
nuget System.Text.Encodings.Web 9.0.16
2323
nuget System.Threading.Tasks.Extensions
2424
nuget Microsoft.Extensions.Logging.Abstractions 8.0.3
2525

2626
group Build
2727

2828
source https://api.nuget.org/v3/index.json
2929
storage: none
30+
framework: net6.0
3031

3132
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
3233
nuget FSharp.Core == 10.1.201
@@ -52,7 +53,9 @@ group Build
5253
nuget FSharp.Compiler.Service 43.12.201
5354
nuget System.Data.SqlClient
5455
nuget MSBuild.StructuredLogger
55-
56+
nuget System.Collections.Immutable
57+
nuget System.Formats.Asn1
58+
nuget Microsoft.Bcl.Cryptography
5659

5760
group SourceFiles
5861
source https://api.nuget.org/v3/index.json
@@ -80,6 +83,7 @@ group Docs
8083
nuget FSharp.Literate >= 4.0.0
8184
nuget Dotnet.ProjInfo.Workspace.FCS
8285
nuget FSharp.Compiler.Service 43.12.201
86+
nuget System.Reflection.Metadata 9.0.16
8387

8488
group Tests
8589
source https://api.nuget.org/v3/index.json

paket.lock

Lines changed: 253 additions & 921 deletions
Large diffs are not rendered by default.

src/SQLProvider.Common/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("SQLProvider.Common")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type provider for SQL database access, common library")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.19")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.19")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.20")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.20")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.Common"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type provider for SQL database access, common library"
16-
let [<Literal>] AssemblyVersion = "1.5.19"
17-
let [<Literal>] AssemblyFileVersion = "1.5.19"
16+
let [<Literal>] AssemblyVersion = "1.5.20"
17+
let [<Literal>] AssemblyFileVersion = "1.5.20"

src/SQLProvider.Common/SQLProvider.Common.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Import Project="..\..\netfx.props" />
66
<PropertyGroup>
77
<OutputType>Library</OutputType>
8-
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48;net462;net461;net6.0;net8.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48;net462;net461;net6.0;net8.0;net10.0</TargetFrameworks>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1010
<DefineConstants>TP_RUNTIME;NETSTANDARD;NO_GENERATIVE</DefineConstants>
1111
<AssemblyName>FSharp.Data.SqlProvider.Common</AssemblyName>
@@ -29,7 +29,7 @@
2929
<Optimize>true</Optimize>
3030
<Tailcalls>true</Tailcalls>
3131
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
32+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
3333
<DefineConstants>$(DefineConstants);MICROSOFTSQL;NETSTANDARD21</DefineConstants>
3434
</PropertyGroup>
3535
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

src/SQLProvider.DesignTime/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("SQLProvider.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("SQLProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Type providers for any SQL database access.")>]
8-
[<assembly: AssemblyVersionAttribute("1.5.19")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.5.19")>]
8+
[<assembly: AssemblyVersionAttribute("1.5.20")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.5.20")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "SQLProvider.DesignTime"
1414
let [<Literal>] AssemblyProduct = "SQLProvider"
1515
let [<Literal>] AssemblyDescription = "Type providers for any SQL database access."
16-
let [<Literal>] AssemblyVersion = "1.5.19"
17-
let [<Literal>] AssemblyFileVersion = "1.5.19"
16+
let [<Literal>] AssemblyVersion = "1.5.20"
17+
let [<Literal>] AssemblyFileVersion = "1.5.20"

src/SQLProvider.DesignTime/SQLProvider.DesignTime.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\netfx.props" />
44
<PropertyGroup>
55
<OutputType>Library</OutputType>
6-
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48;net6.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48;net6.0;net8.0;net10.0</TargetFrameworks>
77
<DefineConstants>NETSTANDARD;NO_GENERATIVE;DESIGNTIME;COMMON;REFLECTIONLOAD</DefineConstants>
88
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
99
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -19,7 +19,7 @@
1919
<Optimize>true</Optimize>
2020
<Tailcalls>true</Tailcalls>
2121
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
22+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
2323
<DefineConstants>$(DefineConstants);MICROSOFTSQL;NETSTANDARD21</DefineConstants>
2424
</PropertyGroup>
2525
<ItemGroup>

src/SQLProvider.DesignTime/SqlDesignTime.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@ type public SqlTypeProvider(config: TypeProviderConfig) as this =
15281528
// This is not a perfect cache-invalidation solution, it can remove a valid item from
15291529
// cache after the time-out, causing one extra hit, but this is only a design-time cache
15301530
// and it will work well enough to deal with Visual Studio's multi-threading problems
1531-
let expiration = TimeSpan.FromMinutes 3
1531+
let expiration = TimeSpan.FromMinutes 3.0
15321532
let rec invalidationFunction key =
15331533
async {
15341534
do! Async.Sleep (int expiration.TotalMilliseconds)

0 commit comments

Comments
 (0)