Skip to content

Commit b43f9d5

Browse files
Copilotaaronpowell
andauthored
Add .NET 10 (preview) as the default TFM and enable multi-targeting builds (#949)
* Initial plan * Add .NET 10 (preview) as a TFM for multi-targeting builds Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> * Change default TFM to .NET 10 and update GitHub Actions to install .NET 10 Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> * Update devcontainer to install .NET 10 as preview Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> * Add .NET 10 to setup-runtimes-caching action Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> * Fixing some versioning * Hard coding an update to use Apache.NMS.AMQP@2.4.0 as 2.2.0 has a CVE but the MassTransit.ActiveMQ package isn't updated yet Tracked: MassTransit/MassTransit#6133 * Fixing some projects that specified their own TFM and trying to address ambiguous referencing * Using an improved approach approach to adding system.linq.asyncenumerable * Updating how dev certs are setup * Turns out you can't upgrade around the CVE, so we now suppress it I feel dirty doing that... * skipping tests which would do nothing * Some msbuild library updates * handling .net 8 down leveling of packages * Removing .NET 10 support from sql database projects integration * test and example projects set to net8.0 * Setting target frameworks too * Moving to the new sdk structure * how'd I miss that merge * Can't have Aspire.Hosting.AppHost in CPM as it's implicitly added * Back to zero compiler errors, woo * Removing the .net down levelling there too * Missed another reference to the apphost package * reverting a change * Attempting to force the removal of some nuget packages that we don't want at runtime * csproj mistake * Going nuclear on the files in a post-build task --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> Co-authored-by: Aaron Powell <me@aaron-powell.com>
1 parent 2b1757e commit b43f9d5

File tree

65 files changed

+129
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+129
-326
lines changed

.devcontainer/devcontainer.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
{
2-
"name": ".NET Aspire Community Toolkit",
3-
"image": "mcr.microsoft.com/devcontainers/dotnet:8.0-noble",
2+
"name": "Aspire Community Toolkit",
3+
"image": "mcr.microsoft.com/devcontainers/dotnet:10.0-noble",
44
"features": {
55
"ghcr.io/azure/azure-dev/azd:latest": {},
66
"ghcr.io/devcontainers/features/dotnet:latest": {
7-
"version": "8.0",
8-
"additionalVersions": "9.0"
7+
"version": "10.0",
8+
"additionalVersions": "8.0,9.0",
9+
"installUsingApt": false
910
},
1011
"ghcr.io/devcontainers/features/github-cli:latest": {},
1112
"ghcr.io/devcontainers/features/java:1": {
1213
"installGradle": true,
1314
"installMaven": true,
1415
"version": "21"
1516
},
16-
"ghcr.io/devcontainers/features/docker-in-docker": {},
17+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
1718
"ghcr.io/devcontainers/features/node:latest": {},
1819
"ghcr.io/devcontainers-community/features/deno": {},
1920
"ghcr.io/devcontainers/features/go:latest": {},
2021
"ghcr.io/devcontainers/features/rust:latest": {},
2122
"ghcr.io/devcontainers/features/python:1": {},
22-
"ghcr.io/dapr/cli/dapr-cli:0": {}
23+
"ghcr.io/dapr/cli/dapr-cli:0": {
24+
"version": "1.16.3"
25+
}
2326
},
2427
"customizations": {
2528
"vscode": {

.devcontainer/post-create.sh

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,15 @@ sudo apt-get update && \
55
sudo rm -rf /var/lib/apt/lists/*
66

77
echo Install .NET dev certs
8-
dotnet tool update -g linux-dev-certs
9-
dotnet linux-dev-certs install
8+
dotnet dev-certs https --trust
109

11-
echo Install JS monorepo tools
12-
npm install -g turbo
13-
npm install -g nx
14-
15-
echo Install Aspire 9 templates
16-
dotnet new install Aspire.ProjectTemplates
10+
echo Install Aspire
11+
curl -sSL https://aspire.dev/install.sh | bash
1712

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

21-
echo Installing uvicorn
22-
pip install uvicorn
23-
2416
echo Setting up dapr
2517
dapr init
2618

27-
echo Installing uv
28-
pip install uv
29-
3019
echo Done!

.github/actions/setup-runtimes-caching/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ runs:
2222
dotnet-version: |
2323
8.0.x
2424
9.0.x
25+
10.0.x
2526
2627
- name: Set up Python
2728
uses: actions/setup-python@v5
@@ -84,8 +85,7 @@ runs:
8485
shell: bash
8586
if: ${{ matrix.os == 'ubuntu-latest' }}
8687
run: |
87-
dotnet tool update -g linux-dev-certs
88-
dotnet linux-dev-certs install
88+
dotnet dev-certs https --trust
8989
9090
- name: Setup Node globals
9191
shell: bash
@@ -117,3 +117,4 @@ runs:
117117
run: |
118118
dapr init --runtime-version=${{ env.DAPR_VERSION }}
119119
dapr --version
120+

.github/agents/hosting-integration-creator.agent.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,20 +238,14 @@ Each hosting integration should have a corresponding sample application in the `
238238
Here is an example of the `csproj` file for the AppHost project for the Bun hosting integration:
239239

240240
```xml
241-
<Project Sdk="Microsoft.NET.Sdk">
242-
243-
<Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
241+
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">
244242

245243
<PropertyGroup>
246244
<OutputType>Exe</OutputType>
247245
<IsAspireHost>true</IsAspireHost>
248246
<UserSecretsId>7e518d7d-87e8-4337-8806-1c99acce5dfb</UserSecretsId>
249247
</PropertyGroup>
250248

251-
<ItemGroup>
252-
<PackageReference Include="Aspire.Hosting.AppHost" />
253-
</ItemGroup>
254-
255249
<ItemGroup>
256250
<ProjectReference Include="../../../src/CommunityToolkit.Aspire.Hosting.Bun/CommunityToolkit.Aspire.Hosting.Bun.csproj" IsAspireProjectResource="false" />
257251
</ItemGroup>

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
dotnet-version: |
7070
8.0.x
7171
9.0.x
72+
10.0.x
7273
# Initializes the CodeQL tools for scanning.
7374
- name: Initialize CodeQL
7475
uses: github/codeql-action/init@v4

.github/workflows/dotnet-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77

88
env:
9-
DEFAULT_DOTNET_VERSION: "8.0.x"
9+
DEFAULT_DOTNET_VERSION: "10.0.x"
1010

1111
permissions:
1212
contents: read

.github/workflows/dotnet-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "v*"
77

88
env:
9-
DEFAULT_DOTNET_VERSION: "8.0.x"
9+
DEFAULT_DOTNET_VERSION: "10.0.x"
1010

1111
jobs:
1212
build:

.github/workflows/generate-api-diffs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ jobs:
2121
dotnet-version: |
2222
8.0.x
2323
9.0.x
24+
10.0.x
2425
2526
- name: Restore and build
2627
run: |
2728
2829
find src -type f -name "*.csproj" | while read -r csproj; do
29-
dotnet build "$csproj" -f net8.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource
30+
dotnet build "$csproj" -f net10.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource
3031
done
3132
continue-on-error: true
3233

.github/workflows/package.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
dotnet-version: |
2525
8.0.x
2626
9.0.x
27+
10.0.x
2728
2829
- name: Get git tag
2930
id: git_tag

Directory.Build.props

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
44
<PropertyGroup>
55

6-
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
6+
<DefaultTargetFramework>net10.0</DefaultTargetFramework>
77
<TargetFrameworks>$(DefaultTargetFramework)</TargetFrameworks>
8-
<AllTargetFrameworks>$(DefaultTargetFramework);net9.0</AllTargetFrameworks>
8+
<AllTargetFrameworks>$(DefaultTargetFramework);net8.0;net9.0</AllTargetFrameworks>
99
<LangVersion>latest</LangVersion>
1010

1111
<ImplicitUsings>enable</ImplicitUsings>
@@ -18,7 +18,7 @@
1818
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
1919
<DotNetExtensionsVersion>10.0.0</DotNetExtensionsVersion>
2020
<OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
21-
<TestContainersVersion>4.7.0</TestContainersVersion>
21+
<TestContainersVersion>4.8.1</TestContainersVersion>
2222
<MEAIVersion>9.9.0</MEAIVersion>
2323
<ServiceDiscoveryVersion>10.0.0</ServiceDiscoveryVersion>
2424
<IsPackable>false</IsPackable>
@@ -46,4 +46,8 @@
4646

4747
<VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>
4848
</PropertyGroup>
49+
50+
<ItemGroup>
51+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-4mjw-xr5x-prpc" />
52+
</ItemGroup>
4953
</Project>

0 commit comments

Comments
 (0)