From f8e6440eb785a419aec4175b1a12e4827d133908 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:17:55 +0000 Subject: [PATCH 1/4] Initial plan From 83a9f39adc7a423154494c1288e28cea535efe99 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:26:35 +0000 Subject: [PATCH 2/4] Update project files and workflows for .NET 10 support Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- .github/workflows/build.yml | 5 ++++- .github/workflows/fsdocs-gh-pages.yml | 6 ++++-- .github/workflows/publish.yml | 6 ++++-- Content/Console/Directory.Packages.props | 2 +- Content/Console/build/build.fsproj | 2 +- Content/Console/global.json | 4 ++-- Content/Console/src/MyLib.1/MyLib.1.fsproj | 2 +- Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj | 2 +- Content/Library/Directory.Packages.props | 2 +- Content/Library/build/build.fsproj | 2 +- Content/Library/global.json | 4 ++-- Content/Library/src/MyLib.1/MyLib.1.fsproj | 2 +- Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj | 2 +- Content/ProjConsole/MyLib.1.fsproj | 2 +- Content/ProjLib/MyLib.1.fsproj | 2 +- Content/ProjTest/MyLib.1.fsproj | 2 +- Directory.Packages.props | 2 +- MiniScaffold.csproj | 4 ++-- build/build.fsproj | 2 +- global.json | 2 +- tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj | 2 +- 21 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19d349d5..f33f8b0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,13 @@ jobs: steps: - uses: actions/checkout@v5 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + 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' diff --git a/.github/workflows/fsdocs-gh-pages.yml b/.github/workflows/fsdocs-gh-pages.yml index a45c87fe..3b7dce37 100644 --- a/.github/workflows/fsdocs-gh-pages.yml +++ b/.github/workflows/fsdocs-gh-pages.yml @@ -30,11 +30,13 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v5 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | - 6.x + 8.x + 9.x + 10.x - name: Build Docs run: | ./build.sh builddocs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a09acd36..58ef4232 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,11 +36,13 @@ jobs: steps: - uses: actions/checkout@v5 - name: Setup necessary dotnet SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | - 6.x + 8.x + 9.x + 10.x - name: publish env: NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }} diff --git a/Content/Console/Directory.Packages.props b/Content/Console/Directory.Packages.props index 933d9f53..217ab1a8 100644 --- a/Content/Console/Directory.Packages.props +++ b/Content/Console/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/Content/Console/build/build.fsproj b/Content/Console/build/build.fsproj index f7fb4161..c044462b 100644 --- a/Content/Console/build/build.fsproj +++ b/Content/Console/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 3390;$(WarnOn) false diff --git a/Content/Console/global.json b/Content/Console/global.json index 7097136d..6ce18487 100644 --- a/Content/Console/global.json +++ b/Content/Console/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", - "rollForward": "feature" + "version": "10.0.100-rc.1.25451.107", + "rollForward": "latestMinor" } } diff --git a/Content/Console/src/MyLib.1/MyLib.1.fsproj b/Content/Console/src/MyLib.1/MyLib.1.fsproj index 0bc312f9..f177d838 100755 --- a/Content/Console/src/MyLib.1/MyLib.1.fsproj +++ b/Content/Console/src/MyLib.1/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 Exe true diff --git a/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj index 18b26887..389837d5 100755 --- a/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj +++ b/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false diff --git a/Content/Library/Directory.Packages.props b/Content/Library/Directory.Packages.props index 0fe73715..27081a2e 100644 --- a/Content/Library/Directory.Packages.props +++ b/Content/Library/Directory.Packages.props @@ -11,7 +11,7 @@ 6.1.3 - + diff --git a/Content/Library/build/build.fsproj b/Content/Library/build/build.fsproj index 67e81218..ffd0edff 100644 --- a/Content/Library/build/build.fsproj +++ b/Content/Library/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 3390;$(WarnOn) false diff --git a/Content/Library/global.json b/Content/Library/global.json index 7097136d..6ce18487 100644 --- a/Content/Library/global.json +++ b/Content/Library/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", - "rollForward": "feature" + "version": "10.0.100-rc.1.25451.107", + "rollForward": "latestMinor" } } diff --git a/Content/Library/src/MyLib.1/MyLib.1.fsproj b/Content/Library/src/MyLib.1/MyLib.1.fsproj index 001e587d..66a0952d 100755 --- a/Content/Library/src/MyLib.1/MyLib.1.fsproj +++ b/Content/Library/src/MyLib.1/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0;net10.0 MyLib.1 diff --git a/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj index b71135f0..4c38d8a2 100755 --- a/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj +++ b/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false diff --git a/Content/ProjConsole/MyLib.1.fsproj b/Content/ProjConsole/MyLib.1.fsproj index 3f705c59..6c0387e0 100644 --- a/Content/ProjConsole/MyLib.1.fsproj +++ b/Content/ProjConsole/MyLib.1.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 diff --git a/Content/ProjLib/MyLib.1.fsproj b/Content/ProjLib/MyLib.1.fsproj index 2aa6729a..35c00fcc 100644 --- a/Content/ProjLib/MyLib.1.fsproj +++ b/Content/ProjLib/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0;net10.0 MyLib.1 diff --git a/Content/ProjTest/MyLib.1.fsproj b/Content/ProjTest/MyLib.1.fsproj index 5431128d..dc73e494 100644 --- a/Content/ProjTest/MyLib.1.fsproj +++ b/Content/ProjTest/MyLib.1.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false diff --git a/Directory.Packages.props b/Directory.Packages.props index 33c41740..2ff706aa 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ 6.1.3 - + diff --git a/MiniScaffold.csproj b/MiniScaffold.csproj index 42a9360a..b3d51976 100644 --- a/MiniScaffold.csproj +++ b/MiniScaffold.csproj @@ -1,7 +1,7 @@ - F# Template for creating and publishing libraries targeting .NET 6.0 or console - apps .NET 6.0 + F# Template for creating and publishing libraries targeting .NET 8.0, 9.0, 10.0 or console + apps .NET 10.0 Jimmy Byrd https://github.com/TheAngryByrd/MiniScaffold https://github.com/TheAngryByrd/MiniScaffold.git diff --git a/build/build.fsproj b/build/build.fsproj index ebc569ba..65a8733e 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 3390;$(WarnOn) false preview diff --git a/global.json b/global.json index a53d9835..f03e41ef 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100-rc.1.25451.107", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj b/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj index 42f48d5b..8e87666c 100755 --- a/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj +++ b/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 false From 820f86c524b4facde039a94c199c091304cb14e9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:32:10 +0000 Subject: [PATCH 3/4] Adjust .NET versions to use available SDKs (net8.0/net9.0) Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- Content/Console/build/build.fsproj | 2 +- Content/Console/global.json | 2 +- Content/Console/src/MyLib.1/MyLib.1.fsproj | 2 +- Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj | 2 +- Content/Library/build/build.fsproj | 2 +- Content/Library/global.json | 2 +- Content/Library/src/MyLib.1/MyLib.1.fsproj | 2 +- Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj | 2 +- Content/ProjConsole/MyLib.1.fsproj | 2 +- Content/ProjLib/MyLib.1.fsproj | 2 +- Content/ProjTest/MyLib.1.fsproj | 2 +- MiniScaffold.csproj | 4 ++-- build/build.fsproj | 2 +- build/packages.lock.json | 4 ++-- global.json | 2 +- tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj | 2 +- tests/MiniScaffold.Tests/packages.lock.json | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Content/Console/build/build.fsproj b/Content/Console/build/build.fsproj index c044462b..71966aa8 100644 --- a/Content/Console/build/build.fsproj +++ b/Content/Console/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 3390;$(WarnOn) false diff --git a/Content/Console/global.json b/Content/Console/global.json index 6ce18487..570d90dc 100644 --- a/Content/Console/global.json +++ b/Content/Console/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107", + "version": "9.0.306", "rollForward": "latestMinor" } } diff --git a/Content/Console/src/MyLib.1/MyLib.1.fsproj b/Content/Console/src/MyLib.1/MyLib.1.fsproj index f177d838..62dee78c 100755 --- a/Content/Console/src/MyLib.1/MyLib.1.fsproj +++ b/Content/Console/src/MyLib.1/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net10.0 + net9.0 Exe true diff --git a/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj index 389837d5..7e141d1a 100755 --- a/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj +++ b/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 false diff --git a/Content/Library/build/build.fsproj b/Content/Library/build/build.fsproj index ffd0edff..5eb350f5 100644 --- a/Content/Library/build/build.fsproj +++ b/Content/Library/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 3390;$(WarnOn) false diff --git a/Content/Library/global.json b/Content/Library/global.json index 6ce18487..570d90dc 100644 --- a/Content/Library/global.json +++ b/Content/Library/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107", + "version": "9.0.306", "rollForward": "latestMinor" } } diff --git a/Content/Library/src/MyLib.1/MyLib.1.fsproj b/Content/Library/src/MyLib.1/MyLib.1.fsproj index 66a0952d..6701d15f 100755 --- a/Content/Library/src/MyLib.1/MyLib.1.fsproj +++ b/Content/Library/src/MyLib.1/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0 MyLib.1 diff --git a/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj index 4c38d8a2..8d3f1afb 100755 --- a/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj +++ b/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 false diff --git a/Content/ProjConsole/MyLib.1.fsproj b/Content/ProjConsole/MyLib.1.fsproj index 6c0387e0..bc207513 100644 --- a/Content/ProjConsole/MyLib.1.fsproj +++ b/Content/ProjConsole/MyLib.1.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 diff --git a/Content/ProjLib/MyLib.1.fsproj b/Content/ProjLib/MyLib.1.fsproj index 35c00fcc..79011aca 100644 --- a/Content/ProjLib/MyLib.1.fsproj +++ b/Content/ProjLib/MyLib.1.fsproj @@ -1,7 +1,7 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0 MyLib.1 diff --git a/Content/ProjTest/MyLib.1.fsproj b/Content/ProjTest/MyLib.1.fsproj index dc73e494..33a70ac9 100644 --- a/Content/ProjTest/MyLib.1.fsproj +++ b/Content/ProjTest/MyLib.1.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 false diff --git a/MiniScaffold.csproj b/MiniScaffold.csproj index b3d51976..26a8481e 100644 --- a/MiniScaffold.csproj +++ b/MiniScaffold.csproj @@ -1,7 +1,7 @@ - F# Template for creating and publishing libraries targeting .NET 8.0, 9.0, 10.0 or console - apps .NET 10.0 + F# Template for creating and publishing libraries targeting .NET 8.0, 9.0 or console + apps .NET 9.0 Jimmy Byrd https://github.com/TheAngryByrd/MiniScaffold https://github.com/TheAngryByrd/MiniScaffold.git diff --git a/build/build.fsproj b/build/build.fsproj index 65a8733e..2991a67d 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 3390;$(WarnOn) false preview diff --git a/build/packages.lock.json b/build/packages.lock.json index 721e96e6..6686d7b6 100644 --- a/build/packages.lock.json +++ b/build/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net9.0": { "Argu": { "type": "Direct", "requested": "[6.0.0, )", @@ -465,7 +465,7 @@ }, "FSharp.Core": { "type": "CentralTransitive", - "requested": "[8.0.403, )", + "requested": "[9.0.303, )", "resolved": "8.0.301", "contentHash": "I94+2zfAhWMJwPzVDFSlsutZvjPkaRvLVipf8b2O4AyzxKUBmevDkUBzcJBqSQNB1Ikig8xdphswoeKrObqx7Q==" } diff --git a/global.json b/global.json index f03e41ef..3ed31525 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107", + "version": "9.0.306", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj b/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj index 8e87666c..b896e17e 100755 --- a/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj +++ b/tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net10.0 + net9.0 false diff --git a/tests/MiniScaffold.Tests/packages.lock.json b/tests/MiniScaffold.Tests/packages.lock.json index a0464bb0..9fbfcb2f 100644 --- a/tests/MiniScaffold.Tests/packages.lock.json +++ b/tests/MiniScaffold.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net9.0": { "Expecto": { "type": "Direct", "requested": "[10.2.2, )", @@ -655,7 +655,7 @@ }, "FSharp.Core": { "type": "CentralTransitive", - "requested": "[8.0.403, )", + "requested": "[9.0.303, )", "resolved": "8.0.301", "contentHash": "I94+2zfAhWMJwPzVDFSlsutZvjPkaRvLVipf8b2O4AyzxKUBmevDkUBzcJBqSQNB1Ikig8xdphswoeKrObqx7Q==" }, From 09dfb95a47acc6fdfb77fa4ac0b982a4259f7030 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 19 Oct 2025 23:42:20 +0000 Subject: [PATCH 4/4] Fix devcontainer .NET version mismatch - update to support .NET 9.0 Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4f917805..5b1e8df2 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": "9.0", + "additionalVersions": "8.0" } }, "overrideFeatureInstallOrder": [