Skip to content
Merged
Show file tree
Hide file tree
Changes from 26 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
15 changes: 9 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
{
"name": ".NET Aspire Community Toolkit",
"image": "mcr.microsoft.com/devcontainers/dotnet:8.0-noble",
"name": "Aspire Community Toolkit",
"image": "mcr.microsoft.com/devcontainers/dotnet:10.0-noble",
"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": {
"installGradle": true,
"installMaven": true,
"version": "21"
},
"ghcr.io/devcontainers/features/docker-in-docker": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/node:latest": {},
"ghcr.io/devcontainers-community/features/deno": {},
"ghcr.io/devcontainers/features/go:latest": {},
"ghcr.io/devcontainers/features/rust:latest": {},
"ghcr.io/devcontainers/features/python:1": {},
"ghcr.io/dapr/cli/dapr-cli:0": {}
"ghcr.io/dapr/cli/dapr-cli:0": {
"version": "1.16.3"
}
},
"customizations": {
"vscode": {
Expand Down
17 changes: 3 additions & 14 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,15 @@ 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
npm install -g nx

echo Install Aspire 9 templates
dotnet new install Aspire.ProjectTemplates
echo Install Aspire
curl -sSL https://aspire.dev/install.sh | bash

echo Installing Bun
curl -fsSL https://bun.sh/install | bash

echo Installing uvicorn
pip install uvicorn

echo Setting up dapr
dapr init

echo Installing uv
pip install uv

echo Done!
5 changes: 3 additions & 2 deletions .github/actions/setup-runtimes-caching/action.yml
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

8 changes: 1 addition & 7 deletions .github/agents/hosting-integration-creator.agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,20 +238,14 @@ Each hosting integration should have a corresponding sample application in the `
Here is an example of the `csproj` file for the AppHost project for the Bun hosting integration:

```xml
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
<IsAspireHost>true</IsAspireHost>
<UserSecretsId>7e518d7d-87e8-4337-8806-1c99acce5dfb</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../../../src/CommunityToolkit.Aspire.Hosting.Bun/CommunityToolkit.Aspire.Hosting.Bun.csproj" IsAspireProjectResource="false" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
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
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
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
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
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
10 changes: 7 additions & 3 deletions Directory.Build.props
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 @@ -18,7 +18,7 @@
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
<DotNetExtensionsVersion>10.0.0</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</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: 7 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<ItemGroup Label="Aspire Packages">
<!-- Aspire packages -->
<PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Dapr" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.AppContainers" Version="$(AspireVersion)" />
Expand Down Expand Up @@ -44,11 +43,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.11" />
<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 @@ -79,7 +79,7 @@
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.20" />
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="170.2.70" />
<PackageVersion Include="Microsoft.Build" Version="17.11.48" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.12" />
<PackageVersion Include="ErikEJ.Dacpac.Chinook" Version="1.0.0" />
<PackageVersion Include="RavenDB.Client" Version="6.2.1" />
<PackageVersion Include="RavenDB.TestDriver" Version="6.2.1" />
Expand Down Expand Up @@ -114,4 +114,8 @@
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestContainersVersion)" />
</ItemGroup>

<ItemGroup Label="System">
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(DotNetExtensionsVersion)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -10,10 +8,6 @@
<UserSecretsId>cb846a57-bdaf-4abd-a7fb-0299aa095f5e</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.ActiveMQ\CommunityToolkit.Aspire.Hosting.ActiveMQ.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit\CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -8,10 +7,6 @@
<IsAspireHost>true</IsAspireHost>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Adminer\CommunityToolkit.Aspire.Hosting.Adminer.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions\CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.csproj" IsAspireProjectResource="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -10,10 +8,6 @@
<UserSecretsId>7e518d7d-87e8-4337-8806-1c99acce5dfb</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../../../src/CommunityToolkit.Aspire.Hosting.Bun/CommunityToolkit.Aspire.Hosting.Bun.csproj" IsAspireProjectResource="false" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -10,10 +8,6 @@
<UserSecretsId>068ca29f-dd8a-4898-9ba1-5839fd6a13db</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Dapr.ServiceA/CommunityToolkit.Aspire.Hosting.Dapr.ServiceA.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -15,7 +13,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.Azure.Redis" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)"/>
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -10,7 +9,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.SqlServer" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -8,10 +7,6 @@
<IsAspireHost>true</IsAspireHost>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.DbGate\CommunityToolkit.Aspire.Hosting.DbGate.csproj" IsAspireProjectResource="false" />
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.MongoDB.Extensions\CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj" IsAspireProjectResource="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)"/>
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,10 +8,6 @@
<UserSecretsId>68a53d20-c63f-4188-8bf5-5206263fa5c7</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Deno\CommunityToolkit.Aspire.Hosting.Deno.csproj" IsAspireProjectResource="false" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -11,7 +9,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="OpenFeature.Contrib.Providers.Flagd" />
</ItemGroup>

Expand Down
Loading
Loading