Skip to content

Add .NET 10 (preview) as the default TFM and enable multi-targeting builds #949

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

Merged
aaronpowell merged 30 commits into from
Nov 15, 2025
Merged

Add .NET 10 (preview) as the default TFM and enable multi-targeting builds #949

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4e9036e
Initial plan
Copilot Nov 6, 2025
7236d38
Add .NET 10 (preview) as a TFM for multi-targeting builds
Copilot Nov 6, 2025
303a76f
Change default TFM to .NET 10 and update GitHub Actions to install .N…
Copilot Nov 6, 2025
c6b19fc
Update devcontainer to install .NET 10 as preview
Copilot Nov 6, 2025
1e4e20d
Add .NET 10 to setup-runtimes-caching action
Copilot Nov 6, 2025
ac50650
Fixing some versioning
aaronpowell Nov 6, 2025
9441794
Hard coding an update to use [email protected] as 2.2.0 has a CVE…
aaronpowell Nov 6, 2025
ef89379
Fixing some projects that specified their own TFM and trying to addre…
aaronpowell Nov 6, 2025
e66de71
Using an improved approach approach to adding system.linq.asyncenumer…
aaronpowell Nov 7, 2025
51e57ba
Updating how dev certs are setup
aaronpowell Nov 10, 2025
f3ff1ff
Turns out you can't upgrade around the CVE, so we now suppress it
aaronpowell Nov 10, 2025
dc27f09
skipping tests which would do nothing
aaronpowell Nov 11, 2025
ce0d983
Merge branch 'main' into copilot/add-dotnet-10-tfm-support
aaronpowell Nov 11, 2025
2dca5eb
Some msbuild library updates
aaronpowell Nov 11, 2025
f5cc442
Merge branch 'copilot/add-dotnet-10-tfm-support' of https://github.co…
aaronpowell Nov 11, 2025
a705c4d
handling .net 8 down leveling of packages
aaronpowell Nov 11, 2025
7172f34
Removing .NET 10 support from sql database projects integration
aaronpowell Nov 11, 2025
d784f00
test and example projects set to net8.0
aaronpowell Nov 11, 2025
3a3128d
Setting target frameworks too
aaronpowell Nov 11, 2025
7ab3be8
Merge branch 'main' into copilot/add-dotnet-10-tfm-support
aaronpowell Nov 12, 2025
87c71c6
Moving to the new sdk structure
aaronpowell Nov 12, 2025
7919020
how'd I miss that merge
aaronpowell Nov 12, 2025
f6d32e9
Can't have Aspire.Hosting.AppHost in CPM as it's implicitly added
aaronpowell Nov 12, 2025
5349300
Back to zero compiler errors, woo
aaronpowell Nov 12, 2025
809b171
Removing the .net down levelling there too
aaronpowell Nov 12, 2025
6a73db8
Missed another reference to the apphost package
aaronpowell Nov 12, 2025
e567daa
reverting a change
aaronpowell Nov 14, 2025
1911944
Attempting to force the removal of some nuget packages that we don't …
aaronpowell Nov 14, 2025
a6057e6
csproj mistake
aaronpowell Nov 14, 2025
90fb953
Going nuclear on the files in a post-build task
aaronpowell Nov 14, 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
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
"features": {
"ghcr.io/azure/azure-dev/azd:latest": {},
"ghcr.io/devcontainers/features/dotnet:latest": {
"version": "8.0",
"additionalVersions": "9.0"
"version": "10.0",
"additionalVersions": "8.0,9.0",
"installUsingApt": false
},
"ghcr.io/devcontainers/features/github-cli:latest": {},
"ghcr.io/devcontainers/features/java:1": {
Expand Down
3 changes: 1 addition & 2 deletions .devcontainer/post-create.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ sudo apt-get update && \
sudo rm -rf /var/lib/apt/lists/*

echo Install .NET dev certs
dotnet tool update -g linux-dev-certs
dotnet linux-dev-certs install
dotnet dev-certs https --trust

echo Install JS monorepo tools
npm install -g turbo
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/setup-runtimes-caching/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ runs:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Set up Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -84,8 +85,7 @@ runs:
shell: bash
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
dotnet tool update -g linux-dev-certs
dotnet linux-dev-certs install
dotnet dev-certs https --trust

- name: Setup Node globals
shell: bash
Expand Down Expand Up @@ -117,3 +117,4 @@ runs:
run: |
dapr init --runtime-version=${{ env.DAPR_VERSION }}
dapr --version

1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

env:
DEFAULT_DOTNET_VERSION: "8.0.x"
DEFAULT_DOTNET_VERSION: "10.0.x"

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "v*"

env:
DEFAULT_DOTNET_VERSION: "8.0.x"
DEFAULT_DOTNET_VERSION: "10.0.x"

jobs:
build:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/generate-api-diffs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Restore and build
run: |

find src -type f -name "*.csproj" | while read -r csproj; do
dotnet build "$csproj" -f net8.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource
dotnet build "$csproj" -f net10.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource
done
continue-on-error: true

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Get git tag
id: git_tag
Expand Down
12 changes: 8 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
<PropertyGroup>

<DefaultTargetFramework>net8.0</DefaultTargetFramework>
<DefaultTargetFramework>net10.0</DefaultTargetFramework>
<TargetFrameworks>$(DefaultTargetFramework)</TargetFrameworks>
<AllTargetFrameworks>$(DefaultTargetFramework);net9.0</AllTargetFrameworks>
<AllTargetFrameworks>$(DefaultTargetFramework);net8.0;net9.0</AllTargetFrameworks>
<LangVersion>latest</LangVersion>

<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -16,9 +16,9 @@
<AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
<AspirePreviewSuffix>preview.1.25522.3</AspirePreviewSuffix>
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
<DotNetExtensionsVersion>9.0.10</DotNetExtensionsVersion>
<DotNetExtensionsVersion>10.0.0-rc.2.25502.107</DotNetExtensionsVersion>
<OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
<TestContainersVersion>4.7.0</TestContainersVersion>
<TestContainersVersion>4.8.1</TestContainersVersion>
<MEAIVersion>9.9.0</MEAIVersion>
<ServiceDiscoveryVersion>10.0.0-preview.1.25520.3</ServiceDiscoveryVersion>
<IsPackable>false</IsPackable>
Expand Down Expand Up @@ -46,4 +46,8 @@

<VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>
</PropertyGroup>

<ItemGroup>
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-4mjw-xr5x-prpc" />
</ItemGroup>
</Project>
10 changes: 6 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(DotNetExtensionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(DotNetExtensionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetExtensionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetExtensionsVersion)" />
<!-- .NET packages -->
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(ServiceDiscoveryVersion)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(DotNetExtensionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(DotNetExtensionsVersion)" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(DotNetExtensionsVersion)" />
<!-- OpenTelemetry packages -->
Expand Down Expand Up @@ -113,8 +114,9 @@
<PackageVersion Include="Testcontainers" Version="$(TestContainersVersion)" />
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestContainersVersion)" />
</ItemGroup>
<ItemGroup Label=".NET 9 Overrides" Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />

<ItemGroup Label="System">
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(DotNetExtensionsVersion)" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions ...it.RabbitMQ.MessageTypes/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Messaging</RootNamespace>
</PropertyGroup>

Expand Down
3 changes: 0 additions & 3 deletions ...sTransit.RabbitMQ.Publisher/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions ...munityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
<UserSecretsId>bc193f31-c9f7-4e3d-b70a-0dc39ec3047f</UserSecretsId>
</PropertyGroup>
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,5 +1,5 @@
{
"sdk": {
"allowPrerelease": false
"allowPrerelease": true
}
}
7 changes: 7 additions & 0 deletions ...ommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,11 @@
<InternalsVisibleTo Include="CommunityToolkit.Aspire.Hosting.KurrentDB.Tests"></InternalsVisibleTo>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...re.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<!-- Workaround for https://github.com/dotnet/aspire/issues/7779 -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ....Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<!-- Workaround for https://github.com/dotnet/aspire/issues/7779 -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options" />
</ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@
<Compile Include="$(SharedDir)\HealthChecksExtensions.cs" Link="Utils\HealthChecksExtensions.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
Copy link

Copilot AI Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The explicit TargetFramework setting here is inconsistent with the approach used in other AppHost projects. Most example AppHost projects (e.g., examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost) have removed explicit TargetFramework settings to inherit from Directory.Build.props. Consider removing this line to maintain consistency and allow the framework to be inherited from DefaultTargetFramework.

Suggested change
<TargetFramework>net10.0</TargetFramework>

Copilot uses AI. Check for mistakes.
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Copy link

Copilot AI Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to the pattern used in other AppHost projects, consider removing the explicit ImplicitUsings and Nullable properties as they are already set in Directory.Build.props (lines 11-12) and will be inherited automatically.

Suggested change
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Copilot uses AI. Check for mistakes.
<IsAspireHost>true</IsAspireHost>
Expand Down
7 changes: 7 additions & 0 deletions tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@
<ItemGroup>
<Compile Include="$(RepoRoot)src\CommunityToolkit.Aspire.Hosting.KurrentDB\KurrentDBContainerImageTags.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>
</Project>
8 changes: 5 additions & 3 deletions tests/CommunityToolkit.Aspire.SurrealDb.Tests/ConformanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

namespace CommunityToolkit.Aspire.SurrealDb.Tests;

public class ConformanceTests :
ConformanceTests<SurrealDbClient, SurrealDbClientSettings>,
public class ConformanceTests :
ConformanceTests<SurrealDbClient, SurrealDbClientSettings>,
IClassFixture<SurrealDbContainerFixture>
{
private readonly SurrealDbContainerFixture _containerFixture;

protected override ServiceLifetime ServiceLifetime => ServiceLifetime.Singleton;

protected override string ActivitySourceName => string.Empty;
Expand All @@ -25,6 +25,8 @@ public class ConformanceTests :

protected override bool SupportsKeyedRegistrations => true;

protected override bool CanCreateClientWithoutConnectingToServer => false;

public ConformanceTests(SurrealDbContainerFixture containerFixture)
{
_containerFixture = containerFixture;
Expand Down
5 changes: 5 additions & 0 deletions tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,11 @@ public void LoggerFactoryIsUsedByRegisteredClient(bool registerAfterLoggerFactor
SkipIfRequiredServerConnectionCanNotBeEstablished();
SkipIfKeyedRegistrationIsNotSupported(useKey);

if (RequiredLogCategories.Length == 0 && NotAcceptableLogCategories.Length == 0)
{
throw new SkipTestException("No log categories specified to test against.");
}

string? key = useKey ? "key" : null;
HostApplicationBuilder builder = CreateHostBuilder(key: key);

Expand Down
Loading