Skip to content

Prepare for .NET 10 support - Update infrastructure and target frameworks #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Prepare for .NET 10 support - Update infrastructure and target frameworks #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8e6440
Initial plan
Copilot Oct 19, 2025
83a9f39
Update project files and workflows for .NET 10 support
Copilot Oct 19, 2025
820f86c
Adjust .NET versions to use available SDKs (net8.0/net9.0)
Copilot Oct 19, 2025
09dfb95
Fix devcontainer .NET version mismatch - update to support .NET 9.0
Copilot Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/fsdocs-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Content/Console/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>

<PackageVersion Include="FSharp.Core" Version="8.0.403" />
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
<PackageVersion Include="Expecto" Version="10.2.2" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
Expand Down
2 changes: 1 addition & 1 deletion Content/Console/build/build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Content/Console/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "feature"
"version": "9.0.306",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion Content/Console/src/MyLib.1/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Content/Library/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<FakeVersion>6.1.3</FakeVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FSharp.Core" Version="8.0.403" />
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.0" />
<PackageVersion Include="altcover" Version="8.2.825" />
<PackageVersion Include="Expecto" Version="10.2.2" />
Expand Down
2 changes: 1 addition & 1 deletion Content/Library/build/build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Content/Library/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "feature"
"version": "9.0.306",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion Content/Library/src/MyLib.1/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<Title>MyLib.1</Title>
Expand Down
2 changes: 1 addition & 1 deletion Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Content/ProjConsole/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Content/ProjLib/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<Title>MyLib.1</Title>
Expand Down
2 changes: 1 addition & 1 deletion Content/ProjTest/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<FakeVersion>6.1.3</FakeVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FSharp.Core" Version="8.0.403" />
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
<PackageVersion Include="Expecto" Version="10.2.2" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
Expand Down
4 changes: 2 additions & 2 deletions MiniScaffold.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>F# Template for creating and publishing libraries targeting .NET 6.0 or console
apps .NET 6.0</Description>
<Description>F# Template for creating and publishing libraries targeting .NET 8.0, 9.0 or console
apps .NET 9.0</Description>
<Authors>Jimmy Byrd</Authors>
<PackageProjectUrl>https://github.com/TheAngryByrd/MiniScaffold</PackageProjectUrl>
<RepositoryUrl>https://github.com/TheAngryByrd/MiniScaffold.git</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion build/build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
<LangVersion>preview</LangVersion>
Expand Down
4 changes: 2 additions & 2 deletions build/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 2,
"dependencies": {
"net8.0": {
"net9.0": {
"Argu": {
"type": "Direct",
"requested": "[6.0.0, )",
Expand Down Expand Up @@ -465,7 +465,7 @@
},
"FSharp.Core": {
"type": "CentralTransitive",
"requested": "[8.0.403, )",
"requested": "[9.0.303, )",
"resolved": "8.0.301",
"contentHash": "I94+2zfAhWMJwPzVDFSlsutZvjPkaRvLVipf8b2O4AyzxKUBmevDkUBzcJBqSQNB1Ikig8xdphswoeKrObqx7Q=="
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.306",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion tests/MiniScaffold.Tests/MiniScaffold.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/MiniScaffold.Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 2,
"dependencies": {
"net8.0": {
"net9.0": {
"Expecto": {
"type": "Direct",
"requested": "[10.2.2, )",
Expand Down Expand Up @@ -655,7 +655,7 @@
},
"FSharp.Core": {
"type": "CentralTransitive",
"requested": "[8.0.403, )",
"requested": "[9.0.303, )",
"resolved": "8.0.301",
"contentHash": "I94+2zfAhWMJwPzVDFSlsutZvjPkaRvLVipf8b2O4AyzxKUBmevDkUBzcJBqSQNB1Ikig8xdphswoeKrObqx7Q=="
},
Expand Down
Loading