From 1bcc171b829792f8bda032013dabbb07c7b4b151 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 10 Oct 2025 19:40:34 +0000
Subject: [PATCH 1/7] Merged PR 54223: Getting the branch ready for 9.10
 release

Getting the branch ready for 9.10 release

----
#### AI description  (iteration 1)
#### PR Classification
This pull request prepares the branch for the 9.10 release by updating dependency versions and adjusting build configurations.

#### PR Summary
The update bumps multiple dependency versions from 9.0.9 to 9.0.10, updates release stabilization properties, and refines build pipeline tasks and NuGet configurations.
- **`eng/Version.Details.xml` and `eng/Versions.props`**: Dependency versions and SHA values have been updated to 9.0.10, with build properties modified to enable release stabilization and update LTS version numbers.
- **`azure-pipelines.yml`**: The code coverage stage has been removed and stage dependencies adjusted.
- **`NuGet.config`**: Package source mappings were removed, and internal feed sources have been appropriately disabled.
- **`eng/pipelines/templates/BuildAndTest.yml` & `Directory.Build.props`**: New tasks were added to set up private feed credentials, integration test steps were commented out due to authentication requirements, and NU1507 warnings have been suppressed.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
---
 Directory.Build.props                    |   5 +
 NuGet.config                             |  34 ++--
 azure-pipelines.yml                      |  46 ------
 eng/Version.Details.xml                  | 200 +++++++++++------------
 eng/Versions.props                       | 132 +++++++--------
 eng/pipelines/templates/BuildAndTest.yml |  32 +++-
 6 files changed, 208 insertions(+), 241 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0af806af628..0c0fcf22bfd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -34,6 +34,11 @@
     <TestNetCoreTargetFrameworks>$(NetCoreTargetFrameworks)</TestNetCoreTargetFrameworks>
   </PropertyGroup>
 
+  <!-- Internal branches don't use package source mapping feature due to internal feeds, so disable NU1507 warning saying it should be used. -->
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <LangVersion>latest</LangVersion>
diff --git a/NuGet.config b/NuGet.config
index 0fedd015e82..0aaac621ef0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,16 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-6254f5c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6254f5ca/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-5bae930" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5bae9307/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-bd381fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-bd381fa6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-5452ff9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5452ff90/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-362ab66" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-362ab666/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-e1f1988" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e1f19886/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -18,35 +24,19 @@
     <!-- Used for the Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
-  <!-- Define mappings by adding package patterns beneath the target source.
-       https://aka.ms/nuget-package-source-mapping  -->
-  <packageSourceMapping>
-    <packageSource key="dotnet-public">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet-eng">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet-tools">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet9">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet9-transport">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="richnav">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-6254f5c" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-5bae930" value="true" />
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-bd381fa" value="true" />
+    <add key="darc-int-dotnet-efcore-5452ff9" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-362ab66" value="true" />
+    <add key="darc-int-dotnet-runtime-e1f1988" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3ec5e3d1cdb..0052dc9f706 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -239,51 +239,6 @@ extends:
                 isWindows: false
                 warnAsError: 0
 
-    # ----------------------------------------------------------------
-    # This stage performs quality gates enforcements
-    # ----------------------------------------------------------------
-    - stage: codecoverage
-      displayName: CodeCoverage
-      dependsOn:
-      - build
-      condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
-      variables:
-      - template: /eng/common/templates-official/variables/pool-providers.yml@self
-      jobs:
-      - template: /eng/common/templates-official/jobs/jobs.yml@self
-        parameters:
-          enableMicrobuild: true
-          enableTelemetry: true
-          runAsPublic: ${{ variables['runAsPublic'] }}
-          workspace:
-            clean: all
-
-          # ----------------------------------------------------------------
-          # This stage downloads the code coverage reports from the build jobs,
-          # merges those and validates the combined test coverage.
-          # ----------------------------------------------------------------
-          jobs:
-          - job: CodeCoverageReport
-            timeoutInMinutes: 180
-
-            pool:
-              name: NetCore1ESPool-Internal
-              image: 1es-mariner-2
-              os: linux
-
-            preSteps:
-            - checkout: self
-              clean: true
-              persistCredentials: true
-              fetchDepth: 1
-
-            steps:
-            - script: $(Build.SourcesDirectory)/build.sh --ci --restore
-              displayName: Init toolset
-
-            - template: /eng/pipelines/templates/VerifyCoverageReport.yml
-
-
     # ----------------------------------------------------------------
     # This stage only performs a build treating warnings as errors
     # to detect any kind of code style violations
@@ -339,7 +294,6 @@ extends:
         parameters:
           validateDependsOn:
           - build
-          - codecoverage
           - correctness
           publishingInfraVersion: 3
           enableSymbolValidation: false
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3b5a0c53b49..de48574ba80 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,208 +1,208 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.Memory" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.Memory" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Memory.Data" Version="9.0.9">
+    <Dependency Name="System.Memory.Data" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Net.Http.Json" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Numerics.Tensors" Version="9.0.9">
+    <Dependency Name="System.Numerics.Tensors" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Threading.Channels" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
+      <Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.9">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.9">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.9">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Features" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.Features" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.9">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>ff66c263be7ed395794bdaf616322977b8ec897c</Sha>
+      <Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>78871c83aac6c38eb5476c2f34aae98ef65314f5</Sha>
+      <Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 22d61962791..770b745929b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,14 +10,14 @@
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <!--
         When DotNetFinalVersionKind is set to 'release' (only for the release branches),
         the build will produce stable outputs for 'Shipping' packages.
 
         This is used by the Arcade SDK (Publish.proj) to determine if the build is a release build or not.
       -->
-    <DotNetFinalVersionKind />
+    <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <!-- Enabling this rule will cause build failures on undocumented public APIs. -->
     <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
@@ -33,58 +33,58 @@
   -->
   <PropertyGroup Label="Automated Maestro dependency updates">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclAsyncInterfacesVersion>9.0.9</MicrosoftBclAsyncInterfacesVersion>
-    <MicrosoftBclMemoryVersion>9.0.9</MicrosoftBclMemoryVersion>
-    <MicrosoftBclTimeProviderVersion>9.0.9</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.9</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.9</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.9</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.9</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.9</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.9</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.9</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.9</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.9</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.9</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.9</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.9</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.9</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.9</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.9</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.9</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.9</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.9</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftExtensionsPrimitivesVersion>9.0.9</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.9</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.9</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.9</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.9</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.9</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.9</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.9</SystemIOPipelinesVersion>
-    <SystemMemoryDataVersion>9.0.9</SystemMemoryDataVersion>
-    <SystemNetHttpJsonVersion>9.0.9</SystemNetHttpJsonVersion>
-    <SystemRuntimeCachingVersion>9.0.9</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.9</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.9</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.9</SystemTextEncodingsWebVersion>
-    <SystemNumericsTensorsVersion>9.0.9</SystemNumericsTensorsVersion>
-    <SystemTextJsonVersion>9.0.9</SystemTextJsonVersion>
-    <SystemThreadingChannelsVersion>9.0.9</SystemThreadingChannelsVersion>
+    <MicrosoftBclAsyncInterfacesVersion>9.0.10</MicrosoftBclAsyncInterfacesVersion>
+    <MicrosoftBclMemoryVersion>9.0.10</MicrosoftBclMemoryVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.10</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.10</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.10</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.10</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.10</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.10</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.10</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.10</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.10</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.10</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.10</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.10</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.10</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.10</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.10</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.10</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.10</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.10</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.10</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsPrimitivesVersion>9.0.10</MicrosoftExtensionsPrimitivesVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.10</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.10</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.10</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.10</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.10</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.10</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.10</SystemIOPipelinesVersion>
+    <SystemMemoryDataVersion>9.0.10</SystemMemoryDataVersion>
+    <SystemNetHttpJsonVersion>9.0.10</SystemNetHttpJsonVersion>
+    <SystemRuntimeCachingVersion>9.0.10</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.10</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.10</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.10</SystemTextEncodingsWebVersion>
+    <SystemNumericsTensorsVersion>9.0.10</SystemNumericsTensorsVersion>
+    <SystemTextJsonVersion>9.0.10</SystemTextJsonVersion>
+    <SystemThreadingChannelsVersion>9.0.10</SystemThreadingChannelsVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.9</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.9</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.9</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.9</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.9</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.9</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.9</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsFeaturesVersion>9.0.9</MicrosoftExtensionsFeaturesVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.9</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.9</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.10</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.10</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.10</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.10</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.10</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.10</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.10</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsFeaturesVersion>9.0.10</MicrosoftExtensionsFeaturesVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.10</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.10</MicrosoftExtensionsObjectPoolVersion>
     <!-- Dependencies from https://github.com/dotnet/efcore -->
-    <MicrosoftEntityFrameworkCoreSqliteVersion>9.0.9</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>9.0.10</MicrosoftEntityFrameworkCoreSqliteVersion>
     <!-- Dependencies from https://github.com/dotnet/arcade -->
     <MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25476.2</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
@@ -111,8 +111,8 @@
     <MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>
     <MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
     <MicrosoftExtensionsPrimitivesLTSVersion>8.0.0</MicrosoftExtensionsPrimitivesLTSVersion>
-    <MicrosoftNETCoreAppRefLTSVersion>8.0.20</MicrosoftNETCoreAppRefLTSVersion>
-    <MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.20</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
+    <MicrosoftNETCoreAppRefLTSVersion>8.0.21</MicrosoftNETCoreAppRefLTSVersion>
+    <MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.21</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
     <SystemCollectionsImmutableLTSVersion>8.0.0</SystemCollectionsImmutableLTSVersion>
     <SystemConfigurationConfigurationManagerLTSVersion>8.0.1</SystemConfigurationConfigurationManagerLTSVersion>
     <SystemDiagnosticsDiagnosticSourceLTSVersion>8.0.1</SystemDiagnosticsDiagnosticSourceLTSVersion>
@@ -125,22 +125,22 @@
     <SystemSecurityCryptographyPkcsLTSVersion>8.0.1</SystemSecurityCryptographyPkcsLTSVersion>
     <SystemSecurityCryptographyXmlLTSVersion>8.0.2</SystemSecurityCryptographyXmlLTSVersion>
     <SystemTextEncodingsWebLTSVersion>8.0.0</SystemTextEncodingsWebLTSVersion>
-    <SystemNumericsTensorsLTSVersion>8.0.0</SystemNumericsTensorsLTSVersion>
+    <SystemNumericsTensorsLTSVersion>8.0.1</SystemNumericsTensorsLTSVersion>
     <SystemTextJsonLTSVersion>8.0.6</SystemTextJsonLTSVersion>
     <SystemThreadingChannelsLTSVersion>8.0.0</SystemThreadingChannelsLTSVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefLTSVersion>8.0.20</MicrosoftAspNetCoreAppRefLTSVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.20</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
-    <MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.20</MicrosoftAspNetCoreMvcTestingLTSVersion>
-    <MicrosoftAspNetCoreTestHostLTSVersion>8.0.20</MicrosoftAspNetCoreTestHostLTSVersion>
-    <MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.20</MicrosoftExtensionsCachingSqlServerLTSVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.20</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.20</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
-    <MicrosoftExtensionsFeaturesLTSVersion>8.0.20</MicrosoftExtensionsFeaturesLTSVersion>
-    <MicrosoftExtensionsHttpPollyLTSVersion>8.0.20</MicrosoftExtensionsHttpPollyLTSVersion>
-    <MicrosoftExtensionsObjectPoolLTSVersion>8.0.20</MicrosoftExtensionsObjectPoolLTSVersion>
+    <MicrosoftAspNetCoreAppRefLTSVersion>8.0.21</MicrosoftAspNetCoreAppRefLTSVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.21</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
+    <MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.21</MicrosoftAspNetCoreMvcTestingLTSVersion>
+    <MicrosoftAspNetCoreTestHostLTSVersion>8.0.21</MicrosoftAspNetCoreTestHostLTSVersion>
+    <MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.21</MicrosoftExtensionsCachingSqlServerLTSVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.21</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.21</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
+    <MicrosoftExtensionsFeaturesLTSVersion>8.0.21</MicrosoftExtensionsFeaturesLTSVersion>
+    <MicrosoftExtensionsHttpPollyLTSVersion>8.0.21</MicrosoftExtensionsHttpPollyLTSVersion>
+    <MicrosoftExtensionsObjectPoolLTSVersion>8.0.21</MicrosoftExtensionsObjectPoolLTSVersion>
     <!-- Dependencies from https://github.com/dotnet/efcore -->
-    <MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.20</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
+    <MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.21</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index bd760e84f3c..89092b139d7 100644
--- a/eng/pipelines/templates/BuildAndTest.yml
+++ b/eng/pipelines/templates/BuildAndTest.yml
@@ -28,6 +28,23 @@ steps:
     inputs:
       versionSpec: "20.x"
       checkLatest: true
+  - task: PowerShell@2
+    displayName: Setup Private Feeds Credentials
+    condition: eq(variables['Agent.OS'], 'Windows_NT')
+    inputs:
+      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+      arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+    env:
+      Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+  - task: Bash@3
+    displayName: Setup Private Feeds Credentials
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
+    inputs:
+      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+      arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+    env:
+      Token: $(dn-bot-dnceng-artifact-feeds-rw)
 
   - script: ${{ parameters.buildScript }}
             -restore
@@ -68,13 +85,14 @@ steps:
     displayName: Pack
     
   - ${{ if ne(parameters.skipTests, 'true') }}:
-    - script: ${{ parameters.buildScript }}
-              -integrationTest
-              -configuration ${{ parameters.buildConfig }}
-              -warnAsError 1
-              /bl:${{ parameters.repoLogPath }}/integration_tests.binlog
-              $(_OfficialBuildIdArgs)
-      displayName: Run integration tests
+    # Skipping integration tests for now as they require authentication to the private feeds
+    # - script: ${{ parameters.buildScript }}
+    #           -integrationTest
+    #           -configuration ${{ parameters.buildConfig }}
+    #           -warnAsError 1
+    #           /bl:${{ parameters.repoLogPath }}/integration_tests.binlog
+    #           $(_OfficialBuildIdArgs)
+    #   displayName: Run integration tests
 
     - pwsh: |
         $SourcesDirectory = '$(Build.SourcesDirectory)';

From 110c5a6d4b90ac3e1e71a7c5a914352bc9762434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire?= <g.verdier@criteo.com>
Date: Fri, 10 Oct 2025 13:59:40 +0200
Subject: [PATCH 2/7] Give FunctionInvokingChatClient span a more OTELy name
 (#6911)

---
 .../ChatCompletion/FunctionInvokingChatClient.cs          | 4 ++--
 .../Microsoft.Extensions.AI/OpenTelemetryConsts.cs        | 1 +
 .../ChatCompletion/FunctionInvokingChatClientTests.cs     | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
index febf0a1336e..ff71e9f83ed 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
@@ -269,7 +269,7 @@ public override async Task<ChatResponse> GetResponseAsync(
 
         // A single request into this GetResponseAsync may result in multiple requests to the inner client.
         // Create an activity to group them together for better observability.
-        using Activity? activity = _activitySource?.StartActivity($"{nameof(FunctionInvokingChatClient)}.{nameof(GetResponseAsync)}");
+        using Activity? activity = _activitySource?.StartActivity(OpenTelemetryConsts.GenAI.OrchestrateToolsName);
 
         // Copy the original messages in order to avoid enumerating the original messages multiple times.
         // The IEnumerable can represent an arbitrary amount of work.
@@ -408,7 +408,7 @@ public override async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseA
 
         // A single request into this GetStreamingResponseAsync may result in multiple requests to the inner client.
         // Create an activity to group them together for better observability.
-        using Activity? activity = _activitySource?.StartActivity($"{nameof(FunctionInvokingChatClient)}.{nameof(GetStreamingResponseAsync)}");
+        using Activity? activity = _activitySource?.StartActivity(OpenTelemetryConsts.GenAI.OrchestrateToolsName);
         UsageDetails? totalUsage = activity is { IsAllDataRequested: true } ? new() : null; // tracked usage across all turns, to be used for activity purposes
 
         // Copy the original messages in order to avoid enumerating the original messages multiple times.
diff --git a/src/Libraries/Microsoft.Extensions.AI/OpenTelemetryConsts.cs b/src/Libraries/Microsoft.Extensions.AI/OpenTelemetryConsts.cs
index c9b4a1ded1c..3def478d0e1 100644
--- a/src/Libraries/Microsoft.Extensions.AI/OpenTelemetryConsts.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/OpenTelemetryConsts.cs
@@ -35,6 +35,7 @@ public static class GenAI
         public const string ChatName = "chat";
         public const string EmbeddingsName = "embeddings";
         public const string ExecuteToolName = "execute_tool";
+        public const string OrchestrateToolsName = "orchestrate_tools"; // Non-standard
         public const string GenerateContentName = "generate_content";
 
         public const string SystemInstructions = "gen_ai.system_instructions";
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
index 7a3c09db438..27c0d3ff0d6 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
@@ -678,11 +678,11 @@ public async Task FunctionInvocationTrackedWithActivity(bool enableTelemetry, bo
         Func<ChatClientBuilder, ChatClientBuilder> configure = b => b.Use(c =>
             new FunctionInvokingChatClient(new OpenTelemetryChatClient(c, sourceName: sourceName) { EnableSensitiveData = enableSensitiveData }));
 
-        await InvokeAsync(() => InvokeAndAssertAsync(options, plan, configurePipeline: configure), streaming: false);
+        await InvokeAsync(() => InvokeAndAssertAsync(options, plan, configurePipeline: configure));
 
-        await InvokeAsync(() => InvokeAndAssertStreamingAsync(options, plan, configurePipeline: configure), streaming: true);
+        await InvokeAsync(() => InvokeAndAssertStreamingAsync(options, plan, configurePipeline: configure));
 
-        async Task InvokeAsync(Func<Task> work, bool streaming)
+        async Task InvokeAsync(Func<Task> work)
         {
             var activities = new List<Activity>();
             using TracerProvider? tracerProvider = enableTelemetry ?
@@ -700,7 +700,7 @@ async Task InvokeAsync(Func<Task> work, bool streaming)
                     activity => Assert.Equal("chat", activity.DisplayName),
                     activity => Assert.Equal("execute_tool Func1", activity.DisplayName),
                     activity => Assert.Equal("chat", activity.DisplayName),
-                    activity => Assert.Equal(streaming ? "FunctionInvokingChatClient.GetStreamingResponseAsync" : "FunctionInvokingChatClient.GetResponseAsync", activity.DisplayName));
+                    activity => Assert.Equal("orchestrate_tools", activity.DisplayName));
 
                 var executeTool = activities[1];
                 if (enableSensitiveData)

From 7aeb0d52e8ba07df4e004f689ba7747263b4e7f2 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Fri, 10 Oct 2025 18:19:33 -0400
Subject: [PATCH 3/7] Clean up local function names in AIFunctionFactory
 (#6909)

* Initial plan

* Implement local function name cleanup for AIFunctionFactory

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Fix lambda name uniqueness by capturing full ordinal suffix

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Fix analyzer errors by adding comments to empty test methods

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Change Assert.Contains to Assert.StartsWith for lambda name tests

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Consolidate regexes and improve test parameter names

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Keep ordinal suffix for local functions to ensure uniqueness

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Fix build errors for netstandard2.0 and net462 targets

Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>

* Cleanup

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
---
 .../Functions/AIFunctionFactory.cs            |  49 ++++--
 .../Functions/AIFunctionFactoryTest.cs        | 139 ++++++++++++++++++
 2 files changed, 179 insertions(+), 9 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
index 1b804e282dd..7df48182e52 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
@@ -749,11 +749,21 @@ private static string GetFunctionName(MethodInfo method)
             string name = SanitizeMemberName(method.Name);
 
             const string AsyncSuffix = "Async";
-            if (IsAsyncMethod(method) &&
-                name.EndsWith(AsyncSuffix, StringComparison.Ordinal) &&
-                name.Length > AsyncSuffix.Length)
+            if (IsAsyncMethod(method))
             {
-                name = name.Substring(0, name.Length - AsyncSuffix.Length);
+                // If the method ends in "Async" or contains "Async_", remove the "Async".
+                int asyncIndex = name.LastIndexOf(AsyncSuffix, StringComparison.Ordinal);
+                if (asyncIndex > 0 &&
+                    (asyncIndex + AsyncSuffix.Length == name.Length ||
+                     ((asyncIndex + AsyncSuffix.Length < name.Length) && (name[asyncIndex + AsyncSuffix.Length] == '_'))))
+                {
+                    name =
+#if NET
+                        string.Concat(name.AsSpan(0, asyncIndex), name.AsSpan(asyncIndex + AsyncSuffix.Length));
+#else
+                        string.Concat(name.Substring(0, asyncIndex), name.Substring(asyncIndex + AsyncSuffix.Length));
+#endif
+                }
             }
 
             return name;
@@ -1105,16 +1115,37 @@ private record struct DescriptorKey(
     /// Replaces non-alphanumeric characters in the identifier with the underscore character.
     /// Primarily intended to remove characters produced by compiler-generated method name mangling.
     /// </returns>
-    private static string SanitizeMemberName(string memberName) =>
-        InvalidNameCharsRegex().Replace(memberName, "_");
+    private static string SanitizeMemberName(string memberName)
+    {
+        // Handle compiler-generated names (local functions and lambdas)
+        // Local functions: <ContainingMethod>g__LocalFunctionName|ordinal_depth -> ContainingMethod_LocalFunctionName_ordinal_depth
+        // Lambdas: <ContainingMethod>b__ordinal_depth -> ContainingMethod_ordinal_depth
+        if (CompilerGeneratedNameRegex().Match(memberName) is { Success: true } match)
+        {
+            memberName = $"{match.Groups[1].Value}_{match.Groups[2].Value}";
+        }
+
+        // Replace all non-alphanumeric characters with underscores.
+        return InvalidNameCharsRegex().Replace(memberName, "_");
+    }
+
+    /// <summary>Regex that matches compiler-generated names (local functions and lambdas).</summary>
+#if NET
+    [GeneratedRegex(@"^<([^>]+)>\w__(.+)")]
+    private static partial Regex CompilerGeneratedNameRegex();
+#else
+    private static Regex CompilerGeneratedNameRegex() => _compilerGeneratedNameRegex;
+    private static readonly Regex _compilerGeneratedNameRegex = new(@"^<([^>]+)>\w__(.+)", RegexOptions.Compiled);
+#endif
 
-    /// <summary>Regex that flags any character other than ASCII digits or letters or the underscore.</summary>
+    /// <summary>Regex that flags any character other than ASCII digits or letters.</summary>
+    /// <remarks>Underscore isn't included so that sequences of underscores are replaced by a single one.</remarks>
 #if NET
-    [GeneratedRegex("[^0-9A-Za-z_]")]
+    [GeneratedRegex("[^0-9A-Za-z]+")]
     private static partial Regex InvalidNameCharsRegex();
 #else
     private static Regex InvalidNameCharsRegex() => _invalidNameCharsRegex;
-    private static readonly Regex _invalidNameCharsRegex = new("[^0-9A-Za-z_]", RegexOptions.Compiled);
+    private static readonly Regex _invalidNameCharsRegex = new("[^0-9A-Za-z]+", RegexOptions.Compiled);
 #endif
 
     /// <summary>Invokes the MethodInfo with the specified target object and arguments.</summary>
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
index 7e61ad745c4..f99f9f94bc9 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
@@ -1005,6 +1005,8 @@ private sealed class MyFunctionTypeWithOneArg(MyArgumentType arg)
 
     private sealed class MyArgumentType;
 
+    private static int TestStaticMethod(int a, int b) => a + b;
+
     private class A;
     private class B : A;
     private sealed class C : B;
@@ -1039,6 +1041,143 @@ private static AIFunctionFactoryOptions CreateKeyedServicesSupportOptions() =>
             },
         };
 
+    [Fact]
+    public void LocalFunction_NameCleanup()
+    {
+        static void DoSomething()
+        {
+            // Empty local function for testing name cleanup
+        }
+
+        var tool = AIFunctionFactory.Create(DoSomething);
+
+        // The name should start with: ContainingMethodName_LocalFunctionName (followed by ordinal)
+        Assert.StartsWith("LocalFunction_NameCleanup_DoSomething_", tool.Name);
+    }
+
+    [Fact]
+    public void LocalFunction_MultipleInSameMethod()
+    {
+        static void FirstLocal()
+        {
+            // Empty local function for testing name cleanup
+        }
+
+        static void SecondLocal()
+        {
+            // Empty local function for testing name cleanup
+        }
+
+        var tool1 = AIFunctionFactory.Create(FirstLocal);
+        var tool2 = AIFunctionFactory.Create(SecondLocal);
+
+        // Each should have unique names based on the local function name (including ordinal)
+        Assert.StartsWith("LocalFunction_MultipleInSameMethod_FirstLocal_", tool1.Name);
+        Assert.StartsWith("LocalFunction_MultipleInSameMethod_SecondLocal_", tool2.Name);
+        Assert.NotEqual(tool1.Name, tool2.Name);
+    }
+
+    [Fact]
+    public void Lambda_NameCleanup()
+    {
+        Action lambda = () =>
+        {
+            // Empty lambda for testing name cleanup
+        };
+
+        var tool = AIFunctionFactory.Create(lambda);
+
+        // The name should be the containing method name with ordinal for uniqueness
+        Assert.StartsWith("Lambda_NameCleanup", tool.Name);
+    }
+
+    [Fact]
+    public void Lambda_MultipleInSameMethod()
+    {
+        Action lambda1 = () =>
+        {
+            // Empty lambda for testing name cleanup
+        };
+
+        Action lambda2 = () =>
+        {
+            // Empty lambda for testing name cleanup
+        };
+
+        var tool1 = AIFunctionFactory.Create(lambda1);
+        var tool2 = AIFunctionFactory.Create(lambda2);
+
+        // Each lambda should have a unique name based on its ordinal
+        // to allow the LLM to distinguish between them
+        Assert.StartsWith("Lambda_MultipleInSameMethod", tool1.Name);
+        Assert.StartsWith("Lambda_MultipleInSameMethod", tool2.Name);
+        Assert.NotEqual(tool1.Name, tool2.Name);
+    }
+
+    [Fact]
+    public void LocalFunction_WithParameters()
+    {
+        static int Add(int firstNumber, int secondNumber) => firstNumber + secondNumber;
+
+        var tool = AIFunctionFactory.Create(Add);
+
+        Assert.StartsWith("LocalFunction_WithParameters_Add_", tool.Name);
+        Assert.Contains("firstNumber", tool.JsonSchema.ToString());
+        Assert.Contains("secondNumber", tool.JsonSchema.ToString());
+    }
+
+    [Fact]
+    public async Task LocalFunction_AsyncFunction()
+    {
+        static async Task<string> FetchDataAsync()
+        {
+            await Task.Yield();
+            return "data";
+        }
+
+        var tool = AIFunctionFactory.Create(FetchDataAsync);
+
+        // Should strip "Async" suffix and include ordinal
+        Assert.StartsWith("LocalFunction_AsyncFunction_FetchData_", tool.Name);
+
+        var result = await tool.InvokeAsync();
+        AssertExtensions.EqualFunctionCallResults("data", result);
+    }
+
+    [Fact]
+    public void LocalFunction_ExplicitNameOverride()
+    {
+        static void DoSomething()
+        {
+            // Empty local function for testing name cleanup
+        }
+
+        var tool = AIFunctionFactory.Create(DoSomething, name: "CustomName");
+
+        Assert.Equal("CustomName", tool.Name);
+    }
+
+    [Fact]
+    public void LocalFunction_InsideTestMethod()
+    {
+        // Even local functions defined in test methods get cleaned up
+        var tool = AIFunctionFactory.Create(Add, serializerOptions: JsonContext.Default.Options);
+
+        Assert.StartsWith("LocalFunction_InsideTestMethod_Add_", tool.Name);
+
+        [return: Description("The summed result")]
+        static int Add(int a, int b) => a + b;
+    }
+
+    [Fact]
+    public void RegularStaticMethod_NameUnchanged()
+    {
+        // Test that actual static methods (not local functions) have names unchanged
+        var tool = AIFunctionFactory.Create(TestStaticMethod, null, serializerOptions: JsonContext.Default.Options);
+
+        Assert.Equal("TestStaticMethod", tool.Name);
+    }
+
     [JsonSerializable(typeof(IAsyncEnumerable<int>))]
     [JsonSerializable(typeof(int[]))]
     [JsonSerializable(typeof(string))]

From 577c64763902e6182fd25f1eba1472a5c1e1e0c0 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Fri, 10 Oct 2025 18:36:07 -0400
Subject: [PATCH 4/7] Update OpenTelemetryChatClient to output data on all
 tools (#6906)

We're currently filtering down to only AITools that are AIFunctionDeclaration. With this, we'll handle AIFunctionDeclaration wrappers the same as well, and for all other tools emit their name as the type. This can be further extended as otel adds more details about how non-function tools should be represented.
---
 .../Microsoft.Extensions.AI.Abstractions.json | 14 ++++++++++
 .../Tools/HostedCodeInterpreterTool.cs        |  3 ++
 .../Tools/HostedFileSearchTool.cs             |  3 ++
 .../Tools/HostedMcpServerTool.cs              |  3 ++
 .../Tools/HostedWebSearchTool.cs              |  3 ++
 .../ChatCompletion/OpenTelemetryChatClient.cs | 28 +++++++++++--------
 .../Tools/HostedCodeInterpreterToolTests.cs   |  4 +--
 .../Tools/HostedFileSearchToolTests.cs        |  4 +--
 .../Tools/HostedMcpServerToolTests.cs         |  3 +-
 .../Tools/HostedWebSearchToolTests.cs         |  4 +--
 .../OpenTelemetryChatClientTests.cs           | 15 ++++++++++
 11 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.json b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.json
index daa5063cf51..d8bd5c47d3d 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.json
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.json
@@ -1952,6 +1952,10 @@
         {
           "Member": "System.Collections.Generic.IList<Microsoft.Extensions.AI.AIContent>? Microsoft.Extensions.AI.HostedCodeInterpreterTool.Inputs { get; set; }",
           "Stage": "Stable"
+        },
+        {
+          "Member": "override string Microsoft.Extensions.AI.HostedCodeInterpreterTool.Name { get; }",
+          "Stage": "Stable"
         }
       ]
     },
@@ -1972,6 +1976,10 @@
         {
           "Member": "int? Microsoft.Extensions.AI.HostedFileSearchTool.MaximumResultCount { get; set; }",
           "Stage": "Stable"
+        },
+        {
+          "Member": "override string Microsoft.Extensions.AI.HostedFileSearchTool.Name { get; }",
+          "Stage": "Stable"
         }
       ]
     },
@@ -1983,6 +1991,12 @@
           "Member": "Microsoft.Extensions.AI.HostedWebSearchTool.HostedWebSearchTool();",
           "Stage": "Stable"
         }
+      ],
+      "Properties": [
+        {
+          "Member": "override string Microsoft.Extensions.AI.HostedWebSearchTool.Name { get; }",
+          "Stage": "Stable"
+        }
       ]
     },
     {
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedCodeInterpreterTool.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedCodeInterpreterTool.cs
index 737226a5f7e..4bd63a0df75 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedCodeInterpreterTool.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedCodeInterpreterTool.cs
@@ -17,6 +17,9 @@ public HostedCodeInterpreterTool()
     {
     }
 
+    /// <inheritdoc />
+    public override string Name => "code_interpreter";
+
     /// <summary>Gets or sets a collection of <see cref="AIContent"/> to be used as input to the code interpreter tool.</summary>
     /// <remarks>
     /// Services support different varied kinds of inputs. Most support the IDs of files that are hosted by the service,
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedFileSearchTool.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedFileSearchTool.cs
index b524ca5676c..b130e26b647 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedFileSearchTool.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedFileSearchTool.cs
@@ -17,6 +17,9 @@ public HostedFileSearchTool()
     {
     }
 
+    /// <inheritdoc />
+    public override string Name => "file_search";
+
     /// <summary>Gets or sets a collection of <see cref="AIContent"/> to be used as input to the file search tool.</summary>
     /// <remarks>
     /// If no explicit inputs are provided, the service determines what inputs should be searched. Different services
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedMcpServerTool.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedMcpServerTool.cs
index 26fc3cd6434..d55ffb3788c 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedMcpServerTool.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedMcpServerTool.cs
@@ -39,6 +39,9 @@ public HostedMcpServerTool(string serverName, Uri url)
         Url = Throw.IfNull(url);
     }
 
+    /// <inheritdoc />
+    public override string Name => "mcp";
+
     /// <summary>
     /// Gets the name of the remote MCP server that is used to identify it.
     /// </summary>
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedWebSearchTool.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedWebSearchTool.cs
index 06d11bf40ed..19d25510d19 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedWebSearchTool.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Tools/HostedWebSearchTool.cs
@@ -14,4 +14,7 @@ public class HostedWebSearchTool : AITool
     public HostedWebSearchTool()
     {
     }
+
+    /// <inheritdoc />
+    public override string Name => "web_search";
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
index 33c9306aa11..5305e05c8c5 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
@@ -249,6 +249,10 @@ internal static string SerializeChatMessages(IEnumerable<ChatMessage> messages,
                         m.Parts.Add(new OtelGenericPart { Content = tc.Text });
                         break;
 
+                    case TextReasoningContent trc when !string.IsNullOrWhiteSpace(trc.Text):
+                        m.Parts.Add(new OtelGenericPart { Type = "reasoning", Content = trc.Text });
+                        break;
+
                     case FunctionCallContent fcc:
                         m.Parts.Add(new OtelToolCallRequestPart
                         {
@@ -268,10 +272,6 @@ internal static string SerializeChatMessages(IEnumerable<ChatMessage> messages,
 
                     // These are non-standard and are using the "generic" non-text part that provides an extensibility mechanism:
 
-                    case TextReasoningContent trc when !string.IsNullOrWhiteSpace(trc.Text):
-                        m.Parts.Add(new OtelGenericPart { Type = "reasoning", Content = trc.Text });
-                        break;
-
                     case UriContent uc:
                         m.Parts.Add(new OtelGenericPart { Type = "image", Content = uc.Uri.ToString() });
                         break;
@@ -396,16 +396,20 @@ internal static string SerializeChatMessages(IEnumerable<ChatMessage> messages,
 
                     if (EnableSensitiveData)
                     {
-                        if (options.Tools?.Any(t => t is AIFunctionDeclaration) is true)
+                        if (options.Tools is { Count: > 0 })
                         {
                             _ = activity.AddTag(
-                                    OpenTelemetryConsts.GenAI.Tool.Definitions,
-                                    JsonSerializer.Serialize(options.Tools.OfType<AIFunctionDeclaration>().Select(t => new OtelFunction
+                                OpenTelemetryConsts.GenAI.Tool.Definitions,
+                                JsonSerializer.Serialize(options.Tools.Select(t => t switch
+                                {
+                                    _ when t.GetService<AIFunctionDeclaration>() is { } af => new OtelFunction
                                     {
-                                        Name = t.Name,
-                                        Description = t.Description,
-                                        Parameters = t.JsonSchema,
-                                    }), OtelContext.Default.IEnumerableOtelFunction));
+                                        Name = af.Name,
+                                        Description = af.Description,
+                                        Parameters = af.JsonSchema,
+                                    },
+                                    _ => new OtelFunction { Type = t.Name },
+                                }), OtelContext.Default.IEnumerableOtelFunction));
                         }
 
                         // Log all additional request options as raw values on the span.
@@ -601,7 +605,7 @@ private sealed class OtelFunction
         public string Type { get; set; } = "function";
         public string? Name { get; set; }
         public string? Description { get; set; }
-        public JsonElement Parameters { get; set; }
+        public JsonElement? Parameters { get; set; }
     }
 
     private static readonly JsonSerializerOptions _defaultOptions = CreateDefaultOptions();
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedCodeInterpreterToolTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedCodeInterpreterToolTests.cs
index e7e80c55048..19044a6a295 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedCodeInterpreterToolTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedCodeInterpreterToolTests.cs
@@ -11,11 +11,11 @@ public class HostedCodeInterpreterToolTests
     public void Constructor_Roundtrips()
     {
         var tool = new HostedCodeInterpreterTool();
-        Assert.Equal(nameof(HostedCodeInterpreterTool), tool.Name);
+        Assert.Equal("code_interpreter", tool.Name);
         Assert.Empty(tool.Description);
         Assert.Empty(tool.AdditionalProperties);
         Assert.Null(tool.Inputs);
-        Assert.Equal(nameof(HostedCodeInterpreterTool), tool.ToString());
+        Assert.Equal(tool.Name, tool.ToString());
     }
 
     [Fact]
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedFileSearchToolTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedFileSearchToolTests.cs
index 418689dda4b..e2d71a65013 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedFileSearchToolTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedFileSearchToolTests.cs
@@ -11,12 +11,12 @@ public class HostedFileSearchToolTests
     public void Constructor_Roundtrips()
     {
         var tool = new HostedFileSearchTool();
-        Assert.Equal(nameof(HostedFileSearchTool), tool.Name);
+        Assert.Equal("file_search", tool.Name);
         Assert.Empty(tool.Description);
         Assert.Empty(tool.AdditionalProperties);
         Assert.Null(tool.Inputs);
         Assert.Null(tool.MaximumResultCount);
-        Assert.Equal(nameof(HostedFileSearchTool), tool.ToString());
+        Assert.Equal(tool.Name, tool.ToString());
     }
 
     [Fact]
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedMcpServerToolTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedMcpServerToolTests.cs
index c77e59e3307..6ab073e1dda 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedMcpServerToolTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedMcpServerToolTests.cs
@@ -31,7 +31,8 @@ public void Constructor_Roundtrips()
 
         Assert.Empty(tool.AdditionalProperties);
         Assert.Empty(tool.Description);
-        Assert.Equal(nameof(HostedMcpServerTool), tool.Name);
+        Assert.Equal("mcp", tool.Name);
+        Assert.Equal(tool.Name, tool.ToString());
 
         Assert.Equal("serverName", tool.ServerName);
         Assert.Equal("https://localhost/", tool.Url.ToString());
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedWebSearchToolTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedWebSearchToolTests.cs
index 4b03cbb0031..4bb6ca4b847 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedWebSearchToolTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Tools/HostedWebSearchToolTests.cs
@@ -11,9 +11,9 @@ public class HostedWebSearchToolTests
     public void Constructor_Roundtrips()
     {
         var tool = new HostedWebSearchTool();
-        Assert.Equal(nameof(HostedWebSearchTool), tool.Name);
+        Assert.Equal("web_search", tool.Name);
         Assert.Empty(tool.Description);
         Assert.Empty(tool.AdditionalProperties);
-        Assert.Equal(nameof(HostedWebSearchTool), tool.ToString());
+        Assert.Equal(tool.Name, tool.ToString());
     }
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
index eb052c3d3e2..938f6f92d4c 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
@@ -134,6 +134,9 @@ async static IAsyncEnumerable<ChatResponseUpdate> CallbackAsync(
             [
                 AIFunctionFactory.Create((string personName) => personName, "GetPersonAge", "Gets the age of a person by name."),
                 new HostedWebSearchTool(),
+                new HostedFileSearchTool(),
+                new HostedCodeInterpreterTool(),
+                new HostedMcpServerTool("myAwesomeServer", "http://localhost:1234/somewhere"),
                 AIFunctionFactory.Create((string location) => "", "GetCurrentWeather", "Gets the current weather for a location.").AsDeclarationOnly(),
             ],
         };
@@ -288,6 +291,18 @@ async static IAsyncEnumerable<ChatResponseUpdate> CallbackAsync(
                       ]
                     }
                   },
+                  {
+                    "type": "web_search"
+                  },
+                  {
+                    "type": "file_search"
+                  },
+                  {
+                    "type": "code_interpreter"
+                  },
+                  {
+                    "type": "mcp"
+                  },
                   {
                     "type": "function",
                     "name": "GetCurrentWeather",

From b9626880876586f1cc33d811465a942736b38d55 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Fri, 10 Oct 2025 18:38:43 -0400
Subject: [PATCH 5/7] Update ToChatResponse{Async} to also factor in AuthorName
 (#6910)

* Update ToChatResponse{Async} to also factor in AuthorName

Originally we were only factoring in Role. Then we also augmented it to factor in MessageId, since updates from different messages are by definition not part of the same message. Now it also makes sense to factor in AuthorName, as different text from different speakers / agents are also by definition not part of the same message.

* Fix useAsync inversion in tests
---
 .../ChatCompletion/ChatResponseExtensions.cs  |  35 +-
 .../ChatResponseUpdateExtensionsTests.cs      | 392 ++++++++++++++++--
 ...eechToTextResponseUpdateExtensionsTests.cs |   4 +-
 3 files changed, 383 insertions(+), 48 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseExtensions.cs
index 87a957130f5..cbc00dd98ec 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseExtensions.cs
@@ -306,26 +306,19 @@ private static void FinalizeResponse(ChatResponse response)
     private static void ProcessUpdate(ChatResponseUpdate update, ChatResponse response)
     {
         // If there is no message created yet, or if the last update we saw had a different
-        // message ID or role than the newest update, create a new message.
-        ChatMessage message;
-        var isNewMessage = false;
-        if (response.Messages.Count == 0)
-        {
-            isNewMessage = true;
-        }
-        else if (update.MessageId is { Length: > 0 } updateMessageId
-            && response.Messages[response.Messages.Count - 1].MessageId is string lastMessageId
-            && updateMessageId != lastMessageId)
-        {
-            isNewMessage = true;
-        }
-        else if (update.Role is { } updateRole
-            && response.Messages[response.Messages.Count - 1].Role is { } lastRole
-            && updateRole != lastRole)
+        // identifying parts, create a new message.
+        bool isNewMessage = true;
+        if (response.Messages.Count != 0)
         {
-            isNewMessage = true;
+            var lastMessage = response.Messages[response.Messages.Count - 1];
+            isNewMessage =
+                NotEmptyOrEqual(update.AuthorName, lastMessage.AuthorName) ||
+                NotEmptyOrEqual(update.MessageId, lastMessage.MessageId) ||
+                NotNullOrEqual(update.Role, lastMessage.Role);
         }
 
+        // Get the message to target, either a new one or the last ones.
+        ChatMessage message;
         if (isNewMessage)
         {
             message = new(ChatRole.Assistant, []);
@@ -418,4 +411,12 @@ private static void ProcessUpdate(ChatResponseUpdate update, ChatResponse respon
             }
         }
     }
+
+    /// <summary>Gets whether both strings are not null/empty and not the same as each other.</summary>
+    private static bool NotEmptyOrEqual(string? s1, string? s2) =>
+        s1 is { Length: > 0 } str1 && s2 is { Length: > 0 } str2 && str1 != str2;
+
+    /// <summary>Gets whether two roles are not null and not the same as each other.</summary>
+    private static bool NotNullOrEqual(ChatRole? r1, ChatRole? r2) =>
+        r1.HasValue && r2.HasValue && r1.Value != r2.Value;
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatResponseUpdateExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatResponseUpdateExtensionsTests.cs
index 3328d0be083..ee9ae354677 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatResponseUpdateExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatResponseUpdateExtensionsTests.cs
@@ -36,8 +36,8 @@ public async Task ToChatResponse_SuccessfullyCreatesResponse(bool useAsync)
         ];
 
         ChatResponse response = useAsync ?
-            updates.ToChatResponse() :
-            await YieldAsync(updates).ToChatResponseAsync();
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
         Assert.NotNull(response);
 
         Assert.NotNull(response.Usage);
@@ -67,7 +67,7 @@ public async Task ToChatResponse_SuccessfullyCreatesResponse(bool useAsync)
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
-    public async Task ToChatResponse_RoleOrIdChangeDictatesMessageChange(bool useAsync)
+    public async Task ToChatResponse_RoleOrIdOrAuthorNameChangeDictatesMessageChange(bool useAsync)
     {
         ChatResponseUpdate[] updates =
         [
@@ -88,8 +88,8 @@ public async Task ToChatResponse_RoleOrIdChangeDictatesMessageChange(bool useAsy
         ];
 
         ChatResponse response = useAsync ?
-            updates.ToChatResponse() :
-            await YieldAsync(updates).ToChatResponseAsync();
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
         Assert.Equal(9, response.Messages.Count);
 
         Assert.Equal("!a", response.Messages[0].Text);
@@ -120,6 +120,329 @@ public async Task ToChatResponse_RoleOrIdChangeDictatesMessageChange(bool useAsy
         Assert.Equal(ChatRole.Assistant, response.Messages[8].Role);
     }
 
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_AuthorNameChangeDictatesMessageBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with AuthorName "Alice"
+            new(ChatRole.Assistant, "Hello ") { AuthorName = "Alice" },
+            new(null, "from ") { AuthorName = "Alice" },
+            new(null, "Alice!"),
+
+            // Second message - AuthorName changes to "Bob"
+            new(null, "Hi ") { AuthorName = "Bob" },
+            new(null, "from ") { AuthorName = "Bob" },
+            new(null, "Bob!"),
+
+            // Third message - AuthorName changes to "Charlie"
+            new(ChatRole.Assistant, "Greetings ") { AuthorName = "Charlie" },
+            new(null, "from Charlie!") { AuthorName = "Charlie" },
+
+            // Fourth message - AuthorName changes back to "Alice"
+            new(null, "Alice again!") { AuthorName = "Alice" },
+
+            // Fifth message - empty/null AuthorName should continue with last message
+            new(null, " Still Alice.") { AuthorName = "" },
+            new(null, " And more."),
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(4, response.Messages.Count);
+
+        Assert.Equal("Hello from Alice!", response.Messages[0].Text);
+        Assert.Equal("Alice", response.Messages[0].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[0].Role);
+
+        Assert.Equal("Hi from Bob!", response.Messages[1].Text);
+        Assert.Equal("Bob", response.Messages[1].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[1].Role);
+
+        Assert.Equal("Greetings from Charlie!", response.Messages[2].Text);
+        Assert.Equal("Charlie", response.Messages[2].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[2].Role);
+
+        Assert.Equal("Alice again! Still Alice. And more.", response.Messages[3].Text);
+        Assert.Equal("Alice", response.Messages[3].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[3].Role);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_AuthorNameWithOtherBoundaries(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // Message 1: Role=Assistant, MessageId="1", AuthorName="Alice"
+            new(ChatRole.Assistant, "A") { MessageId = "1", AuthorName = "Alice" },
+            new(null, "B") { MessageId = "1", AuthorName = "Alice" },
+
+            // Message 2: AuthorName changes to "Bob", same MessageId and Role
+            new(null, "C") { MessageId = "1", AuthorName = "Bob" },
+
+            // Message 3: MessageId changes to "2", AuthorName stays "Bob"
+            new(null, "D") { MessageId = "2", AuthorName = "Bob" },
+            new(null, "E") { MessageId = "2", AuthorName = "Bob" },
+
+            // Message 4: Role changes to User, AuthorName stays "Bob"
+            new(ChatRole.User, "F") { MessageId = "2", AuthorName = "Bob" },
+
+            // Message 5: All three boundaries change
+            new(ChatRole.Tool, "G") { MessageId = "3", AuthorName = "Charlie" },
+            new(null, "H") { MessageId = "3", AuthorName = "Charlie" },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(5, response.Messages.Count);
+
+        Assert.Equal("AB", response.Messages[0].Text);
+        Assert.Equal("Alice", response.Messages[0].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[0].Role);
+        Assert.Equal("1", response.Messages[0].MessageId);
+
+        Assert.Equal("C", response.Messages[1].Text);
+        Assert.Equal("Bob", response.Messages[1].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[1].Role);
+        Assert.Equal("1", response.Messages[1].MessageId);
+
+        Assert.Equal("DE", response.Messages[2].Text);
+        Assert.Equal("Bob", response.Messages[2].AuthorName);
+        Assert.Equal(ChatRole.Assistant, response.Messages[2].Role);
+        Assert.Equal("2", response.Messages[2].MessageId);
+
+        Assert.Equal("F", response.Messages[3].Text);
+        Assert.Equal("Bob", response.Messages[3].AuthorName);
+        Assert.Equal(ChatRole.User, response.Messages[3].Role);
+        Assert.Equal("2", response.Messages[3].MessageId);
+
+        Assert.Equal("GH", response.Messages[4].Text);
+        Assert.Equal("Charlie", response.Messages[4].AuthorName);
+        Assert.Equal(ChatRole.Tool, response.Messages[4].Role);
+        Assert.Equal("3", response.Messages[4].MessageId);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_EmptyOrNullAuthorNameDoesNotCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with AuthorName "Assistant"
+            new(ChatRole.Assistant, "Hello") { AuthorName = "Assistant" },
+
+            // Empty AuthorName should not create new message
+            new(null, " world") { AuthorName = "" },
+
+            // Null AuthorName should not create new message
+            new(null, "!"),
+
+            // Another empty AuthorName
+            new(null, " How") { AuthorName = "" },
+            new(null, " are") { AuthorName = "" },
+
+            // Null again
+            new(null, " you?") { AuthorName = null },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        ChatMessage message = Assert.Single(response.Messages);
+        Assert.Equal("Hello world! How are you?", message.Text);
+        Assert.Equal("Assistant", message.AuthorName);
+        Assert.Equal(ChatRole.Assistant, message.Role);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_AuthorNameNullToNonNullDoesNotCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with no AuthorName
+            new(ChatRole.Assistant, "Hello") { MessageId = "1" },
+            new(null, " there") { MessageId = "1" },
+
+            // AuthorName becomes non-empty but doesn't create boundary
+            new(null, " I'm Bob") { MessageId = "1", AuthorName = "Bob" },
+            new(null, " speaking") { MessageId = "1", AuthorName = "Bob" },
+
+            // Second message - AuthorName changes to "Alice" creates boundary
+            new(null, "Now Alice") { MessageId = "1", AuthorName = "Alice" },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(2, response.Messages.Count);
+
+        Assert.Equal("Hello there I'm Bob speaking", response.Messages[0].Text);
+        Assert.Equal("Bob", response.Messages[0].AuthorName); // Last AuthorName wins
+        Assert.Equal("1", response.Messages[0].MessageId);
+
+        Assert.Equal("Now Alice", response.Messages[1].Text);
+        Assert.Equal("Alice", response.Messages[1].AuthorName);
+        Assert.Equal("1", response.Messages[1].MessageId);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_MessageIdNullToNonNullDoesNotCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with no MessageId
+            new(ChatRole.Assistant, "Hello"),
+            new(null, " there"),
+
+            // MessageId becomes non-empty but doesn't create boundary
+            new(null, " from") { MessageId = "msg1" },
+            new(null, " AI") { MessageId = "msg1" },
+
+            // Second message - MessageId changes to different value creates boundary
+            new(null, "Next message") { MessageId = "msg2" },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(2, response.Messages.Count);
+
+        Assert.Equal("Hello there from AI", response.Messages[0].Text);
+        Assert.Equal("msg1", response.Messages[0].MessageId); // Last MessageId wins
+        Assert.Equal(ChatRole.Assistant, response.Messages[0].Role);
+
+        Assert.Equal("Next message", response.Messages[1].Text);
+        Assert.Equal("msg2", response.Messages[1].MessageId);
+        Assert.Equal(ChatRole.Assistant, response.Messages[1].Role);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_EmptyMessageIdDoesNotCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with MessageId
+            new(ChatRole.Assistant, "Hello") { MessageId = "msg1" },
+            new(null, " world") { MessageId = "msg1" },
+
+            // Empty MessageId should not create new message
+            new(null, "!") { MessageId = "" },
+
+            // Null MessageId should not create new message
+            new(null, " How"),
+
+            // Another message with empty MessageId
+            new(null, " are") { MessageId = "" },
+            new(null, " you?"),
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        ChatMessage message = Assert.Single(response.Messages);
+        Assert.Equal("Hello world! How are you?", message.Text);
+        Assert.Equal("msg1", message.MessageId);
+        Assert.Equal(ChatRole.Assistant, message.Role);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_RoleNullToNonNullDoesNotCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with no explicit Role (will default to Assistant)
+            new(null, "Hello") { MessageId = "1" },
+            new(null, " there") { MessageId = "1" },
+
+            // Role becomes explicit Assistant - shouldn't create boundary
+            new(ChatRole.Assistant, " from") { MessageId = "1" },
+            new(null, " AI") { MessageId = "1" },
+
+            // Second message - Role changes to User creates boundary
+            new(ChatRole.User, "User message") { MessageId = "1" },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(2, response.Messages.Count);
+
+        Assert.Equal("Hello there from AI", response.Messages[0].Text);
+        Assert.Equal(ChatRole.Assistant, response.Messages[0].Role);
+        Assert.Equal("1", response.Messages[0].MessageId);
+
+        Assert.Equal("User message", response.Messages[1].Text);
+        Assert.Equal(ChatRole.User, response.Messages[1].Role);
+        Assert.Equal("1", response.Messages[1].MessageId);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ToChatResponse_CustomRoleChangesCreateBoundary(bool useAsync)
+    {
+        ChatResponseUpdate[] updates =
+        [
+
+            // First message with custom role "agent1"
+            new(new ChatRole("agent1"), "Hello") { MessageId = "1" },
+            new(null, " from") { MessageId = "1" },
+            new(new ChatRole("agent1"), " agent1") { MessageId = "1" },
+
+            // Second message - custom role changes to "agent2"
+            new(new ChatRole("agent2"), "Hi") { MessageId = "1" },
+            new(null, " from") { MessageId = "1" },
+            new(new ChatRole("agent2"), " agent2") { MessageId = "1" },
+
+            // Third message - changes to standard role
+            new(ChatRole.Assistant, "Assistant here") { MessageId = "1" },
+        ];
+
+        ChatResponse response = useAsync ?
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
+
+        Assert.Equal(3, response.Messages.Count);
+
+        Assert.Equal("Hello from agent1", response.Messages[0].Text);
+        Assert.Equal(new ChatRole("agent1"), response.Messages[0].Role);
+
+        Assert.Equal("Hi from agent2", response.Messages[1].Text);
+        Assert.Equal(new ChatRole("agent2"), response.Messages[1].Role);
+
+        Assert.Equal("Assistant here", response.Messages[2].Text);
+        Assert.Equal(ChatRole.Assistant, response.Messages[2].Role);
+    }
+
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
@@ -128,22 +451,25 @@ public async Task ToChatResponse_UpdatesProduceMultipleResponseMessages(bool use
         ChatResponseUpdate[] updates =
         [
             
-            // First message - ID "msg1"
+            // First message - ID "msg1", AuthorName "Assistant"
             new(null, "Hi! ") { CreatedAt = new DateTimeOffset(2023, 1, 1, 10, 0, 0, TimeSpan.Zero), AuthorName = "Assistant" },
             new(ChatRole.Assistant, "Hello") { MessageId = "msg1", CreatedAt = new DateTimeOffset(2024, 1, 1, 10, 0, 0, TimeSpan.Zero), AuthorName = "Assistant" },
             new(null, " from") { MessageId = "msg1", CreatedAt = new DateTimeOffset(2024, 1, 1, 10, 1, 0, TimeSpan.Zero) }, // Later CreatedAt should win
-            new(null, " AI") { MessageId = "msg1", AuthorName = "AI Assistant" }, // Later AuthorName should win
+            new(null, " AI") { MessageId = "msg1", AuthorName = "Assistant" }, // Keep same AuthorName to avoid creating new message
+
+            // Second message - ID "msg1" changes to "msg2", still AuthorName "Assistant" 
+            new(null, "More text") { MessageId = "msg2", CreatedAt = new DateTimeOffset(2024, 1, 1, 10, 2, 0, TimeSpan.Zero), AuthorName = "Assistant" },
 
-            // Second message - ID "msg2" 
-            new(ChatRole.User, "How") { MessageId = "msg2", CreatedAt = new DateTimeOffset(2024, 1, 1, 11, 0, 0, TimeSpan.Zero), AuthorName = "User" },
-            new(null, " are") { MessageId = "msg2", CreatedAt = new DateTimeOffset(2024, 1, 1, 11, 1, 0, TimeSpan.Zero) },
-            new(null, " you?") { MessageId = "msg2", AuthorName = "Human User" }, // Later AuthorName should win
+            // Third message - ID "msg3", Role changes to User
+            new(ChatRole.User, "How") { MessageId = "msg3", CreatedAt = new DateTimeOffset(2024, 1, 1, 11, 0, 0, TimeSpan.Zero), AuthorName = "User" },
+            new(null, " are") { MessageId = "msg3", CreatedAt = new DateTimeOffset(2024, 1, 1, 11, 1, 0, TimeSpan.Zero) },
+            new(null, " you?") { MessageId = "msg3", AuthorName = "User" }, // Keep same AuthorName
 
-            // Third message - ID "msg3"
-            new(ChatRole.Assistant, "I'm doing well,") { MessageId = "msg3", CreatedAt = new DateTimeOffset(2024, 1, 1, 12, 0, 0, TimeSpan.Zero) },
-            new(null, " thank you!") { MessageId = "msg3", CreatedAt = new DateTimeOffset(2024, 1, 1, 12, 2, 0, TimeSpan.Zero) }, // Later CreatedAt should win
+            // Fourth message - ID "msg4", Role changes back to Assistant
+            new(ChatRole.Assistant, "I'm doing well,") { MessageId = "msg4", CreatedAt = new DateTimeOffset(2024, 1, 1, 12, 0, 0, TimeSpan.Zero) },
+            new(null, " thank you!") { MessageId = "msg4", CreatedAt = new DateTimeOffset(2024, 1, 1, 12, 2, 0, TimeSpan.Zero) }, // Later CreatedAt should win
 
-            // Updates without MessageId should continue the last message (msg3)
+            // Updates without MessageId should continue the last message (msg4)
             new(null, " How can I help?"),
         ];
 
@@ -152,31 +478,39 @@ await YieldAsync(updates).ToChatResponseAsync() :
             updates.ToChatResponse();
 
         Assert.NotNull(response);
-        Assert.Equal(3, response.Messages.Count);
+        Assert.Equal(4, response.Messages.Count);
 
         // Verify first message
         ChatMessage message1 = response.Messages[0];
         Assert.Equal("msg1", message1.MessageId);
         Assert.Equal(ChatRole.Assistant, message1.Role);
-        Assert.Equal("AI Assistant", message1.AuthorName); // Last value should win
+        Assert.Equal("Assistant", message1.AuthorName);
         Assert.Equal(new DateTimeOffset(2024, 1, 1, 10, 1, 0, TimeSpan.Zero), message1.CreatedAt); // Last value should win
         Assert.Equal("Hi! Hello from AI", message1.Text);
 
         // Verify second message  
         ChatMessage message2 = response.Messages[1];
         Assert.Equal("msg2", message2.MessageId);
-        Assert.Equal(ChatRole.User, message2.Role);
-        Assert.Equal("Human User", message2.AuthorName); // Last value should win
-        Assert.Equal(new DateTimeOffset(2024, 1, 1, 11, 1, 0, TimeSpan.Zero), message2.CreatedAt); // Last value should win
-        Assert.Equal("How are you?", message2.Text);
+        Assert.Equal(ChatRole.Assistant, message2.Role);
+        Assert.Equal("Assistant", message2.AuthorName);
+        Assert.Equal(new DateTimeOffset(2024, 1, 1, 10, 2, 0, TimeSpan.Zero), message2.CreatedAt);
+        Assert.Equal("More text", message2.Text);
 
         // Verify third message
         ChatMessage message3 = response.Messages[2];
         Assert.Equal("msg3", message3.MessageId);
-        Assert.Equal(ChatRole.Assistant, message3.Role);
-        Assert.Null(message3.AuthorName); // No AuthorName set in later updates
-        Assert.Equal(new DateTimeOffset(2024, 1, 1, 12, 2, 0, TimeSpan.Zero), message3.CreatedAt); // Last value should win
-        Assert.Equal("I'm doing well, thank you! How can I help?", message3.Text);
+        Assert.Equal(ChatRole.User, message3.Role);
+        Assert.Equal("User", message3.AuthorName);
+        Assert.Equal(new DateTimeOffset(2024, 1, 1, 11, 1, 0, TimeSpan.Zero), message3.CreatedAt); // Last value should win
+        Assert.Equal("How are you?", message3.Text);
+
+        // Verify fourth message
+        ChatMessage message4 = response.Messages[3];
+        Assert.Equal("msg4", message4.MessageId);
+        Assert.Equal(ChatRole.Assistant, message4.Role);
+        Assert.Null(message4.AuthorName); // No AuthorName set
+        Assert.Equal(new DateTimeOffset(2024, 1, 1, 12, 2, 0, TimeSpan.Zero), message4.CreatedAt); // Last value should win
+        Assert.Equal("I'm doing well, thank you! How can I help?", message4.Text);
     }
 
     public static IEnumerable<object[]> ToChatResponse_Coalescing_VariousSequenceAndGapLengths_MemberData()
@@ -395,8 +729,8 @@ public async Task ToChatResponse_AlternativeTimestamps(bool useAsync)
         ];
 
         ChatResponse response = useAsync ?
-            updates.ToChatResponse() :
-            await YieldAsync(updates).ToChatResponseAsync();
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
         Assert.Single(response.Messages);
 
         Assert.Equal("abcdefg", response.Messages[0].Text);
@@ -442,8 +776,8 @@ public async Task ToChatResponse_TimestampFolding(bool useAsync, string? timesta
         ];
 
         ChatResponse response = useAsync ?
-            updates.ToChatResponse() :
-            await YieldAsync(updates).ToChatResponseAsync();
+            await YieldAsync(updates).ToChatResponseAsync() :
+            updates.ToChatResponse();
 
         Assert.Single(response.Messages);
         Assert.Equal("ab", response.Messages[0].Text);
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/SpeechToText/SpeechToTextResponseUpdateExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/SpeechToText/SpeechToTextResponseUpdateExtensionsTests.cs
index 5d5a035bfe8..f288d3db28b 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/SpeechToText/SpeechToTextResponseUpdateExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/SpeechToText/SpeechToTextResponseUpdateExtensionsTests.cs
@@ -54,8 +54,8 @@ public async Task ToSpeechToTextResponse_SuccessfullyCreatesResponse(bool useAsy
         ];
 
         SpeechToTextResponse response = useAsync ?
-            updates.ToSpeechToTextResponse() :
-            await YieldAsync(updates).ToSpeechToTextResponseAsync();
+            await YieldAsync(updates).ToSpeechToTextResponseAsync() :
+            updates.ToSpeechToTextResponse();
 
         Assert.NotNull(response);
 

From b210b6e51db1c078acd8f1f3088f3b9f1f3ab737 Mon Sep 17 00:00:00 2001
From: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:24:40 +0100
Subject: [PATCH 6/7] add support for background responses (#6854)

* add support for background responses

Adds a model for supporting background responses (long-running operations), updates the chat completion model to use it, and integrates this functionality into OpenAIResponsesChatClient.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
---
 src/Libraries/.editorconfig                   |   2 +-
 .../CHANGELOG.md                              |   1 +
 .../ChatCompletion/ChatOptions.cs             |  44 ++
 .../ChatCompletion/ChatResponse.cs            |  18 +
 .../ChatCompletion/ChatResponseUpdate.cs      |  15 +
 .../ResponseContinuationToken.cs              |  68 +++
 .../Utilities/AIJsonUtilities.Defaults.cs     |   2 +-
 ...icrosoftExtensionsAIResponsesExtensions.cs |   2 +-
 .../OpenAIResponsesChatClient.cs              | 132 ++++-
 .../OpenAIResponsesContinuationToken.cs       | 117 ++++
 .../FunctionInvokingChatClient.cs             |  13 +
 .../ChatClientExtensionsTests.cs              |  86 +++
 .../ChatCompletion/ChatOptionsTests.cs        |  14 +
 .../ResponseContinuationTokenTests.cs         |  38 ++
 .../TestJsonSerializerContext.cs              |   1 +
 .../HttpHandlerExpectedInput.cs               |  22 +
 .../VerbatimHttpHandler.cs                    |  60 +-
 .../OpenAIResponseClientIntegrationTests.cs   | 149 +++++
 .../OpenAIResponseClientTests.cs              | 558 ++++++++++++++++++
 .../FunctionInvokingChatClientTests.cs        |  38 ++
 20 files changed, 1357 insertions(+), 23 deletions(-)
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.Abstractions/ResponseContinuationToken.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesContinuationToken.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ResponseContinuationTokenTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.Integration.Tests/HttpHandlerExpectedInput.cs

diff --git a/src/Libraries/.editorconfig b/src/Libraries/.editorconfig
index d33ed319482..90ede887742 100644
--- a/src/Libraries/.editorconfig
+++ b/src/Libraries/.editorconfig
@@ -2936,7 +2936,7 @@ dotnet_diagnostic.S103.severity = suggestion
 # Title    : Files should not have too many lines of code
 # Category : Major Code Smell
 # Help Link: https://rules.sonarsource.com/csharp/RSPEC-104
-dotnet_diagnostic.S104.severity = warning
+dotnet_diagnostic.S104.severity = none
 
 # Title    : Finalizers should not throw exceptions
 # Category : Blocker Bug
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/CHANGELOG.md b/src/Libraries/Microsoft.Extensions.AI.Abstractions/CHANGELOG.md
index 433978c322a..97d8e9b5a29 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/CHANGELOG.md
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Added protected copy constructors to options types (e.g. `ChatOptions`).
 - Fixed `EmbeddingGeneratorOptions`/`SpeechToTextOptions` `Clone` methods to correctly copy all properties.
 - Fixed `ToChatResponse` to not overwrite `ChatMessage/ChatResponse.CreatedAt` with older timestamps during coalescing. 
+- Added `[Experimental]` support for background responses, such that non-streaming responses are allowed to be pollable, and such that responses and response updates can be tagged with continuation tokens to support later resumption.
 
 ## 9.9.1
 
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
index 4447bace386..1415ae68055 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 
 namespace Microsoft.Extensions.AI;
@@ -25,8 +26,10 @@ protected ChatOptions(ChatOptions? other)
         }
 
         AdditionalProperties = other.AdditionalProperties?.Clone();
+        AllowBackgroundResponses = other.AllowBackgroundResponses;
         AllowMultipleToolCalls = other.AllowMultipleToolCalls;
         ConversationId = other.ConversationId;
+        ContinuationToken = other.ContinuationToken;
         FrequencyPenalty = other.FrequencyPenalty;
         Instructions = other.Instructions;
         MaxOutputTokens = other.MaxOutputTokens;
@@ -155,6 +158,47 @@ protected ChatOptions(ChatOptions? other)
     [JsonIgnore]
     public IList<AITool>? Tools { get; set; }
 
+    /// <summary>Gets or sets a value indicating whether the background responses are allowed.</summary>
+    /// <remarks>
+    /// <para>
+    /// Background responses allow running long-running operations or tasks asynchronously in the background that can be resumed by streaming APIs
+    /// and polled for completion by non-streaming APIs.
+    /// </para>
+    /// <para>
+    /// When this property is set to true, non-streaming APIs may start a background operation and return an initial
+    /// response with a continuation token. Subsequent calls to the same API should be made in a polling manner with
+    /// the continuation token to get the final result of the operation.
+    /// </para>
+    /// <para>
+    /// When this property is set to true, streaming APIs may also start a background operation and begin streaming
+    /// response updates until the operation is completed. If the streaming connection is interrupted, the
+    /// continuation token obtained from the last update that has one should be supplied to a subsequent call to the same streaming API
+    /// to resume the stream from the point of interruption and continue receiving updates until the operation is completed.
+    /// </para>
+    /// <para>
+    /// This property only takes effect if the implementation it's used with supports background responses.
+    /// If the implementation does not support background responses, this property will be ignored.
+    /// </para>
+    /// </remarks>
+    [Experimental("MEAI001")]
+    [JsonIgnore]
+    public bool? AllowBackgroundResponses { get; set; }
+
+    /// <summary>Gets or sets the continuation token for resuming and getting the result of the chat response identified by this token.</summary>
+    /// <remarks>
+    /// This property is used for background responses that can be activated via the <see cref="AllowBackgroundResponses"/>
+    /// property if the <see cref="IChatClient"/> implementation supports them.
+    /// Streamed background responses, such as those returned by default by <see cref="IChatClient.GetStreamingResponseAsync"/>,
+    /// can be resumed if interrupted. This means that a continuation token obtained from the <see cref="ChatResponseUpdate.ContinuationToken"/> 
+    /// of an update just before the interruption occurred can be passed to this property to resume the stream from the point of interruption.
+    /// Non-streamed background responses, such as those returned by <see cref="IChatClient.GetResponseAsync"/>,
+    /// can be polled for completion by obtaining the token from the <see cref="ChatResponse.ContinuationToken"/> property 
+    /// and passing it to this property on subsequent calls to <see cref="IChatClient.GetResponseAsync"/>.
+    /// </remarks>
+    [Experimental("MEAI001")]
+    [JsonIgnore]
+    public object? ContinuationToken { get; set; }
+
     /// <summary>
     /// Gets or sets a callback responsible for creating the raw representation of the chat options from an underlying implementation.
     /// </summary>
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponse.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponse.cs
index 0889fed17d6..ea513d2f073 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponse.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponse.cs
@@ -88,6 +88,23 @@ public IList<ChatMessage> Messages
     /// <summary>Gets or sets usage details for the chat response.</summary>
     public UsageDetails? Usage { get; set; }
 
+    /// <summary>Gets or sets the continuation token for getting result of the background chat response.</summary>
+    /// <remarks>
+    /// <see cref="IChatClient"/> implementations that support background responses will return
+    /// a continuation token if background responses are allowed in <see cref="ChatOptions.AllowBackgroundResponses"/>
+    /// and the result of the response has not been obtained yet. If the response has completed and the result has been obtained,
+    /// the token will be <see langword="null"/>.
+    /// <para>
+    /// This property should be used in conjunction with <see cref="ChatOptions.ContinuationToken"/> to 
+    /// continue to poll for the completion of the response. Pass this token to
+    /// <see cref="ChatOptions.ContinuationToken"/> on subsequent calls to <see cref="IChatClient.GetResponseAsync"/>
+    /// to poll for completion.
+    /// </para>
+    /// </remarks>
+    [Experimental("MEAI001")]
+    [JsonIgnore]
+    public object? ContinuationToken { get; set; }
+
     /// <summary>Gets or sets the raw representation of the chat response from an underlying implementation.</summary>
     /// <remarks>
     /// If a <see cref="ChatResponse"/> is created to represent some underlying object from another object
@@ -143,6 +160,7 @@ public ChatResponseUpdate[] ToChatResponseUpdates()
                 ResponseId = ResponseId,
 
                 CreatedAt = message.CreatedAt ?? CreatedAt,
+                ContinuationToken = ContinuationToken,
             };
         }
 
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseUpdate.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseUpdate.cs
index 0605d0785bb..8b24b5c6b19 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseUpdate.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatResponseUpdate.cs
@@ -136,6 +136,21 @@ public IList<AIContent> Contents
     /// <inheritdoc/>
     public override string ToString() => Text;
 
+    /// <summary>Gets or sets the continuation token for resuming the streamed chat response of which this update is a part.</summary>
+    /// <remarks>
+    /// <see cref="IChatClient"/> implementations that support background responses will return
+    /// a continuation token on each update if background responses are allowed in <see cref="ChatOptions.AllowBackgroundResponses"/>
+    /// except of the last update, for which the token will be <see langword="null"/>.
+    /// <para>
+    /// This property should be used for stream resumption, where the continuation token of the latest received update should be
+    /// passed to <see cref="ChatOptions.ContinuationToken"/> on subsequent calls to <see cref="IChatClient.GetStreamingResponseAsync"/>
+    /// to resume streaming from the point of interruption.
+    /// </para>
+    /// </remarks>
+    [Experimental("MEAI001")]
+    [JsonIgnore]
+    public object? ContinuationToken { get; set; }
+
     /// <summary>Gets a <see cref="AIContent"/> object to display in the debugger display.</summary>
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     private AIContent? ContentForDebuggerDisplay
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ResponseContinuationToken.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ResponseContinuationToken.cs
new file mode 100644
index 00000000000..cf73130be10
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ResponseContinuationToken.cs
@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>
+/// Represents a token used to resume, continue, or rehydrate an operation across multiple scenarios/calls,
+/// such as resuming a streamed response from a specific point or retrieving the result of a background operation.
+/// Subclasses of this class encapsulate all necessary information within the token to facilitate these actions.
+/// </summary>
+[JsonConverter(typeof(Converter))]
+[Experimental("MEAI001")]
+public class ResponseContinuationToken
+{
+    /// <summary>Bytes representing this token.</summary>
+    private readonly ReadOnlyMemory<byte> _bytes;
+
+    /// <summary>Initializes a new instance of the <see cref="ResponseContinuationToken"/> class.</summary>
+    protected ResponseContinuationToken()
+    {
+    }
+
+    /// <summary>Initializes a new instance of the <see cref="ResponseContinuationToken"/> class.</summary>
+    /// <param name="bytes">Bytes to create the token from.</param>
+    protected ResponseContinuationToken(ReadOnlyMemory<byte> bytes)
+    {
+        _bytes = bytes;
+    }
+
+    /// <summary>Create a new instance of <see cref="ResponseContinuationToken"/> from the provided <paramref name="bytes"/>.
+    /// </summary>
+    /// <param name="bytes">Bytes representing the <see cref="ResponseContinuationToken"/>.</param>
+    /// <returns>A <see cref="ResponseContinuationToken"/> equivalent to the one from which
+    /// the original<see cref="ResponseContinuationToken"/> bytes were obtained.</returns>
+    public static ResponseContinuationToken FromBytes(ReadOnlyMemory<byte> bytes) => new(bytes);
+
+    /// <summary>Gets the bytes representing this <see cref="ResponseContinuationToken"/>.</summary>
+    /// <returns>Bytes representing the <see cref="ResponseContinuationToken"/>.</returns>"/>
+    public virtual ReadOnlyMemory<byte> ToBytes() => _bytes;
+
+    /// <summary>Provides a <see cref="JsonConverter{ResponseContinuationToken}"/> for serializing <see cref="ResponseContinuationToken"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Experimental("MEAI001")]
+    public sealed class Converter : JsonConverter<ResponseContinuationToken>
+    {
+        /// <inheritdoc/>
+        public override ResponseContinuationToken Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return ResponseContinuationToken.FromBytes(reader.GetBytesFromBase64());
+        }
+
+        /// <inheritdoc/>
+        public override void Write(Utf8JsonWriter writer, ResponseContinuationToken value, JsonSerializerOptions options)
+        {
+            _ = Throw.IfNull(writer);
+            _ = Throw.IfNull(value);
+
+            writer.WriteBase64StringValue(value.ToBytes().Span);
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Defaults.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Defaults.cs
index 721a08418bf..f1a6f7b0a1e 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Defaults.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Defaults.cs
@@ -135,7 +135,7 @@ private static JsonSerializerOptions CreateDefaultOptions()
     [JsonSerializable(typeof(McpServerToolResultContent))]
     [JsonSerializable(typeof(McpServerToolApprovalRequestContent))]
     [JsonSerializable(typeof(McpServerToolApprovalResponseContent))]
-
+    [JsonSerializable(typeof(ResponseContinuationToken))]
     [EditorBrowsable(EditorBrowsableState.Never)] // Never use JsonContext directly, use DefaultOptions instead.
     private sealed partial class JsonContext : JsonSerializerContext;
 
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/MicrosoftExtensionsAIResponsesExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/MicrosoftExtensionsAIResponsesExtensions.cs
index c632f3c45c7..0d119a742e2 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/MicrosoftExtensionsAIResponsesExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/MicrosoftExtensionsAIResponsesExtensions.cs
@@ -64,7 +64,7 @@ public static ChatResponse AsChatResponse(this OpenAIResponse response, Response
     /// <exception cref="ArgumentNullException"><paramref name="responseUpdates"/> is <see langword="null"/>.</exception>
     public static IAsyncEnumerable<ChatResponseUpdate> AsChatResponseUpdatesAsync(
         this IAsyncEnumerable<StreamingResponseUpdate> responseUpdates, ResponseCreationOptions? options = null, CancellationToken cancellationToken = default) =>
-        OpenAIResponsesChatClient.FromOpenAIStreamingResponseUpdatesAsync(Throw.IfNull(responseUpdates), options, cancellationToken);
+        OpenAIResponsesChatClient.FromOpenAIStreamingResponseUpdatesAsync(Throw.IfNull(responseUpdates), options, cancellationToken: cancellationToken);
 
     /// <summary>Creates an OpenAI <see cref="OpenAIResponse"/> from a <see cref="ChatResponse"/>.</summary>
     /// <param name="response">The response to convert.</param>
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs
index 5da26a435ff..b1e24461f84 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs
@@ -84,9 +84,18 @@ public async Task<ChatResponse> GetResponseAsync(
         _ = Throw.IfNull(messages);
 
         // Convert the inputs into what OpenAIResponseClient expects.
-        var openAIResponseItems = ToOpenAIResponseItems(messages, options);
         var openAIOptions = ToOpenAIResponseCreationOptions(options);
 
+        // Provided continuation token signals that an existing background response should be fetched.
+        if (GetContinuationToken(messages, options) is { } token)
+        {
+            var response = await _responseClient.GetResponseAsync(token.ResponseId, cancellationToken).ConfigureAwait(false);
+
+            return FromOpenAIResponse(response, openAIOptions);
+        }
+
+        var openAIResponseItems = ToOpenAIResponseItems(messages, options);
+
         // Make the call to the OpenAIResponseClient.
         var task = _createResponseAsync is not null ?
             _createResponseAsync(_responseClient, openAIResponseItems, openAIOptions, cancellationToken.ToRequestOptions(streaming: false)) :
@@ -104,6 +113,7 @@ internal static ChatResponse FromOpenAIResponse(OpenAIResponse openAIResponse, R
         {
             ConversationId = openAIOptions?.StoredOutputEnabled is false ? null : openAIResponse.Id,
             CreatedAt = openAIResponse.CreatedAt,
+            ContinuationToken = CreateContinuationToken(openAIResponse),
             FinishReason = ToFinishReason(openAIResponse.IncompleteStatusDetails?.Reason),
             ModelId = openAIResponse.Model,
             RawRepresentation = openAIResponse,
@@ -217,26 +227,39 @@ public IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
     {
         _ = Throw.IfNull(messages);
 
-        var openAIResponseItems = ToOpenAIResponseItems(messages, options);
         var openAIOptions = ToOpenAIResponseCreationOptions(options);
 
+        // Provided continuation token signals that an existing background response should be fetched.
+        if (GetContinuationToken(messages, options) is { } token)
+        {
+            IAsyncEnumerable<StreamingResponseUpdate> updates = _responseClient.GetResponseStreamingAsync(token.ResponseId, token.SequenceNumber, cancellationToken);
+
+            return FromOpenAIStreamingResponseUpdatesAsync(updates, openAIOptions, token.ResponseId, cancellationToken);
+        }
+
+        var openAIResponseItems = ToOpenAIResponseItems(messages, options);
+
         var streamingUpdates = _createResponseStreamingAsync is not null ?
             _createResponseStreamingAsync(_responseClient, openAIResponseItems, openAIOptions, cancellationToken.ToRequestOptions(streaming: true)) :
             _responseClient.CreateResponseStreamingAsync(openAIResponseItems, openAIOptions, cancellationToken);
 
-        return FromOpenAIStreamingResponseUpdatesAsync(streamingUpdates, openAIOptions, cancellationToken);
+        return FromOpenAIStreamingResponseUpdatesAsync(streamingUpdates, openAIOptions, cancellationToken: cancellationToken);
     }
 
     internal static async IAsyncEnumerable<ChatResponseUpdate> FromOpenAIStreamingResponseUpdatesAsync(
-        IAsyncEnumerable<StreamingResponseUpdate> streamingResponseUpdates, ResponseCreationOptions? options, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        IAsyncEnumerable<StreamingResponseUpdate> streamingResponseUpdates,
+        ResponseCreationOptions? options,
+        string? resumeResponseId = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         DateTimeOffset? createdAt = null;
-        string? responseId = null;
-        string? conversationId = null;
+        string? responseId = resumeResponseId;
+        string? conversationId = options?.StoredOutputEnabled is false ? null : resumeResponseId;
         string? modelId = null;
         string? lastMessageId = null;
         ChatRole? lastRole = null;
         bool anyFunctions = false;
+        ResponseStatus? latestResponseStatus = null;
 
         await foreach (var streamingUpdate in streamingResponseUpdates.WithCancellation(cancellationToken).ConfigureAwait(false))
         {
@@ -250,6 +273,11 @@ ChatResponseUpdate CreateUpdate(AIContent? content = null) =>
                     ModelId = modelId,
                     RawRepresentation = streamingUpdate,
                     ResponseId = responseId,
+                    ContinuationToken = CreateContinuationToken(
+                        responseId!,
+                        latestResponseStatus,
+                        options?.BackgroundModeEnabled,
+                        streamingUpdate.SequenceNumber)
                 };
 
             switch (streamingUpdate)
@@ -259,10 +287,48 @@ ChatResponseUpdate CreateUpdate(AIContent? content = null) =>
                     responseId = createdUpdate.Response.Id;
                     conversationId = options?.StoredOutputEnabled is false ? null : responseId;
                     modelId = createdUpdate.Response.Model;
+                    latestResponseStatus = createdUpdate.Response.Status;
+                    goto default;
+
+                case StreamingResponseQueuedUpdate queuedUpdate:
+                    createdAt = queuedUpdate.Response.CreatedAt;
+                    responseId = queuedUpdate.Response.Id;
+                    conversationId = options?.StoredOutputEnabled is false ? null : responseId;
+                    modelId = queuedUpdate.Response.Model;
+                    latestResponseStatus = queuedUpdate.Response.Status;
+                    goto default;
+
+                case StreamingResponseInProgressUpdate inProgressUpdate:
+                    createdAt = inProgressUpdate.Response.CreatedAt;
+                    responseId = inProgressUpdate.Response.Id;
+                    conversationId = options?.StoredOutputEnabled is false ? null : responseId;
+                    modelId = inProgressUpdate.Response.Model;
+                    latestResponseStatus = inProgressUpdate.Response.Status;
+                    goto default;
+
+                case StreamingResponseIncompleteUpdate incompleteUpdate:
+                    createdAt = incompleteUpdate.Response.CreatedAt;
+                    responseId = incompleteUpdate.Response.Id;
+                    conversationId = options?.StoredOutputEnabled is false ? null : responseId;
+                    modelId = incompleteUpdate.Response.Model;
+                    latestResponseStatus = incompleteUpdate.Response.Status;
+                    goto default;
+
+                case StreamingResponseFailedUpdate failedUpdate:
+                    createdAt = failedUpdate.Response.CreatedAt;
+                    responseId = failedUpdate.Response.Id;
+                    conversationId = options?.StoredOutputEnabled is false ? null : responseId;
+                    modelId = failedUpdate.Response.Model;
+                    latestResponseStatus = failedUpdate.Response.Status;
                     goto default;
 
                 case StreamingResponseCompletedUpdate completedUpdate:
                 {
+                    createdAt = completedUpdate.Response.CreatedAt;
+                    responseId = completedUpdate.Response.Id;
+                    conversationId = options?.StoredOutputEnabled is false ? null : responseId;
+                    modelId = completedUpdate.Response.Model;
+                    latestResponseStatus = completedUpdate.Response?.Status;
                     var update = CreateUpdate(ToUsageDetails(completedUpdate.Response) is { } usage ? new UsageContent(usage) : null);
                     update.FinishReason =
                         ToFinishReason(completedUpdate.Response?.IncompleteStatusDetails?.Reason) ??
@@ -412,6 +478,7 @@ private ResponseCreationOptions ToOpenAIResponseCreationOptions(ChatOptions? opt
         result.PreviousResponseId ??= options.ConversationId;
         result.Temperature ??= options.Temperature;
         result.TopP ??= options.TopP;
+        result.BackgroundModeEnabled ??= options.AllowBackgroundResponses;
 
         if (options.Instructions is { } instructions)
         {
@@ -892,6 +959,59 @@ private static void AddAllMcpFilters(IList<string> toolNames, McpToolFilter filt
         }
     }
 
+    private static OpenAIResponsesContinuationToken? CreateContinuationToken(OpenAIResponse openAIResponse)
+    {
+        return CreateContinuationToken(
+            responseId: openAIResponse.Id,
+            responseStatus: openAIResponse.Status,
+            isBackgroundModeEnabled: openAIResponse.BackgroundModeEnabled);
+    }
+
+    private static OpenAIResponsesContinuationToken? CreateContinuationToken(
+        string responseId,
+        ResponseStatus? responseStatus,
+        bool? isBackgroundModeEnabled,
+        int? updateSequenceNumber = null)
+    {
+        if (isBackgroundModeEnabled is not true)
+        {
+            return null;
+        }
+
+        // Returns a continuation token for in-progress or queued responses as they are not yet complete.
+        // Also returns a continuation token if there is no status but there is a sequence number,
+        // which can occur for certain streaming updates related to response content part updates: response.content_part.*,
+        // response.output_text.*
+        if ((responseStatus is ResponseStatus.InProgress or ResponseStatus.Queued) ||
+            (responseStatus is null && updateSequenceNumber is not null))
+        {
+            return new OpenAIResponsesContinuationToken(responseId)
+            {
+                SequenceNumber = updateSequenceNumber,
+            };
+        }
+
+        // For all other statuses: completed, failed, canceled, incomplete
+        // return null to indicate the operation is finished allowing the caller
+        // to stop and access the final result, failure details, reason for incompletion, etc.
+        return null;
+    }
+
+    private static OpenAIResponsesContinuationToken? GetContinuationToken(IEnumerable<ChatMessage> messages, ChatOptions? options = null)
+    {
+        if (options?.ContinuationToken is { } token)
+        {
+            if (messages.Any())
+            {
+                throw new InvalidOperationException("Messages are not allowed when continuing a background response using a continuation token.");
+            }
+
+            return OpenAIResponsesContinuationToken.FromToken(token);
+        }
+
+        return null;
+    }
+
     /// <summary>Provides an <see cref="AITool"/> wrapper for a <see cref="ResponseTool"/>.</summary>
     internal sealed class ResponseToolAITool(ResponseTool tool) : AITool
     {
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesContinuationToken.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesContinuationToken.cs
new file mode 100644
index 00000000000..229f8b40f69
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesContinuationToken.cs
@@ -0,0 +1,117 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.Text.Json;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>Represents a continuation token for OpenAI responses.</summary>
+/// <remarks>
+/// The token is used for resuming streamed background responses and continuing
+/// non-streamed background responses until completion.
+/// </remarks>
+internal sealed class OpenAIResponsesContinuationToken : ResponseContinuationToken
+{
+    /// <summary>Initializes a new instance of the <see cref="OpenAIResponsesContinuationToken"/> class.</summary>
+    internal OpenAIResponsesContinuationToken(string responseId)
+    {
+        ResponseId = responseId;
+    }
+
+    /// <summary>Gets the Id of the response.</summary>
+    internal string ResponseId { get; }
+
+    /// <summary>Gets or sets the sequence number of a streamed update.</summary>
+    internal int? SequenceNumber { get; set; }
+
+    /// <inheritdoc/>
+    public override ReadOnlyMemory<byte> ToBytes()
+    {
+        using MemoryStream stream = new();
+        using Utf8JsonWriter writer = new(stream);
+
+        writer.WriteStartObject();
+
+        writer.WriteString("responseId", ResponseId);
+
+        if (SequenceNumber.HasValue)
+        {
+            writer.WriteNumber("sequenceNumber", SequenceNumber.Value);
+        }
+
+        writer.WriteEndObject();
+
+        writer.Flush();
+
+        return stream.ToArray();
+    }
+
+    /// <summary>Create a new instance of <see cref="OpenAIResponsesContinuationToken"/> from the provided <paramref name="token"/>.
+    /// </summary>
+    /// <param name="token">The token to create the <see cref="OpenAIResponsesContinuationToken"/> from.</param>
+    /// <returns>A <see cref="OpenAIResponsesContinuationToken"/> equivalent of the provided <paramref name="token"/>.</returns>
+    internal static OpenAIResponsesContinuationToken FromToken(object token)
+    {
+        if (token is OpenAIResponsesContinuationToken openAIResponsesContinuationToken)
+        {
+            return openAIResponsesContinuationToken;
+        }
+
+        if (token is not ResponseContinuationToken)
+        {
+            Throw.ArgumentException(nameof(token), "Failed to create OpenAIResponsesResumptionToken from provided token because it is not of type ResponseContinuationToken.");
+        }
+
+        ReadOnlyMemory<byte> data = ((ResponseContinuationToken)token).ToBytes();
+
+        if (data.Length == 0)
+        {
+            Throw.ArgumentException(nameof(token), "Failed to create OpenAIResponsesResumptionToken from provided token because it does not contain any data.");
+        }
+
+        Utf8JsonReader reader = new(data.Span);
+
+        string? responseId = null;
+        int? sequenceNumber = null;
+
+        _ = reader.Read();
+
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndObject)
+            {
+                break;
+            }
+
+            string propertyName = reader.GetString()!;
+
+            switch (propertyName)
+            {
+                case "responseId":
+                    _ = reader.Read();
+                    responseId = reader.GetString();
+                    break;
+                case "sequenceNumber":
+                    _ = reader.Read();
+                    sequenceNumber = reader.GetInt32();
+                    break;
+                default:
+                    Throw.ArgumentException(nameof(token), $"Unrecognized property '{propertyName}'.");
+                    break;
+            }
+        }
+
+        if (responseId is null)
+        {
+            Throw.ArgumentException(nameof(token), "Failed to create MessagesPageToken from provided pageToken because it does not contain a responseId.");
+        }
+
+        return new(responseId)
+        {
+            SequenceNumber = sequenceNumber
+        };
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
index ff71e9f83ed..fb821c984df 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
@@ -806,6 +806,19 @@ private static void UpdateOptionsForNextIteration(ref ChatOptions? options, stri
             options = options.Clone();
             options.ConversationId = conversationId;
         }
+        else if (options.ContinuationToken is not null)
+        {
+            // Clone options before resetting the continuation token below.
+            options = options.Clone();
+        }
+
+        // Reset the continuation token of a background response operation
+        // to signal the inner client to handle function call result rather
+        // than getting the result of the operation.
+        if (options?.ContinuationToken is not null)
+        {
+            options.ContinuationToken = null;
+        }
     }
 
     /// <summary>Gets whether the function calling loop should exit based on the function call requests.</summary>
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatClientExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatClientExtensionsTests.cs
index c74c50813f4..d5a474f0309 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatClientExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatClientExtensionsTests.cs
@@ -158,6 +158,92 @@ public async Task GetStreamingResponseAsync_CreatesTextMessageAsync()
         Assert.Equal(1, count);
     }
 
+    [Fact]
+    public async Task GetResponseAsync_UsesProvidedContinuationToken()
+    {
+        var expectedResponse = new ChatResponse();
+        var expectedContinuationToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4 });
+        var expectedChatOptions = new ChatOptions
+        {
+            ContinuationToken = expectedContinuationToken,
+            AllowBackgroundResponses = true,
+            AdditionalProperties = new AdditionalPropertiesDictionary // Setting this to ensure cloning is happening
+            {
+                { "key", "value" },
+            },
+        };
+
+        using var cts = new CancellationTokenSource();
+
+        using TestChatClient client = new()
+        {
+            GetResponseAsyncCallback = (messages, options, cancellationToken) =>
+            {
+                Assert.Empty(messages);
+                Assert.NotNull(options);
+
+                Assert.True(options.AdditionalProperties!.ContainsKey("key")); // Assert that chat options were cloned
+
+                Assert.Same(expectedChatOptions, options);
+                Assert.Same(expectedContinuationToken, options.ContinuationToken);
+                Assert.Equal(expectedChatOptions.AllowBackgroundResponses, options.AllowBackgroundResponses);
+
+                Assert.Equal(cts.Token, cancellationToken);
+
+                return Task.FromResult(expectedResponse);
+            },
+        };
+
+        ChatResponse response = await client.GetResponseAsync([], expectedChatOptions, cts.Token);
+
+        Assert.Same(expectedResponse, response);
+    }
+
+    [Fact]
+    public async Task GetStreamingResponseAsync_UsesProvidedContinuationToken()
+    {
+        var expectedOptions = new ChatOptions();
+        var expectedContinuationToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4 });
+        var expectedChatOptions = new ChatOptions
+        {
+            ContinuationToken = expectedContinuationToken,
+            AllowBackgroundResponses = true,
+            AdditionalProperties = new AdditionalPropertiesDictionary // Setting this to ensure cloning is happening
+            {
+                { "key", "value" },
+            },
+        };
+        using var cts = new CancellationTokenSource();
+
+        using TestChatClient client = new()
+        {
+            GetStreamingResponseAsyncCallback = (messages, options, cancellationToken) =>
+            {
+                Assert.Empty(messages);
+                Assert.NotNull(options);
+
+                Assert.True(options.AdditionalProperties!.ContainsKey("key")); // Assert that chat options were cloned
+
+                Assert.Same(expectedChatOptions, options);
+                Assert.Same(expectedContinuationToken, options.ContinuationToken);
+                Assert.Equal(expectedChatOptions.AllowBackgroundResponses, options.AllowBackgroundResponses);
+
+                Assert.Equal(cts.Token, cancellationToken);
+
+                return YieldAsync([new ChatResponseUpdate(ChatRole.Assistant, "world")]);
+            },
+        };
+
+        int count = 0;
+        await foreach (var update in client.GetStreamingResponseAsync([], expectedChatOptions, cts.Token))
+        {
+            Assert.Equal(0, count);
+            count++;
+        }
+
+        Assert.Equal(1, count);
+    }
+
     private static async IAsyncEnumerable<ChatResponseUpdate> YieldAsync(params ChatResponseUpdate[] updates)
     {
         await Task.Yield();
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
index 5c9fec9111d..e6d863220e1 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
@@ -50,6 +50,8 @@ public void Constructor_Parameterless_PropsDefaulted()
         Assert.Null(clone.Tools);
         Assert.Null(clone.AdditionalProperties);
         Assert.Null(clone.RawRepresentationFactory);
+        Assert.Null(clone.ContinuationToken);
+        Assert.Null(clone.AllowBackgroundResponses);
     }
 
     [Fact]
@@ -76,6 +78,8 @@ public void Properties_Roundtrip()
 
         Func<IChatClient, object?> rawRepresentationFactory = (c) => null;
 
+        ResponseContinuationToken continuationToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4 });
+
         options.ConversationId = "12345";
         options.Instructions = "Some instructions";
         options.Temperature = 0.1f;
@@ -93,6 +97,8 @@ public void Properties_Roundtrip()
         options.Tools = tools;
         options.RawRepresentationFactory = rawRepresentationFactory;
         options.AdditionalProperties = additionalProps;
+        options.ContinuationToken = continuationToken;
+        options.AllowBackgroundResponses = true;
 
         Assert.Equal("12345", options.ConversationId);
         Assert.Equal("Some instructions", options.Instructions);
@@ -111,6 +117,8 @@ public void Properties_Roundtrip()
         Assert.Same(tools, options.Tools);
         Assert.Same(rawRepresentationFactory, options.RawRepresentationFactory);
         Assert.Same(additionalProps, options.AdditionalProperties);
+        Assert.Same(continuationToken, options.ContinuationToken);
+        Assert.True(options.AllowBackgroundResponses);
 
         ChatOptions clone = options.Clone();
         Assert.Equal("12345", clone.ConversationId);
@@ -129,6 +137,8 @@ public void Properties_Roundtrip()
         Assert.Equal(tools, clone.Tools);
         Assert.Same(rawRepresentationFactory, clone.RawRepresentationFactory);
         Assert.Equal(additionalProps, clone.AdditionalProperties);
+        Assert.Same(continuationToken, clone.ContinuationToken);
+        Assert.True(clone.AllowBackgroundResponses);
     }
 
     [Fact]
@@ -147,6 +157,8 @@ public void JsonSerialization_Roundtrips()
             ["key"] = "value",
         };
 
+        ResponseContinuationToken continuationToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4 });
+
         options.ConversationId = "12345";
         options.Instructions = "Some instructions";
         options.Temperature = 0.1f;
@@ -168,6 +180,8 @@ public void JsonSerialization_Roundtrips()
         ];
         options.RawRepresentationFactory = (c) => null;
         options.AdditionalProperties = additionalProps;
+        options.ContinuationToken = continuationToken;
+        options.AllowBackgroundResponses = true;
 
         string json = JsonSerializer.Serialize(options, TestJsonSerializerContext.Default.ChatOptions);
 
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ResponseContinuationTokenTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ResponseContinuationTokenTests.cs
new file mode 100644
index 00000000000..a6d443a4f47
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ResponseContinuationTokenTests.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Text.Json;
+using Xunit;
+
+namespace Microsoft.Extensions.AI;
+
+public class ResponseContinuationTokenTests
+{
+    [Theory]
+    [InlineData(new byte[0])]
+    [InlineData(new byte[] { 1, 2, 3, 4, 5 })]
+    public void Bytes_Roundtrip(byte[] testBytes)
+    {
+        ResponseContinuationToken token = ResponseContinuationToken.FromBytes(testBytes);
+
+        Assert.NotNull(token);
+        Assert.Equal(testBytes, token.ToBytes().ToArray());
+    }
+
+    [Fact]
+    public void JsonSerialization_Roundtrips()
+    {
+        ResponseContinuationToken originalToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4, 5 });
+
+        // Act
+        string json = JsonSerializer.Serialize(originalToken, TestJsonSerializerContext.Default.ResponseContinuationToken);
+
+        ResponseContinuationToken? deserializedToken = JsonSerializer.Deserialize(json, TestJsonSerializerContext.Default.ResponseContinuationToken);
+
+        // Assert
+        Assert.NotNull(deserializedToken);
+        Assert.Equal(originalToken.ToBytes().ToArray(), deserializedToken.ToBytes().ToArray());
+        Assert.NotSame(originalToken, deserializedToken);
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/TestJsonSerializerContext.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/TestJsonSerializerContext.cs
index 93c7a124e38..d011f8a9030 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/TestJsonSerializerContext.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/TestJsonSerializerContext.cs
@@ -37,4 +37,5 @@ namespace Microsoft.Extensions.AI;
 [JsonSerializable(typeof(decimal))] // Used in Content tests
 [JsonSerializable(typeof(HostedMcpServerToolApprovalMode))]
 [JsonSerializable(typeof(ChatResponseFormatTests.SomeType))]
+[JsonSerializable(typeof(ResponseContinuationToken))]
 internal sealed partial class TestJsonSerializerContext : JsonSerializerContext;
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/HttpHandlerExpectedInput.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/HttpHandlerExpectedInput.cs
new file mode 100644
index 00000000000..981e43912c3
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/HttpHandlerExpectedInput.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Net.Http;
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>Model for expected input to an HTTP handler.</summary>
+public sealed class HttpHandlerExpectedInput
+{
+    /// <summary>Gets or sets the expected request URI.</summary>
+    public Uri? Uri { get; set; }
+
+    /// <summary>Gets or sets the expected request body.</summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Gets or sets the expected HTTP method.
+    /// </summary>
+    public HttpMethod? Method { get; set; }
+}
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/VerbatimHttpHandler.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/VerbatimHttpHandler.cs
index 8b5f1973348..dd3ea7ea199 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/VerbatimHttpHandler.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/VerbatimHttpHandler.cs
@@ -21,36 +21,68 @@ namespace Microsoft.Extensions.AI;
 /// An <see cref="HttpMessageHandler"/> that checks the request body against an expected one
 /// and sends back an expected response.
 /// </summary>
-public sealed class VerbatimHttpHandler(string expectedInput, string expectedOutput, bool validateExpectedResponse = false) :
-    DelegatingHandler(new HttpClientHandler())
+public sealed class VerbatimHttpHandler : DelegatingHandler
 {
+    private readonly string _expectedOutput;
+    private readonly bool _validateExpectedResponse;
+    private readonly HttpHandlerExpectedInput _expectedInput;
+
+    public VerbatimHttpHandler(string expectedInput, string expectedOutput, bool validateExpectedResponse = false)
+        : this(new HttpHandlerExpectedInput { Body = expectedInput }, expectedOutput, validateExpectedResponse)
+    {
+    }
+
+    public VerbatimHttpHandler(HttpHandlerExpectedInput expectedInput, string expectedOutput, bool validateExpectedResponse = false)
+        : base(new HttpClientHandler())
+    {
+        _expectedOutput = expectedOutput;
+        _validateExpectedResponse = validateExpectedResponse;
+        _expectedInput = expectedInput;
+    }
+
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
-        Assert.NotNull(request.Content);
+        if (_expectedInput.Body is not null)
+        {
+            Assert.NotNull(request.Content);
 
-        string? actualInput = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
+            string? actualInput = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-        Assert.NotNull(actualInput);
-        AssertEqualNormalized(expectedInput, actualInput);
+            Assert.NotNull(actualInput);
+            AssertEqualNormalized(_expectedInput.Body, actualInput);
 
-        if (validateExpectedResponse)
-        {
-            ByteArrayContent newContent = new(Encoding.UTF8.GetBytes(actualInput));
-            foreach (var header in request.Content.Headers)
+            if (_validateExpectedResponse)
             {
-                newContent.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                ByteArrayContent newContent = new(Encoding.UTF8.GetBytes(actualInput));
+                foreach (var header in request.Content.Headers)
+                {
+                    newContent.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                }
+
+                request.Content = newContent;
             }
+        }
+
+        if (_expectedInput.Uri is not null)
+        {
+            Assert.Equal(_expectedInput.Uri, request.RequestUri);
+        }
 
-            request.Content = newContent;
+        if (_expectedInput.Method is not null)
+        {
+            Assert.Equal(_expectedInput.Method, request.Method);
+        }
 
+        if (_validateExpectedResponse)
+        {
             using var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
             string? actualOutput = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             Assert.NotNull(actualOutput);
-            AssertEqualNormalized(expectedOutput, actualOutput);
+            AssertEqualNormalized(_expectedOutput, actualOutput);
         }
 
-        return new() { Content = new StringContent(expectedOutput) };
+        return new() { Content = new StringContent(_expectedOutput) };
     }
 
     public static string? RemoveWhiteSpace(string? text) =>
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientIntegrationTests.cs
index c8bdc819ddb..35d72e09436 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientIntegrationTests.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -189,4 +190,152 @@ await client.GetStreamingResponseAsync(input, chatOptions).ToChatResponseAsync()
             Assert.Contains("src/Libraries/Microsoft.Extensions.AI.Abstractions/README.md", response.Text);
         }
     }
+
+    [ConditionalFact]
+    public async Task GetResponseAsync_BackgroundResponses()
+    {
+        SkipIfNotEnabled();
+
+        var chatOptions = new ChatOptions
+        {
+            AllowBackgroundResponses = true,
+        };
+
+        // Get initial response with continuation token
+        var response = await ChatClient.GetResponseAsync("What's the biggest animal?", chatOptions);
+        Assert.NotNull(response.ContinuationToken);
+        Assert.Empty(response.Messages);
+
+        int attempts = 0;
+
+        // Continue to poll until we get the final response
+        while (response.ContinuationToken is not null && ++attempts < 10)
+        {
+            chatOptions.ContinuationToken = response.ContinuationToken;
+            response = await ChatClient.GetResponseAsync([], chatOptions);
+            await Task.Delay(1000);
+        }
+
+        Assert.Contains("whale", response.Text, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [ConditionalFact]
+    public async Task GetResponseAsync_BackgroundResponses_WithFunction()
+    {
+        SkipIfNotEnabled();
+
+        int callCount = 0;
+
+        using var chatClient = new FunctionInvokingChatClient(ChatClient);
+
+        var chatOptions = new ChatOptions
+        {
+            AllowBackgroundResponses = true,
+            Tools = [AIFunctionFactory.Create(() => { callCount++; return "5:43"; }, new AIFunctionFactoryOptions { Name = "GetCurrentTime" })]
+        };
+
+        // Get initial response with continuation token
+        var response = await chatClient.GetResponseAsync("What time is it?", chatOptions);
+        Assert.NotNull(response.ContinuationToken);
+        Assert.Empty(response.Messages);
+
+        int attempts = 0;
+
+        // Poll until the result is received
+        while (response.ContinuationToken is not null && ++attempts < 10)
+        {
+            chatOptions.ContinuationToken = response.ContinuationToken;
+
+            response = await chatClient.GetResponseAsync([], chatOptions);
+            await Task.Delay(1000);
+        }
+
+        Assert.Contains("5:43", response.Text, StringComparison.OrdinalIgnoreCase);
+        Assert.Equal(1, callCount);
+    }
+
+    [ConditionalFact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses()
+    {
+        SkipIfNotEnabled();
+
+        ChatOptions chatOptions = new()
+        {
+            AllowBackgroundResponses = true,
+        };
+
+        string responseText = "";
+
+        await foreach (var update in ChatClient.GetStreamingResponseAsync("What is the capital of France?", chatOptions))
+        {
+            responseText += update;
+        }
+
+        // Assert
+        Assert.Contains("Paris", responseText, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [ConditionalFact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses_StreamResumption()
+    {
+        SkipIfNotEnabled();
+
+        ChatOptions chatOptions = new()
+        {
+            AllowBackgroundResponses = true,
+        };
+
+        int updateNumber = 0;
+        string responseText = "";
+        object? continuationToken = null;
+
+        await foreach (var update in ChatClient.GetStreamingResponseAsync("What is the capital of France?", chatOptions))
+        {
+            responseText += update;
+
+            // Simulate an interruption after receiving 8 updates.
+            if (updateNumber++ == 8)
+            {
+                continuationToken = update.ContinuationToken;
+                break;
+            }
+        }
+
+        Assert.DoesNotContain("Paris", responseText);
+
+        // Resume streaming from the point of interruption captured by the continuation token.
+        chatOptions.ContinuationToken = continuationToken;
+        await foreach (var update in ChatClient.GetStreamingResponseAsync([], chatOptions))
+        {
+            responseText += update;
+        }
+
+        Assert.Contains("Paris", responseText, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [ConditionalFact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses_WithFunction()
+    {
+        SkipIfNotEnabled();
+
+        int callCount = 0;
+
+        using var chatClient = new FunctionInvokingChatClient(ChatClient);
+
+        var chatOptions = new ChatOptions
+        {
+            AllowBackgroundResponses = true,
+            Tools = [AIFunctionFactory.Create(() => { callCount++; return "5:43"; }, new AIFunctionFactoryOptions { Name = "GetCurrentTime" })]
+        };
+
+        string responseText = "";
+
+        await foreach (var update in chatClient.GetStreamingResponseAsync("What time is it?", chatOptions))
+        {
+            responseText += update;
+        }
+
+        Assert.Contains("5:43", responseText);
+        Assert.Equal(1, callCount);
+    }
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
index 79e63162923..c4c6f6b767d 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
@@ -6,6 +6,7 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
@@ -1506,6 +1507,466 @@ public async Task McpToolCall_ApprovalNotRequired_Streaming()
         Assert.Equal(1569, response.Usage.TotalTokenCount);
     }
 
+    [Fact]
+    public async Task GetResponseAsync_BackgroundResponses_FirstCall()
+    {
+        const string Input = """
+            {
+                "temperature":0.5,
+                "model":"gpt-4o-mini",
+                "background":true,
+                "input": [{
+                    "type":"message",
+                    "role":"user",
+                    "content":[{"type":"input_text","text":"hello"}]
+                }],
+                "max_output_tokens":20
+            }
+            """;
+
+        const string Output = """
+            {
+              "id": "resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed7",
+              "object": "response",
+              "created_at": 1758712522,
+              "status": "queued",
+              "background": true,
+              "error": null,
+              "incomplete_details": null,
+              "instructions": null,
+              "max_output_tokens": null,
+              "model": "gpt-4o-mini-2024-07-18",
+              "output": [],
+              "parallel_tool_calls": true,
+              "previous_response_id": null,
+              "reasoning": {
+                "effort": null,
+                "generate_summary": null
+              },
+              "store": true,
+              "temperature": 0.5,
+              "text": {
+                "format": {
+                  "type": "text"
+                }
+              },
+              "tool_choice": "auto",
+              "tools": [],
+              "top_p": 1.0,
+              "usage": null,
+              "user": null,
+              "metadata": {}
+            }
+            """;
+
+        using VerbatimHttpHandler handler = new(Input, Output);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-mini");
+
+        var response = await client.GetResponseAsync("hello", new()
+        {
+            MaxOutputTokens = 20,
+            Temperature = 0.5f,
+            AllowBackgroundResponses = true,
+        });
+        Assert.NotNull(response);
+
+        Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed7", response.ResponseId);
+        Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed7", response.ConversationId);
+        Assert.Empty(response.Messages);
+
+        Assert.NotNull(response.ContinuationToken);
+        var responsesContinuationToken = TestOpenAIResponsesContinuationToken.FromToken(response.ContinuationToken);
+        Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed7", responsesContinuationToken.ResponseId);
+        Assert.Null(responsesContinuationToken.SequenceNumber);
+    }
+
+    [Theory]
+    [InlineData(ResponseStatus.Queued)]
+    [InlineData(ResponseStatus.InProgress)]
+    [InlineData(ResponseStatus.Completed)]
+    [InlineData(ResponseStatus.Cancelled)]
+    [InlineData(ResponseStatus.Failed)]
+    [InlineData(ResponseStatus.Incomplete)]
+    public async Task GetResponseAsync_BackgroundResponses_PollingCall(ResponseStatus expectedStatus)
+    {
+        var expectedInput = new HttpHandlerExpectedInput
+        {
+            Uri = new Uri("https://api.openai.com/v1/responses/resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8"),
+            Method = HttpMethod.Get,
+        };
+
+        string output = $$""""
+            {
+              "id": "resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8",
+              "object": "response",
+              "created_at": 1758712522,
+              "status": "{{ResponseStatusToRequestValue(expectedStatus)}}",
+              "background": true,
+              "error": null,
+              "incomplete_details": null,
+              "instructions": null,
+              "max_output_tokens": null,
+              "model": "gpt-4o-mini-2024-07-18",
+              "output": {{(expectedStatus is (ResponseStatus.Queued or ResponseStatus.InProgress)
+                ? "[]"
+                : """
+                    [{
+                      "type": "message",
+                      "id": "msg_67d32764fcdc8191bcf2e444d4088804058a5e08c46a181d",
+                      "status": "completed",
+                      "role": "assistant",
+                      "content": [
+                        {
+                          "type": "output_text",
+                          "text": "The background response result.",
+                          "annotations": []
+                        }
+                      ]
+                    }]
+                    """
+              )}},
+              "parallel_tool_calls": true,
+              "previous_response_id": null,
+              "reasoning": {
+                "effort": null,
+                "generate_summary": null
+              },
+              "store": true,
+              "temperature": 0.5,
+              "text": {
+                "format": {
+                  "type": "text"
+                }
+              },
+              "tool_choice": "auto",
+              "tools": [],
+              "top_p": 1.0,
+              "usage": null,
+              "user": null,
+              "metadata": {}
+            }
+            """";
+
+        using VerbatimHttpHandler handler = new(expectedInput, output);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-mini");
+
+        var continuationToken = new TestOpenAIResponsesContinuationToken("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8");
+
+        var response = await client.GetResponseAsync([], new()
+        {
+            ContinuationToken = continuationToken,
+            AllowBackgroundResponses = true,
+        });
+        Assert.NotNull(response);
+
+        Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8", response.ResponseId);
+        Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8", response.ConversationId);
+
+        switch (expectedStatus)
+        {
+            case ResponseStatus.Queued:
+            case ResponseStatus.InProgress:
+            {
+                Assert.NotNull(response.ContinuationToken);
+
+                var responsesContinuationToken = TestOpenAIResponsesContinuationToken.FromToken(response.ContinuationToken);
+                Assert.Equal("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8", responsesContinuationToken.ResponseId);
+                Assert.Null(responsesContinuationToken.SequenceNumber);
+
+                Assert.Empty(response.Messages);
+                break;
+            }
+
+            case ResponseStatus.Completed:
+            case ResponseStatus.Cancelled:
+            case ResponseStatus.Failed:
+            case ResponseStatus.Incomplete:
+            {
+                Assert.Null(response.ContinuationToken);
+
+                Assert.Equal("The background response result.", response.Text);
+                Assert.Single(response.Messages.Single().Contents);
+                Assert.Equal(ChatRole.Assistant, response.Messages.Single().Role);
+                break;
+            }
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(expectedStatus), expectedStatus, null);
+        }
+    }
+
+    [Fact]
+    public async Task GetResponseAsync_BackgroundResponses_PollingCall_WithMessages()
+    {
+        using VerbatimHttpHandler handler = new(string.Empty, string.Empty);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-mini");
+
+        var options = new ChatOptions
+        {
+            ContinuationToken = new TestOpenAIResponsesContinuationToken("resp_68d3d2c9ef7c8195863e4e2b2ec226a205007262ecbbfed8"),
+            AllowBackgroundResponses = true,
+        };
+
+        // A try to update a background response with new messages should fail.
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        {
+            await client.GetResponseAsync("Please book hotel as well", options);
+        });
+    }
+
+    [Fact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses()
+    {
+        const string Input = """
+            {
+              "model": "gpt-4o-2024-08-06",
+              "background": true,
+              "input":[{
+                "type":"message",
+                "role":"user",
+                "content":[{
+                  "type":"input_text",
+                  "text":"hello"
+                }]
+              }],
+              
+              "stream": true
+            }
+            """;
+
+        const string Output = """
+            event: response.created
+            data: {"type":"response.created","sequence_number":0,"response":{"id":"resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559","object":"response","created_at":1758724519,"status":"queued","background":true,"error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"max_tool_calls":null,"model":"gpt-4o-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"prompt_cache_key":null,"reasoning":{"effort":null,"summary":null},"safety_identifier":null,"service_tier":"auto","store":true,"temperature":1.0,"text":{"format":{"type":"text"},"verbosity":"medium"},"tool_choice":"auto","tools":[],"top_logprobs":0,"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+            event: response.queued
+            data: {"type":"response.queued","sequence_number":1,"response":{"id":"resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559","object":"response","created_at":1758724519,"status":"queued","background":true,"error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"max_tool_calls":null,"model":"gpt-4o-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"prompt_cache_key":null,"reasoning":{"effort":null,"summary":null},"safety_identifier":null,"service_tier":"auto","store":true,"temperature":1.0,"text":{"format":{"type":"text"},"verbosity":"medium"},"tool_choice":"auto","tools":[],"top_logprobs":0,"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+            event: response.in_progress
+            data: {"type":"response.in_progress","sequence_number":2,"response":{"truncation":"disabled","id":"resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559","tool_choice":"auto","temperature":1.0,"top_p":1.0,"status":"in_progress","top_logprobs":0,"usage":null,"object":"response","created_at":1758724519,"prompt_cache_key":null,"text":{"format":{"type":"text"},"verbosity":"medium"},"incomplete_details":null,"model":"gpt-4o-2024-08-06","previous_response_id":null,"safety_identifier":null,"metadata":{},"store":true,"output":[],"parallel_tool_calls":true,"error":null,"background":true,"instructions":null,"service_tier":"auto","max_tool_calls":null,"max_output_tokens":null,"tools":[],"user":null,"reasoning":{"effort":null,"summary":null}}}
+
+            event: response.output_item.added
+            data: {"type":"response.output_item.added","sequence_number":3,"item":{"id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content":[],"role":"assistant","status":"in_progress","type":"message"},"output_index":0}
+
+            event: response.content_part.added
+            data: {"type":"response.content_part.added","sequence_number":4,"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"part":{"text":"","logprobs":[],"type":"output_text","annotations":[]},"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":5,"delta":"Hello","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":6,"delta":"!","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":7,"delta":" How","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":8,"delta":" can","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":9,"delta":" I","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":10,"delta":" assist","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":11,"delta":" you","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":12,"delta":" today","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":13,"delta":"?","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.output_text.done
+            data: {"type":"response.output_text.done","sequence_number":14,"text":"Hello! How can I assist you today?","logprobs":[],"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"output_index":0}
+
+            event: response.content_part.done
+            data: {"type":"response.content_part.done","sequence_number":15,"item_id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content_index":0,"part":{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]},"output_index":0}
+
+            event: response.output_item.done
+            data: {"type":"response.output_item.done","sequence_number":16,"item":{"id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content":[{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]}],"role":"assistant","status":"completed","type":"message"},"output_index":0}
+
+            event: response.completed
+            data: {"type":"response.completed","sequence_number":17,"response":{"truncation":"disabled","id":"resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559","tool_choice":"auto","temperature":1.0,"top_p":1.0,"status":"completed","top_logprobs":0,"usage":{"total_tokens":18,"input_tokens_details":{"cached_tokens":0},"output_tokens_details":{"reasoning_tokens":0},"output_tokens":10,"input_tokens":8},"object":"response","created_at":1758724519,"prompt_cache_key":null,"text":{"format":{"type":"text"},"verbosity":"medium"},"incomplete_details":null,"model":"gpt-4o-2024-08-06","previous_response_id":null,"safety_identifier":null,"metadata":{},"store":true,"output":[{"id":"msg_68d401aa78d481a2ab30776a79c691a6073420ed59d5f559","content":[{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]}],"role":"assistant","status":"completed","type":"message"}],"parallel_tool_calls":true,"error":null,"background":true,"instructions":null,"service_tier":"default","max_tool_calls":null,"max_output_tokens":null,"tools":[],"user":null,"reasoning":{"effort":null,"summary":null}}}
+
+            
+            """;
+
+        using VerbatimHttpHandler handler = new(Input, Output);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-2024-08-06");
+
+        List<ChatResponseUpdate> updates = [];
+        await foreach (var update in client.GetStreamingResponseAsync("hello", new()
+        {
+            AllowBackgroundResponses = true,
+        }))
+        {
+            updates.Add(update);
+        }
+
+        Assert.Equal("Hello! How can I assist you today?", string.Concat(updates.Select(u => u.Text)));
+        Assert.Equal(18, updates.Count);
+
+        var createdAt = DateTimeOffset.FromUnixTimeSeconds(1_758_724_519);
+
+        for (int i = 0; i < updates.Count; i++)
+        {
+            Assert.Equal("resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559", updates[i].ResponseId);
+            Assert.Equal("resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559", updates[i].ConversationId);
+            Assert.Equal(createdAt, updates[i].CreatedAt);
+            Assert.Equal("gpt-4o-2024-08-06", updates[i].ModelId);
+            Assert.Null(updates[i].AdditionalProperties);
+
+            if (i < updates.Count - 1)
+            {
+                Assert.NotNull(updates[i].ContinuationToken);
+                var responsesContinuationToken = TestOpenAIResponsesContinuationToken.FromToken(updates[i].ContinuationToken!);
+                Assert.Equal("resp_68d401a7b36c81a288600e95a5a119d4073420ed59d5f559", responsesContinuationToken.ResponseId);
+                Assert.Equal(i, responsesContinuationToken.SequenceNumber);
+                Assert.Null(updates[i].FinishReason);
+            }
+            else
+            {
+                Assert.Null(updates[i].ContinuationToken);
+                Assert.Equal(ChatFinishReason.Stop, updates[i].FinishReason);
+            }
+
+            Assert.Equal((i >= 5 && i <= 13) || i == 17 ? 1 : 0, updates[i].Contents.Count);
+        }
+    }
+
+    [Fact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses_StreamResumption()
+    {
+        var expectedInput = new HttpHandlerExpectedInput
+        {
+            Uri = new Uri("https://api.openai.com/v1/responses/resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b?stream=true&starting_after=9"),
+            Method = HttpMethod.Get,
+        };
+
+        const string Output = """
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":10,"delta":" assist","logprobs":[],"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":11,"delta":" you","logprobs":[],"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":12,"delta":" today","logprobs":[],"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"output_index":0}
+
+            event: response.output_text.delta
+            data: {"type":"response.output_text.delta","sequence_number":13,"delta":"?","logprobs":[],"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"output_index":0}
+
+            event: response.output_text.done
+            data: {"type":"response.output_text.done","sequence_number":14,"text":"Hello! How can I assist you today?","logprobs":[],"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"output_index":0}
+
+            event: response.content_part.done
+            data: {"type":"response.content_part.done","sequence_number":15,"item_id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content_index":0,"part":{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]},"output_index":0}
+
+            event: response.output_item.done
+            data: {"type":"response.output_item.done","sequence_number":16,"item":{"id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content":[{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]}],"role":"assistant","status":"completed","type":"message"},"output_index":0}
+
+            event: response.completed
+            data: {"type":"response.completed","sequence_number":17,"response":{"truncation":"disabled","id":"resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b","tool_choice":"auto","temperature":1.0,"top_p":1.0,"status":"completed","top_logprobs":0,"usage":{"total_tokens":18,"input_tokens_details":{"cached_tokens":0},"output_tokens_details":{"reasoning_tokens":0},"output_tokens":10,"input_tokens":8},"object":"response","created_at":1758727622,"prompt_cache_key":null,"text":{"format":{"type":"text"},"verbosity":"medium"},"incomplete_details":null,"model":"gpt-4o-2024-08-06","previous_response_id":null,"safety_identifier":null,"metadata":{},"store":true,"output":[{"id":"msg_68d40dcb2d34819c88f5d6a8ca7b0308029e611c3cc4a34b","content":[{"text":"Hello! How can I assist you today?","logprobs":[],"type":"output_text","annotations":[]}],"role":"assistant","status":"completed","type":"message"}],"parallel_tool_calls":true,"error":null,"background":true,"instructions":null,"service_tier":"default","max_tool_calls":null,"max_output_tokens":null,"tools":[],"user":null,"reasoning":{"effort":null,"summary":null}}}
+
+            
+            """;
+
+        using VerbatimHttpHandler handler = new(expectedInput, Output);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-2024-08-06");
+
+        // Emulating resumption of the stream after receiving the first 9 updates that provided the text "Hello! How can I"
+        var continuationToken = new TestOpenAIResponsesContinuationToken("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b")
+        {
+            SequenceNumber = 9
+        };
+
+        var chatOptions = new ChatOptions
+        {
+            AllowBackgroundResponses = true,
+            ContinuationToken = continuationToken,
+        };
+
+        List<ChatResponseUpdate> updates = [];
+        await foreach (var update in client.GetStreamingResponseAsync([], chatOptions))
+        {
+            updates.Add(update);
+        }
+
+        // Receiving the remaining updates to complete the response "Hello! How can I assist you today?"
+        Assert.Equal(" assist you today?", string.Concat(updates.Select(u => u.Text)));
+        Assert.Equal(8, updates.Count);
+
+        var createdAt = DateTimeOffset.FromUnixTimeSeconds(1_758_727_622);
+
+        for (int i = 0; i < updates.Count; i++)
+        {
+            Assert.Equal("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b", updates[i].ResponseId);
+            Assert.Equal("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b", updates[i].ConversationId);
+
+            var sequenceNumber = i + 10;
+
+            if (sequenceNumber is (>= 10 and <= 13))
+            {
+                // Text deltas
+                Assert.NotNull(updates[i].ContinuationToken);
+                var responsesContinuationToken = TestOpenAIResponsesContinuationToken.FromToken(updates[i].ContinuationToken!);
+                Assert.Equal("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b", responsesContinuationToken.ResponseId);
+                Assert.Equal(sequenceNumber, responsesContinuationToken.SequenceNumber);
+
+                Assert.Single(updates[i].Contents);
+            }
+            else if (sequenceNumber is (>= 14 and <= 16))
+            {
+                // Response Complete and Assistant message updates
+                Assert.NotNull(updates[i].ContinuationToken);
+                var responsesContinuationToken = TestOpenAIResponsesContinuationToken.FromToken(updates[i].ContinuationToken!);
+                Assert.Equal("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b", responsesContinuationToken.ResponseId);
+                Assert.Equal(sequenceNumber, responsesContinuationToken.SequenceNumber);
+
+                Assert.Empty(updates[i].Contents);
+            }
+            else
+            {
+                // The last update with the response completion
+                Assert.Null(updates[i].ContinuationToken);
+                Assert.Single(updates[i].Contents);
+            }
+        }
+    }
+
+    [Fact]
+    public async Task GetStreamingResponseAsync_BackgroundResponses_StreamResumption_WithMessages()
+    {
+        using VerbatimHttpHandler handler = new(string.Empty, string.Empty);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateResponseClient(httpClient, "gpt-4o-2024-08-06");
+
+        // Emulating resumption of the stream after receiving the first 9 updates that provided the text "Hello! How can I"
+        var chatOptions = new ChatOptions
+        {
+            AllowBackgroundResponses = true,
+            ContinuationToken = new TestOpenAIResponsesContinuationToken("resp_68d40dc671a0819cb0ee920078333451029e611c3cc4a34b")
+            {
+                SequenceNumber = 9
+            }
+        };
+
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        {
+            await foreach (var update in client.GetStreamingResponseAsync("Please book a hotel for me", chatOptions))
+#pragma warning disable S108 // Nested blocks of code should not be left empty
+            {
+            }
+#pragma warning restore S108 // Nested blocks of code should not be left empty
+        });
+    }
+
     [Fact]
     public async Task RequestHeaders_UserAgent_ContainsMEAI()
     {
@@ -1525,4 +1986,101 @@ private static IChatClient CreateResponseClient(HttpClient httpClient, string mo
             new OpenAIClientOptions { Transport = new HttpClientPipelineTransport(httpClient) })
         .GetOpenAIResponseClient(modelId)
         .AsIChatClient();
+
+    private static string ResponseStatusToRequestValue(ResponseStatus status)
+    {
+        if (status == ResponseStatus.InProgress)
+        {
+            return "in_progress";
+        }
+
+        return status.ToString().ToLowerInvariant();
+    }
+
+    private sealed class TestOpenAIResponsesContinuationToken : ResponseContinuationToken
+    {
+        internal TestOpenAIResponsesContinuationToken(string responseId)
+        {
+            ResponseId = responseId;
+        }
+
+        /// <summary>Gets or sets the Id of the response.</summary>
+        internal string ResponseId { get; set; }
+
+        /// <summary>Gets or sets the sequence number of a streamed update.</summary>
+        internal int? SequenceNumber { get; set; }
+
+        internal static TestOpenAIResponsesContinuationToken FromToken(object token)
+        {
+            if (token is TestOpenAIResponsesContinuationToken testOpenAIResponsesContinuationToken)
+            {
+                return testOpenAIResponsesContinuationToken;
+            }
+
+            if (token is not ResponseContinuationToken)
+            {
+                throw new ArgumentException("Failed to create OpenAIResponsesResumptionToken from provided token because it is not of type ResponseContinuationToken.", nameof(token));
+            }
+
+            ReadOnlyMemory<byte> data = ((ResponseContinuationToken)token).ToBytes();
+
+            Utf8JsonReader reader = new(data.Span);
+
+            string responseId = null!;
+            int? startAfter = null;
+
+            _ = reader.Read();
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.EndObject)
+                {
+                    break;
+                }
+
+                string propertyName = reader.GetString()!;
+
+                switch (propertyName)
+                {
+                    case "responseId":
+                        _ = reader.Read();
+                        responseId = reader.GetString()!;
+                        break;
+                    case "sequenceNumber":
+                        _ = reader.Read();
+                        startAfter = reader.GetInt32();
+                        break;
+                    default:
+                        throw new JsonException($"Unrecognized property '{propertyName}'.");
+                }
+            }
+
+            return new(responseId)
+            {
+                SequenceNumber = startAfter
+            };
+        }
+
+        public override ReadOnlyMemory<byte> ToBytes()
+        {
+            using MemoryStream stream = new();
+            using Utf8JsonWriter writer = new(stream);
+
+            writer.WriteStartObject();
+
+            writer.WriteString("responseId", ResponseId);
+
+            if (SequenceNumber.HasValue)
+            {
+                writer.WriteNumber("sequenceNumber", SequenceNumber.Value);
+            }
+
+            writer.WriteEndObject();
+
+            writer.Flush();
+            stream.Position = 0;
+
+            return stream.ToArray();
+        }
+    }
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
index 27c0d3ff0d6..2308a921ab3 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
@@ -1194,6 +1194,44 @@ public async Task MixedKnownFunctionAndDeclaration_TerminatesWithoutInvokingKnow
         Assert.Equal(0, invoked);
     }
 
+    [Fact]
+    public async Task ClonesChatOptionsAndResetContinuationTokenForBackgroundResponsesAsync()
+    {
+        ChatOptions? actualChatOptions = null;
+
+        using var innerChatClient = new TestChatClient
+        {
+            GetResponseAsyncCallback = (chatContents, chatOptions, cancellationToken) =>
+            {
+                actualChatOptions = chatOptions;
+
+                List<ChatMessage> messages = [];
+
+                // Simulate the model returning a function call for the first call only
+                if (!chatContents.Any(m => m.Contents.OfType<FunctionCallContent>().Any()))
+                {
+                    messages.Add(new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1")]));
+                }
+
+                return Task.FromResult(new ChatResponse { Messages = messages });
+            }
+        };
+
+        using var chatClient = new FunctionInvokingChatClient(innerChatClient);
+
+        var originalChatOptions = new ChatOptions
+        {
+            Tools = [AIFunctionFactory.Create(() => { }, "Func1")],
+            ContinuationToken = ResponseContinuationToken.FromBytes(new byte[] { 1, 2, 3, 4 }),
+        };
+
+        await chatClient.GetResponseAsync("hi", originalChatOptions);
+
+        // The original options should be cloned and have a null ContinuationToken
+        Assert.NotSame(originalChatOptions, actualChatOptions);
+        Assert.Null(actualChatOptions!.ContinuationToken);
+    }
+
     private sealed class CustomSynchronizationContext : SynchronizationContext
     {
         public override void Post(SendOrPostCallback d, object? state)

From 4c2b1c66a3bdb0fc3b3276bf77e8e920b127074e Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Mon, 13 Oct 2025 12:53:23 -0400
Subject: [PATCH 7/7] Fix OpenTelemetryChatClient failing on unknown content
 types (#6915)

It should fail gracefully by ignoring any content it can't output telemetry for rather than throwing.
---
 .../ChatCompletion/OpenTelemetryChatClient.cs | 29 ++++++--
 .../OpenTelemetryChatClientTests.cs           | 72 ++++++++++++++++++-
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
index 5305e05c8c5..95358dd25a6 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs
@@ -10,6 +10,7 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -216,7 +217,8 @@ public override async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseA
         }
     }
 
-    internal static string SerializeChatMessages(IEnumerable<ChatMessage> messages, ChatFinishReason? chatFinishReason = null)
+    internal static string SerializeChatMessages(
+        IEnumerable<ChatMessage> messages, ChatFinishReason? chatFinishReason = null, JsonSerializerOptions? customContentSerializerOptions = null)
     {
         List<object> output = [];
 
@@ -293,10 +295,28 @@ internal static string SerializeChatMessages(IEnumerable<ChatMessage> messages,
                         break;
 
                     default:
+                        JsonElement element = _emptyObject;
+                        try
+                        {
+                            JsonTypeInfo? unknownContentTypeInfo =
+                                customContentSerializerOptions?.TryGetTypeInfo(content.GetType(), out JsonTypeInfo? ctsi) is true ? ctsi :
+                                _defaultOptions.TryGetTypeInfo(content.GetType(), out JsonTypeInfo? dtsi) ? dtsi :
+                                null;
+
+                            if (unknownContentTypeInfo is not null)
+                            {
+                                element = JsonSerializer.SerializeToElement(content, unknownContentTypeInfo);
+                            }
+                        }
+                        catch
+                        {
+                            // Ignore the contents of any parts that can't be serialized.
+                        }
+
                         m.Parts.Add(new OtelGenericPart
                         {
                             Type = content.GetType().FullName!,
-                            Content = content,
+                            Content = element,
                         });
                         break;
                 }
@@ -558,7 +578,7 @@ private void AddInputMessagesTags(IEnumerable<ChatMessage> messages, ChatOptions
 
             _ = activity.AddTag(
                 OpenTelemetryConsts.GenAI.Input.Messages,
-                SerializeChatMessages(messages));
+                SerializeChatMessages(messages, customContentSerializerOptions: _jsonSerializerOptions));
         }
     }
 
@@ -568,7 +588,7 @@ private void AddOutputMessagesTags(ChatResponse response, Activity? activity)
         {
             _ = activity.AddTag(
                 OpenTelemetryConsts.GenAI.Output.Messages,
-                SerializeChatMessages(response.Messages, response.FinishReason));
+                SerializeChatMessages(response.Messages, response.FinishReason, customContentSerializerOptions: _jsonSerializerOptions));
         }
     }
 
@@ -609,6 +629,7 @@ private sealed class OtelFunction
     }
 
     private static readonly JsonSerializerOptions _defaultOptions = CreateDefaultOptions();
+    private static readonly JsonElement _emptyObject = JsonSerializer.SerializeToElement(new object(), _defaultOptions.GetTypeInfo(typeof(object)));
 
     private static JsonSerializerOptions CreateDefaultOptions()
     {
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
index 938f6f92d4c..88f02191163 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/OpenTelemetryChatClientTests.cs
@@ -329,7 +329,77 @@ async static IAsyncEnumerable<ChatResponseUpdate> CallbackAsync(
             Assert.False(tags.ContainsKey("gen_ai.system_instructions"));
             Assert.False(tags.ContainsKey("gen_ai.tool.definitions"));
         }
+    }
+
+    [Fact]
+    public async Task UnknownContentTypes_Ignored()
+    {
+        var sourceName = Guid.NewGuid().ToString();
+        var activities = new List<Activity>();
+        using var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+            .AddSource(sourceName)
+            .AddInMemoryExporter(activities)
+            .Build();
+
+        using var innerClient = new TestChatClient
+        {
+            GetResponseAsyncCallback = async (messages, options, cancellationToken) =>
+            {
+                await Task.Yield();
+                return new ChatResponse(new ChatMessage(ChatRole.Assistant, "The blue whale, I think."));
+            },
+        };
+
+        using var chatClient = innerClient
+            .AsBuilder()
+            .UseOpenTelemetry(null, sourceName, configure: instance =>
+            {
+                instance.EnableSensitiveData = true;
+                instance.JsonSerializerOptions = TestJsonSerializerContext.Default.Options;
+            })
+            .Build();
 
-        static string ReplaceWhitespace(string? input) => Regex.Replace(input ?? "", @"\s+", " ").Trim();
+        List<ChatMessage> messages =
+        [
+            new(ChatRole.User,
+            [
+                new TextContent("Hello!"),
+                new NonSerializableAIContent(),
+                new TextContent("How are you?"),
+            ]),
+        ];
+
+        var response = await chatClient.GetResponseAsync(messages);
+        Assert.NotNull(response);
+
+        var activity = Assert.Single(activities);
+        Assert.NotNull(activity);
+
+        var inputMessages = activity.Tags.First(kvp => kvp.Key == "gen_ai.input.messages").Value;
+        Assert.Equal(ReplaceWhitespace("""
+                [
+                  {
+                    "role": "user",
+                    "parts": [
+                      {
+                        "type": "text",
+                        "content": "Hello!"
+                      },
+                      {
+                        "type": "Microsoft.Extensions.AI.OpenTelemetryChatClientTests+NonSerializableAIContent",
+                        "content": {}
+                      },
+                      {
+                          "type": "text",
+                          "content": "How are you?"
+                      }
+                    ]
+                  }
+                ]
+                """), ReplaceWhitespace(inputMessages));
     }
+
+    private sealed class NonSerializableAIContent : AIContent;
+
+    private static string ReplaceWhitespace(string? input) => Regex.Replace(input ?? "", @"\s+", " ").Trim();
 }