Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/actions/setup-runtimes-caching/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/generate-api-diffs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

<ImplicitUsings>enable</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion docs/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion examples/python/streamlit-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/CommunityToolkit.Aspire.Hosting.Flagd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/CommunityToolkit.Aspire.Hosting.Flyway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,8 @@
<Description>An Aspire client integration for the Microsoft.Data.Sqlite.Core package.</Description>
</PropertyGroup>

<!-- .NET 8.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Data.Sqlite" VersionOverride="8.0.23" />
</ItemGroup>

<!-- .NET 9.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Data.Sqlite" VersionOverride="9.0.9" />
</ItemGroup>

<!-- .NET 10.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" VersionOverride="10.0.2" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,8 @@
<IsPreview>true</IsPreview>
</PropertyGroup>

<!-- .NET 8.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="8.0.23" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" VersionOverride="8.0.23" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" VersionOverride="8.0.23" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

<!-- .NET 9.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" VersionOverride="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" VersionOverride="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

<!-- .NET 10.0 dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" VersionOverride="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" VersionOverride="10.0.2" />
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/EntityFrameworkUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public static ServiceDescriptor CheckDbContextRegistered<TContext>(this IHostApp
where TContext : DbContext
{
// Resolving DbContext<TContextService> will resolve DbContextOptions<TContextImplementation>.
// 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<TContext>(). 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<TContext>(). c.f. https://github.com/dotnet/efcore/pull/32518

var oldDbContextOptionsDescriptor = builder.Services.FirstOrDefault(sd => sd.ServiceType == typeof(DbContextOptions<TContext>));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
<PackageReference Include="System.Linq.Async">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
</ItemGroup>
</Project>
Loading