From bbd9db7adb83df7ad5489bc028dfce553068f702 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Wed, 2 Jul 2025 23:30:25 +0000
Subject: [PATCH 01/13] Merged PR 51321: Flow .NET Servicing versions

Flow .NET Servicing versions

----
#### AI description  (iteration 1)
#### PR Classification
This PR performs a servicing update by bumping .NET dependency versions and refining CI pipeline configurations for stable releases.

#### PR Summary
The changes update dependency versions from 9.0.6 to 9.0.7 (and corresponding LTS versions) and adjust build settings to support release stability while streamlining internal feed configurations.
- `eng/Version.Details.xml`: Updated multiple dependency version numbers and SHA values from 9.0.6 to 9.0.7.
- `eng/Versions.props`: Bumped version properties (including LTS versions from 8.0.17 to 8.0.18) and enabled stable release settings by setting package stabilization to true and DotNetFinalVersionKind to release.
- `NuGet.config`: Modified package source settings by adding new internal feed mappings and removing preexisting package source mapping blocks.
- `azure-pipelines.yml` & `eng/pipelines/templates/BuildAndTest.yml`: Removed the CodeCoverage stage and added tasks for setting up private feed credentials, with integration tests commented out due to authentication requirements.
- `Directory.Build.props`: Suppressed NU1507 warnings to accommodate internal feeds without package source mapping.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
---
 Directory.Build.props                    |   5 +
 NuGet.config                             |  76 ++++++---
 azure-pipelines.yml                      |  46 ------
 eng/Version.Details.xml                  | 188 +++++++++++------------
 eng/Versions.props                       | 124 +++++++--------
 eng/pipelines/templates/BuildAndTest.yml |  32 +++-
 6 files changed, 240 insertions(+), 231 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..5080151679a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,37 @@
     <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-cea5fa6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-271c94d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-271c94d1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-271c94d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-271c94d1-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-271c94d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-271c94d1-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-271c94d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-271c94d1-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-271c94d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-271c94d1-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-67d253c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-67d253c1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-67d253c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-67d253c1-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-67d253c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-67d253c1-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-67d253c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-67d253c1-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-ef853a7-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-ef853a7-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-ef853a7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-ef853a7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-3c298d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-3c298d9-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-3c298d9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-3c298d9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-1/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 +45,40 @@
     <!-- 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-cea5fa6-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-3" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6-4" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-cea5fa6" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d-3" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="true" />
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-271c94d-1" value="true" />
+    <add key="darc-int-dotnet-efcore-271c94d-2" value="true" />
+    <add key="darc-int-dotnet-efcore-271c94d-3" value="true" />
+    <add key="darc-int-dotnet-efcore-271c94d-4" value="true" />
+    <add key="darc-int-dotnet-efcore-271c94d" value="true" />
+    <add key="darc-int-dotnet-efcore-67d253c-1" value="true" />
+    <add key="darc-int-dotnet-efcore-67d253c-2" value="true" />
+    <add key="darc-int-dotnet-efcore-67d253c-3" value="true" />
+    <add key="darc-int-dotnet-efcore-67d253c" 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-ef853a7-1" value="true" />
+    <add key="darc-int-dotnet-runtime-ef853a7-2" value="true" />
+    <add key="darc-int-dotnet-runtime-ef853a7-3" value="true" />
+    <add key="darc-int-dotnet-runtime-ef853a7-4" value="true" />
+    <add key="darc-int-dotnet-runtime-ef853a7" value="true" />
+    <add key="darc-int-dotnet-runtime-3c298d9-1" value="true" />
+    <add key="darc-int-dotnet-runtime-3c298d9-2" value="true" />
+    <add key="darc-int-dotnet-runtime-3c298d9-3" value="true" />
+    <add key="darc-int-dotnet-runtime-3c298d9" 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 3a746194f1b..cb6ead9fa88 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,196 +1,196 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</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.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Memory.Data" Version="9.0.6">
+    <Dependency Name="System.Memory.Data" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Net.Http.Json" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Numerics.Tensors" Version="9.0.6">
+    <Dependency Name="System.Numerics.Tensors" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Threading.Channels" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
+      <Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.6">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.6">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.6">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.6">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
+      <Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>8751e6d519fda94d5154187358765311ed4a4e84</Sha>
+      <Sha>67d253c17619e6ba325e5390905ea2a13cc7f532</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 03fa0e24fd4..ac0cc576af8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,14 +11,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>
@@ -34,55 +34,55 @@
   -->
   <PropertyGroup Label="Automated Maestro dependency updates">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclAsyncInterfacesVersion>9.0.6</MicrosoftBclAsyncInterfacesVersion>
-    <MicrosoftBclTimeProviderVersion>9.0.6</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.6</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.6</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.6</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.6</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.6</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.6</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.6</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.6</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.6</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.6</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.6</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.6</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.6</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.6</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.6</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.6</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.6</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.6</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.6</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.6</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.6</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.6</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.6</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.6</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.6</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.6</SystemIOPipelinesVersion>
-    <SystemMemoryDataVersion>9.0.6</SystemMemoryDataVersion>
-    <SystemNetHttpJsonVersion>9.0.6</SystemNetHttpJsonVersion>
-    <SystemRuntimeCachingVersion>9.0.6</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.6</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.6</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.6</SystemTextEncodingsWebVersion>
-    <SystemNumericsTensorsVersion>9.0.6</SystemNumericsTensorsVersion>
-    <SystemTextJsonVersion>9.0.6</SystemTextJsonVersion>
-    <SystemThreadingChannelsVersion>9.0.6</SystemThreadingChannelsVersion>
+    <MicrosoftBclAsyncInterfacesVersion>9.0.7</MicrosoftBclAsyncInterfacesVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.7</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.7</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.7</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.7</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.7</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.7</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.7</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.7</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.7</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.7</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.7</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.7</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.7</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.7</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.7</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.7</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.7</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.7</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.7</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.7</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.7</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.7</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.7</SystemIOPipelinesVersion>
+    <SystemMemoryDataVersion>9.0.7</SystemMemoryDataVersion>
+    <SystemNetHttpJsonVersion>9.0.7</SystemNetHttpJsonVersion>
+    <SystemRuntimeCachingVersion>9.0.7</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.7</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.7</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.7</SystemTextEncodingsWebVersion>
+    <SystemNumericsTensorsVersion>9.0.7</SystemNumericsTensorsVersion>
+    <SystemTextJsonVersion>9.0.7</SystemTextJsonVersion>
+    <SystemThreadingChannelsVersion>9.0.7</SystemThreadingChannelsVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.6</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.6</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.6</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.6</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.6</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.6</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.7</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.7</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.7</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.7</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.7</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.7</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.7</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.7</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.7</MicrosoftExtensionsObjectPoolVersion>
     <!-- Dependencies from https://github.com/dotnet/efcore -->
-    <MicrosoftEntityFrameworkCoreSqliteVersion>9.0.6</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>9.0.7</MicrosoftEntityFrameworkCoreSqliteVersion>
     <!-- Dependencies from https://github.com/dotnet/arcade -->
     <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
@@ -108,8 +108,8 @@
     <MicrosoftExtensionsLoggingLTSVersion>8.0.1</MicrosoftExtensionsLoggingLTSVersion>
     <MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>
     <MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
-    <MicrosoftNETCoreAppRefLTSVersion>8.0.17</MicrosoftNETCoreAppRefLTSVersion>
-    <MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.17</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
+    <MicrosoftNETCoreAppRefLTSVersion>8.0.18</MicrosoftNETCoreAppRefLTSVersion>
+    <MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.18</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
     <SystemCollectionsImmutableLTSVersion>8.0.0</SystemCollectionsImmutableLTSVersion>
     <SystemConfigurationConfigurationManagerLTSVersion>8.0.1</SystemConfigurationConfigurationManagerLTSVersion>
     <SystemDiagnosticsDiagnosticSourceLTSVersion>8.0.1</SystemDiagnosticsDiagnosticSourceLTSVersion>
@@ -123,20 +123,20 @@
     <SystemSecurityCryptographyXmlLTSVersion>8.0.2</SystemSecurityCryptographyXmlLTSVersion>
     <SystemTextEncodingsWebLTSVersion>8.0.0</SystemTextEncodingsWebLTSVersion>
     <SystemNumericsTensorsLTSVersion>8.0.0</SystemNumericsTensorsLTSVersion>
-    <SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
+    <SystemTextJsonLTSVersion>8.0.6</SystemTextJsonLTSVersion>
     <SystemThreadingChannelsLTSVersion>8.0.0</SystemThreadingChannelsLTSVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefLTSVersion>8.0.17</MicrosoftAspNetCoreAppRefLTSVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.17</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
-    <MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.17</MicrosoftAspNetCoreMvcTestingLTSVersion>
-    <MicrosoftAspNetCoreTestHostLTSVersion>8.0.17</MicrosoftAspNetCoreTestHostLTSVersion>
-    <MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.17</MicrosoftExtensionsCachingSqlServerLTSVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.17</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.17</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
-    <MicrosoftExtensionsHttpPollyLTSVersion>8.0.17</MicrosoftExtensionsHttpPollyLTSVersion>
-    <MicrosoftExtensionsObjectPoolLTSVersion>8.0.17</MicrosoftExtensionsObjectPoolLTSVersion>
+    <MicrosoftAspNetCoreAppRefLTSVersion>8.0.18</MicrosoftAspNetCoreAppRefLTSVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.18</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
+    <MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.18</MicrosoftAspNetCoreMvcTestingLTSVersion>
+    <MicrosoftAspNetCoreTestHostLTSVersion>8.0.18</MicrosoftAspNetCoreTestHostLTSVersion>
+    <MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.18</MicrosoftExtensionsCachingSqlServerLTSVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.18</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.18</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
+    <MicrosoftExtensionsHttpPollyLTSVersion>8.0.18</MicrosoftExtensionsHttpPollyLTSVersion>
+    <MicrosoftExtensionsObjectPoolLTSVersion>8.0.18</MicrosoftExtensionsObjectPoolLTSVersion>
     <!-- Dependencies from https://github.com/dotnet/efcore -->
-    <MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.17</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
+    <MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.18</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index bd008ead075..6c54a911e84 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 a1bf53c8eb2a1cd8f58ff928a22e9168a0339746 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 2 Jul 2025 11:16:01 -0400
Subject: [PATCH 02/13] Add DelegatingAIFunction (#6565)

* Add DelegatingAIFunction

To simplify scenarios where someone wants to augment an existing AIFunction's behavior, tweak what one of its properties returns, etc.

* Address PR feedback
---
 .../Functions/DelegatingAIFunction.cs         | 61 ++++++++++++
 .../Microsoft.Extensions.AI.Abstractions.json | 52 +++++++++++
 .../Functions/DelegatingAIFunctionTests.cs    | 92 +++++++++++++++++++
 3 files changed, 205 insertions(+)
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/DelegatingAIFunction.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Functions/DelegatingAIFunctionTests.cs

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/DelegatingAIFunction.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/DelegatingAIFunction.cs
new file mode 100644
index 00000000000..a52c5acd959
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/DelegatingAIFunction.cs
@@ -0,0 +1,61 @@
+// 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.Reflection;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Shared.Diagnostics;
+
+#pragma warning disable SA1202 // Elements should be ordered by access
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>
+/// Provides an optional base class for an <see cref="AIFunction"/> that passes through calls to another instance.
+/// </summary>
+public class DelegatingAIFunction : AIFunction
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DelegatingAIFunction"/> class as a wrapper around <paramref name="innerFunction"/>.
+    /// </summary>
+    /// <param name="innerFunction">The inner AI function to which all calls are delegated by default.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="innerFunction"/> is <see langword="null"/>.</exception>
+    protected DelegatingAIFunction(AIFunction innerFunction)
+    {
+        InnerFunction = Throw.IfNull(innerFunction);
+    }
+
+    /// <summary>Gets the inner <see cref="AIFunction" />.</summary>
+    protected AIFunction InnerFunction { get; }
+
+    /// <inheritdoc />
+    public override string Name => InnerFunction.Name;
+
+    /// <inheritdoc />
+    public override string Description => InnerFunction.Description;
+
+    /// <inheritdoc />
+    public override JsonElement JsonSchema => InnerFunction.JsonSchema;
+
+    /// <inheritdoc />
+    public override JsonElement? ReturnJsonSchema => InnerFunction.ReturnJsonSchema;
+
+    /// <inheritdoc />
+    public override JsonSerializerOptions JsonSerializerOptions => InnerFunction.JsonSerializerOptions;
+
+    /// <inheritdoc />
+    public override MethodInfo? UnderlyingMethod => InnerFunction.UnderlyingMethod;
+
+    /// <inheritdoc />
+    public override IReadOnlyDictionary<string, object?> AdditionalProperties => InnerFunction.AdditionalProperties;
+
+    /// <inheritdoc />
+    public override string ToString() => InnerFunction.ToString();
+
+    /// <inheritdoc />
+    protected override ValueTask<object?> InvokeCoreAsync(AIFunctionArguments arguments, CancellationToken cancellationToken) =>
+        InnerFunction.InvokeAsync(arguments, cancellationToken);
+}
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 79776b0ecb4..5e87edc01f9 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
@@ -1355,6 +1355,58 @@
         }
       ]
     },
+    {
+      "Type": "class Microsoft.Extensions.AI.DelegatingAIFunction : Microsoft.Extensions.AI.AIFunction",
+      "Stage": "Stable",
+      "Methods": [
+        {
+          "Member": "Microsoft.Extensions.AI.DelegatingAIFunction.DelegatingAIFunction(Microsoft.Extensions.AI.AIFunction innerFunction);",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Threading.Tasks.ValueTask<object?> Microsoft.Extensions.AI.DelegatingAIFunction.InvokeCoreAsync(Microsoft.Extensions.AI.AIFunctionArguments arguments, System.Threading.CancellationToken cancellationToken);",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override string Microsoft.Extensions.AI.DelegatingAIFunction.ToString();",
+          "Stage": "Experimental"
+        }
+      ],
+      "Properties": [
+        {
+          "Member": "Microsoft.Extensions.AI.AIFunction Microsoft.Extensions.AI.DelegatingAIFunction.InnerFunction { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Collections.Generic.IReadOnlyDictionary<string, object?> Microsoft.Extensions.AI.DelegatingAIFunction.AdditionalProperties { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override string Microsoft.Extensions.AI.DelegatingAIFunction.Description { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Text.Json.JsonElement Microsoft.Extensions.AI.DelegatingAIFunction.JsonSchema { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Text.Json.JsonSerializerOptions Microsoft.Extensions.AI.DelegatingAIFunction.JsonSerializerOptions { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override string Microsoft.Extensions.AI.DelegatingAIFunction.Name { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Text.Json.JsonElement? Microsoft.Extensions.AI.DelegatingAIFunction.ReturnJsonSchema { get; }",
+          "Stage": "Stable"
+        },
+        {
+          "Member": "override System.Reflection.MethodInfo? Microsoft.Extensions.AI.DelegatingAIFunction.UnderlyingMethod { get; }",
+          "Stage": "Stable"
+        }
+      ]
+    },
     {
       "Type": "class Microsoft.Extensions.AI.DelegatingChatClient : Microsoft.Extensions.AI.IChatClient, System.IDisposable",
       "Stage": "Stable",
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Functions/DelegatingAIFunctionTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Functions/DelegatingAIFunctionTests.cs
new file mode 100644
index 00000000000..cfad15efdc0
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Functions/DelegatingAIFunctionTests.cs
@@ -0,0 +1,92 @@
+// 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.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Extensions.AI;
+
+public class DelegatingAIFunctionTests
+{
+    [Fact]
+    public void Constructor_NullInnerFunction_ThrowsArgumentNullException()
+    {
+        Assert.Throws<ArgumentNullException>("innerFunction", () => new DerivedFunction(null!));
+    }
+
+    [Fact]
+    public void DefaultOverrides_DelegateToInnerFunction()
+    {
+        AIFunction expected = AIFunctionFactory.Create(() => 42);
+        DerivedFunction actual = new(expected);
+
+        Assert.Same(expected, actual.InnerFunction);
+        Assert.Equal(expected.Name, actual.Name);
+        Assert.Equal(expected.Description, actual.Description);
+        Assert.Equal(expected.JsonSchema, actual.JsonSchema);
+        Assert.Equal(expected.ReturnJsonSchema, actual.ReturnJsonSchema);
+        Assert.Same(expected.JsonSerializerOptions, actual.JsonSerializerOptions);
+        Assert.Same(expected.UnderlyingMethod, actual.UnderlyingMethod);
+        Assert.Same(expected.AdditionalProperties, actual.AdditionalProperties);
+        Assert.Equal(expected.ToString(), actual.ToString());
+    }
+
+    private sealed class DerivedFunction(AIFunction innerFunction) : DelegatingAIFunction(innerFunction)
+    {
+        public new AIFunction InnerFunction => base.InnerFunction;
+    }
+
+    [Fact]
+    public void Virtuals_AllOverridden()
+    {
+        Assert.All(typeof(DelegatingAIFunction).GetMembers(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance), m =>
+        {
+            switch (m)
+            {
+                case MethodInfo methodInfo when methodInfo.IsVirtual && methodInfo.Name is not ("Finalize" or "Equals" or "GetHashCode"):
+                    Assert.True(methodInfo.DeclaringType == typeof(DelegatingAIFunction), $"{methodInfo.Name} not overridden");
+                    break;
+
+                case PropertyInfo propertyInfo when propertyInfo.GetMethod?.IsVirtual is true:
+                    Assert.True(propertyInfo.DeclaringType == typeof(DelegatingAIFunction), $"{propertyInfo.Name} not overridden");
+                    break;
+            }
+        });
+    }
+
+    [Fact]
+    public async Task OverriddenInvocation_SuccessfullyInvoked()
+    {
+        bool innerInvoked = false;
+        AIFunction inner = AIFunctionFactory.Create(int () =>
+        {
+            innerInvoked = true;
+            throw new Exception("uh oh");
+        }, "TestFunction", "A test function for DelegatingAIFunction");
+
+        AIFunction actual = new OverridesInvocation(inner, (args, ct) => new ValueTask<object?>(84));
+
+        Assert.Equal(inner.Name, actual.Name);
+        Assert.Equal(inner.Description, actual.Description);
+        Assert.Equal(inner.JsonSchema, actual.JsonSchema);
+        Assert.Equal(inner.ReturnJsonSchema, actual.ReturnJsonSchema);
+        Assert.Same(inner.JsonSerializerOptions, actual.JsonSerializerOptions);
+        Assert.Same(inner.UnderlyingMethod, actual.UnderlyingMethod);
+        Assert.Same(inner.AdditionalProperties, actual.AdditionalProperties);
+        Assert.Equal(inner.ToString(), actual.ToString());
+
+        object? result = await actual.InvokeAsync(new(), CancellationToken.None);
+        Assert.Contains("84", result?.ToString());
+
+        Assert.False(innerInvoked);
+    }
+
+    private sealed class OverridesInvocation(AIFunction innerFunction, Func<AIFunctionArguments, CancellationToken, ValueTask<object?>> invokeAsync) : DelegatingAIFunction(innerFunction)
+    {
+        protected override ValueTask<object?> InvokeCoreAsync(AIFunctionArguments arguments, CancellationToken cancellationToken) =>
+            invokeAsync(arguments, cancellationToken);
+    }
+}

From 498c427539298e8e6105c8c67b1430d9eeed5cec Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Wed, 2 Jul 2025 12:06:38 -0400
Subject: [PATCH 03/13] Create a project template for an MCP server (#6547)

The conventions we're pushing for on NuGet are:

1. `PackAsTool`
2. `McpServer` package type (in addition to the default `DotnetTool`)
3. Embed server.json

This provides an `mcpserver` template as part of `Microsoft.Extensions.AI.Templates`. This currently only covers a local MCP server, with stdio transport.
---
 src/ProjectTemplates/GeneratedContent.targets |   8 ++
 .../Microsoft.Extensions.AI.Templates.csproj  |  10 ++
 .../McpServer-CSharp/.mcp/server.json         |  20 ++++
 .../.template.config/dotnetcli.host.json      |   7 ++
 .../.template.config/ide.host.json            |   6 ++
 .../.template.config/ide/icon.ico             | Bin 0 -> 38045 bytes
 .../.template.config/template.json            |  46 +++++++++
 .../McpServer-CSharp.csproj.in                |  32 ++++++
 .../src/McpServer/McpServer-CSharp/Program.cs |  16 +++
 .../src/McpServer/McpServer-CSharp/README.md  |  82 +++++++++++++++
 .../Tools/RandomNumberTools.cs                |  18 ++++
 .../McpServerSnapshotTests.cs                 |  95 ++++++++++++++++++
 .../mcpserver/.mcp/server.json                |  20 ++++
 .../mcpserver/Program.cs                      |  16 +++
 .../mcpserver/README.md                       |  82 +++++++++++++++
 .../mcpserver/Tools/RandomNumberTools.cs      |  18 ++++
 .../mcpserver/mcpserver.csproj                |  32 ++++++
 17 files changed, 508 insertions(+)
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide/icon.ico
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/template.json
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
 create mode 100644 src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/.mcp/server.json
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Program.cs
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
 create mode 100644 test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj

diff --git a/src/ProjectTemplates/GeneratedContent.targets b/src/ProjectTemplates/GeneratedContent.targets
index c3287408034..ce6ba2bc502 100644
--- a/src/ProjectTemplates/GeneratedContent.targets
+++ b/src/ProjectTemplates/GeneratedContent.targets
@@ -10,6 +10,7 @@
     <_LocalChatTemplateVariant>aspire</_LocalChatTemplateVariant>
 
     <_ChatWithCustomDataContentRoot>$(MSBuildThisFileDirectory)Microsoft.Extensions.AI.Templates\src\ChatWithCustomData\</_ChatWithCustomDataContentRoot>
+    <_McpServerContentRoot>$(MSBuildThisFileDirectory)Microsoft.Extensions.AI.Templates\src\McpServer\</_McpServerContentRoot>
   </PropertyGroup>
 
   <Target Name="ComputeGeneratedContentProperties">
@@ -34,9 +35,11 @@
       <TemplatePackageVersion_AzureIdentity>1.14.0</TemplatePackageVersion_AzureIdentity>
       <TemplatePackageVersion_AzureSearchDocuments>11.6.0</TemplatePackageVersion_AzureSearchDocuments>
       <TemplatePackageVersion_CommunityToolkitAspire>9.4.1-beta.291</TemplatePackageVersion_CommunityToolkitAspire>
+      <TemplatePackageVersion_MicrosoftExtensionsHosting>10.0.0-preview.5.25277.114</TemplatePackageVersion_MicrosoftExtensionsHosting>
       <TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery>9.3.0</TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery>
       <TemplatePackageVersion_MicrosoftSemanticKernel>1.53.0</TemplatePackageVersion_MicrosoftSemanticKernel>
       <TemplatePackageVersion_MicrosoftSemanticKernel_Preview>1.53.0-preview</TemplatePackageVersion_MicrosoftSemanticKernel_Preview>
+      <TemplatePackageVersion_ModelContextProtocol>0.3.0-preview.1</TemplatePackageVersion_ModelContextProtocol>
       <TemplatePackageVersion_OllamaSharp>5.1.18</TemplatePackageVersion_OllamaSharp>
       <TemplatePackageVersion_OpenTelemetry>1.12.0</TemplatePackageVersion_OpenTelemetry>
       <TemplatePackageVersion_PdfPig>0.1.10</TemplatePackageVersion_PdfPig>
@@ -64,9 +67,11 @@
         TemplatePackageVersion_AzureIdentity=$(TemplatePackageVersion_AzureIdentity);
         TemplatePackageVersion_AzureSearchDocuments=$(TemplatePackageVersion_AzureSearchDocuments);
         TemplatePackageVersion_CommunityToolkitAspire=$(TemplatePackageVersion_CommunityToolkitAspire);
+        TemplatePackageVersion_MicrosoftExtensionsHosting=$(TemplatePackageVersion_MicrosoftExtensionsHosting);
         TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery=$(TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery);
         TemplatePackageVersion_MicrosoftSemanticKernel=$(TemplatePackageVersion_MicrosoftSemanticKernel);
         TemplatePackageVersion_MicrosoftSemanticKernel_Preview=$(TemplatePackageVersion_MicrosoftSemanticKernel_Preview);
+        TemplatePackageVersion_ModelContextProtocol=$(TemplatePackageVersion_ModelContextProtocol);
         TemplatePackageVersion_OllamaSharp=$(TemplatePackageVersion_OllamaSharp);
         TemplatePackageVersion_OpenTelemetry=$(TemplatePackageVersion_OpenTelemetry);
         TemplatePackageVersion_PdfPig=$(TemplatePackageVersion_PdfPig);
@@ -100,6 +105,9 @@
       <GeneratedContent
         Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.ServiceDefaults\ChatWithCustomData-CSharp.ServiceDefaults.csproj.in"
         OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.ServiceDefaults\ChatWithCustomData-CSharp.ServiceDefaults.csproj" />
+      <GeneratedContent
+        Include="$(_McpServerContentRoot)McpServer-CSharp\McpServer-CSharp.csproj.in"
+        OutputPath="$(_McpServerContentRoot)McpServer-CSharp\McpServer-CSharp.csproj" />
 
       <!-- The following content only gets generated when using just-built packages -->
       <_GeneratedContentEnablingJustBuiltPackages
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj
index 2827734c794..7784747028e 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj
@@ -61,6 +61,16 @@
         **\NuGet.config;
         **\Directory.Build.targets;
         **\Directory.Build.props;" />
+
+    <!-- Keep the exclude patterns below in sync with those in McpServerSnapshotTests.cs -->
+    <Content
+      Include="src\McpServer\**\*"
+      Exclude="
+        **\bin\**;
+        **\obj\**;
+        **\.vs\**;
+        **\*.sln;
+        **\*.in;" />
     <None Include="THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="." />
     <Compile Remove="**\*" />
   </ItemGroup>
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json
new file mode 100644
index 00000000000..d4b9d0edf5b
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json
@@ -0,0 +1,20 @@
+{
+  "description": "<your description here>",
+  "name": "io.github.<your GitHub username here>/<your repo name>",
+  "packages": [
+    {
+      "registry_name": "nuget",
+      "name": "<your package ID here>",
+      "version": "0.1.0-beta",
+      "package_arguments": [],
+      "environment_variables": []
+    }
+  ],
+  "repository": {
+    "url": "https://github.com/<your GitHub username here>/<your repo name>",
+    "source": "github"
+  },
+  "version_detail": {
+    "version": "0.1.0-beta"
+  }
+}
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json
new file mode 100644
index 00000000000..5be51dd6357
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {},
+  "usageExamples": [
+    ""
+  ]
+}
\ No newline at end of file
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json
new file mode 100644
index 00000000000..5edf447bbd4
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json.schemastore.org/ide.host",
+  "order": 0,
+  "icon": "ide/icon.ico",
+  "symbolInfo": []
+}
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide/icon.ico b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..954709ffd6b9d360fbc0b121a63a29657e0fe768
GIT binary patch
literal 38045
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
A&j0`b

literal 0
HcmV?d00001

diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/template.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/template.json
new file mode 100644
index 00000000000..1fdc9128e81
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/template.json
@@ -0,0 +1,46 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Microsoft",
+  "classifications": [
+    "Common",
+    "AI",
+    "MCP"
+  ],
+  "identity": "Microsoft.Extensions.AI.Templates.McpServer.CSharp",
+  "name": "Local MCP Server Console App",
+  "description": "A project template for creating a Model Context Protocol (MCP) server using C# and the ModelContextProtocol package.",
+  "shortName": "mcpserver",
+  "defaultName": "McpServer",
+  "sourceName": "McpServer-CSharp",
+  "preferNameDirectory": true,
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "symbols": {
+    "hostIdentifier": {
+      "type": "bind",
+      "binding": "HostIdentifier"
+    }
+  },
+  "primaryOutputs": [
+    {
+      "path": "./README.md"
+    },
+    {
+      "path": "./McpServer-CSharp.csproj"
+    }
+  ],
+  "postActions": [
+    {
+      "condition": "(hostIdentifier != \"dotnetcli\" && hostIdentifier != \"dotnetcli-preview\")",
+      "description": "Opens README file in the editor",
+      "manualInstructions": [],
+      "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6",
+      "args": {
+        "files": "0"
+      },
+      "continueOnError": true
+    }
+  ]
+}
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in
new file mode 100644
index 00000000000..d47952229d9
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <!-- Set up the NuGet package to be an MCP server -->
+    <PackAsTool>true</PackAsTool>
+    <PackageType>McpServer</PackageType>
+
+    <!-- Set recommended package metadata -->
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageId>SampleMcpServer</PackageId>
+    <PackageVersion>0.1.0-beta</PackageVersion>
+    <PackageTags>AI; MCP; server; stdio</PackageTags>
+    <Description>An MCP server using the MCP C# SDK.</Description>
+  </PropertyGroup>
+
+  <!-- Include additional files for browsing the MCP server. -->
+  <ItemGroup>
+    <None Include=".mcp\server.json" Pack="true" PackagePath="/.mcp/" />
+    <None Include="README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="${TemplatePackageVersion_MicrosoftExtensionsHosting}" />
+    <PackageReference Include="ModelContextProtocol" Version="${TemplatePackageVersion_ModelContextProtocol}" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs
new file mode 100644
index 00000000000..f320c93fd88
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+var builder = Host.CreateApplicationBuilder(args);
+
+// Configure all logs to go to stderr (stdout is used for the MCP protocol messages).
+builder.Logging.AddConsole(o => o.LogToStandardErrorThreshold = LogLevel.Trace);
+
+// Add the MCP services: the transport to use (stdio) and the tools to register.
+builder.Services
+    .AddMcpServer()
+    .WithStdioServerTransport()
+    .WithTools<RandomNumberTools>();
+
+await builder.Build().RunAsync();
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
new file mode 100644
index 00000000000..dc6f5038b61
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
@@ -0,0 +1,82 @@
+# MCP Server
+
+This README was created using the C# MCP server template project. It demonstrates how you can easily create an MCP server using C# and then package it in a NuGet package.
+
+See [aka.ms/nuget/mcp/guide](https://aka.ms/nuget/mcp/guide) for the full guide.
+
+## Checklist before publishing to NuGet.org
+
+- Test the MCP server locally using the steps below.
+- Update the package metadata in the .csproj file, in particular the `<PackageId>`.
+- Update `.mcp/server.json` to declare your MCP server's inputs.
+  - See [configuring inputs](https://aka.ms/nuget/mcp/guide/configuring-inputs) for more details.
+- Pack the project using `dotnet pack`.
+
+The `bin/Release` directory will contain the package file (.nupkg), which can be [published to NuGet.org](https://learn.microsoft.com/nuget/nuget-org/publish-a-package).
+
+## Using the MCP Server in VS Code
+
+Once the MCP server package is published to NuGet.org, you can use the following VS Code user configuration to download and install the MCP server package. See [Use MCP servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers) for more information about using MCP servers in VS Code.
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "McpServer-CSharp": {
+        "type": "stdio",
+        "command": "dotnet",
+        "args": [
+          "tool",
+          "exec",
+          "<your package ID here>",
+          "--version",
+          "<your package version here>",
+          "--yes"
+        ]
+      }
+    }
+  }
+}
+```
+
+Now you can ask Copilot Chat for a random number, for example, `Give me 3 random numbers`. It should prompt you to use the `get_random_number` tool on the `McpServer-CSharp` MCP server and show you the results.
+
+## Developing locally in VS Code
+
+To test this MCP server from source code (locally) without using a built MCP server package, create a `.vscode/mcp.json` file (a VS Code workspace settings file) in your project directory and add the following configuration:
+
+```json
+{
+  "servers": {
+    "McpServer-CSharp": {
+      "type": "stdio",
+      "command": "dotnet",
+      "args": [
+        "run",
+        "--project",
+        "<RELATIVE PATH TO PROJECT DIRECTORY>"
+      ]
+    }
+  }
+}
+```
+
+Alternatively, you can configure your VS Code user settings to use your local project:
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "McpServer-CSharp": {
+        "type": "stdio",
+        "command": "dotnet",
+        "args": [
+          "run",
+          "--project",
+          "<FULL PATH TO PROJECT DIRECTORY>"
+        ]
+      }
+    }
+  }
+}
+```
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
new file mode 100644
index 00000000000..4542f8505a5
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel;
+using ModelContextProtocol.Server;
+
+/// <summary>
+/// Sample MCP tools for demonstration purposes.
+/// These tools can be invoked by MCP clients to perform various operations.
+/// </summary>
+internal class RandomNumberTools
+{
+    [McpServerTool(Name = "get_random_number")]
+    [Description("Generates a random number between the specified minimum and maximum values.")]
+    public int GetRandomNumber(
+        [Description("Minimum value (inclusive)")] int min = 0,
+        [Description("Maximum value (exclusive)")] int max = 100)
+    {
+        return Random.Shared.Next(min, max);
+    }
+}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs
new file mode 100644
index 00000000000..a3f3dedd1b5
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs
@@ -0,0 +1,95 @@
+// 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.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.AI.Templates.Tests;
+using Microsoft.Extensions.Logging;
+using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
+using Microsoft.TemplateEngine.TestHelper;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.AI.Templates.Tests;
+
+public class McpServerSnapshotTests
+{
+    // Keep the exclude patterns below in sync with those in Microsoft.Extensions.AI.Templates.csproj.
+    private static readonly string[] _verificationExcludePatterns = [
+        "**/bin/**",
+        "**/obj/**",
+        "**/.vs/**",
+        "**/*.sln",
+        "**/*.in",
+    ];
+
+    private readonly ILogger _log;
+
+    public McpServerSnapshotTests(ITestOutputHelper log)
+    {
+#pragma warning disable CA2000 // Dispose objects before losing scope
+        _log = new XunitLoggerProvider(log).CreateLogger("TestRun");
+#pragma warning restore CA2000 // Dispose objects before losing scope
+    }
+
+    [Fact]
+    public async Task BasicTest()
+    {
+        await TestTemplateCoreAsync(scenarioName: "Basic");
+    }
+
+    private async Task TestTemplateCoreAsync(string scenarioName, IEnumerable<string>? templateArgs = null)
+    {
+        string workingDir = TestUtils.CreateTemporaryFolder();
+        string templateShortName = "mcpserver";
+
+        // Get the template location
+        string templateLocation = Path.Combine(WellKnownPaths.TemplateFeedLocation, "Microsoft.Extensions.AI.Templates", "src", "McpServer");
+
+        var verificationExcludePatterns = Path.DirectorySeparatorChar is '/'
+            ? _verificationExcludePatterns
+            : _verificationExcludePatterns.Select(p => p.Replace('/', Path.DirectorySeparatorChar)).ToArray();
+
+        TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName)
+        {
+            TemplatePath = templateLocation,
+            TemplateSpecificArgs = templateArgs,
+            SnapshotsDirectory = "Snapshots",
+            OutputDirectory = workingDir,
+            DoNotPrependCallerMethodNameToScenarioName = true,
+            DoNotAppendTemplateArgsToScenarioName = true,
+            ScenarioName = scenarioName,
+            VerificationExcludePatterns = verificationExcludePatterns,
+        }
+        .WithCustomScrubbers(
+            ScrubbersDefinition.Empty.AddScrubber((path, content) =>
+            {
+                string filePath = path.UnixifyDirSeparators();
+
+                if (filePath.EndsWith(".csproj"))
+                {
+                    // Scrub references to just-built packages and remove the suffix, if it exists.
+                    // This allows the snapshots to remain the same regardless of where the repo is built (e.g., locally, public CI, internal CI).
+                    var pattern = @"(?<=<PackageReference\s+Include=""Microsoft\.Extensions\..*""\s+Version="")(\d+\.\d+\.\d+)(?:-[^""]*)?(?=""\s*/>)";
+                    content.ScrubByRegex(pattern, replacement: "$1");
+                }
+            }));
+
+        VerificationEngine engine = new VerificationEngine(_log);
+        await engine.Execute(options);
+
+#pragma warning disable CA1031 // Do not catch general exception types
+        try
+        {
+            Directory.Delete(workingDir, recursive: true);
+        }
+        catch
+        {
+            /* don't care */
+        }
+#pragma warning restore CA1031 // Do not catch general exception types
+    }
+}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/.mcp/server.json b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/.mcp/server.json
new file mode 100644
index 00000000000..ab997541e52
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/.mcp/server.json
@@ -0,0 +1,20 @@
+{
+  "description": "<your description here>",
+  "name": "io.github.<your GitHub username here>/<your repo name>",
+  "packages": [
+    {
+      "registry_name": "nuget",
+      "name": "<your package ID here>",
+      "version": "0.1.0-beta",
+      "package_arguments": [],
+      "environment_variables": []
+    }
+  ],
+  "repository": {
+    "url": "https://github.com/<your GitHub username here>/<your repo name>",
+    "source": "github"
+  },
+  "version_detail": {
+    "version": "0.1.0-beta"
+  }
+}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Program.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Program.cs
new file mode 100644
index 00000000000..73b72d35a46
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Program.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+var builder = Host.CreateApplicationBuilder(args);
+
+// Configure all logs to go to stderr (stdout is used for the MCP protocol messages).
+builder.Logging.AddConsole(o => o.LogToStandardErrorThreshold = LogLevel.Trace);
+
+// Add the MCP services: the transport to use (stdio) and the tools to register.
+builder.Services
+    .AddMcpServer()
+    .WithStdioServerTransport()
+    .WithTools<RandomNumberTools>();
+
+await builder.Build().RunAsync();
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
new file mode 100644
index 00000000000..25704e5d135
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
@@ -0,0 +1,82 @@
+# MCP Server
+
+This README was created using the C# MCP server template project. It demonstrates how you can easily create an MCP server using C# and then package it in a NuGet package.
+
+See [aka.ms/nuget/mcp/guide](https://aka.ms/nuget/mcp/guide) for the full guide.
+
+## Checklist before publishing to NuGet.org
+
+- Test the MCP server locally using the steps below.
+- Update the package metadata in the .csproj file, in particular the `<PackageId>`.
+- Update `.mcp/server.json` to declare your MCP server's inputs.
+  - See [configuring inputs](https://aka.ms/nuget/mcp/guide/configuring-inputs) for more details.
+- Pack the project using `dotnet pack`.
+
+The `bin/Release` directory will contain the package file (.nupkg), which can be [published to NuGet.org](https://learn.microsoft.com/nuget/nuget-org/publish-a-package).
+
+## Using the MCP Server in VS Code
+
+Once the MCP server package is published to NuGet.org, you can use the following VS Code user configuration to download and install the MCP server package. See [Use MCP servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers) for more information about using MCP servers in VS Code.
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "mcpserver": {
+        "type": "stdio",
+        "command": "dotnet",
+        "args": [
+          "tool",
+          "exec",
+          "<your package ID here>",
+          "--version",
+          "<your package version here>",
+          "--yes"
+        ]
+      }
+    }
+  }
+}
+```
+
+Now you can ask Copilot Chat for a random number, for example, `Give me 3 random numbers`. It should prompt you to use the `get_random_number` tool on the `mcpserver` MCP server and show you the results.
+
+## Developing locally in VS Code
+
+To test this MCP server from source code (locally) without using a built MCP server package, create a `.vscode/mcp.json` file (a VS Code workspace settings file) in your project directory and add the following configuration:
+
+```json
+{
+  "servers": {
+    "mcpserver": {
+      "type": "stdio",
+      "command": "dotnet",
+      "args": [
+        "run",
+        "--project",
+        "<RELATIVE PATH TO PROJECT DIRECTORY>"
+      ]
+    }
+  }
+}
+```
+
+Alternatively, you can configure your VS Code user settings to use your local project:
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "mcpserver": {
+        "type": "stdio",
+        "command": "dotnet",
+        "args": [
+          "run",
+          "--project",
+          "<FULL PATH TO PROJECT DIRECTORY>"
+        ]
+      }
+    }
+  }
+}
+```
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
new file mode 100644
index 00000000000..72af767e320
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel;
+using ModelContextProtocol.Server;
+
+/// <summary>
+/// Sample MCP tools for demonstration purposes.
+/// These tools can be invoked by MCP clients to perform various operations.
+/// </summary>
+internal class RandomNumberTools
+{
+    [McpServerTool(Name = "get_random_number")]
+    [Description("Generates a random number between the specified minimum and maximum values.")]
+    public int GetRandomNumber(
+        [Description("Minimum value (inclusive)")] int min = 0,
+        [Description("Maximum value (exclusive)")] int max = 100)
+    {
+        return Random.Shared.Next(min, max);
+    }
+}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj
new file mode 100644
index 00000000000..a71ac148e6f
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <!-- Set up the NuGet package to be an MCP server -->
+    <PackAsTool>true</PackAsTool>
+    <PackageType>McpServer</PackageType>
+
+    <!-- Set recommended package metadata -->
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageId>SampleMcpServer</PackageId>
+    <PackageVersion>0.1.0-beta</PackageVersion>
+    <PackageTags>AI; MCP; server; stdio</PackageTags>
+    <Description>An MCP server using the MCP C# SDK.</Description>
+  </PropertyGroup>
+
+  <!-- Include additional files for browsing the MCP server. -->
+  <ItemGroup>
+    <None Include=".mcp\server.json" Pack="true" PackagePath="/.mcp/" />
+    <None Include="README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+    <PackageReference Include="ModelContextProtocol" Version="0.3.0-preview.1" />
+  </ItemGroup>
+
+</Project>

From 7780060c1f13f9c2fd35a68ac486d7d4f74ca7c4 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 2 Jul 2025 13:27:21 -0400
Subject: [PATCH 04/13] Add FunctionInvokingChatClient.FunctionInvoker delegate
 (#6564)

We've had a bunch of requests to be able to customize how function invocation is handled, and while it's already possible today by deriving from FunctionInvokingChatClient and overriding its InvokeFunctionAsync, there's a lot of ceremony involved in that. By having a property on the client instance, that behavior can instead be configured as part of a UseFunctionInvocation call.
---
 .../FunctionInvokingChatClient.cs             | 13 +++-
 .../Microsoft.Extensions.AI.json              |  4 +
 .../FunctionInvokingChatClientTests.cs        | 73 +++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
index 293ff1d98f1..6b1d3b3e905 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
@@ -205,6 +205,15 @@ public int MaximumConsecutiveErrorsPerRequest
         set => _maximumConsecutiveErrorsPerRequest = Throw.IfLessThan(value, 0);
     }
 
+    /// <summary>Gets or sets a delegate used to invoke <see cref="AIFunction"/> instances.</summary>
+    /// <remarks>
+    /// By default, the protected <see cref="InvokeFunctionAsync"/> method is called for each <see cref="AIFunction"/> to be invoked,
+    /// invoking the instance and returning its result. If this delegate is set to a non-<see langword="null"/> value,
+    /// <see cref="InvokeFunctionAsync"/> will replace its normal invocation with a call to this delegate, enabling
+    /// this delegate to assume all invocation handling of the function.
+    /// </remarks>
+    public Func<FunctionInvocationContext, CancellationToken, ValueTask<object?>>? FunctionInvoker { get; set; }
+
     /// <inheritdoc/>
     public override async Task<ChatResponse> GetResponseAsync(
         IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default)
@@ -872,7 +881,9 @@ FunctionResultContent CreateFunctionResultContent(FunctionInvocationResult resul
     {
         _ = Throw.IfNull(context);
 
-        return context.Function.InvokeAsync(context.Arguments, cancellationToken);
+        return FunctionInvoker is { } invoker ?
+            invoker(context, cancellationToken) :
+            context.Function.InvokeAsync(context.Arguments, cancellationToken);
     }
 
     private static TimeSpan GetElapsedTime(long startingTimestamp) =>
diff --git a/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.json b/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.json
index 4f4317c9978..59ed3d32fab 100644
--- a/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.json
+++ b/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.json
@@ -527,6 +527,10 @@
           "Member": "System.IServiceProvider? Microsoft.Extensions.AI.FunctionInvokingChatClient.FunctionInvocationServices { get; }",
           "Stage": "Stable"
         },
+        {
+          "Member": "System.Func<Microsoft.Extensions.AI.FunctionInvocationContext, System.Threading.CancellationToken, System.Threading.Tasks.ValueTask<object?>>? Microsoft.Extensions.AI.FunctionInvokingChatClient.FunctionInvoker { get; set; }",
+          "Stage": "Stable"
+        },
         {
           "Member": "bool Microsoft.Extensions.AI.FunctionInvokingChatClient.IncludeDetailedErrors { get; set; }",
           "Stage": "Stable"
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
index 26554946dca..1379cef8bf0 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -37,6 +38,35 @@ public void Ctor_HasExpectedDefaults()
         Assert.False(client.IncludeDetailedErrors);
         Assert.Equal(10, client.MaximumIterationsPerRequest);
         Assert.Equal(3, client.MaximumConsecutiveErrorsPerRequest);
+        Assert.Null(client.FunctionInvoker);
+    }
+
+    [Fact]
+    public void Properties_Roundtrip()
+    {
+        using TestChatClient innerClient = new();
+        using FunctionInvokingChatClient client = new(innerClient);
+
+        Assert.False(client.AllowConcurrentInvocation);
+        client.AllowConcurrentInvocation = true;
+        Assert.True(client.AllowConcurrentInvocation);
+
+        Assert.False(client.IncludeDetailedErrors);
+        client.IncludeDetailedErrors = true;
+        Assert.True(client.IncludeDetailedErrors);
+
+        Assert.Equal(10, client.MaximumIterationsPerRequest);
+        client.MaximumIterationsPerRequest = 5;
+        Assert.Equal(5, client.MaximumIterationsPerRequest);
+
+        Assert.Equal(3, client.MaximumConsecutiveErrorsPerRequest);
+        client.MaximumConsecutiveErrorsPerRequest = 1;
+        Assert.Equal(1, client.MaximumConsecutiveErrorsPerRequest);
+
+        Assert.Null(client.FunctionInvoker);
+        Func<FunctionInvocationContext, CancellationToken, ValueTask<object?>> invoker = (ctx, ct) => new ValueTask<object?>("test");
+        client.FunctionInvoker = invoker;
+        Assert.Same(invoker, client.FunctionInvoker);
     }
 
     [Fact]
@@ -208,6 +238,49 @@ public async Task ConcurrentInvocationOfParallelCallsDisabledByDefaultAsync()
         await InvokeAndAssertStreamingAsync(options, plan);
     }
 
+    [Fact]
+    public async Task FunctionInvokerDelegateOverridesHandlingAsync()
+    {
+        var options = new ChatOptions
+        {
+            Tools =
+            [
+                AIFunctionFactory.Create(() => "Result 1", "Func1"),
+                AIFunctionFactory.Create((int i) => $"Result 2: {i}", "Func2"),
+                AIFunctionFactory.Create((int i) => { }, "VoidReturn"),
+            ]
+        };
+
+        List<ChatMessage> plan =
+        [
+            new ChatMessage(ChatRole.User, "hello"),
+            new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1")]),
+            new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId1", result: "Result 1 from delegate")]),
+            new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
+            new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId2", result: "Result 2: 42 from delegate")]),
+            new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId3", "VoidReturn", arguments: new Dictionary<string, object?> { { "i", 43 } })]),
+            new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId3", result: "Success: Function completed.")]),
+            new ChatMessage(ChatRole.Assistant, "world"),
+        ];
+
+        Func<ChatClientBuilder, ChatClientBuilder> configure = b => b.Use(
+            s => new FunctionInvokingChatClient(s)
+            {
+                FunctionInvoker = async (ctx, cancellationToken) =>
+                {
+                    Assert.NotNull(ctx);
+                    var result = await ctx.Function.InvokeAsync(ctx.Arguments, cancellationToken);
+                    return result is JsonElement e ?
+                        JsonSerializer.SerializeToElement($"{e.GetString()} from delegate", AIJsonUtilities.DefaultOptions) :
+                        result;
+                }
+            });
+
+        await InvokeAndAssertAsync(options, plan, configurePipeline: configure);
+
+        await InvokeAndAssertStreamingAsync(options, plan, configurePipeline: configure);
+    }
+
     [Fact]
     public async Task ContinuesWithSuccessfulCallsUntilMaximumIterations()
     {

From 1a35757910d32601a458c1749de71164138e87ac Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Wed, 2 Jul 2025 13:28:50 -0400
Subject: [PATCH 05/13] Use dnx instead of dotnet tool exec in template README
 (#6571)

---
 .../src/McpServer/McpServer-CSharp/README.md                  | 4 +---
 .../Snapshots/mcpserver.Basic.verified/mcpserver/README.md    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
index dc6f5038b61..50091888ad8 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
@@ -24,10 +24,8 @@ Once the MCP server package is published to NuGet.org, you can use the following
     "servers": {
       "McpServer-CSharp": {
         "type": "stdio",
-        "command": "dotnet",
+        "command": "dnx",
         "args": [
-          "tool",
-          "exec",
           "<your package ID here>",
           "--version",
           "<your package version here>",
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
index 25704e5d135..5c00a3bf669 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/README.md
@@ -24,10 +24,8 @@ Once the MCP server package is published to NuGet.org, you can use the following
     "servers": {
       "mcpserver": {
         "type": "stdio",
-        "command": "dotnet",
+        "command": "dnx",
         "args": [
-          "tool",
-          "exec",
           "<your package ID here>",
           "--version",
           "<your package version here>",

From 93b8616aa132856df0e31cc3b996de7c10e25c37 Mon Sep 17 00:00:00 2001
From: Peter Waldschmidt <pewaldsc@microsoft.com>
Date: Wed, 2 Jul 2025 17:15:40 -0400
Subject: [PATCH 06/13] Add reporting tests that show NLP results. (#6574)

* Add reporting tests that show NLP results.

* Cleanup analyzer errors.

* Add global tags for NLP

* Add more precision to the evaluator timing

* More tags

* Add another partial match test
---
 .../BLEUEvaluator.cs                          |   2 +-
 .../F1Evaluator.cs                            |   2 +-
 .../GLEUEvaluator.cs                          |   2 +-
 .../EvaluationMetricExtensions.cs             |   2 +-
 ...ons.AI.Evaluation.Integration.Tests.csproj |   1 +
 .../NLPEvaluatorTests.cs                      | 162 ++++++++++++++++++
 6 files changed, 167 insertions(+), 4 deletions(-)
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/NLPEvaluatorTests.cs

diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/BLEUEvaluator.cs b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/BLEUEvaluator.cs
index e1419bd630e..f3030ec7cfb 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/BLEUEvaluator.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/BLEUEvaluator.cs
@@ -86,7 +86,7 @@ public ValueTask<EvaluationResult> EvaluateAsync(
         });
 
         metric.Value = score;
-        string durationText = $"{duration.TotalSeconds.ToString("F2", CultureInfo.InvariantCulture)} s";
+        string durationText = $"{duration.TotalSeconds.ToString("F4", CultureInfo.InvariantCulture)} s";
         metric.AddOrUpdateMetadata(name: "evaluation-duration", value: durationText);
         metric.AddOrUpdateContext(context);
         metric.Interpretation = metric.Interpret();
diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/F1Evaluator.cs b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/F1Evaluator.cs
index b0806be6d66..e070577c448 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/F1Evaluator.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/F1Evaluator.cs
@@ -77,7 +77,7 @@ public ValueTask<EvaluationResult> EvaluateAsync(
         });
 
         metric.Value = score;
-        string durationText = $"{duration.TotalSeconds.ToString("F2", CultureInfo.InvariantCulture)} s";
+        string durationText = $"{duration.TotalSeconds.ToString("F4", CultureInfo.InvariantCulture)} s";
         metric.AddOrUpdateMetadata(name: "evaluation-duration", value: durationText);
         metric.AddOrUpdateContext(context);
         metric.Interpretation = metric.Interpret();
diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/GLEUEvaluator.cs b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/GLEUEvaluator.cs
index 0c9805ee108..60df30879a4 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/GLEUEvaluator.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.NLP/GLEUEvaluator.cs
@@ -86,7 +86,7 @@ public ValueTask<EvaluationResult> EvaluateAsync(
         });
 
         metric.Value = score;
-        string durationText = $"{duration.TotalSeconds.ToString("F2", CultureInfo.InvariantCulture)} s";
+        string durationText = $"{duration.TotalSeconds.ToString("F4", CultureInfo.InvariantCulture)} s";
         metric.AddOrUpdateMetadata(name: "evaluation-duration", value: durationText);
         metric.AddOrUpdateContext(context);
         metric.Interpretation = metric.Interpret();
diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation/EvaluationMetricExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.Evaluation/EvaluationMetricExtensions.cs
index d3012030cec..534f5e300f7 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Evaluation/EvaluationMetricExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation/EvaluationMetricExtensions.cs
@@ -177,7 +177,7 @@ public static void AddOrUpdateChatMetadata(
 
         if (duration is not null)
         {
-            string durationText = $"{duration.Value.TotalSeconds.ToString("F2", CultureInfo.InvariantCulture)} s";
+            string durationText = $"{duration.Value.TotalSeconds.ToString("F4", CultureInfo.InvariantCulture)} s";
             metric.AddOrUpdateMetadata(name: "evaluation-duration", value: durationText);
         }
     }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Microsoft.Extensions.AI.Evaluation.Integration.Tests.csproj b/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Microsoft.Extensions.AI.Evaluation.Integration.Tests.csproj
index c08667ff421..6e3332ebca6 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Microsoft.Extensions.AI.Evaluation.Integration.Tests.csproj
+++ b/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Microsoft.Extensions.AI.Evaluation.Integration.Tests.csproj
@@ -28,6 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.AI.Evaluation.NLP\Microsoft.Extensions.AI.Evaluation.NLP.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.AI.OpenAI\Microsoft.Extensions.AI.OpenAI.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.AI.Evaluation\Microsoft.Extensions.AI.Evaluation.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.AI.Evaluation.Quality\Microsoft.Extensions.AI.Evaluation.Quality.csproj" />
diff --git a/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/NLPEvaluatorTests.cs b/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/NLPEvaluatorTests.cs
new file mode 100644
index 00000000000..a4f3b75045a
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/NLPEvaluatorTests.cs
@@ -0,0 +1,162 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#pragma warning disable CA2016 // Forward the 'CancellationToken' parameter to methods that take it.
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.AI.Evaluation.NLP;
+using Microsoft.Extensions.AI.Evaluation.Reporting;
+using Microsoft.Extensions.AI.Evaluation.Reporting.Storage;
+using Microsoft.TestUtilities;
+using Xunit;
+
+namespace Microsoft.Extensions.AI.Evaluation.Integration.Tests;
+
+[Experimental("AIEVAL001")]
+public class NLPEvaluatorTests
+{
+    private static readonly ReportingConfiguration? _nlpReportingConfiguration;
+
+    static NLPEvaluatorTests()
+    {
+        if (Settings.Current.Configured)
+        {
+            string version = $"Product Version: {Constants.Version}";
+            string date = $"Date: {DateTime.UtcNow:dddd, dd MMMM yyyy}";
+            string projectName = $"Project: Integration Tests";
+            string testClass = $"Test Class: {nameof(NLPEvaluatorTests)}";
+            string usesContext = $"Feature: Context";
+
+            IEvaluator bleuEvaluator = new BLEUEvaluator();
+            IEvaluator gleuEvaluator = new GLEUEvaluator();
+            IEvaluator f1Evaluator = new F1Evaluator();
+
+            _nlpReportingConfiguration =
+                DiskBasedReportingConfiguration.Create(
+                    storageRootPath: Settings.Current.StorageRootPath,
+                    evaluators: [bleuEvaluator, gleuEvaluator, f1Evaluator],
+                    executionName: Constants.Version,
+                    tags: [version, date, projectName, testClass, usesContext]);
+        }
+    }
+
+    [ConditionalFact]
+    public async Task ExactMatch()
+    {
+        SkipIfNotConfigured();
+
+        await using ScenarioRun scenarioRun =
+            await _nlpReportingConfiguration.CreateScenarioRunAsync(
+                scenarioName: $"Microsoft.Extensions.AI.Evaluation.Integration.Tests.{nameof(NLPEvaluatorTests)}.{nameof(ExactMatch)}");
+
+        var referenceText = "The quick brown fox jumps over the lazy dog.";
+        var bleuContext = new BLEUEvaluatorContext(referenceText);
+        var gleuContext = new GLEUEvaluatorContext(referenceText);
+        var f1Context = new F1EvaluatorContext(referenceText);
+
+        EvaluationResult result = await scenarioRun.EvaluateAsync(referenceText, [bleuContext, gleuContext, f1Context]);
+
+        Assert.False(
+            result.ContainsDiagnostics(d => d.Severity >= EvaluationDiagnosticSeverity.Warning),
+            string.Join("\r\n\r\n", result.Metrics.Values.SelectMany(m => m.Diagnostics ?? []).Select(d => d.ToString())));
+
+        Assert.Equal(3, result.Metrics.Count);
+        Assert.True(result.TryGet(BLEUEvaluator.BLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(GLEUEvaluator.GLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(F1Evaluator.F1MetricName, out NumericMetric? _));
+    }
+
+    [ConditionalFact]
+    public async Task PartialMatch()
+    {
+        SkipIfNotConfigured();
+
+        await using ScenarioRun scenarioRun =
+            await _nlpReportingConfiguration.CreateScenarioRunAsync(
+                scenarioName: $"Microsoft.Extensions.AI.Evaluation.Integration.Tests.{nameof(NLPEvaluatorTests)}.{nameof(PartialMatch)}");
+
+        var referenceText = "The quick brown fox jumps over the lazy dog.";
+        var bleuContext = new BLEUEvaluatorContext(referenceText);
+        var gleuContext = new GLEUEvaluatorContext(referenceText);
+        var f1Context = new F1EvaluatorContext(referenceText);
+
+        var similarText = "The brown fox quickly jumps over a lazy dog.";
+        EvaluationResult result = await scenarioRun.EvaluateAsync(similarText, [bleuContext, gleuContext, f1Context]);
+
+        Assert.False(
+            result.ContainsDiagnostics(d => d.Severity >= EvaluationDiagnosticSeverity.Warning),
+            string.Join("\r\n\r\n", result.Metrics.Values.SelectMany(m => m.Diagnostics ?? []).Select(d => d.ToString())));
+
+        Assert.Equal(3, result.Metrics.Count);
+        Assert.True(result.TryGet(BLEUEvaluator.BLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(GLEUEvaluator.GLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(F1Evaluator.F1MetricName, out NumericMetric? _));
+    }
+
+    [ConditionalFact]
+    public async Task Unmatched()
+    {
+        SkipIfNotConfigured();
+
+        await using ScenarioRun scenarioRun =
+            await _nlpReportingConfiguration.CreateScenarioRunAsync(
+                scenarioName: $"Microsoft.Extensions.AI.Evaluation.Integration.Tests.{nameof(NLPEvaluatorTests)}.{nameof(Unmatched)}");
+
+        var referenceText = "The quick brown fox jumps over the lazy dog.";
+        var bleuContext = new BLEUEvaluatorContext(referenceText);
+        var gleuContext = new GLEUEvaluatorContext(referenceText);
+        var f1Context = new F1EvaluatorContext(referenceText);
+
+        EvaluationResult result = await scenarioRun.EvaluateAsync("What is life's meaning?", [bleuContext, gleuContext, f1Context]);
+
+        Assert.False(
+            result.ContainsDiagnostics(d => d.Severity >= EvaluationDiagnosticSeverity.Warning),
+            string.Join("\r\n\r\n", result.Metrics.Values.SelectMany(m => m.Diagnostics ?? []).Select(d => d.ToString())));
+
+        Assert.Equal(3, result.Metrics.Count);
+        Assert.True(result.TryGet(BLEUEvaluator.BLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(GLEUEvaluator.GLEUMetricName, out NumericMetric? _));
+        Assert.True(result.TryGet(F1Evaluator.F1MetricName, out NumericMetric? _));
+    }
+
+    [ConditionalFact]
+    public async Task AdditionalContextIsNotPassed()
+    {
+        SkipIfNotConfigured();
+
+        await using ScenarioRun scenarioRun =
+            await _nlpReportingConfiguration.CreateScenarioRunAsync(
+                scenarioName: $"Microsoft.Extensions.AI.Evaluation.Integration.Tests.{nameof(NLPEvaluatorTests)}.{nameof(AdditionalContextIsNotPassed)}");
+
+        EvaluationResult result = await scenarioRun.EvaluateAsync("What is the meaning of life?");
+
+        Assert.True(
+            result.Metrics.Values.All(m => m.ContainsDiagnostics(d => d.Severity is EvaluationDiagnosticSeverity.Error)),
+            string.Join("\r\n\r\n", result.Metrics.Values.SelectMany(m => m.Diagnostics ?? []).Select(d => d.ToString())));
+
+        Assert.Equal(3, result.Metrics.Count);
+        Assert.True(result.TryGet(BLEUEvaluator.BLEUMetricName, out NumericMetric? bleu));
+        Assert.True(result.TryGet(GLEUEvaluator.GLEUMetricName, out NumericMetric? gleu));
+        Assert.True(result.TryGet(F1Evaluator.F1MetricName, out NumericMetric? f1));
+
+        Assert.Null(bleu.Context);
+        Assert.Null(gleu.Context);
+        Assert.Null(f1.Context);
+
+    }
+
+    [MemberNotNull(nameof(_nlpReportingConfiguration))]
+    private static void SkipIfNotConfigured()
+    {
+        if (!Settings.Current.Configured)
+        {
+            throw new SkipTestException("Test is not configured");
+        }
+
+        Assert.NotNull(_nlpReportingConfiguration);
+    }
+}

From aa6e9af7dd70e3ab2cb1667854a9291d682097ea Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 2 Jul 2025 23:53:52 -0400
Subject: [PATCH 07/13] Enable specifying "strict" for OpenAI clients via
 ChatOptions (#6552)

* Enable specifying "strict" for OpenAI clients via ChatOptions

* Address PR feedback
---
 .../OpenAIAssistantChatClient.cs              | 13 +--
 .../OpenAIChatClient.cs                       | 19 ++--
 .../OpenAIClientExtensions.cs                 | 19 ++--
 .../OpenAIRealtimeConversationClient.cs       |  9 +-
 .../OpenAIResponseChatClient.cs               | 19 ++--
 .../OpenAIChatClientTests.cs                  | 86 +++++++++++++++----
 .../OpenAIResponseClientTests.cs              | 75 ++++++++++++++++
 7 files changed, 195 insertions(+), 45 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
index 3547483da10..0b6c5f5122f 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
@@ -237,14 +237,16 @@ void IDisposable.Dispose()
     }
 
     /// <summary>Converts an Extensions function to an OpenAI assistants function tool.</summary>
-    internal static FunctionToolDefinition ToOpenAIAssistantsFunctionToolDefinition(AIFunction aiFunction)
+    internal static FunctionToolDefinition ToOpenAIAssistantsFunctionToolDefinition(AIFunction aiFunction, ChatOptions? options = null)
     {
-        (BinaryData parameters, bool? strict) = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction);
+        bool? strict =
+            OpenAIClientExtensions.HasStrict(aiFunction.AdditionalProperties) ??
+            OpenAIClientExtensions.HasStrict(options?.AdditionalProperties);
 
         return new FunctionToolDefinition(aiFunction.Name)
         {
             Description = aiFunction.Description,
-            Parameters = parameters,
+            Parameters = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction, strict),
             StrictParameterSchemaEnabled = strict,
         };
     }
@@ -296,7 +298,7 @@ internal static FunctionToolDefinition ToOpenAIAssistantsFunctionToolDefinition(
                     switch (tool)
                     {
                         case AIFunction aiFunction:
-                            runOptions.ToolsOverride.Add(ToOpenAIAssistantsFunctionToolDefinition(aiFunction));
+                            runOptions.ToolsOverride.Add(ToOpenAIAssistantsFunctionToolDefinition(aiFunction, options));
                             break;
 
                         case HostedCodeInterpreterTool:
@@ -342,7 +344,8 @@ internal static FunctionToolDefinition ToOpenAIAssistantsFunctionToolDefinition(
                         runOptions.ResponseFormat = AssistantResponseFormat.CreateJsonSchemaFormat(
                             jsonFormat.SchemaName,
                             BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(jsonSchema, OpenAIJsonContext.Default.JsonElement)),
-                            jsonFormat.SchemaDescription);
+                            jsonFormat.SchemaDescription,
+                            OpenAIClientExtensions.HasStrict(options.AdditionalProperties));
                         break;
 
                     case ChatResponseFormatJson jsonFormat:
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
index abbcb0ed0ae..c051550d493 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
@@ -101,11 +101,17 @@ void IDisposable.Dispose()
     }
 
     /// <summary>Converts an Extensions function to an OpenAI chat tool.</summary>
-    internal static ChatTool ToOpenAIChatTool(AIFunction aiFunction)
+    internal static ChatTool ToOpenAIChatTool(AIFunction aiFunction, ChatOptions? options = null)
     {
-        (BinaryData parameters, bool? strict) = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction);
-
-        return ChatTool.CreateFunctionTool(aiFunction.Name, aiFunction.Description, parameters, strict);
+        bool? strict =
+            OpenAIClientExtensions.HasStrict(aiFunction.AdditionalProperties) ??
+            OpenAIClientExtensions.HasStrict(options?.AdditionalProperties);
+
+        return ChatTool.CreateFunctionTool(
+            aiFunction.Name,
+            aiFunction.Description,
+            OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction, strict),
+            strict);
     }
 
     /// <summary>Converts an Extensions chat message enumerable to an OpenAI chat message enumerable.</summary>
@@ -517,7 +523,7 @@ private ChatCompletionOptions ToOpenAIOptions(ChatOptions? options)
             {
                 if (tool is AIFunction af)
                 {
-                    result.Tools.Add(ToOpenAIChatTool(af));
+                    result.Tools.Add(ToOpenAIChatTool(af, options));
                 }
             }
 
@@ -555,7 +561,8 @@ private ChatCompletionOptions ToOpenAIOptions(ChatOptions? options)
                     OpenAI.Chat.ChatResponseFormat.CreateJsonSchemaFormat(
                         jsonFormat.SchemaName ?? "json_schema",
                         BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(jsonSchema, OpenAIJsonContext.Default.JsonElement)),
-                        jsonFormat.SchemaDescription) :
+                        jsonFormat.SchemaDescription,
+                        OpenAIClientExtensions.HasStrict(options.AdditionalProperties)) :
                     OpenAI.Chat.ChatResponseFormat.CreateJsonObjectFormat();
             }
         }
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
index 24fd93ccb65..b20769c0dc4 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
@@ -21,6 +21,7 @@
 #pragma warning disable S1067 // Expressions should not be too complex
 #pragma warning disable SA1515 // Single-line comment should be preceded by blank line
 #pragma warning disable CA1305 // Specify IFormatProvider
+#pragma warning disable S1135 // Track uses of "TODO" tags
 
 namespace Microsoft.Extensions.AI;
 
@@ -182,15 +183,17 @@ public static ResponseTool AsOpenAIResponseTool(this AIFunction function) =>
     public static ConversationFunctionTool AsOpenAIConversationFunctionTool(this AIFunction function) =>
         OpenAIRealtimeConversationClient.ToOpenAIConversationFunctionTool(Throw.IfNull(function));
 
+    // TODO: Once we're ready to rely on C# 14 features, add an extension property ChatOptions.Strict.
+
+    /// <summary>Gets whether the properties specify that strict schema handling is desired.</summary>
+    internal static bool? HasStrict(IReadOnlyDictionary<string, object?>? additionalProperties) =>
+        additionalProperties?.TryGetValue(StrictKey, out object? strictObj) is true &&
+        strictObj is bool strictValue ?
+        strictValue : null;
+
     /// <summary>Extracts from an <see cref="AIFunction"/> the parameters and strictness setting for use with OpenAI's APIs.</summary>
-    internal static (BinaryData Parameters, bool? Strict) ToOpenAIFunctionParameters(AIFunction aiFunction)
+    internal static BinaryData ToOpenAIFunctionParameters(AIFunction aiFunction, bool? strict)
     {
-        // Extract any strict setting from AdditionalProperties.
-        bool? strict =
-            aiFunction.AdditionalProperties.TryGetValue(OpenAIClientExtensions.StrictKey, out object? strictObj) &&
-            strictObj is bool strictValue ?
-            strictValue : null;
-
         // Perform any desirable transformations on the function's JSON schema, if it'll be used in a strict setting.
         JsonElement jsonSchema = strict is true ?
             StrictSchemaTransformCache.GetOrCreateTransformedSchema(aiFunction) :
@@ -201,7 +204,7 @@ strictObj is bool strictValue ?
         var tool = JsonSerializer.Deserialize(jsonSchema, OpenAIJsonContext.Default.ToolJson)!;
         var functionParameters = BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(tool, OpenAIJsonContext.Default.ToolJson));
 
-        return (functionParameters, strict);
+        return functionParameters;
     }
 
     /// <summary>Used to create the JSON payload for an OpenAI tool description.</summary>
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
index 892a9e9aa2a..abfebd99f34 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
@@ -1,7 +1,6 @@
 // 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 OpenAI.RealtimeConversation;
 
 namespace Microsoft.Extensions.AI;
@@ -9,14 +8,16 @@ namespace Microsoft.Extensions.AI;
 /// <summary>Provides helpers for interacting with OpenAI Realtime.</summary>
 internal sealed class OpenAIRealtimeConversationClient
 {
-    public static ConversationFunctionTool ToOpenAIConversationFunctionTool(AIFunction aiFunction)
+    public static ConversationFunctionTool ToOpenAIConversationFunctionTool(AIFunction aiFunction, ChatOptions? options = null)
     {
-        (BinaryData parameters, _) = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction);
+        bool? strict =
+            OpenAIClientExtensions.HasStrict(aiFunction.AdditionalProperties) ??
+            OpenAIClientExtensions.HasStrict(options?.AdditionalProperties);
 
         return new ConversationFunctionTool(aiFunction.Name)
         {
             Description = aiFunction.Description,
-            Parameters = parameters,
+            Parameters = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction, strict),
         };
     }
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
index a5f68e10365..46019166719 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
@@ -323,11 +323,17 @@ void IDisposable.Dispose()
         // Nothing to dispose. Implementation required for the IChatClient interface.
     }
 
-    internal static ResponseTool ToResponseTool(AIFunction aiFunction)
+    internal static ResponseTool ToResponseTool(AIFunction aiFunction, ChatOptions? options = null)
     {
-        (BinaryData parameters, bool? strict) = OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction);
-
-        return ResponseTool.CreateFunctionTool(aiFunction.Name, aiFunction.Description, parameters, strict ?? false);
+        bool? strict =
+            OpenAIClientExtensions.HasStrict(aiFunction.AdditionalProperties) ??
+            OpenAIClientExtensions.HasStrict(options?.AdditionalProperties);
+
+        return ResponseTool.CreateFunctionTool(
+            aiFunction.Name,
+            aiFunction.Description,
+            OpenAIClientExtensions.ToOpenAIFunctionParameters(aiFunction, strict),
+            strict ?? false);
     }
 
     /// <summary>Creates a <see cref="ChatRole"/> from a <see cref="MessageRole"/>.</summary>
@@ -380,7 +386,7 @@ private ResponseCreationOptions ToOpenAIResponseCreationOptions(ChatOptions? opt
                 switch (tool)
                 {
                     case AIFunction aiFunction:
-                        ResponseTool rtool = ToResponseTool(aiFunction);
+                        ResponseTool rtool = ToResponseTool(aiFunction, options);
                         result.Tools.Add(rtool);
                         break;
 
@@ -442,7 +448,8 @@ private ResponseCreationOptions ToOpenAIResponseCreationOptions(ChatOptions? opt
                         ResponseTextFormat.CreateJsonSchemaFormat(
                             jsonFormat.SchemaName ?? "json_schema",
                             BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(jsonSchema, OpenAIJsonContext.Default.JsonElement)),
-                            jsonFormat.SchemaDescription) :
+                            jsonFormat.SchemaDescription,
+                            OpenAIClientExtensions.HasStrict(options.AdditionalProperties)) :
                         ResponseTextFormat.CreateJsonObjectFormat(),
                 };
             }
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
index 30d03b6eee3..edb5d9fab07 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
@@ -276,6 +276,74 @@ public async Task BasicRequestResponse_Streaming()
         }, usage.Details.AdditionalCounts);
     }
 
+    [Fact]
+    public async Task ChatOptions_StrictRespected()
+    {
+        const string Input = """
+            {
+                "tools": [
+                    {
+                        "function": {
+                            "description": "Gets the age of the specified person.",
+                            "name": "GetPersonAge",
+                            "strict": true,
+                            "parameters": {
+                                "type": "object",
+                                "required": [],
+                                "properties": {},
+                                "additionalProperties": false
+                            }
+                        },
+                        "type": "function"
+                    }
+                ],
+                "messages": [
+                    {
+                        "role": "user",
+                        "content": "hello"
+                    }
+                ],
+                "model": "gpt-4o-mini",
+                "tool_choice": "auto"
+            }
+            """;
+
+        const string Output = """
+            {
+              "id": "chatcmpl-ADx3PvAnCwJg0woha4pYsBTi3ZpOI",
+              "object": "chat.completion",
+              "created": 1727888631,
+              "model": "gpt-4o-mini-2024-07-18",
+              "choices": [
+                {
+                  "index": 0,
+                  "message": {
+                    "role": "assistant",
+                    "content": "Hello! How can I assist you today?",
+                    "refusal": null
+                  },
+                  "logprobs": null,
+                  "finish_reason": "stop"
+                }
+              ]
+            }
+            """;
+
+        using VerbatimHttpHandler handler = new(Input, Output);
+        using HttpClient httpClient = new(handler);
+        using IChatClient client = CreateChatClient(httpClient, "gpt-4o-mini");
+
+        var response = await client.GetResponseAsync("hello", new()
+        {
+            Tools = [AIFunctionFactory.Create(() => 42, "GetPersonAge", "Gets the age of the specified person.")],
+            AdditionalProperties = new()
+            {
+                ["strictJsonSchema"] = true,
+            },
+        });
+        Assert.NotNull(response);
+    }
+
     [Fact]
     public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentation_NonStreaming()
     {
@@ -337,7 +405,7 @@ public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentatio
                     ResponseFormat = OpenAI.Chat.ChatResponseFormat.CreateTextFormat()
                 };
                 openAIOptions.StopSequences.Add("hello");
-                openAIOptions.Tools.Add(ToOpenAIChatTool(tool));
+                openAIOptions.Tools.Add(OpenAIClientExtensions.AsOpenAIChatTool(tool));
                 return openAIOptions;
             },
             ModelId = null,
@@ -416,7 +484,7 @@ public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentatio
                     ResponseFormat = OpenAI.Chat.ChatResponseFormat.CreateTextFormat()
                 };
                 openAIOptions.StopSequences.Add("hello");
-                openAIOptions.Tools.Add(ToOpenAIChatTool(tool));
+                openAIOptions.Tools.Add(OpenAIClientExtensions.AsOpenAIChatTool(tool));
                 return openAIOptions;
             },
             ModelId = null, // has no effect, you cannot change the model of an OpenAI's ChatClient.
@@ -600,20 +668,6 @@ public async Task ChatOptions_Overwrite_NullPropertiesInRawRepresentation_Stream
         Assert.Equal("Hello! How can I assist you today?", responseText);
     }
 
-    /// <summary>Converts an Extensions function to an OpenAI chat tool.</summary>
-    private static ChatTool ToOpenAIChatTool(AIFunction aiFunction)
-    {
-        bool? strict =
-            aiFunction.AdditionalProperties.TryGetValue("strictJsonSchema", out object? strictObj) &&
-            strictObj is bool strictValue ?
-            strictValue : null;
-
-        // Map to an intermediate model so that redundant properties are skipped.
-        var tool = JsonSerializer.Deserialize<ChatToolJson>(aiFunction.JsonSchema)!;
-        var functionParameters = BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(tool));
-        return ChatTool.CreateFunctionTool(aiFunction.Name, aiFunction.Description, functionParameters, strict);
-    }
-
     /// <summary>Used to create the JSON payload for an OpenAI chat tool description.</summary>
     internal sealed class ChatToolJson
     {
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
index 8b27cd918a7..28125e462b7 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
@@ -288,6 +288,81 @@ public async Task BasicRequestResponse_Streaming()
         Assert.Equal(36, usage.Details.TotalTokenCount);
     }
 
+    [Fact]
+    public async Task ChatOptions_StrictRespected()
+    {
+        const string Input = """
+            {
+                "model": "gpt-4o-mini",
+                "input": [
+                    {
+                        "type": "message",
+                        "role": "user",
+                        "content": [
+                            {
+                                "type": "input_text",
+                                "text": "hello"
+                            }
+                        ]
+                    }
+                ],
+                "tool_choice": "auto",
+                "tools": [
+                    {
+                        "type": "function",
+                        "name": "GetPersonAge",
+                        "description": "Gets the age of the specified person.",
+                        "parameters": {
+                            "type": "object",
+                            "required": [],
+                            "properties": {},
+                            "additionalProperties": false
+                        },
+                        "strict": true
+                    }
+                ]
+            }
+            """;
+
+        const string Output = """
+            {
+              "id": "resp_67d327649b288191aeb46a824e49dc40058a5e08c46a181d",
+              "object": "response",
+              "status": "completed",
+              "model": "gpt-4o-mini-2024-07-18",
+              "output": [
+                {
+                  "type": "message",
+                  "id": "msg_67d32764fcdc8191bcf2e444d4088804058a5e08c46a181d",
+                  "status": "completed",
+                  "role": "assistant",
+                  "content": [
+                    {
+                      "type": "output_text",
+                      "text": "Hello! How can I assist you today?",
+                      "annotations": []
+                    }
+                  ]
+                }
+              ]
+            }
+            """;
+
+        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()
+        {
+            Tools = [AIFunctionFactory.Create(() => 42, "GetPersonAge", "Gets the age of the specified person.")],
+            AdditionalProperties = new()
+            {
+                ["strictJsonSchema"] = true,
+            },
+        });
+        Assert.NotNull(response);
+    }
+
     [Fact]
     public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentation_NonStreaming()
     {

From 61dc5a90a979eb5d36df0d46379db9a4f58333d9 Mon Sep 17 00:00:00 2001
From: Peter Waldschmidt <pewaldsc@microsoft.com>
Date: Thu, 3 Jul 2025 01:59:20 -0400
Subject: [PATCH 08/13] Fix ConfigureEvaluationTests script when  is not
 supplied (#6575)

---
 scripts/ConfigureEvaluationTests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ConfigureEvaluationTests.ps1 b/scripts/ConfigureEvaluationTests.ps1
index d58cb1352db..b00624ac29d 100644
--- a/scripts/ConfigureEvaluationTests.ps1
+++ b/scripts/ConfigureEvaluationTests.ps1
@@ -31,7 +31,7 @@ if ($Configure -and $Unconfigure) {
     Exit 1
 }
 
-if (!(Test-Path $ConfigRoot)) {
+if (-not $ConfigRoot -or -not (Test-Path $ConfigRoot)) {
     $ConfigRoot = "$HOME/.config/dotnet-extensions"
 }
 

From e4ba7e8d1ecdd99f8fa0818e0dc35aa837af757c Mon Sep 17 00:00:00 2001
From: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Date: Thu, 3 Jul 2025 14:09:56 +0300
Subject: [PATCH 09/13] AIFunctionFactory: tolerate JSON string function
 parameters. (#6572)

* AIFunctionFactory: tolerate JSON string function parameters.

* Add debug assertion.

* Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs

Co-authored-by: Stephen Toub <stoub@microsoft.com>

* Add regex-based JSON string recognition and add more tests.

---------

Co-authored-by: Stephen Toub <stoub@microsoft.com>
---
 .../Functions/AIFunctionFactory.cs            | 47 ++++++++++++++
 .../ChatClientIntegrationTests.cs             | 33 ++++++++++
 .../Functions/AIFunctionFactoryTest.cs        | 61 +++++++++++++++++++
 3 files changed, 141 insertions(+)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
index 320df4098a3..e864923883e 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
@@ -26,6 +26,7 @@
 #pragma warning disable S2333 // Redundant modifiers should not be used
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
 #pragma warning disable SA1202 // Public members should come before private members
+#pragma warning disable SA1203 // Constants should appear before fields
 
 namespace Microsoft.Extensions.AI;
 
@@ -825,6 +826,23 @@ static bool IsAsyncMethod(MethodInfo method)
                     {
                         try
                         {
+                            if (value is string text && IsPotentiallyJson(text))
+                            {
+                                Debug.Assert(typeInfo.Type != typeof(string), "string parameters should not enter this branch.");
+
+                                // Account for the parameter potentially being a JSON string.
+                                // The value is a string but the type is not. Try to deserialize it under the assumption that it's JSON.
+                                // If it's not, we'll fall through to the default path that makes it valid JSON and then tries to deserialize.
+                                try
+                                {
+                                    return JsonSerializer.Deserialize(text, typeInfo);
+                                }
+                                catch (JsonException)
+                                {
+                                    // If the string is not valid JSON, fall through to the round-trip.
+                                }
+                            }
+
                             string json = JsonSerializer.Serialize(value, serializerOptions.GetTypeInfo(value.GetType()));
                             return JsonSerializer.Deserialize(json, typeInfo);
                         }
@@ -1021,6 +1039,35 @@ private record struct DescriptorKey(
             AIJsonSchemaCreateOptions SchemaOptions);
     }
 
+    /// <summary>
+    /// Quickly checks if the specified string is potentially JSON
+    /// by checking if the first non-whitespace characters are valid JSON start tokens.
+    /// </summary>
+    /// <param name="value">The string to check.</param>
+    /// <returns>If <see langword="false"/> then the string is definitely not valid JSON.</returns>
+    private static bool IsPotentiallyJson(string value) => PotentiallyJsonRegex().IsMatch(value);
+#if NET
+    [GeneratedRegex(PotentiallyJsonRegexString, RegexOptions.IgnorePatternWhitespace)]
+    private static partial Regex PotentiallyJsonRegex();
+#else
+    private static Regex PotentiallyJsonRegex() => _potentiallyJsonRegex;
+    private static readonly Regex _potentiallyJsonRegex = new(PotentiallyJsonRegexString, RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
+#endif
+    private const string PotentiallyJsonRegexString = """
+        ^\s*        # Optional whitespace at the start of the string
+           ( null   # null literal
+           | false  # false literal
+           | true   # true literal
+           | \d     # positive number
+           | -\d    # negative number
+           | "      # string
+           | \[     # start array
+           | {      # start object
+           | //     # Start of single-line comment
+           | /\*    # Start of multi-line comment
+           )
+        """;
+
     /// <summary>
     /// Removes characters from a .NET member name that shouldn't be used in an AI function name.
     /// </summary>
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
index d84d767fd4c..ffa94f64531 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
@@ -341,6 +341,39 @@ public virtual async Task FunctionInvocation_NestedParameters()
         AssertUsageAgainstActivities(response, activities);
     }
 
+    [ConditionalFact]
+    public virtual async Task FunctionInvocation_ArrayParameter()
+    {
+        SkipIfNotEnabled();
+
+        var sourceName = Guid.NewGuid().ToString();
+        var activities = new List<Activity>();
+        using var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+            .AddSource(sourceName)
+            .AddInMemoryExporter(activities)
+            .Build();
+
+        using var chatClient = new FunctionInvokingChatClient(
+            new OpenTelemetryChatClient(_chatClient, sourceName: sourceName));
+
+        List<ChatMessage> messages =
+        [
+            new(ChatRole.User, "Can you add bacon, lettuce, and tomatoes to Peter's shopping cart?")
+        ];
+
+        string? shopperName = null;
+        List<string> shoppingCart = [];
+        AIFunction func = AIFunctionFactory.Create((string[] items, string shopperId) => { shoppingCart.AddRange(items); shopperName = shopperId; }, "AddItemsToShoppingCart");
+        var response = await chatClient.GetResponseAsync(messages, new()
+        {
+            Tools = [func]
+        });
+
+        Assert.Equal("Peter", shopperName);
+        Assert.Equal(["bacon", "lettuce", "tomatoes"], shoppingCart);
+        AssertUsageAgainstActivities(response, activities);
+    }
+
     private static void AssertUsageAgainstActivities(ChatResponse response, List<Activity> activities)
     {
         // If the underlying IChatClient provides usage data, function invocation should aggregate the
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
index 84298788e8c..b15d200a39a 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -75,6 +76,66 @@ public async Task Parameters_MissingRequiredParametersFail_Async()
         }
     }
 
+    [Fact]
+    public async Task Parameters_ToleratesJsonEncodedParameters()
+    {
+        AIFunction func = AIFunctionFactory.Create((int x, int y, int z, int w, int u) => x + y + z + w + u);
+
+        var result = await func.InvokeAsync(new()
+        {
+            ["x"] = "1",
+            ["y"] = JsonNode.Parse("2"),
+            ["z"] = JsonDocument.Parse("3"),
+            ["w"] = JsonDocument.Parse("4").RootElement,
+            ["u"] = 5M, // boxed decimal cannot be cast to int, requires conversion
+        });
+
+        AssertExtensions.EqualFunctionCallResults(15, result);
+    }
+
+    [Theory]
+    [InlineData("   null")]
+    [InlineData("   false   ")]
+    [InlineData("true   ")]
+    [InlineData("42")]
+    [InlineData("0.0")]
+    [InlineData("-1e15")]
+    [InlineData("  \"I am a string!\" ")]
+    [InlineData("  {}")]
+    [InlineData("[]")]
+    public async Task Parameters_ToleratesJsonStringParameters(string jsonStringParam)
+    {
+        AIFunction func = AIFunctionFactory.Create((JsonElement param) => param);
+        JsonElement expectedResult = JsonDocument.Parse(jsonStringParam).RootElement;
+
+        var result = await func.InvokeAsync(new()
+        {
+            ["param"] = jsonStringParam
+        });
+
+        AssertExtensions.EqualFunctionCallResults(expectedResult, result);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("                 \r\n")]
+    [InlineData("I am a string!")]
+    [InlineData("/* Code snippet */ int main(void) { return 0; }")]
+    [InlineData("let rec Y F x = F (Y F) x")]
+    [InlineData("+3")]
+    public async Task Parameters_ToleratesInvalidJsonStringParameters(string invalidJsonParam)
+    {
+        AIFunction func = AIFunctionFactory.Create((JsonElement param) => param);
+        JsonElement expectedResult = JsonDocument.Parse(JsonSerializer.Serialize(invalidJsonParam, JsonContext.Default.String)).RootElement;
+
+        var result = await func.InvokeAsync(new()
+        {
+            ["param"] = invalidJsonParam
+        });
+
+        AssertExtensions.EqualFunctionCallResults(expectedResult, result);
+    }
+
     [Fact]
     public async Task Parameters_MappedByType_Async()
     {

From dd5fa173e3eb1c5a459ba50fb32b8dd20d5cb25d Mon Sep 17 00:00:00 2001
From: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Date: Thu, 3 Jul 2025 18:14:36 +0300
Subject: [PATCH 10/13] AIFunctionFactory: add test coverage for JSON comments.
 (#6576)

---
 .../Functions/AIFunctionFactory.cs                         | 3 +--
 .../Functions/AIFunctionFactoryTest.cs                     | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
index e864923883e..5ad178e7bc8 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs
@@ -1058,8 +1058,7 @@ private record struct DescriptorKey(
            ( null   # null literal
            | false  # false literal
            | true   # true literal
-           | \d     # positive number
-           | -\d    # negative number
+           | -?[0-9]# number
            | "      # string
            | \[     # start array
            | {      # start object
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
index b15d200a39a..afced22038f 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs
@@ -103,10 +103,13 @@ public async Task Parameters_ToleratesJsonEncodedParameters()
     [InlineData("  \"I am a string!\" ")]
     [InlineData("  {}")]
     [InlineData("[]")]
+    [InlineData("// single-line comment\r\nnull")]
+    [InlineData("/* multi-line\r\ncomment */\r\nnull")]
     public async Task Parameters_ToleratesJsonStringParameters(string jsonStringParam)
     {
-        AIFunction func = AIFunctionFactory.Create((JsonElement param) => param);
-        JsonElement expectedResult = JsonDocument.Parse(jsonStringParam).RootElement;
+        JsonSerializerOptions options = new(AIJsonUtilities.DefaultOptions) { ReadCommentHandling = JsonCommentHandling.Skip };
+        AIFunction func = AIFunctionFactory.Create((JsonElement param) => param, serializerOptions: options);
+        JsonElement expectedResult = JsonDocument.Parse(jsonStringParam, new() { CommentHandling = JsonCommentHandling.Skip }).RootElement;
 
         var result = await func.InvokeAsync(new()
         {

From c21e89d7911b62b05e1eae6272bcb31729f62919 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Fri, 4 Jul 2025 19:56:19 -0400
Subject: [PATCH 11/13] Update M.E.AI.OpenAI for latest OpenAI release (#6577)

---
 eng/packages/General.props                    |   2 +-
 .../SpeechToText/SpeechToTextOptions.cs       |  14 +-
 .../Microsoft.Extensions.AI.OpenAI.csproj     |   6 +-
 .../OpenAIAssistantChatClient.cs              |   2 -
 .../OpenAIChatClient.cs                       |  47 +++--
 .../OpenAIClientExtensions.cs                 |   4 +-
 .../OpenAIRealtimeConversationClient.cs       |   2 +-
 .../OpenAIResponseChatClient.cs               |  48 +++--
 .../OpenAISpeechToTextClient.cs               | 199 ++++++++----------
 ...icrosoft.Extensions.AI.OpenAI.Tests.csproj |   3 +-
 .../OpenAIAIFunctionConversionTests.cs        |  14 +-
 ...enAIAssistantChatClientIntegrationTests.cs |   3 +-
 .../OpenAIAssistantChatClientTests.cs         |  12 +-
 .../OpenAIChatClientTests.cs                  |  19 +-
 .../OpenAIEmbeddingGeneratorTests.cs          |  11 +-
 .../OpenAIResponseClientTests.cs              |  11 +-
 ...penAISpeechToTextClientIntegrationTests.cs |   2 +-
 .../OpenAISpeechToTextClientTests.cs          |  14 +-
 18 files changed, 186 insertions(+), 227 deletions(-)

diff --git a/eng/packages/General.props b/eng/packages/General.props
index fa2d51de886..aa9771bfb4a 100644
--- a/eng/packages/General.props
+++ b/eng/packages/General.props
@@ -16,7 +16,7 @@
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="$(MicrosoftMLTokenizersVersion)" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="OllamaSharp" Version="5.1.9" />
-    <PackageVersion Include="OpenAI" Version="2.2.0-beta.4" />
+    <PackageVersion Include="OpenAI" Version="2.2.0" />
     <PackageVersion Include="Polly" Version="8.4.2" />
     <PackageVersion Include="Polly.Core" Version="8.4.2" />
     <PackageVersion Include="Polly.Extensions" Version="8.4.2" />
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/SpeechToText/SpeechToTextOptions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/SpeechToText/SpeechToTextOptions.cs
index 5ff0135cec7..8efbf510164 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/SpeechToText/SpeechToTextOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/SpeechToText/SpeechToTextOptions.cs
@@ -11,20 +11,20 @@ namespace Microsoft.Extensions.AI;
 [Experimental("MEAI001")]
 public class SpeechToTextOptions
 {
+    /// <summary>Gets or sets any additional properties associated with the options.</summary>
+    public AdditionalPropertiesDictionary? AdditionalProperties { get; set; }
+
     /// <summary>Gets or sets the model ID for the speech to text.</summary>
     public string? ModelId { get; set; }
 
     /// <summary>Gets or sets the language of source speech.</summary>
     public string? SpeechLanguage { get; set; }
 
-    /// <summary>Gets or sets the language for the target generated text.</summary>
-    public string? TextLanguage { get; set; }
-
     /// <summary>Gets or sets the sample rate of the speech input audio.</summary>
     public int? SpeechSampleRate { get; set; }
 
-    /// <summary>Gets or sets any additional properties associated with the options.</summary>
-    public AdditionalPropertiesDictionary? AdditionalProperties { get; set; }
+    /// <summary>Gets or sets the language for the target generated text.</summary>
+    public string? TextLanguage { get; set; }
 
     /// <summary>
     /// Gets or sets a callback responsible for creating the raw representation of the embedding generation options from an underlying implementation.
@@ -51,11 +51,11 @@ public virtual SpeechToTextOptions Clone()
     {
         SpeechToTextOptions options = new()
         {
+            AdditionalProperties = AdditionalProperties?.Clone(),
             ModelId = ModelId,
             SpeechLanguage = SpeechLanguage,
-            TextLanguage = TextLanguage,
             SpeechSampleRate = SpeechSampleRate,
-            AdditionalProperties = AdditionalProperties?.Clone(),
+            TextLanguage = TextLanguage,
         };
 
         return options;
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj b/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj
index 552d45f0fc6..a135ee011ea 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -15,8 +15,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
-    <NoWarn>$(NoWarn);CA1063;CA1508;CA2227;SA1316;S1121;S3358;EA0002;OPENAI002</NoWarn>
-    <NoWarn>$(NoWarn);MEAI001</NoWarn>
+    <NoWarn>$(NoWarn);CA1063;CA1508;CA2227;SA1316;S1121;S3358;EA0002</NoWarn>
+    <NoWarn>$(NoWarn);OPENAI001;OPENAI002;MEAI001</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DisableNETStandardCompatErrors>true</DisableNETStandardCompatErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
index 0b6c5f5122f..c1d59e30a68 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -28,7 +27,6 @@
 namespace Microsoft.Extensions.AI;
 
 /// <summary>Represents an <see cref="IChatClient"/> for an Azure.AI.Agents.Persistent <see cref="AssistantClient"/>.</summary>
-[Experimental("OPENAI001")]
 internal sealed class OpenAIAssistantChatClient : IChatClient
 {
     /// <summary>The underlying <see cref="AssistantClient" />.</summary>
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
index c051550d493..3be0a1cc1ee 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
@@ -91,7 +91,7 @@ public IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
         // Make the call to OpenAI.
         var chatCompletionUpdates = _chatClient.CompleteChatStreamingAsync(openAIChatMessages, openAIOptions, cancellationToken);
 
-        return FromOpenAIStreamingChatCompletionAsync(chatCompletionUpdates, cancellationToken);
+        return FromOpenAIStreamingChatCompletionAsync(chatCompletionUpdates, openAIOptions, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -290,7 +290,8 @@ private static List<ChatMessageContentPart> ToOpenAIChatContent(IList<AIContent>
 
     private static async IAsyncEnumerable<ChatResponseUpdate> FromOpenAIStreamingChatCompletionAsync(
         IAsyncEnumerable<StreamingChatCompletionUpdate> updates,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        ChatCompletionOptions? options,
+        [EnumeratorCancellation] CancellationToken cancellationToken)
     {
         Dictionary<int, FunctionCallInfo>? functionCallInfos = null;
         ChatRole? streamedRole = null;
@@ -334,6 +335,14 @@ private static async IAsyncEnumerable<ChatResponseUpdate> FromOpenAIStreamingCha
                 }
             }
 
+            if (update.OutputAudioUpdate is { } audioUpdate)
+            {
+                responseUpdate.Contents.Add(new DataContent(audioUpdate.AudioBytesUpdate.ToMemory(), GetOutputAudioMimeType(options))
+                {
+                    RawRepresentation = audioUpdate,
+                });
+            }
+
             // Transfer over refusal updates.
             if (update.RefusalUpdate is not null)
             {
@@ -363,8 +372,10 @@ private static async IAsyncEnumerable<ChatResponseUpdate> FromOpenAIStreamingCha
             // Transfer over usage updates.
             if (update.Usage is ChatTokenUsage tokenUsage)
             {
-                var usageDetails = FromOpenAIUsage(tokenUsage);
-                responseUpdate.Contents.Add(new UsageContent(usageDetails));
+                responseUpdate.Contents.Add(new UsageContent(FromOpenAIUsage(tokenUsage))
+                {
+                    RawRepresentation = tokenUsage,
+                });
             }
 
             // Now yield the item.
@@ -408,6 +419,17 @@ private static async IAsyncEnumerable<ChatResponseUpdate> FromOpenAIStreamingCha
         }
     }
 
+    private static string GetOutputAudioMimeType(ChatCompletionOptions? options) =>
+        options?.AudioOptions?.OutputAudioFormat.ToString()?.ToLowerInvariant() switch
+        {
+            "opus" => "audio/opus",
+            "aac" => "audio/aac",
+            "flac" => "audio/flac",
+            "wav" => "audio/wav",
+            "pcm" => "audio/pcm",
+            "mp3" or _ => "audio/mpeg",
+        };
+
     private static ChatResponse FromOpenAIChatCompletion(ChatCompletion openAICompletion, ChatOptions? options, ChatCompletionOptions chatCompletionOptions)
     {
         _ = Throw.IfNull(openAICompletion);
@@ -432,19 +454,10 @@ private static ChatResponse FromOpenAIChatCompletion(ChatCompletion openAIComple
         // Output audio is handled separately from message content parts.
         if (openAICompletion.OutputAudio is ChatOutputAudio audio)
         {
-            string mimeType = chatCompletionOptions?.AudioOptions?.OutputAudioFormat.ToString()?.ToLowerInvariant() switch
+            returnMessage.Contents.Add(new DataContent(audio.AudioBytes.ToMemory(), GetOutputAudioMimeType(chatCompletionOptions))
             {
-                "opus" => "audio/opus",
-                "aac" => "audio/aac",
-                "flac" => "audio/flac",
-                "wav" => "audio/wav",
-                "pcm" => "audio/pcm",
-                "mp3" or _ => "audio/mpeg",
-            };
-
-            var dc = new DataContent(audio.AudioBytes.ToMemory(), mimeType);
-
-            returnMessage.Contents.Add(dc);
+                RawRepresentation = audio,
+            });
         }
 
         // Also manufacture function calling content items from any tool calls in the response.
@@ -505,9 +518,7 @@ private ChatCompletionOptions ToOpenAIOptions(ChatOptions? options)
         result.PresencePenalty ??= options.PresencePenalty;
         result.Temperature ??= options.Temperature;
         result.AllowParallelToolCalls ??= options.AllowMultipleToolCalls;
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
         result.Seed ??= options.Seed;
-#pragma warning restore OPENAI001
 
         if (options.StopSequences is { Count: > 0 } stopSequences)
         {
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
index b20769c0dc4..dccddf3038e 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIClientExtensions.cs
@@ -14,7 +14,7 @@
 using OpenAI.Audio;
 using OpenAI.Chat;
 using OpenAI.Embeddings;
-using OpenAI.RealtimeConversation;
+using OpenAI.Realtime;
 using OpenAI.Responses;
 
 #pragma warning disable S103 // Lines should not be too long
@@ -134,7 +134,6 @@ public static IChatClient AsIChatClient(this OpenAIResponseClient responseClient
     /// <exception cref="ArgumentNullException"><paramref name="assistantClient"/> is <see langword="null"/>.</exception>
     /// <exception cref="ArgumentNullException"><paramref name="assistantId"/> is <see langword="null"/>.</exception>
     /// <exception cref="ArgumentException"><paramref name="assistantId"/> is empty or composed entirely of whitespace.</exception>
-    [Experimental("OPENAI001")] // AssistantClient itself is experimental with this ID
     public static IChatClient AsIChatClient(this AssistantClient assistantClient, string assistantId, string? threadId = null) =>
         new OpenAIAssistantChatClient(assistantClient, assistantId, threadId);
 
@@ -165,7 +164,6 @@ public static ChatTool AsOpenAIChatTool(this AIFunction function) =>
     /// <param name="function">The function to convert.</param>
     /// <returns>An OpenAI <see cref="FunctionToolDefinition"/> representing <paramref name="function"/>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="function"/> is <see langword="null"/>.</exception>
-    [Experimental("OPENAI001")] // AssistantClient itself is experimental with this ID
     public static FunctionToolDefinition AsOpenAIAssistantsFunctionToolDefinition(this AIFunction function) =>
         OpenAIAssistantChatClient.ToOpenAIAssistantsFunctionToolDefinition(Throw.IfNull(function));
 
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
index abfebd99f34..7c944ac5edb 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIRealtimeConversationClient.cs
@@ -1,7 +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 OpenAI.RealtimeConversation;
+using OpenAI.Realtime;
 
 namespace Microsoft.Extensions.AI;
 
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
index 46019166719..6aee4bc77e4 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponseChatClient.cs
@@ -117,6 +117,13 @@ public async Task<ChatResponse> GetResponseAsync(
                         ((List<AIContent>)message.Contents).AddRange(ToAIContents(messageItem.Content));
                         break;
 
+                    case ReasoningResponseItem reasoningItem when reasoningItem.GetSummaryText() is string summary && !string.IsNullOrWhiteSpace(summary):
+                        message.Contents.Add(new TextReasoningContent(summary)
+                        {
+                            RawRepresentation = reasoningItem
+                        });
+                        break;
+
                     case FunctionCallResponseItem functionCall:
                         response.FinishReason ??= ChatFinishReason.ToolCalls;
                         var fcc = FunctionCallContent.CreateFromParsedArguments(
@@ -139,7 +146,7 @@ public async Task<ChatResponse> GetResponseAsync(
 
             if (openAIResponse.Error is { } error)
             {
-                message.Contents.Add(new ErrorContent(error.Message) { ErrorCode = error.Code });
+                message.Contents.Add(new ErrorContent(error.Message) { ErrorCode = error.Code.ToString() });
             }
         }
 
@@ -367,10 +374,11 @@ private ResponseCreationOptions ToOpenAIResponseCreationOptions(ChatOptions? opt
 
         // Handle strongly-typed properties.
         result.MaxOutputTokenCount ??= options.MaxOutputTokens;
+        result.ParallelToolCallsEnabled ??= options.AllowMultipleToolCalls;
         result.PreviousResponseId ??= options.ConversationId;
-        result.TopP ??= options.TopP;
         result.Temperature ??= options.Temperature;
-        result.ParallelToolCallsEnabled ??= options.AllowMultipleToolCalls;
+        result.TopP ??= options.TopP;
+
         if (options.Instructions is { } instructions)
         {
             result.Instructions = string.IsNullOrEmpty(result.Instructions) ?
@@ -386,22 +394,21 @@ private ResponseCreationOptions ToOpenAIResponseCreationOptions(ChatOptions? opt
                 switch (tool)
                 {
                     case AIFunction aiFunction:
-                        ResponseTool rtool = ToResponseTool(aiFunction, options);
-                        result.Tools.Add(rtool);
+                        result.Tools.Add(ToResponseTool(aiFunction, options));
                         break;
 
                     case HostedWebSearchTool:
-                        WebSearchToolLocation? location = null;
-                        if (tool.AdditionalProperties.TryGetValue(nameof(WebSearchToolLocation), out object? objLocation))
+                        WebSearchUserLocation? location = null;
+                        if (tool.AdditionalProperties.TryGetValue(nameof(WebSearchUserLocation), out object? objLocation))
                         {
-                            location = objLocation as WebSearchToolLocation;
+                            location = objLocation as WebSearchUserLocation;
                         }
 
-                        WebSearchToolContextSize? size = null;
-                        if (tool.AdditionalProperties.TryGetValue(nameof(WebSearchToolContextSize), out object? objSize) &&
-                            objSize is WebSearchToolContextSize)
+                        WebSearchContextSize? size = null;
+                        if (tool.AdditionalProperties.TryGetValue(nameof(WebSearchContextSize), out object? objSize) &&
+                            objSize is WebSearchContextSize)
                         {
-                            size = (WebSearchToolContextSize)objSize;
+                            size = (WebSearchContextSize)objSize;
                         }
 
                         result.Tools.Add(ResponseTool.CreateWebSearchTool(location, size));
@@ -522,6 +529,10 @@ private static IEnumerable<ResponseItem> ToOpenAIResponseItems(
                             yield return ResponseItem.CreateAssistantMessageItem(textContent.Text);
                             break;
 
+                        case TextReasoningContent reasoningContent:
+                            yield return ResponseItem.CreateReasoningItem(reasoningContent.Text);
+                            break;
+
                         case FunctionCallContent callContent:
                             yield return ResponseItem.CreateFunctionCallItem(
                                 callContent.CallId,
@@ -555,12 +566,16 @@ private static IEnumerable<ResponseItem> ToOpenAIResponseItems(
                 TotalTokenCount = usage.TotalTokenCount,
             };
 
-            if (usage.OutputTokenDetails is { } outputDetails)
+            if (usage.InputTokenDetails is { } inputDetails)
             {
                 ud.AdditionalCounts ??= [];
+                ud.AdditionalCounts.Add($"{nameof(usage.InputTokenDetails)}.{nameof(inputDetails.CachedTokenCount)}", inputDetails.CachedTokenCount);
+            }
 
-                const string OutputDetails = nameof(usage.OutputTokenDetails);
-                ud.AdditionalCounts.Add($"{OutputDetails}.{nameof(outputDetails.ReasoningTokenCount)}", outputDetails.ReasoningTokenCount);
+            if (usage.OutputTokenDetails is { } outputDetails)
+            {
+                ud.AdditionalCounts ??= [];
+                ud.AdditionalCounts.Add($"{nameof(usage.OutputTokenDetails)}.{nameof(outputDetails.ReasoningTokenCount)}", outputDetails.ReasoningTokenCount);
             }
         }
 
@@ -624,8 +639,7 @@ private static List<ResponseContentPart> ToOpenAIResponsesContent(IList<AIConten
                     break;
 
                 case DataContent dataContent when dataContent.MediaType.StartsWith("application/pdf", StringComparison.OrdinalIgnoreCase):
-                    parts.Add(ResponseContentPart.CreateInputFilePart(null, $"{Guid.NewGuid():N}.pdf",
-                        BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(dataContent.Uri, OpenAIJsonContext.Default.String))));
+                    parts.Add(ResponseContentPart.CreateInputFilePart(BinaryData.FromBytes(dataContent.Data), dataContent.MediaType, $"{Guid.NewGuid():N}.pdf"));
                     break;
 
                 case ErrorContent errorContent when errorContent.ErrorCode == nameof(ResponseContentPartKind.Refusal):
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAISpeechToTextClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAISpeechToTextClient.cs
index 338ff0685f1..fa00fc45232 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAISpeechToTextClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAISpeechToTextClient.cs
@@ -23,8 +23,9 @@ namespace Microsoft.Extensions.AI;
 [Experimental("MEAI001")]
 internal sealed class OpenAISpeechToTextClient : ISpeechToTextClient
 {
-    /// <summary>Default OpenAI endpoint.</summary>
-    private static readonly Uri _defaultOpenAIEndpoint = new("https://api.openai.com/v1");
+    /// <summary>Filename to use when audio lacks a name.</summary>
+    /// <remarks>This information internally is required but is only being used to create a header name in the multipart request.</remarks>
+    private const string Filename = "audio.mp3";
 
     /// <summary>Metadata about the client.</summary>
     private readonly SpeechToTextClientMetadata _metadata;
@@ -45,7 +46,7 @@ public OpenAISpeechToTextClient(AudioClient audioClient)
         // implement the abstractions directly rather than providing adapters on top of the public APIs,
         // the package can provide such implementations separate from what's exposed in the public API.
         Uri providerUrl = typeof(AudioClient).GetField("_endpoint", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
-            ?.GetValue(audioClient) as Uri ?? _defaultOpenAIEndpoint;
+            ?.GetValue(audioClient) as Uri ?? OpenAIClientExtensions.DefaultOpenAIEndpoint;
         string? model = typeof(AudioClient).GetField("_model", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
             ?.GetValue(audioClient) as string;
 
@@ -65,20 +66,6 @@ public OpenAISpeechToTextClient(AudioClient audioClient)
             null;
     }
 
-    /// <inheritdoc />
-    public async IAsyncEnumerable<SpeechToTextResponseUpdate> GetStreamingTextAsync(
-        Stream audioSpeechStream, SpeechToTextOptions? options = null, [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        _ = Throw.IfNull(audioSpeechStream);
-
-        var speechResponse = await GetTextAsync(audioSpeechStream, options, cancellationToken).ConfigureAwait(false);
-
-        foreach (var update in speechResponse.ToSpeechToTextResponseUpdates())
-        {
-            yield return update;
-        }
-    }
-
     /// <inheritdoc />
     public async Task<SpeechToTextResponse> GetTextAsync(
         Stream audioSpeechStream, SpeechToTextOptions? options = null, CancellationToken cancellationToken = default)
@@ -87,140 +74,126 @@ public async Task<SpeechToTextResponse> GetTextAsync(
 
         SpeechToTextResponse response = new();
 
-        // <summary>A translation is triggered when the target text language is specified and the source language is not provided or different.</summary>
-        static bool IsTranslationRequest(SpeechToTextOptions? options)
-             => options is not null && options.TextLanguage is not null
-                && (options.SpeechLanguage is null || options.SpeechLanguage != options.TextLanguage);
+        string filename = audioSpeechStream is FileStream fileStream ?
+            Path.GetFileName(fileStream.Name) : // Use the file name if we can get one from the stream.
+            Filename; // Otherwise, use a default name; this is only used to create a header name in the multipart request.
 
         if (IsTranslationRequest(options))
         {
-            _ = Throw.IfNull(options);
+            var translation = (await _audioClient.TranslateAudioAsync(audioSpeechStream, filename, ToOpenAITranslationOptions(options), cancellationToken).ConfigureAwait(false)).Value;
 
-            var openAIOptions = ToOpenAITranslationOptions(options);
-            AudioTranslation translationResult;
+            response.Contents = [new TextContent(translation.Text)];
+            response.RawRepresentation = translation;
 
-#if NET
-            await using (audioSpeechStream.ConfigureAwait(false))
-#else
-            using (audioSpeechStream)
-#endif
+            int segmentCount = translation.Segments.Count;
+            if (segmentCount > 0)
             {
-                translationResult = (await _audioClient.TranslateAudioAsync(
-                    audioSpeechStream,
-                    "file.wav", // this information internally is required but is only being used to create a header name in the multipart request.
-                    openAIOptions, cancellationToken).ConfigureAwait(false)).Value;
+                response.StartTime = translation.Segments[0].StartTime;
+                response.EndTime = translation.Segments[segmentCount - 1].EndTime;
             }
-
-            UpdateResponseFromOpenAIAudioTranslation(response, translationResult);
         }
         else
         {
-            var openAIOptions = ToOpenAITranscriptionOptions(options);
+            var transcription = (await _audioClient.TranscribeAudioAsync(audioSpeechStream, filename, ToOpenAITranscriptionOptions(options), cancellationToken).ConfigureAwait(false)).Value;
 
-            // Transcription request
-            AudioTranscription transcriptionResult;
+            response.Contents = [new TextContent(transcription.Text)];
+            response.RawRepresentation = transcription;
 
-#if NET
-            await using (audioSpeechStream.ConfigureAwait(false))
-#else
-            using (audioSpeechStream)
-#endif
+            int segmentCount = transcription.Segments.Count;
+            if (segmentCount > 0)
             {
-                transcriptionResult = (await _audioClient.TranscribeAudioAsync(
-                    audioSpeechStream,
-                    "file.wav", // this information internally is required but is only being used to create a header name in the multipart request.
-                    openAIOptions, cancellationToken).ConfigureAwait(false)).Value;
+                response.StartTime = transcription.Segments[0].StartTime;
+                response.EndTime = transcription.Segments[segmentCount - 1].EndTime;
+            }
+            else
+            {
+                int wordCount = transcription.Words.Count;
+                if (wordCount > 0)
+                {
+                    response.StartTime = transcription.Words[0].StartTime;
+                    response.EndTime = transcription.Words[wordCount - 1].EndTime;
+                }
             }
-
-            UpdateResponseFromOpenAIAudioTranscription(response, transcriptionResult);
         }
 
         return response;
     }
 
     /// <inheritdoc />
-    void IDisposable.Dispose()
-    {
-        // Nothing to dispose. Implementation required for the IAudioTranscriptionClient interface.
-    }
-
-    /// <summary>Updates a <see cref="SpeechToTextResponse"/> from an OpenAI <see cref="AudioTranscription"/>.</summary>
-    /// <param name="response">The response to update.</param>
-    /// <param name="audioTranscription">The OpenAI audio transcription.</param>
-    private static void UpdateResponseFromOpenAIAudioTranscription(SpeechToTextResponse response, AudioTranscription audioTranscription)
+    public async IAsyncEnumerable<SpeechToTextResponseUpdate> GetStreamingTextAsync(
+        Stream audioSpeechStream, SpeechToTextOptions? options = null, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        _ = Throw.IfNull(audioTranscription);
+        _ = Throw.IfNull(audioSpeechStream);
 
-        var segmentCount = audioTranscription.Segments.Count;
-        var wordCount = audioTranscription.Words.Count;
+        string filename = audioSpeechStream is FileStream fileStream ?
+            Path.GetFileName(fileStream.Name) : // Use the file name if we can get one from the stream.
+            Filename; // Otherwise, use a default name; this is only used to create a header name in the multipart request.
 
-        TimeSpan? endTime = null;
-        TimeSpan? startTime = null;
-        if (segmentCount > 0)
+        if (IsTranslationRequest(options))
         {
-            endTime = audioTranscription.Segments[segmentCount - 1].EndTime;
-            startTime = audioTranscription.Segments[0].StartTime;
+            foreach (var update in (await GetTextAsync(audioSpeechStream, options, cancellationToken).ConfigureAwait(false)).ToSpeechToTextResponseUpdates())
+            {
+                yield return update;
+            }
         }
-        else if (wordCount > 0)
+        else
         {
-            endTime = audioTranscription.Words[wordCount - 1].EndTime;
-            startTime = audioTranscription.Words[0].StartTime;
+            await foreach (var update in _audioClient.TranscribeAudioStreamingAsync(
+                audioSpeechStream,
+                filename,
+                ToOpenAITranscriptionOptions(options),
+                cancellationToken).ConfigureAwait(false))
+            {
+                SpeechToTextResponseUpdate result = new()
+                {
+                    ModelId = options?.ModelId,
+                    RawRepresentation = update,
+                };
+
+                switch (update)
+                {
+                    case StreamingAudioTranscriptionTextDeltaUpdate deltaUpdate:
+                        result.Kind = SpeechToTextResponseUpdateKind.TextUpdated;
+                        result.Contents = [new TextContent(deltaUpdate.Delta)];
+                        break;
+
+                    case StreamingAudioTranscriptionTextDoneUpdate doneUpdate:
+                        result.Kind = SpeechToTextResponseUpdateKind.SessionClose;
+                        break;
+                }
+
+                yield return result;
+            }
         }
+    }
 
-        // Update the response
-        response.RawRepresentation = audioTranscription;
-        response.Contents = [new TextContent(audioTranscription.Text)];
-        response.StartTime = startTime;
-        response.EndTime = endTime;
-        response.AdditionalProperties = new AdditionalPropertiesDictionary
-        {
-            [nameof(audioTranscription.Language)] = audioTranscription.Language,
-            [nameof(audioTranscription.Duration)] = audioTranscription.Duration
-        };
+    /// <inheritdoc />
+    void IDisposable.Dispose()
+    {
+        // Nothing to dispose. Implementation required for the IAudioTranscriptionClient interface.
     }
 
-    /// <summary>Converts an extensions options instance to an OpenAI options instance.</summary>
+    // <summary>A translation is triggered when the target text language is specified and the source language is not provided or different.</summary>
+    private static bool IsTranslationRequest(SpeechToTextOptions? options) =>
+        options is not null &&
+        options.TextLanguage is not null &&
+        (options.SpeechLanguage is null || options.SpeechLanguage != options.TextLanguage);
+
+    /// <summary>Converts an extensions options instance to an OpenAI transcription options instance.</summary>
     private AudioTranscriptionOptions ToOpenAITranscriptionOptions(SpeechToTextOptions? options)
     {
-        if (options?.RawRepresentationFactory?.Invoke(this) is not AudioTranscriptionOptions result)
-        {
-            result = new AudioTranscriptionOptions();
-        }
+        AudioTranscriptionOptions result = options?.RawRepresentationFactory?.Invoke(this) as AudioTranscriptionOptions ?? new();
 
         result.Language ??= options?.SpeechLanguage;
+
         return result;
     }
 
-    /// <summary>Updates a <see cref="SpeechToTextResponse"/> from an OpenAI <see cref="AudioTranslation"/>.</summary>
-    /// <param name="response">The response to update.</param>
-    /// <param name="audioTranslation">The OpenAI audio translation.</param>
-    private static void UpdateResponseFromOpenAIAudioTranslation(SpeechToTextResponse response, AudioTranslation audioTranslation)
+    /// <summary>Converts an extensions options instance to an OpenAI translation options instance.</summary>
+    private AudioTranslationOptions ToOpenAITranslationOptions(SpeechToTextOptions? options)
     {
-        _ = Throw.IfNull(audioTranslation);
-
-        var segmentCount = audioTranslation.Segments.Count;
-
-        TimeSpan? endTime = null;
-        TimeSpan? startTime = null;
-        if (segmentCount > 0)
-        {
-            endTime = audioTranslation.Segments[segmentCount - 1].EndTime;
-            startTime = audioTranslation.Segments[0].StartTime;
-        }
+        AudioTranslationOptions result = options?.RawRepresentationFactory?.Invoke(this) as AudioTranslationOptions ?? new();
 
-        // Update the response
-        response.RawRepresentation = audioTranslation;
-        response.Contents = [new TextContent(audioTranslation.Text)];
-        response.StartTime = startTime;
-        response.EndTime = endTime;
-        response.AdditionalProperties = new AdditionalPropertiesDictionary
-        {
-            [nameof(audioTranslation.Language)] = audioTranslation.Language,
-            [nameof(audioTranslation.Duration)] = audioTranslation.Duration
-        };
+        return result;
     }
-
-    /// <summary>Converts an extensions options instance to an OpenAI options instance.</summary>
-    private AudioTranslationOptions ToOpenAITranslationOptions(SpeechToTextOptions? options)
-        => options?.RawRepresentationFactory?.Invoke(this) as AudioTranslationOptions ?? new AudioTranslationOptions();
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/Microsoft.Extensions.AI.OpenAI.Tests.csproj b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/Microsoft.Extensions.AI.OpenAI.Tests.csproj
index 60b6f8c84ab..536c250cb47 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/Microsoft.Extensions.AI.OpenAI.Tests.csproj
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/Microsoft.Extensions.AI.OpenAI.Tests.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
     <Description>Unit tests for Microsoft.Extensions.AI.OpenAI</Description>
-    <NoWarn>$(NoWarn);OPENAI002;MEAI001;S104</NoWarn>
+    <NoWarn>$(NoWarn);S104</NoWarn>
+    <NoWarn>$(NoWarn);OPENAI001;MEAI001</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAIFunctionConversionTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAIFunctionConversionTests.cs
index f2f0c9d8a3f..ce458473c59 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAIFunctionConversionTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAIFunctionConversionTests.cs
@@ -6,12 +6,10 @@
 using System.Text.Json;
 using OpenAI.Assistants;
 using OpenAI.Chat;
-using OpenAI.RealtimeConversation;
+using OpenAI.Realtime;
 using OpenAI.Responses;
 using Xunit;
 
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-
 namespace Microsoft.Extensions.AI;
 
 public class OpenAIAIFunctionConversionTests
@@ -24,7 +22,7 @@ public class OpenAIAIFunctionConversionTests
     [Fact]
     public void AsOpenAIChatTool_ProducesValidInstance()
     {
-        ChatTool tool = _testFunction.AsOpenAIChatTool();
+        var tool = _testFunction.AsOpenAIChatTool();
 
         Assert.NotNull(tool);
         Assert.Equal("test_function", tool.FunctionName);
@@ -35,7 +33,7 @@ public void AsOpenAIChatTool_ProducesValidInstance()
     [Fact]
     public void AsOpenAIResponseTool_ProducesValidInstance()
     {
-        ResponseTool tool = _testFunction.AsOpenAIResponseTool();
+        var tool = _testFunction.AsOpenAIResponseTool();
 
         Assert.NotNull(tool);
     }
@@ -43,7 +41,7 @@ public void AsOpenAIResponseTool_ProducesValidInstance()
     [Fact]
     public void AsOpenAIConversationFunctionTool_ProducesValidInstance()
     {
-        ConversationFunctionTool tool = _testFunction.AsOpenAIConversationFunctionTool();
+        var tool = _testFunction.AsOpenAIConversationFunctionTool();
 
         Assert.NotNull(tool);
         Assert.Equal("test_function", tool.Name);
@@ -54,7 +52,7 @@ public void AsOpenAIConversationFunctionTool_ProducesValidInstance()
     [Fact]
     public void AsOpenAIAssistantsFunctionToolDefinition_ProducesValidInstance()
     {
-        FunctionToolDefinition tool = _testFunction.AsOpenAIAssistantsFunctionToolDefinition();
+        var tool = _testFunction.AsOpenAIAssistantsFunctionToolDefinition();
 
         Assert.NotNull(tool);
         Assert.Equal("test_function", tool.FunctionName);
@@ -62,7 +60,7 @@ public void AsOpenAIAssistantsFunctionToolDefinition_ProducesValidInstance()
         ValidateSchemaParameters(tool.Parameters);
     }
 
-    /// <summary>Helper method to validate function parameters match our schema</summary>
+    /// <summary>Helper method to validate function parameters match our schema.</summary>
     private static void ValidateSchemaParameters(BinaryData parameters)
     {
         Assert.NotNull(parameters);
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientIntegrationTests.cs
index e616d5fb87b..90bcf9f2632 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientIntegrationTests.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 #pragma warning disable CA1822 // Mark members as static
 #pragma warning disable CA2000 // Dispose objects before losing scope
 #pragma warning disable S1135 // Track uses of "TODO" tags
@@ -62,7 +61,7 @@ public async Task DeleteAllThreads()
         client.DefaultRequestHeaders.Add("openai-organization", "org-ENTERYOURORGID");
         client.DefaultRequestHeaders.Add("openai-project", "proj_ENTERYOURPROJECTID");
 
-        AssistantClient ac = new AssistantClient(Environment.GetEnvironmentVariable("AI:OpenAI:ApiKey")!);
+        AssistantClient ac = new(Environment.GetEnvironmentVariable("AI:OpenAI:ApiKey")!);
         while (true)
         {
             string listing = await client.GetStringAsync("https://api.openai.com/v1/threads?limit=100");
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientTests.cs
index 6d3a02a08ec..3b084b5ec8a 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIAssistantChatClientTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.ClientModel;
-using Azure.AI.OpenAI;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using OpenAI;
@@ -11,7 +10,6 @@
 using Xunit;
 
 #pragma warning disable S103 // Lines should not be too long
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
 namespace Microsoft.Extensions.AI;
 
@@ -24,16 +22,12 @@ public void AsIChatClient_InvalidArgs_Throws()
         Assert.Throws<ArgumentNullException>("assistantId", () => new AssistantClient("ignored").AsIChatClient(null!));
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void AsIChatClient_OpenAIClient_ProducesExpectedMetadata(bool useAzureOpenAI)
+    [Fact]
+    public void AsIChatClient_OpenAIClient_ProducesExpectedMetadata()
     {
         Uri endpoint = new("http://localhost/some/endpoint");
 
-        var client = useAzureOpenAI ?
-            new AzureOpenAIClient(endpoint, new ApiKeyCredential("key")) :
-            new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
+        var client = new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
 
         IChatClient[] clients =
         [
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
index edb5d9fab07..d06d8f520be 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIChatClientTests.cs
@@ -11,7 +11,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Azure.AI.OpenAI;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using OpenAI;
@@ -30,17 +29,13 @@ public void AsIChatClient_InvalidArgs_Throws()
         Assert.Throws<ArgumentNullException>("chatClient", () => ((ChatClient)null!).AsIChatClient());
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void AsIChatClient_OpenAIClient_ProducesExpectedMetadata(bool useAzureOpenAI)
+    [Fact]
+    public void AsIChatClient_OpenAIClient_ProducesExpectedMetadata()
     {
         Uri endpoint = new("http://localhost/some/endpoint");
         string model = "amazingModel";
 
-        var client = useAzureOpenAI ?
-            new AzureOpenAIClient(endpoint, new ApiKeyCredential("key")) :
-            new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
+        var client = new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
 
         IChatClient chatClient = client.GetChatClient(model).AsIChatClient();
         var metadata = chatClient.GetService<ChatClientMetadata>();
@@ -398,9 +393,7 @@ public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentatio
                     TopP = 0.5f,
                     PresencePenalty = 0.5f,
                     Temperature = 0.5f,
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
                     Seed = 42,
-#pragma warning restore OPENAI001
                     ToolChoice = ChatToolChoice.CreateAutoChoice(),
                     ResponseFormat = OpenAI.Chat.ChatResponseFormat.CreateTextFormat()
                 };
@@ -477,9 +470,7 @@ public async Task ChatOptions_DoNotOverwrite_NotNullPropertiesInRawRepresentatio
                     TopP = 0.5f,
                     PresencePenalty = 0.5f,
                     Temperature = 0.5f,
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
                     Seed = 42,
-#pragma warning restore OPENAI001
                     ToolChoice = ChatToolChoice.CreateAutoChoice(),
                     ResponseFormat = OpenAI.Chat.ChatResponseFormat.CreateTextFormat()
                 };
@@ -561,9 +552,7 @@ public async Task ChatOptions_Overwrite_NullPropertiesInRawRepresentation_NonStr
                 Assert.Null(openAIOptions.TopP);
                 Assert.Null(openAIOptions.PresencePenalty);
                 Assert.Null(openAIOptions.Temperature);
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
                 Assert.Null(openAIOptions.Seed);
-#pragma warning restore OPENAI001
                 Assert.Empty(openAIOptions.StopSequences);
                 Assert.Empty(openAIOptions.Tools);
                 Assert.Null(openAIOptions.ToolChoice);
@@ -637,9 +626,7 @@ public async Task ChatOptions_Overwrite_NullPropertiesInRawRepresentation_Stream
                 Assert.Null(openAIOptions.TopP);
                 Assert.Null(openAIOptions.PresencePenalty);
                 Assert.Null(openAIOptions.Temperature);
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
                 Assert.Null(openAIOptions.Seed);
-#pragma warning restore OPENAI001
                 Assert.Empty(openAIOptions.StopSequences);
                 Assert.Empty(openAIOptions.Tools);
                 Assert.Null(openAIOptions.ToolChoice);
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIEmbeddingGeneratorTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIEmbeddingGeneratorTests.cs
index 9d8a1219ea7..43112fa88e3 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIEmbeddingGeneratorTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIEmbeddingGeneratorTests.cs
@@ -6,7 +6,6 @@
 using System.ClientModel.Primitives;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Azure.AI.OpenAI;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using OpenAI;
@@ -25,17 +24,13 @@ public void AsIEmbeddingGenerator_InvalidArgs_Throws()
         Assert.Throws<ArgumentNullException>("embeddingClient", () => ((EmbeddingClient)null!).AsIEmbeddingGenerator());
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void AsIEmbeddingGenerator_OpenAIClient_ProducesExpectedMetadata(bool useAzureOpenAI)
+    [Fact]
+    public void AsIEmbeddingGenerator_OpenAIClient_ProducesExpectedMetadata()
     {
         Uri endpoint = new("http://localhost/some/endpoint");
         string model = "amazingModel";
 
-        var client = useAzureOpenAI ?
-            new AzureOpenAIClient(endpoint, new ApiKeyCredential("key")) :
-            new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
+        var client = new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
 
         IEmbeddingGenerator<string, Embedding<float>> embeddingGenerator = client.GetEmbeddingClient(model).AsIEmbeddingGenerator();
         var metadata = embeddingGenerator.GetService<EmbeddingGeneratorMetadata>();
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
index 28125e462b7..b98eb89197f 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIResponseClientTests.cs
@@ -10,7 +10,6 @@
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Azure.AI.OpenAI;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using OpenAI;
@@ -29,17 +28,13 @@ public void AsIChatClient_InvalidArgs_Throws()
         Assert.Throws<ArgumentNullException>("responseClient", () => ((OpenAIResponseClient)null!).AsIChatClient());
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void AsIChatClient_ProducesExpectedMetadata(bool useAzureOpenAI)
+    [Fact]
+    public void AsIChatClient_ProducesExpectedMetadata()
     {
         Uri endpoint = new("http://localhost/some/endpoint");
         string model = "amazingModel";
 
-        var client = useAzureOpenAI ?
-            new AzureOpenAIClient(endpoint, new ApiKeyCredential("key")) :
-            new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
+        var client = new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
 
         IChatClient chatClient = client.GetOpenAIResponseClient(model).AsIChatClient();
         var metadata = chatClient.GetService<ChatClientMetadata>();
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientIntegrationTests.cs
index c80b37c865e..bb721806ff6 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientIntegrationTests.cs
@@ -7,6 +7,6 @@ public class OpenAISpeechToTextClientIntegrationTests : SpeechToTextClientIntegr
 {
     protected override ISpeechToTextClient? CreateClient()
         => IntegrationTestHelpers.GetOpenAIClient()?
-            .GetAudioClient(TestRunnerConfiguration.Instance["OpenAI:AudioTranscriptionModel"] ?? "whisper-1")
+            .GetAudioClient(TestRunnerConfiguration.Instance["OpenAI:AudioTranscriptionModel"] ?? "gpt-4o-mini-transcribe")
             .AsISpeechToTextClient();
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientTests.cs
index c92d9627968..1252a20741b 100644
--- a/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAISpeechToTextClientTests.cs
@@ -8,7 +8,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Azure.AI.OpenAI;
 using Microsoft.Extensions.Logging;
 using OpenAI;
 using OpenAI.Audio;
@@ -26,17 +25,13 @@ public void AsISpeechToTextClient_InvalidArgs_Throws()
         Assert.Throws<ArgumentNullException>("audioClient", () => ((AudioClient)null!).AsISpeechToTextClient());
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void AsISpeechToTextClient_AudioClient_ProducesExpectedMetadata(bool useAzureOpenAI)
+    [Fact]
+    public void AsISpeechToTextClient_AudioClient_ProducesExpectedMetadata()
     {
         Uri endpoint = new("http://localhost/some/endpoint");
         string model = "amazingModel";
 
-        var client = useAzureOpenAI ?
-            new AzureOpenAIClient(endpoint, new ApiKeyCredential("key")) :
-            new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
+        var client = new OpenAIClient(new ApiKeyCredential("key"), new OpenAIClientOptions { Endpoint = endpoint });
 
         ISpeechToTextClient speechToTextClient = client.GetAudioClient(model).AsISpeechToTextClient();
         var metadata = speechToTextClient.GetService<SpeechToTextClientMetadata>();
@@ -148,7 +143,8 @@ public async Task GetStreamingTextAsync_BasicRequestResponse(string? speechLangu
         string input = $$"""
                 {
                     "model": "whisper-1",
-                    "language": "{{speechLanguage}}"
+                    "language": "{{speechLanguage}}",
+                    "stream":true
                 }
                 """;
 

From 0e90bf3d09eff30dfa29cdc54b9d89622d4e1cb2 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Fri, 4 Jul 2025 19:56:30 -0400
Subject: [PATCH 12/13] Update McpServer template for 0.3.0-preview.2 (#6578)

---
 src/ProjectTemplates/GeneratedContent.targets                   | 2 +-
 .../src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs   | 2 +-
 .../mcpserver/Tools/RandomNumberTools.cs                        | 2 +-
 .../mcpserver.Basic.verified/mcpserver/mcpserver.csproj         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ProjectTemplates/GeneratedContent.targets b/src/ProjectTemplates/GeneratedContent.targets
index ce6ba2bc502..dfe93dbc5a8 100644
--- a/src/ProjectTemplates/GeneratedContent.targets
+++ b/src/ProjectTemplates/GeneratedContent.targets
@@ -39,7 +39,7 @@
       <TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery>9.3.0</TemplatePackageVersion_MicrosoftExtensionsServiceDiscovery>
       <TemplatePackageVersion_MicrosoftSemanticKernel>1.53.0</TemplatePackageVersion_MicrosoftSemanticKernel>
       <TemplatePackageVersion_MicrosoftSemanticKernel_Preview>1.53.0-preview</TemplatePackageVersion_MicrosoftSemanticKernel_Preview>
-      <TemplatePackageVersion_ModelContextProtocol>0.3.0-preview.1</TemplatePackageVersion_ModelContextProtocol>
+      <TemplatePackageVersion_ModelContextProtocol>0.3.0-preview.2</TemplatePackageVersion_ModelContextProtocol>
       <TemplatePackageVersion_OllamaSharp>5.1.18</TemplatePackageVersion_OllamaSharp>
       <TemplatePackageVersion_OpenTelemetry>1.12.0</TemplatePackageVersion_OpenTelemetry>
       <TemplatePackageVersion_PdfPig>0.1.10</TemplatePackageVersion_PdfPig>
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
index 4542f8505a5..568574f47d9 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
@@ -7,7 +7,7 @@
 /// </summary>
 internal class RandomNumberTools
 {
-    [McpServerTool(Name = "get_random_number")]
+    [McpServerTool]
     [Description("Generates a random number between the specified minimum and maximum values.")]
     public int GetRandomNumber(
         [Description("Minimum value (inclusive)")] int min = 0,
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
index 72af767e320..611745f4129 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/Tools/RandomNumberTools.cs
@@ -7,7 +7,7 @@
 /// </summary>
 internal class RandomNumberTools
 {
-    [McpServerTool(Name = "get_random_number")]
+    [McpServerTool]
     [Description("Generates a random number between the specified minimum and maximum values.")]
     public int GetRandomNumber(
         [Description("Minimum value (inclusive)")] int min = 0,
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj
index a71ac148e6f..e959c64702f 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/mcpserver.Basic.verified/mcpserver/mcpserver.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
-    <PackageReference Include="ModelContextProtocol" Version="0.3.0-preview.1" />
+    <PackageReference Include="ModelContextProtocol" Version="0.3.0-preview.2" />
   </ItemGroup>
 
 </Project>

From e6b555c147e47c7b848cae4aa708468deb28b889 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 8 Jul 2025 16:46:11 -0700
Subject: [PATCH 13/13] Fix template tests

---
 src/ProjectTemplates/GeneratedContent.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ProjectTemplates/GeneratedContent.targets b/src/ProjectTemplates/GeneratedContent.targets
index dfe93dbc5a8..e37794c3c0e 100644
--- a/src/ProjectTemplates/GeneratedContent.targets
+++ b/src/ProjectTemplates/GeneratedContent.targets
@@ -21,9 +21,9 @@
         - Use specific version numbers to pin to already-released packages
       -->
     <PropertyGroup>
-      <TemplatePackageVersion_MicrosoftExtensionsAI>$(Version)</TemplatePackageVersion_MicrosoftExtensionsAI>
-      <TemplatePackageVersion_MicrosoftExtensionsAI_Preview>$(Version)</TemplatePackageVersion_MicrosoftExtensionsAI_Preview>
-      <TemplatePackageVersion_MicrosoftExtensionsHttpResilience>$(Version)</TemplatePackageVersion_MicrosoftExtensionsHttpResilience>
+      <TemplatePackageVersion_MicrosoftExtensionsAI>9.7.0</TemplatePackageVersion_MicrosoftExtensionsAI>
+      <TemplatePackageVersion_MicrosoftExtensionsAI_Preview>9.7.0-preview.1.25356.2</TemplatePackageVersion_MicrosoftExtensionsAI_Preview>
+      <TemplatePackageVersion_MicrosoftExtensionsHttpResilience>9.7.0</TemplatePackageVersion_MicrosoftExtensionsHttpResilience>
     </PropertyGroup>
 
     <!-- External dependency packages -->