From decbd395beeded4f40421f5b1c0f06681d7a8739 Mon Sep 17 00:00:00 2001
From: KrzysztofPajak <krzysiek@grandnode.com>
Date: Sat, 8 Aug 2026 19:30:21 +0200
Subject: [PATCH] Align Aspire on 13.4.6 and net10.0

Aspire was pinned at three different versions at once. Aspire.Hosting.*
was 13.4.6, but Aspire.AppHost.Sdk was 9.0.0, and Aspire.Dashboard.Sdk /
Aspire.Hosting.Orchestration were declared 9.0.0 for the generic
$(NETCoreSdkRuntimeIdentifier) and overridden to 13.4.6 for win-x64 only.

The override hid the problem on Windows. Restoring with
-p:NETCoreSdkRuntimeIdentifier=linux-x64 resolved the dashboard and
orchestration at 9.0.0 next to hosting at 13.4.6 - which is what every CI
runner was building. Both now resolve 13.4.6 on linux-x64, and the win-x64
override is gone because it no longer differs from the generic entry.

The Aspire projects also targeted net9.0 while the rest of the solution is
net10.0, and all four web hosts reference Aspire.ServiceDefaults. Both are
now net10.0.

Aspire has been SDK-based since 9.2, so `dotnet workload install aspire` is
obsolete; the solution builds with no aspire workload installed. Dropped
from all four CI definitions.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .github/workflows/aspnetcore.yml                          | 2 --
 .github/workflows/build.yml                               | 2 --
 .github/workflows/grandnode.yml                           | 2 --
 Directory.Packages.props                                  | 8 ++------
 azure-pipelines.yml                                       | 7 -------
 src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj           | 4 ++--
 .../Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj  | 2 +-
 7 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml
index 5ab842c20b..eb19bb993f 100644
--- a/.github/workflows/aspnetcore.yml
+++ b/.github/workflows/aspnetcore.yml
@@ -17,8 +17,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 10.0.x
-    - name: Install .NET Aspire workload
-      run: dotnet workload install aspire
     - name: Restore
       run: dotnet restore ./GrandNode.sln
     - name: Build with dotnet
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4345d096c..458655b217 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,8 +22,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 10.0.x
-      - name: Install .NET Aspire workload
-        run: dotnet workload install aspire
       - name: Cache SonarQube Cloud packages
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
diff --git a/.github/workflows/grandnode.yml b/.github/workflows/grandnode.yml
index 95e4ce74e7..11f81b46e3 100644
--- a/.github/workflows/grandnode.yml
+++ b/.github/workflows/grandnode.yml
@@ -27,8 +27,6 @@ jobs:
           sleep 2
         done
         echo "MongoDB did not become ready" && exit 1
-    - name: Install .NET Aspire workload
-      run: dotnet workload install aspire
     - name: Restore
       run: dotnet restore "${{ env.WORKING_DIRECTORY }}"
     - name: Build sln
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 24c8ecc1b9..71deb76ec9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -73,11 +73,7 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.17.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.17.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.17.0" />
-    <PackageVersion Include="Aspire.Dashboard.Sdk.$(NETCoreSdkRuntimeIdentifier)" Version="9.0.0" />
-    <PackageVersion Include="Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier)" Version="9.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageVersion Update="Aspire.Dashboard.Sdk.win-x64" Version="13.4.6" />
-    <PackageVersion Update="Aspire.Hosting.Orchestration.win-x64" Version="13.4.6" />
+    <PackageVersion Include="Aspire.Dashboard.Sdk.$(NETCoreSdkRuntimeIdentifier)" Version="13.4.6" />
+    <PackageVersion Include="Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier)" Version="13.4.6" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3f961fa9cb..08e5f997e6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,13 +53,6 @@ steps:
   inputs:
     version: '10.0.x'
 
-- task: Bash@3
-  displayName: Install .NET Aspire workload
-  inputs:
-    targetType: 'inline'
-    script: |
-      dotnet workload install aspire
-
 # Replaced NuGet tasks with dotnet CLI commands to fix Ubuntu 24.04 compatibility
 - task: DotNetCoreCLI@2
   displayName: 'dotnet restore'
diff --git a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
index aef766843e..db57b84f61 100644
--- a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
+++ b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+	<Sdk Name="Aspire.AppHost.Sdk" Version="13.4.6" />
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsAspireHost>true</IsAspireHost>
diff --git a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
index 3812d8e5d6..1efcb64ca1 100644
--- a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
+++ b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsAspireSharedProject>true</IsAspireSharedProject>