diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a90d2733..418951aa 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,14 +3,14 @@ "isRoot": true, "tools": { "fable": { - "version": "4.25.0", + "version": "4.27.0", "commands": [ "fable" ], "rollForward": false }, "fantomas": { - "version": "7.0.2", + "version": "7.0.3", "commands": [ "fantomas" ], @@ -24,7 +24,7 @@ "rollForward": false }, "fsharp-analyzers": { - "version": "0.31.0", + "version": "0.34.1", "commands": [ "fsharp-analyzers" ], diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f028e21a..9d7b2401 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -19,12 +19,12 @@ }, // https://github.com/devcontainers/features/blob/main/src/github-cli/README.md "ghcr.io/devcontainers/features/github-cli:1": {}, - // https://github.com/devcontainers-contrib/features/blob/main/src/starship/README.md - "ghcr.io/devcontainers-contrib/features/starship:1": {}, + // https://github.com/devcontainers-extra/features/blob/main/src/starship/README.md + "ghcr.io/devcontainers-extra/features/starship:1": {}, // https://github.com/devcontainers/features/blob/main/src/dotnet/README.md "ghcr.io/devcontainers/features/dotnet:2": { - "version": "9.0", - "additionalVersions": "8.0" + "version": "10.0", + "additionalVersions": ["8.0", "9.0"] }, "ghcr.io/devcontainers/features/node:1": { "version": "22" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fa73b7f..93cf520d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,14 +24,15 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | 8.x 9.x + 10.x - name: Build via Bash if: runner.os != 'Windows' @@ -58,20 +59,21 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v5 with: node-version: ${{ matrix.node-version }} - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | 8.x 9.x + 10.x - name: Build via Bash if: runner.os != 'Windows' @@ -105,12 +107,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | 8.x 9.x + 10.x - name: Build via Bash if: runner.os != 'Windows' run: | @@ -132,7 +135,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Build and run dev container task uses: devcontainers/ci@v0.3 @@ -144,14 +147,15 @@ jobs: analyze: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | 8.x 9.x + 10.x - name: Analyze run: | chmod +x ./build.sh diff --git a/.vscode/launch.json b/.vscode/launch.json index 05714b78..415b8ab8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,14 +5,14 @@ "name": "benchmarks", "type": "coreclr", "request": "launch", - "program": "${workspaceFolder}/benchmarks/bin/Release/net8.0/benchmarks.exe", - "args": ["-m", "--runtimes", "net8.0", "--filter", "*"], + "program": "${workspaceFolder}/benchmarks/bin/Release/net10.0/benchmarks.exe", + "args": ["-m", "--runtimes", "net10.0", "--filter", "*"], "env": { "ASPNETCORE_ENVIRONMENT": "Development" }, "console": "integratedTerminal", "preLaunchTask": "build release", - "cwd": "${workspaceFolder}/benchmarks/bin/Release/net8.0/" + "cwd": "${workspaceFolder}/benchmarks/bin/Release/net10.0/" } ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 939105bb..dcae6a2a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,8 +10,5 @@ "BackgroundCompiler." ], "FSharp.fsac.parallelReferenceResolution": false, - "FSharp.enableAnalyzers": true, - "FSharp.analyzersPath": [ - "packages/analyzers" - ] + "FSharp.enableAnalyzers": true } \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 6f1b8566..2294318c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ true - $(NoWarn);FS2003;NU1903;NU1904;FS0057 + $(NoWarn);FS2003;NU1902;NU1903;NU1904;FS0057 true 8.0 - 9.0 - enable + 10.0 + enable diff --git a/Directory.Packages.props b/Directory.Packages.props index d6bbe960..c4650824 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -22,20 +22,20 @@ - - - + + + - - - - - - - - - + + + + + + + + + @@ -43,8 +43,8 @@ - - + + diff --git a/benchmarks/benchmarks.fsproj b/benchmarks/benchmarks.fsproj index b27c660e..6e09a612 100644 --- a/benchmarks/benchmarks.fsproj +++ b/benchmarks/benchmarks.fsproj @@ -1,7 +1,7 @@  - net8.0;net9.0 + net10.0 Exe diff --git a/build/build.fsproj b/build/build.fsproj index 42bbcf17..44236bd7 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false diff --git a/global.json b/global.json index fb37ab71..fe954fe1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4f6a3298..383f6256 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -30,9 +30,9 @@ - + - + @@ -41,4 +41,10 @@ + + + + + + diff --git a/src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj b/src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj index b8b16333..0fb98df2 100644 --- a/src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj +++ b/src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj @@ -2,7 +2,7 @@ Library - netstandard2.1;netstandard2.0;net9.0 + netstandard2.1;netstandard2.0;net10.0 portable diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj b/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj index ee2f32c8..b505e8fe 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj +++ b/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj @@ -2,7 +2,7 @@ Library - net6.0;netstandard2.0;netstandard2.1;net9.0 + net6.0;netstandard2.0;netstandard2.1;net10.0 portable $(NoWarn);FS3511;FS3513 diff --git a/src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj b/src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj index f3586ee3..37ed82e9 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj +++ b/src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj @@ -2,7 +2,7 @@ Library - netstandard2.1;netstandard2.0;net9.0 + netstandard2.1;netstandard2.0;net10.0 portable diff --git a/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj b/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj index 563ef414..b3b9974f 100644 --- a/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj +++ b/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj @@ -1,7 +1,7 @@ Library - netstandard2.1;netstandard2.0;net9.0 + netstandard2.1;netstandard2.0;net10.0 portable $(NoWarn);FS1204;FS3511;FS3513;FS0057 $(PackageTags), fable-library, fable-dotnet, fable-javascript, fable-python diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 19cb75c5..440885e8 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -15,9 +15,9 @@ - + - + diff --git a/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj b/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj index b61f1b73..87180a36 100644 --- a/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj +++ b/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0;net9.0 + net8.0;net10.0 diff --git a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskResultCE.fs b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskResultCE.fs index 9c3f036d..0fbef9eb 100644 --- a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskResultCE.fs +++ b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskResultCE.fs @@ -746,7 +746,7 @@ module CancellableTaskResultCE = let! actual = cancellableTaskResult { - use d = null + use d: IDisposableNull = null return data } diff --git a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs index a530445f..c17516ca 100644 --- a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs +++ b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs @@ -833,7 +833,7 @@ module CancellableTaskValidationCE = let! actual = cancellableTaskValidation { - use d = null + use d: IDisposableNull = null return data } diff --git a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj index b6fd8c9d..9663a854 100644 --- a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj +++ b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 $(NoWarn); FS3511 diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj b/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj index 48057958..82aeecf3 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0;net9.0 + net8.0;net10.0 diff --git a/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj b/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj index eedf2526..b7afe643 100644 --- a/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj +++ b/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net9.0;net8.0; + net8.0;net10.0 diff --git a/tools/FunctionMap/FunctionMap.fsproj b/tools/FunctionMap/FunctionMap.fsproj index 9ec716ea..67f64c6b 100644 --- a/tools/FunctionMap/FunctionMap.fsproj +++ b/tools/FunctionMap/FunctionMap.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false false