From 2a3f7afd099dbabbe0f238e539245f054030d34d Mon Sep 17 00:00:00 2001 From: afscrome Date: Sat, 24 Oct 2026 20:22:03 +0100 Subject: [PATCH] Drop .NET 8 and .NET 9 target frameworks --- .../actions/setup-runtimes-caching/action.yml | 2 -- .github/workflows/codeql.yml | 2 -- .github/workflows/copilot-setup-steps.yml | 2 -- .github/workflows/generate-api-diffs.yml | 2 -- .github/workflows/package.yml | 2 -- Directory.Build.props | 2 +- docs/setup.md | 2 +- examples/python/streamlit-api/README.md | 2 +- .../README.md | 2 +- .../README.md | 2 +- ...nityToolkit.Aspire.Hosting.KurrentDB.csproj | 1 - .../CommunityToolkit.Aspire.KurrentDB.csproj | 1 - ...Toolkit.Aspire.Microsoft.Data.Sqlite.csproj | 12 +----------- ...Microsoft.EntityFrameworkCore.Sqlite.csproj | 18 +----------------- src/Shared/EntityFrameworkUtils.cs | 4 ++-- ...munityToolkit.Aspire.KurrentDB.Tests.csproj | 1 - 16 files changed, 9 insertions(+), 48 deletions(-) diff --git a/.github/actions/setup-runtimes-caching/action.yml b/.github/actions/setup-runtimes-caching/action.yml index b2ed0d1b2..bde28ae68 100644 --- a/.github/actions/setup-runtimes-caching/action.yml +++ b/.github/actions/setup-runtimes-caching/action.yml @@ -20,8 +20,6 @@ runs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x - name: Resolve Aspire version diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b595814b1..1eae1df89 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -67,8 +67,6 @@ jobs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 5b68db5e8..0f90451fa 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -25,8 +25,6 @@ jobs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x - name: Resolve Aspire version diff --git a/.github/workflows/generate-api-diffs.yml b/.github/workflows/generate-api-diffs.yml index 324fac81b..1a4f58acb 100644 --- a/.github/workflows/generate-api-diffs.yml +++ b/.github/workflows/generate-api-diffs.yml @@ -19,8 +19,6 @@ jobs: - uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x - name: Restore and build diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 13e089c94..5ab358e31 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -22,8 +22,6 @@ jobs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x - name: Get git tag diff --git a/Directory.Build.props b/Directory.Build.props index ea4de6063..a2da30e38 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ net10.0 $(DefaultTargetFramework) - $(DefaultTargetFramework);net8.0;net9.0 + $(DefaultTargetFramework) latest enable diff --git a/docs/setup.md b/docs/setup.md index 5548c2ed2..cca2344a1 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -14,7 +14,7 @@ If an AppHost endpoint is not reachable from the host machine, use VS Code's [po If you prefer not to use `devcontainer`, you can manually set up your development environment by installing the following tools: -- [.NET 8](https://dotnet.microsoft.com/download/dotnet/8.0), [.NET 9](https://dotnet.microsoft.com/download/dotnet/9.0), and [.NET 10](https://dotnet.microsoft.com/download/dotnet/10.0) +- [.NET 10](https://dotnet.microsoft.com/download/dotnet/10.0) - [Node.js LTS](https://nodejs.org/en/) - [Yarn 2](https://yarnpkg.com/getting-started/install) - [pnpm](https://pnpm.io/) diff --git a/examples/python/streamlit-api/README.md b/examples/python/streamlit-api/README.md index 04b5d7c87..ee9d35603 100644 --- a/examples/python/streamlit-api/README.md +++ b/examples/python/streamlit-api/README.md @@ -5,7 +5,7 @@ This is a simple Streamlit application that demonstrates how to run Streamlit ap ## Prerequisites - Python 3.12 or later -- .NET 8.0 or later +- .NET 10.0 or later - Streamlit package ## Setup diff --git a/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md b/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md index 10b9f7232..91a587261 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md +++ b/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md @@ -6,7 +6,7 @@ An Aspire hosting integration for [flagd](https://flagd.dev), a feature flag eva ### Prerequisites -- .NET 8.0 or later +- .NET 10.0 or later - Docker (for running the flagd container) ### Installation diff --git a/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md b/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md index 8d3624b09..a92fcde18 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md +++ b/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md @@ -9,7 +9,7 @@ An Aspire hosting integration for [Flyway](https://flywaydb.org/), a database mi ### Prerequisites -- .NET 8.0 or later +- .NET 10.0 or later - Docker (for running the Flyway and database containers) ### Installation diff --git a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj index 1c369db03..4699cd791 100644 --- a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj @@ -19,7 +19,6 @@ all - diff --git a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj index c9164e06f..5671a3dba 100644 --- a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj +++ b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj @@ -20,6 +20,5 @@ all - diff --git a/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj b/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj index 33ca47e77..7c22d74bb 100644 --- a/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj +++ b/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj @@ -5,18 +5,8 @@ An Aspire client integration for the Microsoft.Data.Sqlite.Core package. - - - - - - - - - - - + diff --git a/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj b/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj index 020b43889..01b3f3bc5 100644 --- a/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj +++ b/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj @@ -6,24 +6,8 @@ true - - - - - - - - - - - - - - - - - + diff --git a/src/Shared/EntityFrameworkUtils.cs b/src/Shared/EntityFrameworkUtils.cs index fcbafc982..be4ffa99a 100644 --- a/src/Shared/EntityFrameworkUtils.cs +++ b/src/Shared/EntityFrameworkUtils.cs @@ -35,8 +35,8 @@ public static ServiceDescriptor CheckDbContextRegistered(this IHostApp where TContext : DbContext { // Resolving DbContext will resolve DbContextOptions. - // We need to replace the DbContextOptions service descriptor to inject more logic. This won't be necessary once - // Aspire targets .NET 9 as EF will respect the calls to services.ConfigureDbContext(). c.f. https://github.com/dotnet/efcore/pull/32518 + // We need to replace the DbContextOptions service descriptor to inject more logic. EF Core 9 and later respects + // calls to services.ConfigureDbContext(). c.f. https://github.com/dotnet/efcore/pull/32518 var oldDbContextOptionsDescriptor = builder.Services.FirstOrDefault(sd => sd.ServiceType == typeof(DbContextOptions)); diff --git a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj index 72ed754f7..a99ee0bcd 100644 --- a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj @@ -14,6 +14,5 @@ all -