From 694779a71f4f893639d358f0b79cdf973653715f Mon Sep 17 00:00:00 2001 From: Andrii Chebukin Date: Fri, 22 May 2026 23:04:41 +0200 Subject: [PATCH 1/2] chore: update to `10.0.300` SDK and migrate to `SLNX` --- .devcontainer/devcontainer.json | 3 +- .github/workflows/build.yml | 2 - .github/workflows/publish_ci.yml | 2 - .github/workflows/publish_release.yml | 2 - FSharp.Control.R3.sln | 80 ------------------- FSharp.Control.R3.slnf | 2 +- FSharp.Control.R3.slnx | 17 ++++ build/build.fsproj | 2 +- global.json | 2 +- .../FSharp.Control.R3.Tests.fsproj | 2 +- 10 files changed, 23 insertions(+), 91 deletions(-) delete mode 100644 FSharp.Control.R3.sln create mode 100644 FSharp.Control.R3.slnx diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4f91780..00a2e66 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,7 +23,8 @@ "ghcr.io/devcontainers-contrib/features/starship:1": {}, // https://github.com/devcontainers/features/blob/main/src/dotnet/README.md "ghcr.io/devcontainers/features/dotnet:2": { - "version": "8.0" + "version": "10.0.300", + "additionalVersions": "8.0" } }, "overrideFeatureInstallOrder": [ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a861f2a..5077bdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,6 @@ jobs: uses: actions/setup-dotnet@v4 with: global-json-file: global.json - dotnet-version: | - 8.x - name: Build via Bash if: runner.os != 'Windows' diff --git a/.github/workflows/publish_ci.yml b/.github/workflows/publish_ci.yml index 24d76b1..f4612bc 100644 --- a/.github/workflows/publish_ci.yml +++ b/.github/workflows/publish_ci.yml @@ -24,8 +24,6 @@ jobs: uses: actions/setup-dotnet@v4 with: global-json-file: global.json - dotnet-version: | - 8.x - name: Add the GitHub source run: dotnet nuget add source --name "github.com" "https://nuget.pkg.github.com/fsprojects/index.json" diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 61b6f09..2c6b2b6 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -21,8 +21,6 @@ jobs: uses: actions/setup-dotnet@v4 with: global-json-file: global.json - dotnet-version: | - 8.x - name: Publish to NuGet env: diff --git a/FSharp.Control.R3.sln b/FSharp.Control.R3.sln deleted file mode 100644 index daeb8f3..0000000 --- a/FSharp.Control.R3.sln +++ /dev/null @@ -1,80 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.12.35424.110 d17.12 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C397A34C-84F1-49E7-AEBC-2F9F2B196216}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.R3", "src\FSharp.Control.R3\FSharp.Control.R3.fsproj", "{5D30E174-2538-47AC-8443-318C8C5DC2C9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.R3.Tests", "tests\FSharp.Control.R3.Tests\FSharp.Control.R3.Tests.fsproj", "{1CA2E092-2320-451D-A4F0-9ED7C7C528CA}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{40D2259D-991D-44C4-B45D-C88CE0710C23}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CA9A2552-65D7-4D71-A24B-F3D8A9F4C50F}" - ProjectSection(SolutionItems) = preProject - CHANGELOG.md = CHANGELOG.md - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - Directory.Packages.props = Directory.Packages.props - global.json = global.json - README.md = README.md - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|x64.ActiveCfg = Debug|x64 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|x64.Build.0 = Debug|x64 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|x86.ActiveCfg = Debug|x86 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Debug|x86.Build.0 = Debug|x86 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|Any CPU.Build.0 = Release|Any CPU - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|x64.ActiveCfg = Release|x64 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|x64.Build.0 = Release|x64 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|x86.ActiveCfg = Release|x86 - {5D30E174-2538-47AC-8443-318C8C5DC2C9}.Release|x86.Build.0 = Release|x86 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|x64.ActiveCfg = Debug|x64 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|x64.Build.0 = Debug|x64 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|x86.ActiveCfg = Debug|x86 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Debug|x86.Build.0 = Debug|x86 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|Any CPU.Build.0 = Release|Any CPU - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|x64.ActiveCfg = Release|x64 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|x64.Build.0 = Release|x64 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|x86.ActiveCfg = Release|x86 - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA}.Release|x86.Build.0 = Release|x86 - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x64.ActiveCfg = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x64.Build.0 = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x86.ActiveCfg = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x86.Build.0 = Debug|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|Any CPU.Build.0 = Release|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x64.ActiveCfg = Release|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x64.Build.0 = Release|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.ActiveCfg = Release|Any CPU - {40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {5D30E174-2538-47AC-8443-318C8C5DC2C9} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216} - {1CA2E092-2320-451D-A4F0-9ED7C7C528CA} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F} - EndGlobalSection -EndGlobal diff --git a/FSharp.Control.R3.slnf b/FSharp.Control.R3.slnf index 65a6805..1056652 100644 --- a/FSharp.Control.R3.slnf +++ b/FSharp.Control.R3.slnf @@ -1,6 +1,6 @@ { "solution": { - "path": "FSharp.Control.R3.sln", + "path": "FSharp.Control.R3.slnx", "projects": [ "src\\FSharp.Control.R3\\FSharp.Control.R3.fsproj", "tests\\FSharp.Control.R3.Tests\\FSharp.Control.R3.Tests.fsproj" diff --git a/FSharp.Control.R3.slnx b/FSharp.Control.R3.slnx new file mode 100644 index 0000000..08bdcb9 --- /dev/null +++ b/FSharp.Control.R3.slnx @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/build/build.fsproj b/build/build.fsproj index 86538f0..2678dfd 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/global.json b/global.json index ab68d9f..1838608 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.403", + "version": "10.0.300", "allowPrerelease": false, "rollForward": "latestMinor" } diff --git a/tests/FSharp.Control.R3.Tests/FSharp.Control.R3.Tests.fsproj b/tests/FSharp.Control.R3.Tests/FSharp.Control.R3.Tests.fsproj index 865ef9c..9c07d08 100644 --- a/tests/FSharp.Control.R3.Tests/FSharp.Control.R3.Tests.fsproj +++ b/tests/FSharp.Control.R3.Tests/FSharp.Control.R3.Tests.fsproj @@ -20,4 +20,4 @@ - \ No newline at end of file + From bc408bddf550c7a02bdd257b4dd11c0340e0b79f Mon Sep 17 00:00:00 2001 From: Andrii Chebukin Date: Fri, 22 May 2026 23:05:17 +0200 Subject: [PATCH 2/2] ci: update all Github actions --- .github/workflows/build.yml | 6 +++--- .github/workflows/fsdocs-gh-pages.yml | 10 +++++----- .github/workflows/publish_ci.yml | 4 ++-- .github/workflows/publish_release.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5077bdc..514f90a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,9 +17,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Build and run dev container task uses: devcontainers/ci@v0.3 diff --git a/.github/workflows/fsdocs-gh-pages.yml b/.github/workflows/fsdocs-gh-pages.yml index cccb8e9..1d5a147 100644 --- a/.github/workflows/fsdocs-gh-pages.yml +++ b/.github/workflows/fsdocs-gh-pages.yml @@ -26,11 +26,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v6 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | @@ -41,7 +41,7 @@ jobs: ./build.sh builddocs - name: Upload artifact - uses: actions/upload-pages-artifact@v4 + uses: actions/upload-pages-artifact@v5 with: path: docs/ @@ -55,4 +55,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.github/workflows/publish_ci.yml b/.github/workflows/publish_ci.yml index f4612bc..2ac854b 100644 --- a/.github/workflows/publish_ci.yml +++ b/.github/workflows/publish_ci.yml @@ -18,10 +18,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 2c6b2b6..f52e4d4 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -16,9 +16,9 @@ jobs: name: nuget runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json