Skip to content

Expand framework targets to .NET 10.0, 9.0, and 8.0 #81

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

Open
frequency403 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Expand framework targets to .NET 10.0, 9.0, and 8.0 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa3580
Expand framework targets to .NET 10.0, 9.0, and 8.0 while adjusting l…
frequency403 Dec 10, 2025
445820c
Update SDK, workflows, and project configuration for compatibility wi…
frequency403 Dec 11, 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
17 changes: 10 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
os: [ windows-2022, ubuntu-22.04, macos-12 ]
os: [ windows-2022, ubuntu-24.04, macos-14 ]

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -30,35 +30,38 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4.2.2

- name: Fetch all tags and branches
run: git fetch --prune --unshallow

- uses: actions/setup-dotnet@v3.4.2
- uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
9.0.x
10.0.x

- name: Cache Tools
uses: actions/cache@v3
uses: actions/cache@v4.1.0
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

- name: Build project
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v3.0.1
with:
script-path: recipe.cake
target: CI
cake-version: 1.3.0

- name: Upload Issues
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
with:
if-no-files-found: warn
name: ${{ matrix.os }} Issues
Expand All @@ -67,7 +70,7 @@ jobs:
BuildArtifacts/**/coverlet/*.xml

- name: Upload Packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: runner.os == 'Windows'
with:
if-no-files-found: warn
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
Expand Up @@ -2,7 +2,7 @@
"projects": [ "src" ],
"sdk": {
"allowPrerelease": true,
"version": "7.0.410",
"version": "10.0.0",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion src/Samples/SingleCommand/Commands/DefaultCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public DefaultCommand(IGreeter greeter)
_greeter = greeter ?? throw new ArgumentNullException(nameof(greeter));
}

public override int Execute([NotNull] CommandContext context, [NotNull] Settings settings)
public override int Execute([NotNull] CommandContext context, [NotNull] Settings settings, [NotNull] CancellationToken cancellationToken)
{
_greeter.Greet(settings.Name);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/SingleCommand/SingleCommand.csproj
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>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>SingleCommand</RootNamespace>
Expand Down
7 changes: 7 additions & 0 deletions src/Spectre.Console.Extensions.Hosting.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleCommand", "Samples\Si
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3EEF9DAB-A839-40AB-B67A-54A88D753B21}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47DE6B49-FEDA-4921-AC0E-5F5CD0C4796B}"
ProjectSection(SolutionItems) = preProject
..\global.json = ..\global.json
..\.github\renovate.json = ..\.github\renovate.json
..\.github\workflows\build.yml = ..\.github\workflows\build.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
15 changes: 13 additions & 2 deletions src/Spectre.Console.Extensions.Hosting/Spectre.Console.Extensions.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
<LangVersion>10</LangVersion>
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
<ImplicitUsings>true</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Spectre.Console.Extensions.Hosting</RootNamespace>
</PropertyGroup>
<Choose>
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PropertyGroup>
<LangVersion>10</LangVersion>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<LangVersion>default</LangVersion>
</PropertyGroup>
</Otherwise>
</Choose>
<PropertyGroup>
<StartYear>2022</StartYear>
<EndYear>$([System.DateTime]::Today.Year)</EndYear>
Expand Down