From cdcdb3f1c6b4532fc4d7f4becd2785c4aeb9a495 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 23 Aug 2026 08:40:45 +0000
Subject: [PATCH 1/4] Bump Aspire.Hosting from 13.1.0 to 13.5.2

---
updated-dependencies:
- dependency-name: Aspire.Hosting
  dependency-version: 13.5.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 dotnet/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index 636e2695abd..e2d5b31a785 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Aspire -->
-    <AspireAppHostSdkVersion>13.1.0</AspireAppHostSdkVersion>
+    <AspireAppHostSdkVersion>13.5.2</AspireAppHostSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->

From 3106e547febba36b88d168759d1c1f82d0375156 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Aug 2026 11:06:03 +0000
Subject: [PATCH 2/4] Fix Aspire 13.5.2 restore/build regressions

Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com>
---
 dotnet/Directory.Packages.props | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index e2d5b31a785..a617fe488d6 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -7,19 +7,20 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Aspire -->
-    <AspireAppHostSdkVersion>13.5.2</AspireAppHostSdkVersion>
+    <AspireVersion>13.5.2</AspireVersion>
+    <AspireAppHostSdkVersion>13.1.0</AspireAppHostSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->
     <PackageVersion Include="Anthropic" Version="12.42.0" />
     <PackageVersion Include="Anthropic.Foundry" Version="0.7.1" />
-    <PackageVersion Include="Aspire.Hosting" Version="$(AspireAppHostSdkVersion)" />
+    <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
     <PackageVersion Include="Aspire.Azure.AI.Inference" Version="13.1.0-preview.1.25616.3" />
     <PackageVersion Include="Aspire.Hosting.Azure.AIFoundry" Version="13.1.0-preview.1.25616.3" />
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
-    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
-    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
     <PackageVersion Include="MessagePack" Version="3.1.7" /> <!-- Transitive dependency of Aspire pinned to newer version due to vulnerability in 2.5.192 -->
     <!-- Azure.* -->
@@ -89,19 +90,19 @@
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.6.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.5.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.11" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.11" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.7.0" />
     <!-- Vector Stores -->

From af5c086f1d6b95a14f56a04c62b67c981b296a85 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Aug 2026 21:16:18 +0000
Subject: [PATCH 3/4] Use Aspire AppHost SDK 13.5.2 with temporary
 _AspireUseSdkPickBestRid workaround

Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com>
---
 dotnet/Directory.Build.props    | 19 +++++++++++++++++++
 dotnet/Directory.Packages.props |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
index 6b73159828e..8b1b6330f05 100644
--- a/dotnet/Directory.Build.props
+++ b/dotnet/Directory.Build.props
@@ -19,6 +19,25 @@
     <IsReleaseCandidate>false</IsReleaseCandidate>
     <IsReleased>false</IsReleased>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+      Temporary workarounds for Aspire 13.5.2. Remove both once the AppHost SDK/packages no longer need them.
+
+      1. Aspire.AppHost.Sdk 13.5.2 resolves the Dashboard/DCP runtime identifier with the in-proc
+         Microsoft.NET.Build.Tasks.PickBestRid task, which is not registered while a cross-targeting
+         (TargetFrameworks) project is being evaluated, so AppHost restore fails with MSB4036. Setting this to
+         false keeps the SDK on its out-of-proc Aspire.RuntimeIdentifier.Tool fallback, which resolves the same
+         runtime identifier at the cost of one extra process launch.
+         Mirrors the workaround in https://github.com/CommunityToolkit/Aspire.
+
+      2. Aspire.Hosting.AppHost 13.5.2 raises ASPIRE010 whenever an AppHost builds without the Aspire CLI
+         bundle (the SDK default). The bundle is not available on CI agents, and the diagnostic itself offers
+         suppression as the supported way to keep building without it, so it is treated as informational here.
+    -->
+    <_AspireUseSdkPickBestRid>false</_AspireUseSdkPickBestRid>
+    <NoWarn>$(NoWarn);ASPIRE010</NoWarn>
+  </PropertyGroup>
   
   <PropertyGroup>
     <!-- Disable NuGet packaging by default. Projects can override. -->
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index a617fe488d6..fdef9922a2e 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -8,7 +8,7 @@
   <PropertyGroup>
     <!-- Aspire -->
     <AspireVersion>13.5.2</AspireVersion>
-    <AspireAppHostSdkVersion>13.1.0</AspireAppHostSdkVersion>
+    <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->

From c9f60caeae5ed16f0046c6baa4b2d0f09e4c83d8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Aug 2026 21:42:42 +0000
Subject: [PATCH 4/4] Reuse AspireAppHostSdkVersion for Aspire packages

Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com>
---
 dotnet/Directory.Packages.props | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index fdef9922a2e..71c3bc23076 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -7,20 +7,19 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Aspire -->
-    <AspireVersion>13.5.2</AspireVersion>
-    <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
+    <AspireAppHostSdkVersion>13.5.2</AspireAppHostSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->
     <PackageVersion Include="Anthropic" Version="12.42.0" />
     <PackageVersion Include="Anthropic.Foundry" Version="0.7.1" />
-    <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
     <PackageVersion Include="Aspire.Azure.AI.Inference" Version="13.1.0-preview.1.25616.3" />
     <PackageVersion Include="Aspire.Hosting.Azure.AIFoundry" Version="13.1.0-preview.1.25616.3" />
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
-    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireVersion)" />
-    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
+    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
     <PackageVersion Include="MessagePack" Version="3.1.7" /> <!-- Transitive dependency of Aspire pinned to newer version due to vulnerability in 2.5.192 -->
     <!-- Azure.* -->