From 2d7ad3a50441dca3e5d90be59b82859410187d90 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Wed, 2 Oct 2024 21:58:16 +0000
Subject: [PATCH 01/11] Merged PR 43287: Getting ready for 8.10 release

Getting ready for 8.10 release

----
#### AI description  (iteration 1)
#### PR Classification
Release preparation

#### PR Summary
This pull request updates dependencies and configurations in preparation for the 8.10 release.
- `/eng/Version.Details.xml`: Updated various dependencies to newer versions.
- `/eng/Versions.props`: Synchronized dependency versions with the latest updates.
- `/azure-pipelines.yml`: Removed the `codecoverage` stage.
- `/eng/pipelines/templates/BuildAndTest.yml`: Added steps to set up private feed credentials for both Windows and non-Windows agents.
---
 Directory.Build.props                    |  5 ++
 NuGet.config                             | 46 ++++++------
 azure-pipelines.yml                      | 48 +------------
 eng/Version.Details.xml                  | 92 ++++++++++++------------
 eng/Versions.props                       | 53 +++++++-------
 eng/pipelines/templates/BuildAndTest.yml | 18 +++++
 6 files changed, 118 insertions(+), 144 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index cea28e22ade..850685ca2d7 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 9e48c557166..02f1d3194f2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,18 @@
     <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-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
@@ -24,33 +32,18 @@
     <!-- 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="dotnet8">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet8-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-954f61d-8" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
@@ -58,6 +51,7 @@
     <add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
     <add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
     <add key="darc-int-dotnet-runtime-2aade6b" value="true" />
+    <add key="darc-int-dotnet-runtime-81cabf2-3" 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 c8ab2149b97..3da5b47240a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -141,7 +141,7 @@ extends:
         parameters:
           enableMicrobuild: true
           enableTelemetry: true
-          enableSourceIndex: true
+          enableSourceIndex: false
           runAsPublic: ${{ variables['runAsPublic'] }}
           # Publish build logs
           enablePublishBuildArtifacts: true
@@ -218,51 +218,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
@@ -318,7 +273,6 @@ extends:
         parameters:
           validateDependsOn:
           - build
-          - codecoverage
           - correctness
           publishingInfraVersion: 3
           enableSymbolValidation: false
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 674eca8d91e..d7dfa636373 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,53 +16,53 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -76,65 +76,65 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
     <Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
     <Dependency Name="System.IO.Hashing" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
     <Dependency Name="System.Text.Encodings.Web" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.8">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.8">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.8">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.8">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.8">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
+      <Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 314b495eeb7..2d9a7174db0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
     <MajorVersion>8</MajorVersion>
     <MinorVersion>10</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
@@ -11,8 +11,11 @@
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!--
         When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
+
+        In 8.0, we shipped this package as stable even when it was in the dev stage, so we
+        keep it as stable for compatiblity.
     -->
-    <DotNetFinalVersionKind />
+    <DotNetFinalVersionKind Condition="'$(DotNetFinalVersionKind)' == '' And ('$(Stage)' != 'dev' Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing')">release</DotNetFinalVersionKind>
     <!-- Enabling this rule will cause build failures on undocumented public APIs. -->
     <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
@@ -34,43 +37,43 @@
     <MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
     <MicrosoftExtensionsConfigurationBinderVersion>8.0.2</MicrosoftExtensionsConfigurationBinderVersion>
     <MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>8.0.0</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
     <MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>8.0.0</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.1</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>8.0.1</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.1</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>8.0.1</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>8.0.1</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.1</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
     <MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
     <MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
     <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
+    <SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>8.0.0</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>8.0.1</SystemDiagnosticsPerformanceCounterVersion>
     <SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
     <SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
-    <SystemSecurityCryptographyPkcsVersion>8.0.0</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>8.0.1</SystemSecurityCryptographyXmlVersion>
+    <SystemSecurityCryptographyPkcsVersion>8.0.1</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>8.0.2</SystemSecurityCryptographyXmlVersion>
     <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>8.0.3</SystemTextJsonVersion>
-    <SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
+    <SystemRuntimeCachingVersion>8.0.1</SystemRuntimeCachingVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.8</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>8.0.8</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>8.0.8</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.8</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.10</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>8.0.10</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>8.0.10</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.10</MicrosoftExtensionsCachingStackExchangeRedisVersion>
     <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.5</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.8</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.10</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
     <MicrosoftExtensionsFeaturesVersion>8.0.5</MicrosoftExtensionsFeaturesVersion>
-    <MicrosoftExtensionsHttpPollyVersion>8.0.8</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>8.0.8</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftExtensionsHttpPollyVersion>8.0.10</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>8.0.10</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index ced3ce0afb3..c11365b9a50 100644
--- a/eng/pipelines/templates/BuildAndTest.yml
+++ b/eng/pipelines/templates/BuildAndTest.yml
@@ -23,6 +23,24 @@ parameters:
     default: false
 
 steps:
+  - 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
             /bl:${{ parameters.repoLogPath }}/restore.binlog

From 696389c9b8dadcad7cd7a0cdbe1f8803ee1448e4 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <RussKie@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:29:31 +1100
Subject: [PATCH 02/11] Script to generate weekly digest (#5550)

---
 .gitignore                            |   1 +
 eng/scripts/Get-RepoDigest.ps1        | 281 ++++++++++++++++++++++++++
 eng/scripts/repo-digest-template.html | 154 ++++++++++++++
 3 files changed, 436 insertions(+)
 create mode 100644 eng/scripts/Get-RepoDigest.ps1
 create mode 100644 eng/scripts/repo-digest-template.html

diff --git a/.gitignore b/.gitignore
index 677a001a33b..4e8c5f439a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -313,3 +313,4 @@ BenchmarkDotNet.artifacts/
 /_TEST
 
 *.binlog
+/eng/scripts/repo-digest.html
diff --git a/eng/scripts/Get-RepoDigest.ps1 b/eng/scripts/Get-RepoDigest.ps1
new file mode 100644
index 00000000000..02cdf73e072
--- /dev/null
+++ b/eng/scripts/Get-RepoDigest.ps1
@@ -0,0 +1,281 @@
+# Example:
+#    .\eng\scripts\Get-RepoDigest -ghToken <GitHub token>
+#
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True)]
+    [string] $ghToken
+)
+
+$baseUri = "https://api.github.com/repos/dotnet/extensions";
+$baseLabelUri = "https://github.com/dotnet/extensions";
+
+function Format-Avatar {
+    [CmdletBinding()]
+    Param(
+        $user
+    )
+
+    return "<img src='$($user.avatar_url)' class='avatar avatar-user mb-1 mr-1 rgh-small-user-avatars' width='16' height='16' loading='lazy' style='margin-left: 1px;'> <a class='user-mention notranslate' href='https://github.com/$($user.login)'>@$($user.login)</a>";
+}
+
+function Format-IssueByArea {
+    [CmdletBinding()]
+    Param(
+        $issues,
+        [string] $columnHeader
+    )
+
+    if (!$issues) {
+        return '';
+    }
+
+    $issueLinks = @();
+    $issueLinks += '<table><thead><tr>';
+    $issueLinks += "<th>$columnHeader</th>";
+    $issueLinks += "<th>Open for (days)</th>";
+    $issueLinks += "<th>Assignee</th>";
+    $issueLinks += "</tr></thead><tbody>";
+
+    $issues | Sort-Object created_at | ForEach-Object {
+        $issue = $_;
+        if ($issue.html_url.Contains('/pull/')) {
+            return;
+        }
+
+        $staleDays = Get-IssueStaleDays -issue $issue;
+        $assignees = Get-IssueAssignees -issue $issue;
+        $author = Format-Avatar -user $issue.user;
+
+        $issueLinks += '<tr>';
+        $issueLinks += "<td class='col-700'><strong><a href='$($issue.html_url)'>#$($issue.number) $($issue.title)</strong></a><br />by $author on $($issue.created_at.ToString("d MMM yyyy"))</td>"
+        $issueLinks += "<td class='col-70' align='right'><strong>$staleDays</strong></td>";
+        $issueLinks += "<td class='col-150'>$assignees</td>";
+        $issueLinks += "</tr>";
+    }
+
+    $issueLinks += "</tbody></table><br />";
+
+    return $issueLinks;
+}
+
+function Format-IssueLabel {
+    [CmdletBinding()]
+    Param(
+        $label
+    )
+
+    $color = $label.color;
+        $r = [Convert]::ToInt32($color.Substring(0, 2), 16)
+        $g = [Convert]::ToInt32($color.Substring(2, 2), 16)
+        $b = [Convert]::ToInt32($color.Substring(4, 2), 16)
+
+    return "<a href='$baseLabelUri/labels/$([uri]::EscapeDataString($label.name))' style='--label-r:$r;--label-g:$g;--label-b:$b;--label-h:38;--label-s:92;--label-l:50;' class='IssueLabel hx_IssueLabel '>$($label.name)</a>";
+}
+
+function Format-UntriagedIssue {
+    [CmdletBinding()]
+    Param(
+        $issues,
+        [string] $columnHeader
+    )
+
+    $issueLinks = @();
+    $issueLinks += '<table><thead><tr>';
+    $issueLinks += "<th>$columnHeader</th>";
+    $issueLinks += "<th>Open for (days)</th>";
+    $issueLinks += "<th>Assignee</th>";
+    $issueLinks += "<th>Labels</th>";
+    $issueLinks += "</tr></thead><tbody>";
+
+    $issues | Sort-Object created_at | ForEach-Object {
+        $issue = $_;
+        if ($issue.html_url.Contains('/pull/')) {
+            return;
+        }
+
+        $issueLabels = Get-IssueLabels -issue $issue;
+        $staleDays = Get-IssueStaleDays -issue $issue;
+        $assignees = Get-IssueAssignees -issue $issue;
+        $author = Format-Avatar -user $issue.user;
+
+        $issueLinks += '<tr>';
+        $issueLinks += "<td class='col-700'><strong><a href='$($issue.html_url)'>#$($issue.number) $($issue.title)</strong></a><br />by $author on $($issue.created_at.ToString("d MMM yyyy"))</td>"
+        $issueLinks += "<td class='col-70' align='right'><strong>$staleDays</strong></td>";
+        $issueLinks += "<td class='col-150'>$assignees</td>";
+        $issueLinks += "<td>$issueLabels</td>";
+        $issueLinks += "</tr>";
+    }
+
+    $issueLinks += "</tbody></table><br />";
+
+    return $issueLinks;
+}
+
+function Get-AreaLabels {
+    [CmdletBinding()]
+    Param(
+    )
+
+    $labels = @();
+    $nextPattern = "(?<=<)([\S]*)(?=>; rel=`"next`")";
+
+    $headers = @{
+        Authorization = "token $ghToken"
+    }
+    $url = "$baseUri/labels?page=1&per_page=100";
+    Write-Verbose "Next URL: $url"
+    do {
+        $response = Invoke-RestMethod -Method Get -Uri $url -Headers $headers -ResponseHeadersVariable responseHeaders #-Verbose
+        $labels += $response;
+
+        $url = $null;
+
+        # See https://docs.github.com/rest/using-the-rest-api/using-pagination-in-the-rest-api#using-link-headers
+        $linkHeader = $responseHeaders["link"];
+        if ($linkHeader -and ($linkHeader -match $nextPattern) -eq $true) {
+            $url = $Matches[0];
+            Write-Verbose "Next URL: $url"
+        }
+    } while ($url)
+
+    $areaLabels = @();
+    $labels | Sort-Object created_at | ForEach-Object {
+        $label = $_;
+        if ($label.name.StartsWith('area-')) {
+            $areaLabels += $label;
+        }
+    }
+
+    return $areaLabels | Sort-Object name;
+}
+
+function Get-Issues {
+    [CmdletBinding()]
+    Param(
+        [string] $labels,
+        [bool] $noMilestone = $false
+    )
+
+    $issues = @();
+    $nextPattern = "(?<=<)([\S]*)(?=>; rel=`"next`")";
+
+    $headers = @{
+        Authorization = "token $ghToken"
+    }
+    $urlSuffix = if ($noMilestone) { '&milestone=none' } else { '' }
+    $url = "$baseUri/issues?page=1&per_page=100&labels=$labels&state=open$urlSuffix"
+    Write-Verbose "Next URL: $url"
+    do {
+        $response = Invoke-RestMethod -Method Get -Uri $url -Headers $headers -ResponseHeadersVariable responseHeaders #-Verbose
+        $issues += $response;
+
+        $url = $null;
+
+        # See https://docs.github.com/rest/using-the-rest-api/using-pagination-in-the-rest-api#using-link-headers
+        $linkHeader = $responseHeaders["link"];
+        if ($linkHeader -and ($linkHeader -match $nextPattern) -eq $true) {
+            $url = $Matches[0];
+            Write-Verbose "Next URL: $url"
+        }
+    } while ($url)
+
+    return $issues;
+}
+
+function Get-IssuePerArea {
+    [CmdletBinding()]
+    Param(
+    )
+
+    $issues = @();
+
+    $areaLabels = Get-AreaLabels
+    $areaLabels | ForEach-Object {
+        $areaLabel = $_.name;
+
+        $header = "Issues for $(Format-IssueLabel -label $_)";
+        $issuesPerLabel = Get-Issues -labels $areaLabel -noMilestone $true;
+        $issues += (Format-IssueByArea -issues $issuesPerLabel -columnHeader $header);
+        $issues += '';
+    }
+
+    return $issues;
+}
+
+
+function Get-IssueAssignees {
+    [CmdletBinding()]
+    Param(
+        $issue
+    )
+
+    $assignees = '';
+    $issue.assignees | ForEach-Object {
+        $login = Format-Avatar -user $_;
+        $assignees += " <div><strong>$login</strong></div>";
+    }
+
+    return $assignees;
+}
+
+function Get-IssueLabels {
+    [CmdletBinding()]
+    Param(
+        $issue
+    )
+
+    $issueLabels = '';
+    $issue.labels | ForEach-Object {
+        $labelName = Format-IssueLabel -label $_
+        $issueLabels += " $labelName";
+    }
+
+    return $issueLabels;
+}
+
+function Get-IssueStaleDays {
+    [CmdletBinding()]
+    Param(
+        $issue
+    )
+
+    $staleDays = (New-TimeSpan -Start $issue.created_at -End $(Get-Date)).Days;
+
+    if ($staleDays -gt 28) {
+        $staleDays = "<g-emoji class='g-emoji'>❗</g-emoji> $staleDays"
+    }
+    elseif ($staleDays -gt 14) {
+        $staleDays = "<g-emoji class='g-emoji'>⚠️</g-emoji> $staleDays";
+    }
+
+    return $staleDays;
+}
+
+Push-Location $PSScriptRoot
+
+try {
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    # A list of comma separated label names. Example: bug,ui,@high
+    # See https://docs.github.com/rest/issues/issues
+    $untriagedIssues = Format-UntriagedIssue -issues (Get-Issues -labels 'untriaged') -columnHeader 'Untriaged issues'
+
+    # A list of comma separated label names. Example: bug,ui,@high
+    # See https://docs.github.com/rest/issues/issues
+    $issuesPerArea = Get-IssuePerArea
+
+    $template = Get-Content 'repo-digest-template.html';
+    $template = $template.Replace('##ISSUES-UNTRIAGED##', $untriagedIssues);
+    $template = $template.Replace('##ISSUES-BY-AREA##', $issuesPerArea);
+    $template = $template.Replace('##DATE##', $((Get-Date).ToString("d MMM yyyy")));
+    $template | Out-File 'repo-digest.html' -Encoding utf8
+}
+catch {
+    Write-Error $_;
+    Exit -1;
+}
+finally {
+    Pop-Location
+}
diff --git a/eng/scripts/repo-digest-template.html b/eng/scripts/repo-digest-template.html
new file mode 100644
index 00000000000..75ca1f5024b
--- /dev/null
+++ b/eng/scripts/repo-digest-template.html
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>dotnet/extensions weekly digest</title>
+  <style>
+    body {
+      font-family: Segoe UI, SegoeUI, Arial, sans-serif;
+    }
+
+    table,
+    th,
+    td {
+      border: 1px solid silver;
+      border-collapse: collapse;
+    }
+
+    th {
+      background-color: rgb(240, 240, 240);
+    }
+
+    td {
+      display: table-cell;
+      vertical-align: inherit;
+      unicode-bidi: isolate;
+    }
+
+    .markdown-body table th,
+    .markdown-body table td {
+      padding: 6px 13px;
+      border: 1px solid silver;
+    }
+
+    td.col-700 {
+      width: 700px;
+    }
+
+    td.col-150 {
+      width: 150px;
+    }
+
+    td.col-70 {
+      width: 70px;
+    }
+
+    a {
+      color: #0969da;
+      text-decoration: none;
+    }
+
+    .avatar-user {
+      border-radius: 50% !important;
+    }
+
+    .avatar {
+      display: inline-block;
+      flex-shrink: 0;
+      line-height: 1;
+      overflow: hidden;
+      vertical-align: middle;
+    }
+
+    img {
+      overflow-clip-margin: content-box;
+      overflow: clip;
+    }
+
+    g-emoji {
+      display: inline-block;
+      min-width: 1ch;
+      font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+      font-size: 1em;
+      font-style: normal !important;
+      font-weight: var(--base-text-weight-normal, 400);
+      line-height: 1;
+      vertical-align: -0.075em;
+    }
+
+    .IssueLabel {
+      display: inline-block;
+      padding: 0 7px;
+      font-size: 12px;
+      font-weight: var(--base-text-weight-medium, 500);
+      line-height: 18px;
+      white-space: nowrap;
+      border: 1px solid transparent;
+      border-radius: 2em;
+    }
+
+    :root .hx_IssueLabel,
+    [data-color-mode=light][data-light-theme*=light] .hx_IssueLabel,
+    [data-color-mode=dark][data-dark-theme*=light] .hx_IssueLabel {
+      --lightness-threshold: 0.453;
+      --border-threshold: 0.96;
+      --border-alpha: max(0, min(calc((var(--perceived-lightness) - var(--border-threshold))* 100), 1));
+      color: hsl(0deg, 0%, calc(max(0, min(calc((1/(0.453 - calc(((var(--label-r) * 0.2126) + (var(--label-r) * 0.7152) + (var(--label-r) * 0.0722)) / 255)))), 1)) * 100%));
+      background: rgb(var(--label-r), var(--label-g), var(--label-b));
+      border-color: hsla(38, calc(92 * 1%), calc((50 - 25) * 1%), max(0, min(calc((calc(((var(--label-b) * 0.2126) + (var(--label-b) * 0.7152) + (var(--label-b) * 0.0722)) / 255) - 0.96) * 100), 1)));
+    }
+
+    
+    .hx_IssueLabel {
+      --perceived-lightness: calc(((var(--label-r)* 0.2126) +(var(--label-g)* 0.7152) +(var(--label-b)* 0.0722)) / 255);
+      --lightness-switch: max(0, min(calc((1 /(var(--lightness-threshold) - var(--perceived-lightness)))), 1));
+    }
+  </style>
+</head>
+
+<body>
+  <div>
+    Hi.
+    <br /><br />
+    <div id="header">
+      Below is the weekly report for the <a href='https://github.com/dotnet/extensions/'>dotnet/extensions</a> repo.
+      Please little-"r" me if you have any questions or feedback.
+      <p style="font-size: 10"><em>The report was generated on ##DATE##.</em></p>
+    </div>
+  </div>
+
+  <p>
+    <br />
+    <hr noshade style="color: #c0c0c0" />
+    <br />
+  </p>
+
+  <div class="markdown-body issues-untriaged">
+    <p><font size="+2"><strong>REQUIRED ACTION</strong>: <a href="https://github.com/dotnet/extensions/wiki/Maintainers-guide#triage-rules">Triage issues</a> which belong to
+      your area path and remove <a href="https://github.com/dotnet/extensions/labels/untriaged" style="--label-r:245;--label-g:162;--label-b:12;--label-h:38;--label-s:92;--label-l:50;" class="IssueLabel hx_IssueLabel">untriaged</a> label.<br/>
+      Refer to the <strong><a href="https://github.com/dotnet/extensions/wiki/Maintainers-guide#triage-rules">Maintainers guide</a></strong> for more information.
+    </font>
+    </p>
+
+    ##ISSUES-UNTRIAGED##
+  </div>
+
+  <p>
+    <br />
+    <hr noshade style="color: #c0c0c0" />
+    <br />
+  </p>
+
+  <div class="markdown-body issues-by-area">
+    <p><font size="+2"><strong>REQUIRED ACTION</strong>: Consider providing an update for each issue in your area with an expected
+      ETA.<br />
+      Alternatively, consider closing issues which you don't expect to be working on at all.<br/>
+      Refer to the <strong><a href="https://github.com/dotnet/extensions/wiki/Maintainers-guide#triage-rules">Maintainers guide</a></strong> for more information.
+    </font>
+    </p>
+
+    ##ISSUES-BY-AREA##
+  </div>
+</body>
+
+</html>
\ No newline at end of file

From 479b67e12735c189316d181a1fb813b7b9074298 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 23 Oct 2024 17:43:40 -0400
Subject: [PATCH 03/11] Improve EmbeddingGeneratorExtensions (#5551)

* Improve EmbeddingGeneratorExtensions

- Renames GenerateAsync extension method (not the interface method) to be GenerateEmbeddingAsync, since it produces a single TEmbedding
- Adds GenerateEmbeddingVectorAsync, which returns a `ReadOnlyMemory<T>`
- Adds a GenerateAndZipEmbeddingsAsync, which creates a `List<KeyValuePair<TInput, TEmbedding>>` that pairs the inputs with the outputs.

* Address PR feedback
---
 .../EmbeddingGeneratorExtensions.cs           | 99 +++++++++++++++++--
 .../EmbeddingGeneratorExtensionsTests.cs      | 36 ++++++-
 .../EmbeddingGeneratorIntegrationTests.cs     | 10 +-
 ...istributedCachingEmbeddingGeneratorTest.cs | 28 +++---
 .../LoggingEmbeddingGeneratorTests.cs         |  2 +-
 5 files changed, 145 insertions(+), 30 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGeneratorExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGeneratorExtensions.cs
index 944ce0995f8..efa804fd0eb 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGeneratorExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGeneratorExtensions.cs
@@ -2,26 +2,59 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Shared.Diagnostics;
 
+#pragma warning disable S2302 // "nameof" should be used
+
 namespace Microsoft.Extensions.AI;
 
-/// <summary>Provides a collection of static methods for extending <see cref="IEmbeddingGenerator{TValue,TEmbedding}"/> instances.</summary>
+/// <summary>Provides a collection of static methods for extending <see cref="IEmbeddingGenerator{TInput,TEmbedding}"/> instances.</summary>
 public static class EmbeddingGeneratorExtensions
 {
-    /// <summary>Generates an embedding from the specified <paramref name="value"/>.</summary>
-    /// <typeparam name="TValue">The type from which embeddings will be generated.</typeparam>
+    /// <summary>Generates an embedding vector from the specified <paramref name="value"/>.</summary>
+    /// <typeparam name="TInput">The type from which embeddings will be generated.</typeparam>
     /// <typeparam name="TEmbedding">The numeric type of the embedding data.</typeparam>
     /// <param name="generator">The embedding generator.</param>
     /// <param name="value">A value from which an embedding will be generated.</param>
     /// <param name="options">The embedding generation options to configure the request.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The generated embedding for the specified <paramref name="value"/>.</returns>
-    public static async Task<TEmbedding> GenerateAsync<TValue, TEmbedding>(
-        this IEmbeddingGenerator<TValue, TEmbedding> generator,
-        TValue value,
+    /// <remarks>
+    /// This operation is equivalent to using <see cref="GenerateEmbeddingAsync"/> and returning the
+    /// resulting <see cref="Embedding{T}"/>'s <see cref="Embedding{T}.Vector"/> property.
+    /// </remarks>
+    public static async Task<ReadOnlyMemory<TEmbedding>> GenerateEmbeddingVectorAsync<TInput, TEmbedding>(
+        this IEmbeddingGenerator<TInput, Embedding<TEmbedding>> generator,
+        TInput value,
+        EmbeddingGenerationOptions? options = null,
+        CancellationToken cancellationToken = default)
+    {
+        var embedding = await GenerateEmbeddingAsync(generator, value, options, cancellationToken).ConfigureAwait(false);
+        return embedding.Vector;
+    }
+
+    /// <summary>Generates an embedding from the specified <paramref name="value"/>.</summary>
+    /// <typeparam name="TInput">The type from which embeddings will be generated.</typeparam>
+    /// <typeparam name="TEmbedding">The type of embedding to generate.</typeparam>
+    /// <param name="generator">The embedding generator.</param>
+    /// <param name="value">A value from which an embedding will be generated.</param>
+    /// <param name="options">The embedding generation options to configure the request.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>
+    /// The generated embedding for the specified <paramref name="value"/>.
+    /// </returns>
+    /// <remarks>
+    /// This operations is equivalent to using <see cref="IEmbeddingGenerator{TInput, TEmbedding}.GenerateAsync"/> with a
+    /// collection composed of the single <paramref name="value"/> and then returning the first embedding element from the
+    /// resulting <see cref="GeneratedEmbeddings{TEmbedding}"/> collection.
+    /// </remarks>
+    public static async Task<TEmbedding> GenerateEmbeddingAsync<TInput, TEmbedding>(
+        this IEmbeddingGenerator<TInput, TEmbedding> generator,
+        TInput value,
         EmbeddingGenerationOptions? options = null,
         CancellationToken cancellationToken = default)
         where TEmbedding : Embedding
@@ -30,11 +63,61 @@ public static async Task<TEmbedding> GenerateAsync<TValue, TEmbedding>(
         _ = Throw.IfNull(value);
 
         var embeddings = await generator.GenerateAsync([value], options, cancellationToken).ConfigureAwait(false);
+
+        if (embeddings is null)
+        {
+            throw new InvalidOperationException("Embedding generator returned a null collection of embeddings.");
+        }
+
         if (embeddings.Count != 1)
         {
-            throw new InvalidOperationException("Expected exactly one embedding to be generated.");
+            throw new InvalidOperationException($"Expected the number of embeddings ({embeddings.Count}) to match the number of inputs (1).");
+        }
+
+        return embeddings[0] ?? throw new InvalidOperationException("Embedding generator generated a null embedding.");
+    }
+
+    /// <summary>
+    /// Generates embeddings for each of the supplied <paramref name="values"/> and produces a list that pairs
+    /// each input value with its resulting embedding.
+    /// </summary>
+    /// <typeparam name="TInput">The type from which embeddings will be generated.</typeparam>
+    /// <typeparam name="TEmbedding">The type of embedding to generate.</typeparam>
+    /// <param name="generator">The embedding generator.</param>
+    /// <param name="values">The collection of values for which to generate embeddings.</param>
+    /// <param name="options">The embedding generation options to configure the request.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>An array containing tuples of the input values and the associated generated embeddings.</returns>
+    public static async Task<(TInput Value, TEmbedding Embedding)[]> GenerateAndZipAsync<TInput, TEmbedding>(
+        this IEmbeddingGenerator<TInput, TEmbedding> generator,
+        IEnumerable<TInput> values,
+        EmbeddingGenerationOptions? options = null,
+        CancellationToken cancellationToken = default)
+        where TEmbedding : Embedding
+    {
+        _ = Throw.IfNull(generator);
+        _ = Throw.IfNull(values);
+
+        IList<TInput> inputs = values as IList<TInput> ?? values.ToList();
+        int inputsCount = inputs.Count;
+
+        if (inputsCount == 0)
+        {
+            return Array.Empty<(TInput, TEmbedding)>();
+        }
+
+        var embeddings = await generator.GenerateAsync(values, options, cancellationToken).ConfigureAwait(false);
+        if (embeddings.Count != inputsCount)
+        {
+            throw new InvalidOperationException($"Expected the number of embeddings ({embeddings.Count}) to match the number of inputs ({inputsCount}).");
+        }
+
+        var results = new (TInput, TEmbedding)[embeddings.Count];
+        for (int i = 0; i < results.Length; i++)
+        {
+            results[i] = (inputs[i], embeddings[i]);
         }
 
-        return embeddings[0];
+        return results;
     }
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGeneratorExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGeneratorExtensionsTests.cs
index c2e36c9c759..b6deb1ccd0f 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGeneratorExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGeneratorExtensionsTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -12,7 +13,9 @@ public class EmbeddingGeneratorExtensionsTests
     [Fact]
     public async Task GenerateAsync_InvalidArgs_ThrowsAsync()
     {
-        await Assert.ThrowsAsync<ArgumentNullException>("generator", () => ((TestEmbeddingGenerator)null!).GenerateAsync("hello"));
+        await Assert.ThrowsAsync<ArgumentNullException>("generator", () => ((TestEmbeddingGenerator)null!).GenerateEmbeddingAsync("hello"));
+        await Assert.ThrowsAsync<ArgumentNullException>("generator", () => ((TestEmbeddingGenerator)null!).GenerateEmbeddingVectorAsync("hello"));
+        await Assert.ThrowsAsync<ArgumentNullException>("generator", () => ((TestEmbeddingGenerator)null!).GenerateAndZipAsync(["hello"]));
     }
 
     [Fact]
@@ -26,6 +29,35 @@ public async Task GenerateAsync_ReturnsSingleEmbeddingAsync()
                 Task.FromResult<GeneratedEmbeddings<Embedding<float>>>([result])
         };
 
-        Assert.Same(result, await service.GenerateAsync("hello"));
+        Assert.Same(result, await service.GenerateEmbeddingAsync("hello"));
+        Assert.Equal(result.Vector, await service.GenerateEmbeddingVectorAsync("hello"));
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(1)]
+    [InlineData(10)]
+    public async Task GenerateAndZipEmbeddingsAsync_ReturnsExpectedList(int count)
+    {
+        string[] inputs = Enumerable.Range(0, count).Select(i => $"hello {i}").ToArray();
+        Embedding<float>[] embeddings = Enumerable
+            .Range(0, count)
+            .Select(i => new Embedding<float>(Enumerable.Range(i, 4).Select(i => (float)i).ToArray()))
+            .ToArray();
+
+        using TestEmbeddingGenerator service = new()
+        {
+            GenerateAsyncCallback = (values, options, cancellationToken) =>
+                Task.FromResult<GeneratedEmbeddings<Embedding<float>>>(new(embeddings))
+        };
+
+        var results = await service.GenerateAndZipAsync(inputs);
+        Assert.NotNull(results);
+        Assert.Equal(count, results.Length);
+        for (int i = 0; i < count; i++)
+        {
+            Assert.Equal(inputs[i], results[i].Value);
+            Assert.Same(embeddings[i], results[i].Embedding);
+        }
     }
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/EmbeddingGeneratorIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/EmbeddingGeneratorIntegrationTests.cs
index 806cf63e017..70eb6a31283 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/EmbeddingGeneratorIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/EmbeddingGeneratorIntegrationTests.cs
@@ -87,10 +87,10 @@ public virtual async Task Caching_SameOutputsForSameInput()
             .Use(CreateEmbeddingGenerator()!);
 
         string input = "Red, White, and Blue";
-        var embedding1 = await generator.GenerateAsync(input);
-        var embedding2 = await generator.GenerateAsync(input);
-        var embedding3 = await generator.GenerateAsync(input + "... and Green");
-        var embedding4 = await generator.GenerateAsync(input);
+        var embedding1 = await generator.GenerateEmbeddingAsync(input);
+        var embedding2 = await generator.GenerateEmbeddingAsync(input);
+        var embedding3 = await generator.GenerateEmbeddingAsync(input + "... and Green");
+        var embedding4 = await generator.GenerateEmbeddingAsync(input);
 
         var callCounter = generator.GetService<CallCountingEmbeddingGenerator>();
         Assert.NotNull(callCounter);
@@ -114,7 +114,7 @@ public virtual async Task OpenTelemetry_CanEmitTracesAndMetrics()
             .UseOpenTelemetry(sourceName: sourceName)
             .Use(CreateEmbeddingGenerator()!);
 
-        _ = await embeddingGenerator.GenerateAsync("Hello, world!");
+        _ = await embeddingGenerator.GenerateEmbeddingAsync("Hello, world!");
 
         Assert.Single(activities);
         var activity = activities.Single();
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/DistributedCachingEmbeddingGeneratorTest.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/DistributedCachingEmbeddingGeneratorTest.cs
index 9a5086a146d..a2818c7c3ed 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/DistributedCachingEmbeddingGeneratorTest.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/DistributedCachingEmbeddingGeneratorTest.cs
@@ -43,12 +43,12 @@ public async Task CachesSuccessResultsAsync()
         };
 
         // Make the initial request and do a quick sanity check
-        var result1 = await outer.GenerateAsync("abc");
+        var result1 = await outer.GenerateEmbeddingAsync("abc");
         AssertEmbeddingsEqual(_expectedEmbedding, result1);
         Assert.Equal(1, innerCallCount);
 
         // Act
-        var result2 = await outer.GenerateAsync("abc");
+        var result2 = await outer.GenerateEmbeddingAsync("abc");
 
         // Assert
         Assert.Equal(1, innerCallCount);
@@ -134,8 +134,8 @@ public async Task AllowsConcurrentCallsAsync()
         };
 
         // Act 1: Concurrent calls before resolution are passed into the inner client
-        var result1 = outer.GenerateAsync("abc");
-        var result2 = outer.GenerateAsync("abc");
+        var result1 = outer.GenerateEmbeddingAsync("abc");
+        var result2 = outer.GenerateEmbeddingAsync("abc");
 
         // Assert 1
         Assert.Equal(2, innerCallCount);
@@ -146,7 +146,7 @@ public async Task AllowsConcurrentCallsAsync()
         AssertEmbeddingsEqual(_expectedEmbedding, await result2);
 
         // Act 2: Subsequent calls after completion are resolved from the cache
-        var result3 = await outer.GenerateAsync("abc");
+        var result3 = await outer.GenerateEmbeddingAsync("abc");
         Assert.Equal(2, innerCallCount);
         AssertEmbeddingsEqual(_expectedEmbedding, await result1);
     }
@@ -169,12 +169,12 @@ public async Task DoesNotCacheExceptionResultsAsync()
             JsonSerializerOptions = TestJsonSerializerContext.Default.Options,
         };
 
-        var ex1 = await Assert.ThrowsAsync<InvalidTimeZoneException>(() => outer.GenerateAsync("abc"));
+        var ex1 = await Assert.ThrowsAsync<InvalidTimeZoneException>(() => outer.GenerateEmbeddingAsync("abc"));
         Assert.Equal("some failure", ex1.Message);
         Assert.Equal(1, innerCallCount);
 
         // Act
-        var ex2 = await Assert.ThrowsAsync<InvalidTimeZoneException>(() => outer.GenerateAsync("abc"));
+        var ex2 = await Assert.ThrowsAsync<InvalidTimeZoneException>(() => outer.GenerateEmbeddingAsync("abc"));
 
         // Assert
         Assert.NotSame(ex1, ex2);
@@ -207,7 +207,7 @@ public async Task DoesNotCacheCanceledResultsAsync()
         };
 
         // First call gets cancelled
-        var result1 = outer.GenerateAsync("abc");
+        var result1 = outer.GenerateEmbeddingAsync("abc");
         Assert.False(result1.IsCompleted);
         Assert.Equal(1, innerCallCount);
         resolutionTcs.SetCanceled();
@@ -215,7 +215,7 @@ public async Task DoesNotCacheCanceledResultsAsync()
         Assert.True(result1.IsCanceled);
 
         // Act/Assert: Second call can succeed
-        var result2 = await outer.GenerateAsync("abc");
+        var result2 = await outer.GenerateEmbeddingAsync("abc");
         Assert.Equal(2, innerCallCount);
         AssertEmbeddingsEqual(_expectedEmbedding, result2);
     }
@@ -241,11 +241,11 @@ public async Task CacheKeyDoesNotVaryByEmbeddingOptionsAsync()
         };
 
         // Act: Call with two different options
-        var result1 = await outer.GenerateAsync("abc", new EmbeddingGenerationOptions
+        var result1 = await outer.GenerateEmbeddingAsync("abc", new EmbeddingGenerationOptions
         {
             AdditionalProperties = new() { ["someKey"] = "value 1" }
         });
-        var result2 = await outer.GenerateAsync("abc", new EmbeddingGenerationOptions
+        var result2 = await outer.GenerateEmbeddingAsync("abc", new EmbeddingGenerationOptions
         {
             AdditionalProperties = new() { ["someKey"] = "value 2" }
         });
@@ -277,11 +277,11 @@ public async Task SubclassCanOverrideCacheKeyToVaryByOptionsAsync()
         };
 
         // Act: Call with two different options
-        var result1 = await outer.GenerateAsync("abc", new EmbeddingGenerationOptions
+        var result1 = await outer.GenerateEmbeddingAsync("abc", new EmbeddingGenerationOptions
         {
             AdditionalProperties = new() { ["someKey"] = "value 1" }
         });
-        var result2 = await outer.GenerateAsync("abc", new EmbeddingGenerationOptions
+        var result2 = await outer.GenerateEmbeddingAsync("abc", new EmbeddingGenerationOptions
         {
             AdditionalProperties = new() { ["someKey"] = "value 2" }
         });
@@ -315,7 +315,7 @@ public async Task CanResolveIDistributedCacheFromDI()
 
         // Act: Make a request that should populate the cache
         Assert.Empty(_storage.Keys);
-        var result = await outer.GenerateAsync("abc");
+        var result = await outer.GenerateEmbeddingAsync("abc");
 
         // Assert
         Assert.NotNull(result);
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/LoggingEmbeddingGeneratorTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/LoggingEmbeddingGeneratorTests.cs
index e231e8995fe..5cd6267eb74 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/LoggingEmbeddingGeneratorTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/Embeddings/LoggingEmbeddingGeneratorTests.cs
@@ -43,7 +43,7 @@ public async Task CompleteAsync_LogsStartAndCompletion(LogLevel level)
             .UseLogging()
             .Use(innerGenerator);
 
-        await generator.GenerateAsync("Blue whale");
+        await generator.GenerateEmbeddingAsync("Blue whale");
 
         if (level is LogLevel.Trace)
         {

From f9ce7f877d43434ea053fcea54b5a8554617ca20 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <RussKie@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:47:42 +1100
Subject: [PATCH 04/11] Update .gitattributes (#5565)

---
 .gitattributes | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 026fcf99b26..8e443edcd01 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -58,6 +58,3 @@
 *.dbproj text=auto
 *.sln text=auto
 
-*.png filter=lfs diff=lfs merge=lfs -text
-*.jpg filter=lfs diff=lfs merge=lfs -text
-*.dll filter=lfs diff=lfs merge=lfs -text

From 8352f827227a6225849fa422400f6840de3add58 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 08:00:14 -0400
Subject: [PATCH 05/11] Fix cloning of ChatOptions.TopK (#5564)

---
 .../ChatCompletion/ChatOptions.cs                          | 1 +
 .../ChatCompletion/ChatOptionsTests.cs                     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
index b3b60c62bad..4edbed900b4 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/ChatCompletion/ChatOptions.cs
@@ -71,6 +71,7 @@ public virtual ChatOptions Clone()
             Temperature = Temperature,
             MaxOutputTokens = MaxOutputTokens,
             TopP = TopP,
+            TopK = TopK,
             FrequencyPenalty = FrequencyPenalty,
             PresencePenalty = PresencePenalty,
             ResponseFormat = ResponseFormat,
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
index 2e769ff6d7e..f83169712c3 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/ChatCompletion/ChatOptionsTests.cs
@@ -16,6 +16,7 @@ public void Constructor_Parameterless_PropsDefaulted()
         Assert.Null(options.Temperature);
         Assert.Null(options.MaxOutputTokens);
         Assert.Null(options.TopP);
+        Assert.Null(options.TopK);
         Assert.Null(options.FrequencyPenalty);
         Assert.Null(options.PresencePenalty);
         Assert.Null(options.ResponseFormat);
@@ -29,6 +30,7 @@ public void Constructor_Parameterless_PropsDefaulted()
         Assert.Null(clone.Temperature);
         Assert.Null(clone.MaxOutputTokens);
         Assert.Null(clone.TopP);
+        Assert.Null(clone.TopK);
         Assert.Null(clone.FrequencyPenalty);
         Assert.Null(clone.PresencePenalty);
         Assert.Null(clone.ResponseFormat);
@@ -64,6 +66,7 @@ public void Properties_Roundtrip()
         options.Temperature = 0.1f;
         options.MaxOutputTokens = 2;
         options.TopP = 0.3f;
+        options.TopK = 42;
         options.FrequencyPenalty = 0.4f;
         options.PresencePenalty = 0.5f;
         options.ResponseFormat = ChatResponseFormat.Json;
@@ -76,6 +79,7 @@ public void Properties_Roundtrip()
         Assert.Equal(0.1f, options.Temperature);
         Assert.Equal(2, options.MaxOutputTokens);
         Assert.Equal(0.3f, options.TopP);
+        Assert.Equal(42, options.TopK);
         Assert.Equal(0.4f, options.FrequencyPenalty);
         Assert.Equal(0.5f, options.PresencePenalty);
         Assert.Same(ChatResponseFormat.Json, options.ResponseFormat);
@@ -89,6 +93,7 @@ public void Properties_Roundtrip()
         Assert.Equal(0.1f, clone.Temperature);
         Assert.Equal(2, clone.MaxOutputTokens);
         Assert.Equal(0.3f, clone.TopP);
+        Assert.Equal(42, clone.TopK);
         Assert.Equal(0.4f, clone.FrequencyPenalty);
         Assert.Equal(0.5f, clone.PresencePenalty);
         Assert.Same(ChatResponseFormat.Json, clone.ResponseFormat);
@@ -118,6 +123,7 @@ public void JsonSerialization_Roundtrips()
         options.Temperature = 0.1f;
         options.MaxOutputTokens = 2;
         options.TopP = 0.3f;
+        options.TopK = 42;
         options.FrequencyPenalty = 0.4f;
         options.PresencePenalty = 0.5f;
         options.ResponseFormat = ChatResponseFormat.Json;
@@ -139,6 +145,7 @@ public void JsonSerialization_Roundtrips()
         Assert.Equal(0.1f, deserialized.Temperature);
         Assert.Equal(2, deserialized.MaxOutputTokens);
         Assert.Equal(0.3f, deserialized.TopP);
+        Assert.Equal(42, deserialized.TopK);
         Assert.Equal(0.4f, deserialized.FrequencyPenalty);
         Assert.Equal(0.5f, deserialized.PresencePenalty);
         Assert.Equal(ChatResponseFormat.Json, deserialized.ResponseFormat);

From 2616bb8eb96f067a025de74d75fd36b9ea8f1687 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 08:00:28 -0400
Subject: [PATCH 06/11] Add string constructor to OllamaEmbeddingGenerator
 (#5562)

We'd previously added one to OllamaChatClient but neglected to add one here.
---
 .../OllamaEmbeddingGenerator.cs                   | 15 ++++++++++++++-
 .../OllamaEmbeddingGeneratorTests.cs              |  8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Ollama/OllamaEmbeddingGenerator.cs b/src/Libraries/Microsoft.Extensions.AI.Ollama/OllamaEmbeddingGenerator.cs
index 6a34a2ff811..5779b60cbc0 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Ollama/OllamaEmbeddingGenerator.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Ollama/OllamaEmbeddingGenerator.cs
@@ -21,6 +21,18 @@ public sealed class OllamaEmbeddingGenerator : IEmbeddingGenerator<string, Embed
     /// <summary>The <see cref="HttpClient"/> to use for sending requests.</summary>
     private readonly HttpClient _httpClient;
 
+    /// <summary>Initializes a new instance of the <see cref="OllamaEmbeddingGenerator"/> class.</summary>
+    /// <param name="endpoint">The endpoint URI where Ollama is hosted.</param>
+    /// <param name="modelId">
+    /// The id of the model to use. This may also be overridden per request via <see cref="ChatOptions.ModelId"/>.
+    /// Either this parameter or <see cref="ChatOptions.ModelId"/> must provide a valid model id.
+    /// </param>
+    /// <param name="httpClient">An <see cref="HttpClient"/> instance to use for HTTP operations.</param>
+    public OllamaEmbeddingGenerator(string endpoint, string? modelId = null, HttpClient? httpClient = null)
+        : this(new Uri(Throw.IfNull(endpoint)), modelId, httpClient)
+    {
+    }
+
     /// <summary>Initializes a new instance of the <see cref="OllamaEmbeddingGenerator"/> class.</summary>
     /// <param name="endpoint">The endpoint URI where Ollama is hosted.</param>
     /// <param name="modelId">
@@ -59,7 +71,8 @@ public void Dispose()
     }
 
     /// <inheritdoc />
-    public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(IEnumerable<string> values, EmbeddingGenerationOptions? options = null, CancellationToken cancellationToken = default)
+    public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(
+        IEnumerable<string> values, EmbeddingGenerationOptions? options = null, CancellationToken cancellationToken = default)
     {
         _ = Throw.IfNull(values);
 
diff --git a/test/Libraries/Microsoft.Extensions.AI.Ollama.Tests/OllamaEmbeddingGeneratorTests.cs b/test/Libraries/Microsoft.Extensions.AI.Ollama.Tests/OllamaEmbeddingGeneratorTests.cs
index 205398c9a1c..541aab244fe 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Ollama.Tests/OllamaEmbeddingGeneratorTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Ollama.Tests/OllamaEmbeddingGeneratorTests.cs
@@ -17,14 +17,14 @@ public class OllamaEmbeddingGeneratorTests
     [Fact]
     public void Ctor_InvalidArgs_Throws()
     {
-        Assert.Throws<ArgumentNullException>("endpoint", () => new OllamaEmbeddingGenerator(null!));
-        Assert.Throws<ArgumentException>("modelId", () => new OllamaEmbeddingGenerator(new("http://localhost"), "   "));
+        Assert.Throws<ArgumentNullException>("endpoint", () => new OllamaEmbeddingGenerator((string)null!));
+        Assert.Throws<ArgumentException>("modelId", () => new OllamaEmbeddingGenerator(new Uri("http://localhost"), "   "));
     }
 
     [Fact]
     public void GetService_SuccessfullyReturnsUnderlyingClient()
     {
-        using OllamaEmbeddingGenerator generator = new(new("http://localhost"));
+        using OllamaEmbeddingGenerator generator = new("http://localhost");
 
         Assert.Same(generator, generator.GetService<OllamaEmbeddingGenerator>());
         Assert.Same(generator, generator.GetService<IEmbeddingGenerator<string, Embedding<float>>>());
@@ -76,7 +76,7 @@ public async Task GetEmbeddingsAsync_ExpectedRequestResponse()
 
         using VerbatimHttpHandler handler = new(Input, Output);
         using HttpClient httpClient = new(handler);
-        using IEmbeddingGenerator<string, Embedding<float>> generator = new OllamaEmbeddingGenerator(new("http://localhost:11434"), "all-minilm", httpClient);
+        using IEmbeddingGenerator<string, Embedding<float>> generator = new OllamaEmbeddingGenerator("http://localhost:11434", "all-minilm", httpClient);
 
         var response = await generator.GenerateAsync([
             "hello, world!",

From a5e5e8c4891a94233c75ddb79510f9036de411ee Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 08:00:42 -0400
Subject: [PATCH 07/11] Remove some defunct lazy init from chat clients (#5561)

---
 .../AzureAIInferenceChatClient.cs                   |  6 +++---
 .../OpenAIChatClient.cs                             | 13 +++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
index 125449689c4..263830b5ba3 100644
--- a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
@@ -480,15 +480,15 @@ private static List<ChatMessageContentItem> GetContentParts(IList<AIContent> con
             switch (content)
             {
                 case TextContent textContent:
-                    (parts ??= []).Add(new ChatMessageTextContentItem(textContent.Text));
+                    parts.Add(new ChatMessageTextContentItem(textContent.Text));
                     break;
 
                 case ImageContent imageContent when imageContent.Data is { IsEmpty: false } data:
-                    (parts ??= []).Add(new ChatMessageImageContentItem(BinaryData.FromBytes(data), imageContent.MediaType));
+                    parts.Add(new ChatMessageImageContentItem(BinaryData.FromBytes(data), imageContent.MediaType));
                     break;
 
                 case ImageContent imageContent when imageContent.Uri is string uri:
-                    (parts ??= []).Add(new ChatMessageImageContentItem(new Uri(uri)));
+                    parts.Add(new ChatMessageImageContentItem(new Uri(uri)));
                     break;
             }
         }
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
index 6bcf83a7616..ab035aa327b 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
@@ -530,8 +530,6 @@ private sealed class OpenAIChatToolJson
     {
         AIContent? aiContent = null;
 
-        AdditionalPropertiesDictionary? additionalProperties = null;
-
         if (contentPart.Kind == ChatMessageContentPartKind.Text)
         {
             aiContent = new TextContent(contentPart.Text);
@@ -546,7 +544,7 @@ private sealed class OpenAIChatToolJson
 
             if (imageContent is not null && contentPart.ImageDetailLevel?.ToString() is string detail)
             {
-                (additionalProperties ??= [])[nameof(contentPart.ImageDetailLevel)] = detail;
+                (imageContent.AdditionalProperties ??= [])[nameof(contentPart.ImageDetailLevel)] = detail;
             }
         }
 
@@ -554,10 +552,9 @@ private sealed class OpenAIChatToolJson
         {
             if (contentPart.Refusal is string refusal)
             {
-                (additionalProperties ??= [])[nameof(contentPart.Refusal)] = refusal;
+                (aiContent.AdditionalProperties ??= [])[nameof(contentPart.Refusal)] = refusal;
             }
 
-            aiContent.AdditionalProperties = additionalProperties;
             aiContent.RawRepresentation = contentPart;
         }
 
@@ -641,15 +638,15 @@ private static List<ChatMessageContentPart> GetContentParts(IList<AIContent> con
             switch (content)
             {
                 case TextContent textContent:
-                    (parts ??= []).Add(ChatMessageContentPart.CreateTextPart(textContent.Text));
+                    parts.Add(ChatMessageContentPart.CreateTextPart(textContent.Text));
                     break;
 
                 case ImageContent imageContent when imageContent.Data is { IsEmpty: false } data:
-                    (parts ??= []).Add(ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(data), imageContent.MediaType));
+                    parts.Add(ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(data), imageContent.MediaType));
                     break;
 
                 case ImageContent imageContent when imageContent.Uri is string uri:
-                    (parts ??= []).Add(ChatMessageContentPart.CreateImagePart(new Uri(uri)));
+                    parts.Add(ChatMessageContentPart.CreateImagePart(new Uri(uri)));
                     break;
             }
         }

From cb16d5d6e6be455b92d2b9c996e09d4ef9f0664f Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 08:01:01 -0400
Subject: [PATCH 08/11] Add EmbeddingGeneratorOptions.Dimensions (#5563)

---
 .../Embeddings/EmbeddingGenerationOptions.cs  | 20 +++++++++++++++++++
 .../OpenAIEmbeddingGenerator.cs               |  8 +-------
 .../EmbeddingGenerationOptionsTests.cs        | 16 +++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGenerationOptions.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGenerationOptions.cs
index 02875e9de98..27b84273b5b 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGenerationOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGenerationOptions.cs
@@ -1,11 +1,30 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Shared.Diagnostics;
+
 namespace Microsoft.Extensions.AI;
 
 /// <summary>Represents the options for an embedding generation request.</summary>
 public class EmbeddingGenerationOptions
 {
+    private int? _dimensions;
+
+    /// <summary>Gets or sets the number of dimensions requested in the embedding.</summary>
+    public int? Dimensions
+    {
+        get => _dimensions;
+        set
+        {
+            if (value is not null)
+            {
+                _ = Throw.IfLessThan(value.Value, 1);
+            }
+
+            _dimensions = value;
+        }
+    }
+
     /// <summary>Gets or sets the model ID for the embedding generation request.</summary>
     public string? ModelId { get; set; }
 
@@ -22,6 +41,7 @@ public virtual EmbeddingGenerationOptions Clone() =>
         new()
         {
             ModelId = ModelId,
+            Dimensions = Dimensions,
             AdditionalProperties = AdditionalProperties?.Clone(),
         };
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIEmbeddingGenerator.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIEmbeddingGenerator.cs
index 27bf001b3ff..155e047279f 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIEmbeddingGenerator.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIEmbeddingGenerator.cs
@@ -135,17 +135,11 @@ void IDisposable.Dispose()
     {
         OpenAI.Embeddings.EmbeddingGenerationOptions openAIOptions = new()
         {
-            Dimensions = _dimensions,
+            Dimensions = options?.Dimensions ?? _dimensions,
         };
 
         if (options?.AdditionalProperties is { Count: > 0 } additionalProperties)
         {
-            // Allow per-instance dimensions to be overridden by a per-call property
-            if (additionalProperties.TryGetValue(nameof(openAIOptions.Dimensions), out int? dimensions))
-            {
-                openAIOptions.Dimensions = dimensions;
-            }
-
             if (additionalProperties.TryGetValue(nameof(openAIOptions.EndUserId), out string? endUserId))
             {
                 openAIOptions.EndUserId = endUserId;
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGenerationOptionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGenerationOptionsTests.cs
index e9dd45959c7..fbc8b390abf 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGenerationOptionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Embeddings/EmbeddingGenerationOptionsTests.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Text.Json;
 using Xunit;
 
@@ -14,10 +15,20 @@ public void Constructor_Parameterless_PropsDefaulted()
         EmbeddingGenerationOptions options = new();
         Assert.Null(options.ModelId);
         Assert.Null(options.AdditionalProperties);
+        Assert.Null(options.Dimensions);
 
         EmbeddingGenerationOptions clone = options.Clone();
         Assert.Null(clone.ModelId);
         Assert.Null(clone.AdditionalProperties);
+        Assert.Null(clone.Dimensions);
+    }
+
+    [Fact]
+    public void InvalidArgs_Throws()
+    {
+        EmbeddingGenerationOptions options = new();
+        Assert.Throws<ArgumentOutOfRangeException>(() => options.Dimensions = 0);
+        Assert.Throws<ArgumentOutOfRangeException>(() => options.Dimensions = -1);
     }
 
     [Fact]
@@ -31,13 +42,16 @@ public void Properties_Roundtrip()
         };
 
         options.ModelId = "modelId";
+        options.Dimensions = 1536;
         options.AdditionalProperties = additionalProps;
 
         Assert.Equal("modelId", options.ModelId);
+        Assert.Equal(1536, options.Dimensions);
         Assert.Same(additionalProps, options.AdditionalProperties);
 
         EmbeddingGenerationOptions clone = options.Clone();
         Assert.Equal("modelId", clone.ModelId);
+        Assert.Equal(1536, clone.Dimensions);
         Assert.Equal(additionalProps, clone.AdditionalProperties);
     }
 
@@ -53,6 +67,7 @@ public void JsonSerialization_Roundtrips()
 
         options.ModelId = "model";
         options.AdditionalProperties = additionalProps;
+        options.Dimensions = 1536;
 
         string json = JsonSerializer.Serialize(options, TestJsonSerializerContext.Default.EmbeddingGenerationOptions);
 
@@ -60,6 +75,7 @@ public void JsonSerialization_Roundtrips()
         Assert.NotNull(deserialized);
 
         Assert.Equal("model", deserialized.ModelId);
+        Assert.Equal(1536, deserialized.Dimensions);
 
         Assert.NotNull(deserialized.AdditionalProperties);
         Assert.Single(deserialized.AdditionalProperties);

From 46d5e57ca7b5203860c20d075b5e365c35f7e315 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:10:13 +0100
Subject: [PATCH 09/11] Structured output improvements (continuation of PR
 5522) (#5560)

---
 .../ChatClientStructuredOutputExtensions.cs   | 69 ++++++++++++---
 .../ChatCompletion/ChatCompletion{T}.cs       | 27 +++++-
 .../Utilities/AIJsonUtilities.Schema.cs       | 32 ++++++-
 .../AIJsonUtilitiesTests.cs                   | 22 ++++-
 .../ChatClientIntegrationTests.cs             | 83 ++++++++++++++++++-
 ...atClientStructuredOutputExtensionsTests.cs | 68 ++++++++++++++-
 6 files changed, 281 insertions(+), 20 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatClientStructuredOutputExtensions.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatClientStructuredOutputExtensions.cs
index 8b76682f8c8..0f847dbb296 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatClientStructuredOutputExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatClientStructuredOutputExtensions.cs
@@ -1,10 +1,12 @@
 // 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.ComponentModel;
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Shared.Diagnostics;
@@ -44,8 +46,7 @@ public static Task<ChatCompletion<T>> CompleteAsync<T>(
         IList<ChatMessage> chatMessages,
         ChatOptions? options = null,
         bool? useNativeJsonSchema = null,
-        CancellationToken cancellationToken = default)
-        where T : class =>
+        CancellationToken cancellationToken = default) =>
         CompleteAsync<T>(chatClient, chatMessages, AIJsonUtilities.DefaultOptions, options, useNativeJsonSchema, cancellationToken);
 
     /// <summary>Sends a user chat text message to the model, requesting a response matching the type <typeparamref name="T"/>.</summary>
@@ -65,8 +66,7 @@ public static Task<ChatCompletion<T>> CompleteAsync<T>(
         string chatMessage,
         ChatOptions? options = null,
         bool? useNativeJsonSchema = null,
-        CancellationToken cancellationToken = default)
-        where T : class =>
+        CancellationToken cancellationToken = default) =>
         CompleteAsync<T>(chatClient, [new ChatMessage(ChatRole.User, chatMessage)], options, useNativeJsonSchema, cancellationToken);
 
     /// <summary>Sends a user chat text message to the model, requesting a response matching the type <typeparamref name="T"/>.</summary>
@@ -88,8 +88,7 @@ public static Task<ChatCompletion<T>> CompleteAsync<T>(
         JsonSerializerOptions serializerOptions,
         ChatOptions? options = null,
         bool? useNativeJsonSchema = null,
-        CancellationToken cancellationToken = default)
-        where T : class =>
+        CancellationToken cancellationToken = default) =>
         CompleteAsync<T>(chatClient, [new ChatMessage(ChatRole.User, chatMessage)], serializerOptions, options, useNativeJsonSchema, cancellationToken);
 
     /// <summary>Sends chat messages to the model, requesting a response matching the type <typeparamref name="T"/>.</summary>
@@ -116,7 +115,6 @@ public static async Task<ChatCompletion<T>> CompleteAsync<T>(
         ChatOptions? options = null,
         bool? useNativeJsonSchema = null,
         CancellationToken cancellationToken = default)
-        where T : class
     {
         _ = Throw.IfNull(chatClient);
         _ = Throw.IfNull(chatMessages);
@@ -124,12 +122,33 @@ public static async Task<ChatCompletion<T>> CompleteAsync<T>(
 
         serializerOptions.MakeReadOnly();
 
-        var schemaNode = AIJsonUtilities.CreateJsonSchema(
+        var schemaElement = AIJsonUtilities.CreateJsonSchema(
             type: typeof(T),
             serializerOptions: serializerOptions,
             inferenceOptions: _inferenceOptions);
 
-        var schema = JsonSerializer.Serialize(schemaNode, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(JsonElement)));
+        bool isWrappedInObject;
+        string schema;
+        if (SchemaRepresentsObject(schemaElement))
+        {
+            // For object-representing schemas, we can use them as-is
+            isWrappedInObject = false;
+            schema = JsonSerializer.Serialize(schemaElement, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(JsonElement)));
+        }
+        else
+        {
+            // For non-object-representing schemas, we wrap them in an object schema, because all
+            // the real LLM providers today require an object schema as the root. This is currently
+            // true even for providers that support native structured output.
+            isWrappedInObject = true;
+            schema = JsonSerializer.Serialize(new JsonObject
+            {
+                { "$schema", "https://json-schema.org/draft/2020-12/schema" },
+                { "type", "object" },
+                { "properties", new JsonObject { { "data", JsonElementToJsonNode(schemaElement) } } },
+                { "additionalProperties", false },
+            }, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(JsonObject)));
+        }
 
         ChatMessage? promptAugmentation = null;
         options = (options ?? new()).Clone();
@@ -152,7 +171,7 @@ public static async Task<ChatCompletion<T>> CompleteAsync<T>(
 
             // When not using native structured output, augment the chat messages with a schema prompt
 #pragma warning disable SA1118 // Parameter should not span multiple lines
-            promptAugmentation = new ChatMessage(ChatRole.System, $$"""
+            promptAugmentation = new ChatMessage(ChatRole.User, $$"""
                 Respond with a JSON value conforming to the following schema:
                 ```
                 {{schema}}
@@ -166,7 +185,7 @@ public static async Task<ChatCompletion<T>> CompleteAsync<T>(
         try
         {
             var result = await chatClient.CompleteAsync(chatMessages, options, cancellationToken).ConfigureAwait(false);
-            return new ChatCompletion<T>(result, serializerOptions);
+            return new ChatCompletion<T>(result, serializerOptions) { IsWrappedInObject = isWrappedInObject };
         }
         finally
         {
@@ -176,4 +195,32 @@ public static async Task<ChatCompletion<T>> CompleteAsync<T>(
             }
         }
     }
+
+    private static bool SchemaRepresentsObject(JsonElement schemaElement)
+    {
+        if (schemaElement.ValueKind is JsonValueKind.Object)
+        {
+            foreach (var property in schemaElement.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    return property.Value.ValueKind == JsonValueKind.String
+                        && property.Value.ValueEquals("object"u8);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static JsonNode? JsonElementToJsonNode(JsonElement element)
+    {
+        return element.ValueKind switch
+        {
+            JsonValueKind.Null => null,
+            JsonValueKind.Array => JsonArray.Create(element),
+            JsonValueKind.Object => JsonObject.Create(element),
+            _ => JsonValue.Create(element)
+        };
+    }
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatCompletion{T}.cs b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatCompletion{T}.cs
index 344a01d2c22..7166f04e744 100644
--- a/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatCompletion{T}.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatCompletion{T}.cs
@@ -57,6 +57,7 @@ public T Result
             {
                 FailureReason.ResultDidNotContainJson => throw new InvalidOperationException("The response did not contain text to be deserialized"),
                 FailureReason.DeserializationProducedNull => throw new InvalidOperationException("The deserialized response is null"),
+                FailureReason.ResultDidNotContainDataProperty => throw new InvalidOperationException("The response did not contain the expected 'data' property"),
                 _ => result!,
             };
         }
@@ -103,6 +104,12 @@ public bool TryGetResult([NotNullWhen(true)] out T? result)
         }
     }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether the JSON schema has an extra object wrapper.
+    /// This is required for any non-JSON-object-typed values such as numbers, enum values, or arrays.
+    /// </summary>
+    internal bool IsWrappedInObject { get; set; }
+
     private string? GetResultAsJson()
     {
         var choice = Choices.Count == 1 ? Choices[0] : null;
@@ -125,8 +132,25 @@ public bool TryGetResult([NotNullWhen(true)] out T? result)
             return default;
         }
 
+        T? deserialized = default;
+
         // If there's an exception here, we want it to propagate, since the Result property is meant to throw directly
-        var deserialized = DeserializeFirstTopLevelObject(json!, (JsonTypeInfo<T>)_serializerOptions.GetTypeInfo(typeof(T)));
+
+        if (IsWrappedInObject)
+        {
+            if (JsonDocument.Parse(json!).RootElement.TryGetProperty("data", out var data))
+            {
+                json = data.GetRawText();
+            }
+            else
+            {
+                failureReason = FailureReason.ResultDidNotContainDataProperty;
+                return default;
+            }
+        }
+
+        deserialized = DeserializeFirstTopLevelObject(json!, (JsonTypeInfo<T>)_serializerOptions.GetTypeInfo(typeof(T)));
+
         if (deserialized is null)
         {
             failureReason = FailureReason.DeserializationProducedNull;
@@ -143,5 +167,6 @@ private enum FailureReason
     {
         ResultDidNotContainJson,
         DeserializationProducedNull,
+        ResultDidNotContainDataProperty,
     }
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI/Utilities/AIJsonUtilities.Schema.cs b/src/Libraries/Microsoft.Extensions.AI/Utilities/AIJsonUtilities.Schema.cs
index 4ad0603d311..46fe45342f2 100644
--- a/src/Libraries/Microsoft.Extensions.AI/Utilities/AIJsonUtilities.Schema.cs
+++ b/src/Libraries/Microsoft.Extensions.AI/Utilities/AIJsonUtilities.Schema.cs
@@ -231,6 +231,7 @@ JsonNode TransformSchemaNode(JsonSchemaExporterContext ctx, JsonNode schema)
             const string DescriptionPropertyName = "description";
             const string NotPropertyName = "not";
             const string TypePropertyName = "type";
+            const string PatternPropertyName = "pattern";
             const string EnumPropertyName = "enum";
             const string PropertiesPropertyName = "properties";
             const string AdditionalPropertiesPropertyName = "additionalProperties";
@@ -281,7 +282,20 @@ JsonNode TransformSchemaNode(JsonSchemaExporterContext ctx, JsonNode schema)
 
             if (ctx.Path.IsEmpty)
             {
-                // We are at the root-level schema node, append parameter-specific metadata
+                // We are at the root-level schema node, update/append parameter-specific metadata
+
+                // Some consumers of the JSON schema, including Ollama as of v0.3.13, don't understand
+                // schemas with "type": [...], and only understand "type" being a single value.
+                // STJ represents .NET integer types as ["string", "integer"], which will then lead to an error.
+                if (TypeIsArrayContainingInteger(schema))
+                {
+                    // We don't want to emit any array for "type". In this case we know it contains "integer"
+                    // so reduce the type to that alone, assuming it's the most specific type.
+                    // This makes schemas for Int32 (etc) work with Ollama
+                    JsonObject obj = ConvertSchemaToObject(ref schema);
+                    obj[TypePropertyName] = "integer";
+                    _ = obj.Remove(PatternPropertyName);
+                }
 
                 if (!string.IsNullOrWhiteSpace(key.Description))
                 {
@@ -340,6 +354,22 @@ static JsonObject ConvertSchemaToObject(ref JsonNode schema)
         }
     }
 
+    private static bool TypeIsArrayContainingInteger(JsonNode schema)
+    {
+        if (schema["type"] is JsonArray typeArray)
+        {
+            foreach (var entry in typeArray)
+            {
+                if (entry?.GetValueKind() == JsonValueKind.String && entry.GetValue<string>() == "integer")
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     private static JsonElement ParseJsonElement(ReadOnlySpan<byte> utf8Json)
     {
         Utf8JsonReader reader = new(utf8Json);
diff --git a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/AIJsonUtilitiesTests.cs b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/AIJsonUtilitiesTests.cs
index 266f7ec45e9..db482d26804 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/AIJsonUtilitiesTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/AIJsonUtilitiesTests.cs
@@ -127,10 +127,26 @@ public static void ResolveParameterJsonSchema_ReturnsExpectedValue()
         JsonElement resolvedSchema;
         resolvedSchema = AIJsonUtilities.ResolveParameterJsonSchema(param, metadata, options);
         Assert.True(JsonElement.DeepEquals(generatedSchema, resolvedSchema));
+    }
 
-        options = new(options) { NumberHandling = JsonNumberHandling.AllowReadingFromString };
-        resolvedSchema = AIJsonUtilities.ResolveParameterJsonSchema(param, metadata, options);
-        Assert.False(JsonElement.DeepEquals(generatedSchema, resolvedSchema));
+    [Fact]
+    public static void ResolveParameterJsonSchema_TreatsIntegralTypesAsInteger_EvenWithAllowReadingFromString()
+    {
+        JsonElement expected = JsonDocument.Parse("""
+            {
+              "type": "integer"
+            }
+            """).RootElement;
+
+        JsonSerializerOptions options = new(JsonSerializerOptions.Default) { NumberHandling = JsonNumberHandling.AllowReadingFromString };
+        AIFunction func = AIFunctionFactory.Create((int a, int? b, long c, short d) => { }, serializerOptions: options);
+
+        AIFunctionMetadata metadata = func.Metadata;
+        foreach (var param in metadata.Parameters)
+        {
+            JsonElement actualSchema = Assert.IsType<JsonElement>(param.Schema);
+            Assert.True(JsonElement.DeepEquals(expected, actualSchema));
+        }
     }
 
     [Description("The type")]
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
index 634e4a19f9e..3f5ce32fc37 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -569,7 +570,7 @@ public virtual async Task CompleteAsync_StructuredOutput()
 
         var response = await _chatClient.CompleteAsync<Person>("""
             Who is described in the following sentence?
-            Jimbo Smith is a 35-year-old software developer from Cardiff, Wales.
+            Jimbo Smith is a 35-year-old programmer from Cardiff, Wales.
             """);
 
         Assert.Equal("Jimbo Smith", response.Result.FullName);
@@ -578,6 +579,86 @@ Who is described in the following sentence?
         Assert.Equal(JobType.Programmer, response.Result.Job);
     }
 
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputArray()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<Person[]>("""
+            Who are described in the following sentence?
+            Jimbo Smith is a 35-year-old software developer from Cardiff, Wales.
+            Josh Simpson is a 25-year-old software developer from Newport, Wales.
+            """);
+
+        Assert.Equal(2, response.Result.Length);
+        Assert.Contains(response.Result, x => x.FullName == "Jimbo Smith");
+        Assert.Contains(response.Result, x => x.FullName == "Josh Simpson");
+    }
+
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputInteger()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<int>("""
+            There were 14 abstractions for AI programming, which was too many.
+            To fix this we added another one. How many are there now?
+            """);
+
+        Assert.Equal(15, response.Result);
+    }
+
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputString()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<string>("""
+            The software developer, Jimbo Smith, is a 35-year-old from Cardiff, Wales.
+            What's his full name?
+            """);
+
+        Assert.Equal("Jimbo Smith", response.Result);
+    }
+
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputBool_True()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<bool>("""
+            Jimbo Smith is a 35-year-old software developer from Cardiff, Wales.
+            Is there at least one software developer from Cardiff?
+            """);
+
+        Assert.True(response.Result);
+    }
+
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputBool_False()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<bool>("""
+            Jimbo Smith is a 35-year-old software developer from Cardiff, Wales.
+            Can we be sure that he is a medical doctor?
+            """);
+
+        Assert.False(response.Result);
+    }
+
+    [ConditionalFact]
+    public virtual async Task CompleteAsync_StructuredOutputEnum()
+    {
+        SkipIfNotEnabled();
+
+        var response = await _chatClient.CompleteAsync<Architecture>("""
+            I'm using a Macbook Pro with an M2 chip. What architecture am I using?
+            """);
+
+        Assert.Equal(Architecture.Arm64, response.Result);
+    }
+
     [ConditionalFact]
     public virtual async Task CompleteAsync_StructuredOutput_WithFunctions()
     {
diff --git a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs
index eea22abfacb..acb6142935e 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/ChatClientStructuredOutputExtensionsTests.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -34,12 +35,12 @@ public async Task SuccessUsage()
                 Assert.Null(responseFormat.SchemaName);
                 Assert.Null(responseFormat.SchemaDescription);
 
-                // The inner client receives a trailing "system" message with the schema instruction
+                // The inner client receives a trailing "user" message with the schema instruction
                 Assert.Collection(messages,
                     message => Assert.Equal("Hello", message.Text),
                     message =>
                     {
-                        Assert.Equal(ChatRole.System, message.Role);
+                        Assert.Equal(ChatRole.User, message.Role);
                         Assert.Contains("Respond with a JSON value", message.Text);
                         Assert.Contains("https://json-schema.org/draft/2020-12/schema", message.Text);
                         foreach (Species v in Enum.GetValues(typeof(Species)))
@@ -73,6 +74,39 @@ public async Task SuccessUsage()
         Assert.Equal("Hello", Assert.Single(chatHistory).Text);
     }
 
+    [Fact]
+    public async Task WrapsNonObjectValuesInDataProperty()
+    {
+        var expectedResult = new { data = 123 };
+        var expectedCompletion = new ChatCompletion([new ChatMessage(ChatRole.Assistant, JsonSerializer.Serialize(expectedResult))]);
+
+        using var client = new TestChatClient
+        {
+            CompleteAsyncCallback = (messages, options, cancellationToken) =>
+            {
+                var suppliedSchemaMatch = Regex.Match(messages[1].Text!, "```(.*?)```", RegexOptions.Singleline);
+                Assert.True(suppliedSchemaMatch.Success);
+                Assert.Equal("""
+                    {
+                      "$schema": "https://json-schema.org/draft/2020-12/schema",
+                      "type": "object",
+                      "properties": {
+                        "data": {
+                          "$schema": "https://json-schema.org/draft/2020-12/schema",
+                          "type": "integer"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                    """, suppliedSchemaMatch.Groups[1].Value.Trim());
+                return Task.FromResult(expectedCompletion);
+            },
+        };
+
+        var response = await client.CompleteAsync<int>("Hello");
+        Assert.Equal(123, response.Result);
+    }
+
     [Fact]
     public async Task FailureUsage_InvalidJson()
     {
@@ -206,6 +240,34 @@ public async Task CanUseNativeStructuredOutputWithSanitizedTypeName()
         Assert.Equal("Hello", Assert.Single(chatHistory).Text);
     }
 
+    [Fact]
+    public async Task CanUseNativeStructuredOutputWithArray()
+    {
+        var expectedResult = new[] { new Animal { Id = 1, FullName = "Tigger", Species = Species.Tiger } };
+        var payload = new { data = expectedResult };
+        var expectedCompletion = new ChatCompletion([new ChatMessage(ChatRole.Assistant, JsonSerializer.Serialize(payload))]);
+
+        using var client = new TestChatClient
+        {
+            CompleteAsyncCallback = (messages, options, cancellationToken) => Task.FromResult(expectedCompletion)
+        };
+
+        var chatHistory = new List<ChatMessage> { new(ChatRole.User, "Hello") };
+        var response = await client.CompleteAsync<Animal[]>(chatHistory, useNativeJsonSchema: true);
+
+        // The completion contains the deserialized result and other completion properties
+        Assert.Single(response.Result!);
+        Assert.Equal("Tigger", response.Result[0].FullName);
+        Assert.Equal(Species.Tiger, response.Result[0].Species);
+
+        // TryGetResult returns the same value
+        Assert.True(response.TryGetResult(out var tryGetResultOutput));
+        Assert.Same(response.Result, tryGetResultOutput);
+
+        // History remains unmutated
+        Assert.Equal("Hello", Assert.Single(chatHistory).Text);
+    }
+
     [Fact]
     public async Task CanSpecifyCustomJsonSerializationOptions()
     {
@@ -224,7 +286,7 @@ public async Task CanSpecifyCustomJsonSerializationOptions()
                     message => Assert.Equal("Hello", message.Text),
                     message =>
                     {
-                        Assert.Equal(ChatRole.System, message.Role);
+                        Assert.Equal(ChatRole.User, message.Role);
                         Assert.Contains("Respond with a JSON value", message.Text);
                         Assert.Contains("https://json-schema.org/draft/2020-12/schema", message.Text);
                         Assert.DoesNotContain(nameof(Animal.FullName), message.Text); // The JSO uses snake_case

From 4bff11ab4e23339dda0ccad55abdfe8430cfc6ba Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 16:13:03 -0400
Subject: [PATCH 10/11] Work around fixed bug in System.Memory.Data (#5569)

* Workaround fixed bug in System.Memory.Data

BinaryData had a bug in its ToString that would throw an exception if _bytes was empty. That was fixed several years ago, but Azure SDK libraries are still referencing older versions of System.Memory.Data that don't have the fix.

* Add pragma warning and update condition check
---
 .../Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
index ab035aa327b..935bb88f812 100644
--- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -17,6 +17,7 @@
 #pragma warning disable S1135 // Track uses of "TODO" tags
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
 #pragma warning disable SA1204 // Static elements should appear before instance elements
+#pragma warning disable SA1108 // Block statements should not contain embedded comments
 
 namespace Microsoft.Extensions.AI;
 
@@ -264,9 +265,10 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs
 
                     existing.CallId ??= toolCallUpdate.ToolCallId;
                     existing.Name ??= toolCallUpdate.FunctionName;
-                    if (toolCallUpdate.FunctionArgumentsUpdate is not null)
+                    if (toolCallUpdate.FunctionArgumentsUpdate is { } update &&
+                        !update.ToMemory().IsEmpty) // workaround for https://github.com/dotnet/runtime/issues/68262 in 6.0.0 package
                     {
-                        _ = (existing.Arguments ??= new()).Append(toolCallUpdate.FunctionArgumentsUpdate);
+                        _ = (existing.Arguments ??= new()).Append(update.ToString());
                     }
                 }
             }

From 7fe79a39d7e28f46eaa51d82a3d433bff73bd3cd Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Thu, 24 Oct 2024 19:59:54 -0400
Subject: [PATCH 11/11] Update M.E.AI.AzureAIInference for its beta2 release
 (#5558)

- Adapt to breaking changes
- Temporarily work around lack of Index on streaming updates
- Add streaming usage support
- Add an embedding generator
---
 eng/packages/General.props                    |   2 +-
 .../Embeddings/Embedding.cs                   |   2 +
 .../AzureAIChatToolJson.cs                    |  25 +++
 .../AzureAIInferenceChatClient.cs             | 152 +++++++--------
 .../AzureAIInferenceEmbeddingGenerator.cs     | 178 ++++++++++++++++++
 .../AzureAIInferenceExtensions.cs             |  12 +-
 .../JsonContext.cs                            |  70 +++++++
 ...reAIInferenceChatClientIntegrationTests.cs |   5 -
 .../AzureAIInferenceChatClientTests.cs        |  15 +-
 ...renceEmbeddingGeneratorIntegrationTests.cs |  13 ++
 ...AzureAIInferenceEmbeddingGeneratorTests.cs | 135 +++++++++++++
 .../IntegrationTestHelpers.cs                 |  31 +--
 .../ChatClientIntegrationTests.cs             |   8 +-
 13 files changed, 531 insertions(+), 117 deletions(-)
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIChatToolJson.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceEmbeddingGenerator.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.AI.AzureAIInference/JsonContext.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorIntegrationTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorTests.cs

diff --git a/eng/packages/General.props b/eng/packages/General.props
index fbefcb50550..9c54a2351ab 100644
--- a/eng/packages/General.props
+++ b/eng/packages/General.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.1" />
+    <PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.2" />
     <PackageVersion Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/Embedding.cs b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/Embedding.cs
index e70469eaed3..19b8feaa182 100644
--- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/Embedding.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/Embedding.cs
@@ -14,6 +14,8 @@ namespace Microsoft.Extensions.AI;
 #endif
 [JsonDerivedType(typeof(Embedding<float>), typeDiscriminator: "floats")]
 [JsonDerivedType(typeof(Embedding<double>), typeDiscriminator: "doubles")]
+[JsonDerivedType(typeof(Embedding<byte>), typeDiscriminator: "bytes")]
+[JsonDerivedType(typeof(Embedding<sbyte>), typeDiscriminator: "sbytes")]
 public class Embedding
 {
     /// <summary>Initializes a new instance of the <see cref="Embedding"/> class.</summary>
diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIChatToolJson.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIChatToolJson.cs
new file mode 100644
index 00000000000..77e675c0830
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIChatToolJson.cs
@@ -0,0 +1,25 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>Used to create the JSON payload for an AzureAI chat tool description.</summary>
+internal sealed class AzureAIChatToolJson
+{
+    /// <summary>Gets a singleton JSON data for empty parameters. Optimization for the reasonably common case of a parameterless function.</summary>
+    public static BinaryData ZeroFunctionParametersSchema { get; } = new("""{"type":"object","required":[],"properties":{}}"""u8.ToArray());
+
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = "object";
+
+    [JsonPropertyName("required")]
+    public List<string> Required { get; set; } = [];
+
+    [JsonPropertyName("properties")]
+    public Dictionary<string, JsonElement> Properties { get; set; } = [];
+}
diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
index 263830b5ba3..ecc41140b27 100644
--- a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs
@@ -7,7 +7,6 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Inference;
@@ -20,8 +19,9 @@
 namespace Microsoft.Extensions.AI;
 
 /// <summary>An <see cref="IChatClient"/> for an Azure AI Inference <see cref="ChatCompletionsClient"/>.</summary>
-public sealed partial class AzureAIInferenceChatClient : IChatClient
+public sealed class AzureAIInferenceChatClient : IChatClient
 {
+    /// <summary>A default schema to use when a parameter lacks a pre-defined schema.</summary>
     private static readonly JsonElement _defaultParameterSchema = JsonDocument.Parse("{}").RootElement;
 
     /// <summary>The underlying <see cref="ChatCompletionsClient" />.</summary>
@@ -77,43 +77,33 @@ public async Task<ChatCompletion> CompleteAsync(
         List<ChatMessage> returnMessages = [];
 
         // Populate its content from those in the response content.
-        ChatFinishReason? finishReason = null;
-        foreach (var choice in response.Choices)
+        ChatMessage message = new()
         {
-            ChatMessage returnMessage = new()
-            {
-                RawRepresentation = choice,
-                Role = ToChatRole(choice.Message.Role),
-                AdditionalProperties = new() { [nameof(choice.Index)] = choice.Index },
-            };
+            RawRepresentation = response,
+            Role = ToChatRole(response.Role),
+        };
 
-            finishReason ??= ToFinishReason(choice.FinishReason);
+        if (response.Content is string content)
+        {
+            message.Text = content;
+        }
 
-            if (choice.Message.ToolCalls is { Count: > 0 } toolCalls)
+        if (response.ToolCalls is { Count: > 0 } toolCalls)
+        {
+            foreach (var toolCall in toolCalls)
             {
-                foreach (var toolCall in toolCalls)
+                if (toolCall is ChatCompletionsToolCall ftc && !string.IsNullOrWhiteSpace(ftc.Name))
                 {
-                    if (toolCall is ChatCompletionsFunctionToolCall ftc && !string.IsNullOrWhiteSpace(ftc.Name))
-                    {
-                        FunctionCallContent callContent = ParseCallContentFromJsonString(ftc.Arguments, toolCall.Id, ftc.Name);
-                        callContent.RawRepresentation = toolCall;
+                    FunctionCallContent callContent = ParseCallContentFromJsonString(ftc.Arguments, toolCall.Id, ftc.Name);
+                    callContent.RawRepresentation = toolCall;
 
-                        returnMessage.Contents.Add(callContent);
-                    }
+                    message.Contents.Add(callContent);
                 }
             }
-
-            if (!string.IsNullOrEmpty(choice.Message.Content))
-            {
-                returnMessage.Contents.Add(new TextContent(choice.Message.Content)
-                {
-                    RawRepresentation = choice.Message
-                });
-            }
-
-            returnMessages.Add(returnMessage);
         }
 
+        returnMessages.Add(message);
+
         UsageDetails? usage = null;
         if (response.Usage is CompletionsUsage completionsUsage)
         {
@@ -128,11 +118,11 @@ public async Task<ChatCompletion> CompleteAsync(
         // Wrap the content in a ChatCompletion to return.
         return new ChatCompletion(returnMessages)
         {
-            RawRepresentation = response,
             CompletionId = response.Id,
             CreatedAt = response.Created,
             ModelId = response.Model,
-            FinishReason = finishReason,
+            FinishReason = ToFinishReason(response.FinishReason),
+            RawRepresentation = response,
             Usage = usage,
         };
     }
@@ -143,13 +133,13 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs
     {
         _ = Throw.IfNull(chatMessages);
 
-        Dictionary<int, FunctionCallInfo>? functionCallInfos = null;
+        Dictionary<string, FunctionCallInfo>? functionCallInfos = null;
         ChatRole? streamedRole = default;
         ChatFinishReason? finishReason = default;
         string? completionId = null;
         DateTimeOffset? createdAt = null;
         string? modelId = null;
-        string? authorName = null;
+        string lastCallId = string.Empty;
 
         // Process each update as it arrives
         var updates = await _chatCompletionsClient.CompleteStreamingAsync(ToAzureAIOptions(chatMessages, options), cancellationToken).ConfigureAwait(false);
@@ -161,12 +151,10 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs
             completionId ??= chatCompletionUpdate.Id;
             createdAt ??= chatCompletionUpdate.Created;
             modelId ??= chatCompletionUpdate.Model;
-            authorName ??= chatCompletionUpdate.AuthorName;
 
             // Create the response content object.
             StreamingChatCompletionUpdate completionUpdate = new()
             {
-                AuthorName = authorName,
                 CompletionId = chatCompletionUpdate.Id,
                 CreatedAt = chatCompletionUpdate.Created,
                 FinishReason = finishReason,
@@ -182,34 +170,52 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs
             }
 
             // Transfer over tool call updates.
-            if (chatCompletionUpdate.ToolCallUpdate is StreamingFunctionToolCallUpdate toolCallUpdate)
+            if (chatCompletionUpdate.ToolCallUpdate is { } toolCallUpdate)
             {
+                // TODO https://github.com/Azure/azure-sdk-for-net/issues/46830: Azure.AI.Inference
+                // has removed the Index property from ToolCallUpdate. It's now impossible via the
+                // exposed APIs to correctly handle multiple parallel tool calls, as the CallId is
+                // often null for anything other than the first update for a given call, and Index
+                // isn't available to correlate which updates are for which call. This is a temporary
+                // workaround to at least make a single tool call work and also make work multiple
+                // tool calls when their updates aren't interleaved.
+                if (toolCallUpdate.Id is not null)
+                {
+                    lastCallId = toolCallUpdate.Id;
+                }
+
                 functionCallInfos ??= [];
-                if (!functionCallInfos.TryGetValue(toolCallUpdate.ToolCallIndex, out FunctionCallInfo? existing))
+                if (!functionCallInfos.TryGetValue(lastCallId, out FunctionCallInfo? existing))
                 {
-                    functionCallInfos[toolCallUpdate.ToolCallIndex] = existing = new();
+                    functionCallInfos[lastCallId] = existing = new();
                 }
 
-                existing.CallId ??= toolCallUpdate.Id;
-                existing.Name ??= toolCallUpdate.Name;
-                if (toolCallUpdate.ArgumentsUpdate is not null)
+                existing.Name ??= toolCallUpdate.Function.Name;
+                if (toolCallUpdate.Function.Arguments is { } arguments)
                 {
-                    _ = (existing.Arguments ??= new()).Append(toolCallUpdate.ArgumentsUpdate);
+                    _ = (existing.Arguments ??= new()).Append(arguments);
                 }
             }
 
+            if (chatCompletionUpdate.Usage is { } usage)
+            {
+                completionUpdate.Contents.Add(new UsageContent(new()
+                {
+                    InputTokenCount = usage.PromptTokens,
+                    OutputTokenCount = usage.CompletionTokens,
+                    TotalTokenCount = usage.TotalTokens,
+                }));
+            }
+
             // Now yield the item.
             yield return completionUpdate;
         }
 
-        // TODO: Add usage as content when it's exposed by Azure.AI.Inference.
-
         // Now that we've received all updates, combine any for function calls into a single item to yield.
         if (functionCallInfos is not null)
         {
             var completionUpdate = new StreamingChatCompletionUpdate
             {
-                AuthorName = authorName,
                 CompletionId = completionId,
                 CreatedAt = createdAt,
                 FinishReason = finishReason,
@@ -224,7 +230,7 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs
                 {
                     FunctionCallContent callContent = ParseCallContentFromJsonString(
                         fci.Arguments?.ToString() ?? string.Empty,
-                        fci.CallId!,
+                        entry.Key,
                         fci.Name!);
                     completionUpdate.Contents.Add(callContent);
                 }
@@ -243,7 +249,6 @@ void IDisposable.Dispose()
     /// <summary>POCO representing function calling info. Used to concatenation information for a single function call from across multiple streaming updates.</summary>
     private sealed class FunctionCallInfo
     {
-        public string? CallId;
         public string? Name;
         public StringBuilder? Arguments;
     }
@@ -292,7 +297,7 @@ private ChatCompletionsOptions ToAzureAIOptions(IList<ChatMessage> chatContents,
             // These properties are strongly-typed on ChatOptions but not on ChatCompletionsOptions.
             if (options.TopK is int topK)
             {
-                result.AdditionalProperties["top_k"] = BinaryData.FromObjectAsJson(topK, JsonContext.Default.Options);
+                result.AdditionalProperties["top_k"] = new BinaryData(JsonSerializer.SerializeToUtf8Bytes(topK, JsonContext.Default.Int32));
             }
 
             if (options.AdditionalProperties is { } props)
@@ -310,7 +315,8 @@ private ChatCompletionsOptions ToAzureAIOptions(IList<ChatMessage> chatContents,
                         default:
                             if (prop.Value is not null)
                             {
-                                result.AdditionalProperties[prop.Key] = BinaryData.FromObjectAsJson(prop.Value, ToolCallJsonSerializerOptions);
+                                byte[] data = JsonSerializer.SerializeToUtf8Bytes(prop.Value, JsonContext.GetTypeInfo(prop.Value.GetType(), ToolCallJsonSerializerOptions));
+                                result.AdditionalProperties[prop.Key] = new BinaryData(data);
                             }
 
                             break;
@@ -356,7 +362,7 @@ private ChatCompletionsOptions ToAzureAIOptions(IList<ChatMessage> chatContents,
     }
 
     /// <summary>Converts an Extensions function to an AzureAI chat tool.</summary>
-    private static ChatCompletionsFunctionToolDefinition ToAzureAIChatTool(AIFunction aiFunction)
+    private static ChatCompletionsToolDefinition ToAzureAIChatTool(AIFunction aiFunction)
     {
         BinaryData resultParameters = AzureAIChatToolJson.ZeroFunctionParametersSchema;
 
@@ -381,28 +387,11 @@ private static ChatCompletionsFunctionToolDefinition ToAzureAIChatTool(AIFunctio
                 JsonSerializer.SerializeToUtf8Bytes(tool, JsonContext.Default.AzureAIChatToolJson));
         }
 
-        return new()
+        return new(new FunctionDefinition(aiFunction.Metadata.Name)
         {
-            Name = aiFunction.Metadata.Name,
             Description = aiFunction.Metadata.Description,
             Parameters = resultParameters,
-        };
-    }
-
-    /// <summary>Used to create the JSON payload for an AzureAI chat tool description.</summary>
-    private sealed class AzureAIChatToolJson
-    {
-        /// <summary>Gets a singleton JSON data for empty parameters. Optimization for the reasonably common case of a parameterless function.</summary>
-        public static BinaryData ZeroFunctionParametersSchema { get; } = new("""{"type":"object","required":[],"properties":{}}"""u8.ToArray());
-
-        [JsonPropertyName("type")]
-        public string Type { get; set; } = "object";
-
-        [JsonPropertyName("required")]
-        public List<string> Required { get; set; } = [];
-
-        [JsonPropertyName("properties")]
-        public Dictionary<string, JsonElement> Properties { get; set; } = [];
+        });
     }
 
     /// <summary>Converts an Extensions chat message enumerable to an AzureAI chat message enumerable.</summary>
@@ -426,10 +415,9 @@ private IEnumerable<ChatRequestMessage> ToAzureAIInferenceChatMessages(IEnumerab
                         string? result = resultContent.Result as string;
                         if (result is null && resultContent.Result is not null)
                         {
-                            JsonSerializerOptions options = ToolCallJsonSerializerOptions ?? JsonContext.Default.Options;
                             try
                             {
-                                result = JsonSerializer.Serialize(resultContent.Result, options.GetTypeInfo(typeof(object)));
+                                result = JsonSerializer.Serialize(resultContent.Result, JsonContext.GetTypeInfo(typeof(object), ToolCallJsonSerializerOptions));
                             }
                             catch (NotSupportedException)
                             {
@@ -449,20 +437,17 @@ private IEnumerable<ChatRequestMessage> ToAzureAIInferenceChatMessages(IEnumerab
             {
                 // TODO: ChatRequestAssistantMessage only enables text content currently.
                 // Update it with other content types when it supports that.
-                ChatRequestAssistantMessage message = new()
-                {
-                    Content = input.Text
-                };
+                ChatRequestAssistantMessage message = new(input.Text ?? string.Empty);
 
                 foreach (var content in input.Contents)
                 {
                     if (content is FunctionCallContent { CallId: not null } callRequest)
                     {
-                        JsonSerializerOptions serializerOptions = ToolCallJsonSerializerOptions ?? JsonContext.Default.Options;
-                        message.ToolCalls.Add(new ChatCompletionsFunctionToolCall(
-                            callRequest.CallId,
-                            callRequest.Name,
-                            JsonSerializer.Serialize(callRequest.Arguments, serializerOptions.GetTypeInfo(typeof(IDictionary<string, object>)))));
+                        message.ToolCalls.Add(new ChatCompletionsToolCall(
+                             callRequest.CallId,
+                             new FunctionCall(
+                                 callRequest.Name,
+                                 JsonSerializer.Serialize(callRequest.Arguments, JsonContext.GetTypeInfo(typeof(IDictionary<string, object>), ToolCallJsonSerializerOptions)))));
                     }
                 }
 
@@ -504,11 +489,4 @@ private static List<ChatMessageContentItem> GetContentParts(IList<AIContent> con
     private static FunctionCallContent ParseCallContentFromJsonString(string json, string callId, string name) =>
         FunctionCallContent.CreateFromParsedArguments(json, callId, name,
             argumentParser: static json => JsonSerializer.Deserialize(json, JsonContext.Default.IDictionaryStringObject)!);
-
-    /// <summary>Source-generated JSON type information.</summary>
-    [JsonSerializable(typeof(AzureAIChatToolJson))]
-    [JsonSerializable(typeof(IDictionary<string, object?>))]
-    [JsonSerializable(typeof(JsonElement))]
-    [JsonSerializable(typeof(int))]
-    private sealed partial class JsonContext : JsonSerializerContext;
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceEmbeddingGenerator.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceEmbeddingGenerator.cs
new file mode 100644
index 00000000000..84198e6b2cc
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceEmbeddingGenerator.cs
@@ -0,0 +1,178 @@
+// 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.Buffers;
+using System.Buffers.Binary;
+using System.Buffers.Text;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.AI.Inference;
+using Microsoft.Shared.Diagnostics;
+
+#pragma warning disable EA0002 // Use 'System.TimeProvider' to make the code easier to test
+#pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
+#pragma warning disable S109 // Magic numbers should not be used
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>An <see cref="IEmbeddingGenerator{String, Embedding}"/> for an Azure.AI.Inference <see cref="EmbeddingsClient"/>.</summary>
+public sealed class AzureAIInferenceEmbeddingGenerator :
+    IEmbeddingGenerator<string, Embedding<float>>
+{
+    /// <summary>The underlying <see cref="EmbeddingsClient" />.</summary>
+    private readonly EmbeddingsClient _embeddingsClient;
+
+    /// <summary>The number of dimensions produced by the generator.</summary>
+    private readonly int? _dimensions;
+
+    /// <summary>Initializes a new instance of the <see cref="AzureAIInferenceEmbeddingGenerator"/> class.</summary>
+    /// <param name="embeddingsClient">The underlying client.</param>
+    /// <param name="modelId">
+    /// The id of the model to use. This may also be overridden per request via <see cref="EmbeddingGenerationOptions.ModelId"/>.
+    /// Either this parameter or <see cref="EmbeddingGenerationOptions.ModelId"/> must provide a valid model id.
+    /// </param>
+    /// <param name="dimensions">The number of dimensions to generate in each embedding.</param>
+    public AzureAIInferenceEmbeddingGenerator(
+        EmbeddingsClient embeddingsClient, string? modelId = null, int? dimensions = null)
+    {
+        _ = Throw.IfNull(embeddingsClient);
+
+        if (modelId is not null)
+        {
+            _ = Throw.IfNullOrWhitespace(modelId);
+        }
+
+        if (dimensions is < 1)
+        {
+            Throw.ArgumentOutOfRangeException(nameof(dimensions), "Value must be greater than 0.");
+        }
+
+        _embeddingsClient = embeddingsClient;
+        _dimensions = dimensions;
+
+        // https://github.com/Azure/azure-sdk-for-net/issues/46278
+        // The endpoint isn't currently exposed, so use reflection to get at it, temporarily. Once packages
+        // 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.
+        var providerUrl = typeof(EmbeddingsClient).GetField("_endpoint", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+            ?.GetValue(embeddingsClient) as Uri;
+
+        Metadata = new("az.ai.inference", providerUrl, modelId, dimensions);
+    }
+
+    /// <inheritdoc />
+    public EmbeddingGeneratorMetadata Metadata { get; }
+
+    /// <inheritdoc />
+    public TService? GetService<TService>(object? key = null)
+        where TService : class =>
+        typeof(TService) == typeof(EmbeddingsClient) ? (TService)(object)_embeddingsClient :
+        this as TService;
+
+    /// <inheritdoc />
+    public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(
+        IEnumerable<string> values, EmbeddingGenerationOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        var azureAIOptions = ToAzureAIOptions(values, options, EmbeddingEncodingFormat.Base64);
+
+        var embeddings = (await _embeddingsClient.EmbedAsync(azureAIOptions, cancellationToken).ConfigureAwait(false)).Value;
+
+        GeneratedEmbeddings<Embedding<float>> result = new(embeddings.Data.Select(e =>
+            new Embedding<float>(ParseBase64Floats(e.Embedding))
+            {
+                CreatedAt = DateTimeOffset.UtcNow,
+                ModelId = embeddings.Model ?? azureAIOptions.Model,
+            }));
+
+        if (embeddings.Usage is not null)
+        {
+            result.Usage = new()
+            {
+                InputTokenCount = embeddings.Usage.PromptTokens,
+                TotalTokenCount = embeddings.Usage.TotalTokens
+            };
+        }
+
+        return result;
+    }
+
+    /// <inheritdoc />
+    void IDisposable.Dispose()
+    {
+        // Nothing to dispose. Implementation required for the IEmbeddingGenerator interface.
+    }
+
+    private static float[] ParseBase64Floats(BinaryData binaryData)
+    {
+        ReadOnlySpan<byte> base64 = binaryData.ToMemory().Span;
+
+        // Remove quotes around base64 string.
+        if (base64.Length < 2 || base64[0] != (byte)'"' || base64[base64.Length - 1] != (byte)'"')
+        {
+            ThrowInvalidData();
+        }
+
+        base64 = base64.Slice(1, base64.Length - 2);
+
+        // Decode base64 string to bytes.
+        byte[] bytes = ArrayPool<byte>.Shared.Rent(Base64.GetMaxDecodedFromUtf8Length(base64.Length));
+        OperationStatus status = Base64.DecodeFromUtf8(base64, bytes.AsSpan(), out int bytesConsumed, out int bytesWritten);
+        if (status != OperationStatus.Done || bytesWritten % sizeof(float) != 0)
+        {
+            ThrowInvalidData();
+        }
+
+        // Interpret bytes as floats
+        float[] vector = new float[bytesWritten / sizeof(float)];
+        bytes.AsSpan(0, bytesWritten).CopyTo(MemoryMarshal.AsBytes(vector.AsSpan()));
+        if (!BitConverter.IsLittleEndian)
+        {
+            Span<int> ints = MemoryMarshal.Cast<float, int>(vector.AsSpan());
+#if NET
+            BinaryPrimitives.ReverseEndianness(ints, ints);
+#else
+            for (int i = 0; i < ints.Length; i++)
+            {
+                ints[i] = BinaryPrimitives.ReverseEndianness(ints[i]);
+            }
+#endif
+        }
+
+        ArrayPool<byte>.Shared.Return(bytes);
+        return vector;
+
+        static void ThrowInvalidData() =>
+            throw new FormatException("The input is not a valid Base64 string of encoded floats.");
+    }
+
+    /// <summary>Converts an extensions options instance to an OpenAI options instance.</summary>
+    private EmbeddingsOptions ToAzureAIOptions(IEnumerable<string> inputs, EmbeddingGenerationOptions? options, EmbeddingEncodingFormat format)
+    {
+        EmbeddingsOptions result = new(inputs)
+        {
+            Dimensions = _dimensions,
+            Model = options?.ModelId ?? Metadata.ModelId,
+            EncodingFormat = format,
+        };
+
+        if (options?.AdditionalProperties is { } props)
+        {
+            foreach (var prop in props)
+            {
+                if (prop.Value is not null)
+                {
+                    byte[] data = JsonSerializer.SerializeToUtf8Bytes(prop.Value, JsonContext.GetTypeInfo(prop.Value.GetType(), null));
+                    result.AdditionalProperties[prop.Key] = new BinaryData(data);
+                }
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceExtensions.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceExtensions.cs
index d8ba7616316..05a6c87b33b 100644
--- a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceExtensions.cs
@@ -12,6 +12,16 @@ public static class AzureAIInferenceExtensions
     /// <param name="chatCompletionsClient">The client.</param>
     /// <param name="modelId">The id of the model to use. If null, it may be provided per request via <see cref="ChatOptions.ModelId"/>.</param>
     /// <returns>An <see cref="IChatClient"/> that may be used to converse via the <see cref="ChatCompletionsClient"/>.</returns>
-    public static IChatClient AsChatClient(this ChatCompletionsClient chatCompletionsClient, string? modelId = null) =>
+    public static IChatClient AsChatClient(
+        this ChatCompletionsClient chatCompletionsClient, string? modelId = null) =>
         new AzureAIInferenceChatClient(chatCompletionsClient, modelId);
+
+    /// <summary>Gets an <see cref="IEmbeddingGenerator{String, Single}"/> for use with this <see cref="EmbeddingsClient"/>.</summary>
+    /// <param name="embeddingsClient">The client.</param>
+    /// <param name="modelId">The id of the model to use. If null, it may be provided per request via <see cref="ChatOptions.ModelId"/>.</param>
+    /// <param name="dimensions">The number of dimensions to generate in each embedding.</param>
+    /// <returns>An <see cref="IEmbeddingGenerator{String, Embedding}"/> that may be used to generate embeddings via the <see cref="EmbeddingsClient"/>.</returns>
+    public static IEmbeddingGenerator<string, Embedding<float>> AsEmbeddingGenerator(
+        this EmbeddingsClient embeddingsClient, string? modelId = null, int? dimensions = null) =>
+        new AzureAIInferenceEmbeddingGenerator(embeddingsClient, modelId, dimensions);
 }
diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/JsonContext.cs b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/JsonContext.cs
new file mode 100644
index 00000000000..5576cbf134a
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/JsonContext.cs
@@ -0,0 +1,70 @@
+// 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.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Microsoft.Extensions.AI;
+
+/// <summary>Source-generated JSON type information.</summary>
+[JsonSourceGenerationOptions(JsonSerializerDefaults.Web,
+    UseStringEnumConverter = true,
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    WriteIndented = true)]
+[JsonSerializable(typeof(AzureAIChatToolJson))]
+[JsonSerializable(typeof(IDictionary<string, object?>))]
+[JsonSerializable(typeof(JsonElement))]
+[JsonSerializable(typeof(int))]
+[JsonSerializable(typeof(long))]
+[JsonSerializable(typeof(float))]
+[JsonSerializable(typeof(double))]
+[JsonSerializable(typeof(bool))]
+[JsonSerializable(typeof(float[]))]
+[JsonSerializable(typeof(byte[]))]
+[JsonSerializable(typeof(sbyte[]))]
+internal sealed partial class JsonContext : JsonSerializerContext
+{
+    /// <summary>Gets the <see cref="JsonSerializerOptions"/> singleton used as the default in JSON serialization operations.</summary>
+    private static readonly JsonSerializerOptions _defaultToolJsonOptions = CreateDefaultToolJsonOptions();
+
+    /// <summary>Gets JSON type information for the specified type.</summary>
+    /// <remarks>
+    /// This first tries to get the type information from <paramref name="firstOptions"/>,
+    /// falling back to <see cref="_defaultToolJsonOptions"/> if it can't.
+    /// </remarks>
+    public static JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions? firstOptions) =>
+        firstOptions?.TryGetTypeInfo(type, out JsonTypeInfo? info) is true ?
+            info :
+            _defaultToolJsonOptions.GetTypeInfo(type);
+
+    /// <summary>Creates the default <see cref="JsonSerializerOptions"/> to use for serialization-related operations.</summary>
+    [UnconditionalSuppressMessage("AotAnalysis", "IL3050", Justification = "DefaultJsonTypeInfoResolver is only used when reflection-based serialization is enabled")]
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026", Justification = "DefaultJsonTypeInfoResolver is only used when reflection-based serialization is enabled")]
+    private static JsonSerializerOptions CreateDefaultToolJsonOptions()
+    {
+        // If reflection-based serialization is enabled by default, use it, as it's the most permissive in terms of what it can serialize,
+        // and we want to be flexible in terms of what can be put into the various collections in the object model.
+        // Otherwise, use the source-generated options to enable Native AOT.
+
+        if (JsonSerializer.IsReflectionEnabledByDefault)
+        {
+            // Keep in sync with the JsonSourceGenerationOptions on JsonContext below.
+            JsonSerializerOptions options = new(JsonSerializerDefaults.Web)
+            {
+                TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
+                Converters = { new JsonStringEnumConverter() },
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                WriteIndented = true,
+            };
+
+            options.MakeReadOnly();
+            return options;
+        }
+
+        return Default.Options;
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientIntegrationTests.cs
index 29aef62fd77..a42f1bd4ddf 100644
--- a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientIntegrationTests.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Threading.Tasks;
-using Microsoft.TestUtilities;
 
 namespace Microsoft.Extensions.AI;
 
@@ -12,7 +10,4 @@ public class AzureAIInferenceChatClientIntegrationTests : ChatClientIntegrationT
     protected override IChatClient? CreateChatClient() =>
         IntegrationTestHelpers.GetChatCompletionsClient()
             ?.AsChatClient(Environment.GetEnvironmentVariable("AZURE_AI_INFERENCE_CHAT_MODEL") ?? "gpt-4o-mini");
-
-    public override Task CompleteStreamingAsync_UsageDataAvailable() =>
-        throw new SkipTestException("Azure.AI.Inference library doesn't currently surface streaming usage data.");
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientTests.cs b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientTests.cs
index 9a860014b8f..4fb5122cc93 100644
--- a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceChatClientTests.cs
@@ -203,7 +203,7 @@ public async Task BasicRequestResponse_Streaming()
             Assert.Equal(createdAt, updates[i].CreatedAt);
             Assert.Equal("gpt-4o-mini-2024-07-18", updates[i].ModelId);
             Assert.Equal(ChatRole.Assistant, updates[i].Role);
-            Assert.Equal(i < 10 ? 1 : 0, updates[i].Contents.Count);
+            Assert.Equal(i is < 10 or 11 ? 1 : 0, updates[i].Contents.Count);
             Assert.Equal(i < 10 ? null : ChatFinishReason.Stop, updates[i].FinishReason);
         }
     }
@@ -322,12 +322,13 @@ public async Task MultipleMessages_NonStreaming()
     }
 
     [Fact]
-    public async Task NullAssistantText_ContentSkipped_NonStreaming()
+    public async Task NullAssistantText_ContentEmpty_NonStreaming()
     {
         const string Input = """
             {
                 "messages": [
                     {
+                        "content": "",
                         "role": "assistant"
                     },
                     {
@@ -423,6 +424,7 @@ public async Task FunctionCallContent_NonStreaming()
                 "model": "gpt-4o-mini",
                 "tools": [
                     {
+                        "type": "function",
                         "function": {
                             "name": "GetPersonAge",
                             "description": "Gets the age of the specified person.",
@@ -436,8 +438,7 @@ public async Task FunctionCallContent_NonStreaming()
                                     }
                                 }
                             }
-                        },
-                        "type": "function"
+                        }
                     }
                 ],
                 "tool_choice": "auto"
@@ -534,6 +535,7 @@ public async Task FunctionCallContent_Streaming()
                 "model": "gpt-4o-mini",
                 "tools": [
                     {
+                        "type": "function",
                         "function": {
                             "name": "GetPersonAge",
                             "description": "Gets the age of the specified person.",
@@ -547,8 +549,7 @@ public async Task FunctionCallContent_Streaming()
                                     }
                                 }
                             }
-                        },
-                        "type": "function"
+                        }
                     }
                 ],
                 "tool_choice": "auto"
@@ -614,6 +615,6 @@ private static IChatClient CreateChatClient(HttpClient httpClient, string modelI
         new ChatCompletionsClient(
             new("http://somewhere"),
             new AzureKeyCredential("key"),
-            new ChatCompletionsClientOptions { Transport = new HttpClientTransport(httpClient) })
+            new AzureAIInferenceClientOptions { Transport = new HttpClientTransport(httpClient) })
             .AsChatClient(modelId);
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorIntegrationTests.cs
new file mode 100644
index 00000000000..637c1475747
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorIntegrationTests.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.Extensions.AI;
+
+public class AzureAIInferenceEmbeddingGeneratorIntegrationTests : EmbeddingGeneratorIntegrationTests
+{
+    protected override IEmbeddingGenerator<string, Embedding<float>>? CreateEmbeddingGenerator() =>
+        IntegrationTestHelpers.GetEmbeddingsClient()
+        ?.AsEmbeddingGenerator(Environment.GetEnvironmentVariable("OPENAI_EMBEDDING_MODEL") ?? "text-embedding-3-small");
+}
diff --git a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorTests.cs b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorTests.cs
new file mode 100644
index 00000000000..abd5f609ed2
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/AzureAIInferenceEmbeddingGeneratorTests.cs
@@ -0,0 +1,135 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Azure;
+using Azure.AI.Inference;
+using Azure.Core.Pipeline;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+using Xunit;
+
+#pragma warning disable S103 // Lines should not be too long
+
+namespace Microsoft.Extensions.AI;
+
+public class AzureAIInferenceEmbeddingGeneratorTests
+{
+    [Fact]
+    public void Ctor_InvalidArgs_Throws()
+    {
+        Assert.Throws<ArgumentNullException>("embeddingsClient", () => new AzureAIInferenceEmbeddingGenerator(null!));
+
+        EmbeddingsClient client = new(new("http://somewhere"), new AzureKeyCredential("key"));
+        Assert.Throws<ArgumentException>("modelId", () => new AzureAIInferenceEmbeddingGenerator(client, ""));
+        Assert.Throws<ArgumentException>("modelId", () => new AzureAIInferenceEmbeddingGenerator(client, "   "));
+
+        using var _ = new AzureAIInferenceEmbeddingGenerator(client);
+    }
+
+    [Fact]
+    public void AsEmbeddingGenerator_InvalidArgs_Throws()
+    {
+        Assert.Throws<ArgumentNullException>("embeddingsClient", () => ((EmbeddingsClient)null!).AsEmbeddingGenerator());
+
+        EmbeddingsClient client = new(new("http://somewhere"), new AzureKeyCredential("key"));
+        Assert.Throws<ArgumentException>("modelId", () => client.AsEmbeddingGenerator("   "));
+
+        client.AsEmbeddingGenerator(null);
+    }
+
+    [Fact]
+    public void AsEmbeddingGenerator_OpenAIClient_ProducesExpectedMetadata()
+    {
+        Uri endpoint = new("http://localhost/some/endpoint");
+        string model = "amazingModel";
+
+        EmbeddingsClient client = new(endpoint, new AzureKeyCredential("key"));
+
+        IEmbeddingGenerator<string, Embedding<float>> embeddingGenerator = client.AsEmbeddingGenerator(model);
+        Assert.Equal("az.ai.inference", embeddingGenerator.Metadata.ProviderName);
+        Assert.Equal(endpoint, embeddingGenerator.Metadata.ProviderUri);
+        Assert.Equal(model, embeddingGenerator.Metadata.ModelId);
+    }
+
+    [Fact]
+    public void GetService_SuccessfullyReturnsUnderlyingClient()
+    {
+        var client = new EmbeddingsClient(new("http://somewhere"), new AzureKeyCredential("key"));
+        var embeddingGenerator = client.AsEmbeddingGenerator("model");
+
+        Assert.Same(embeddingGenerator, embeddingGenerator.GetService<IEmbeddingGenerator<string, Embedding<float>>>());
+        Assert.Same(client, embeddingGenerator.GetService<EmbeddingsClient>());
+
+        using IEmbeddingGenerator<string, Embedding<float>> pipeline = new EmbeddingGeneratorBuilder<string, Embedding<float>>()
+            .UseOpenTelemetry()
+            .UseDistributedCache(new MemoryDistributedCache(Options.Options.Create(new MemoryDistributedCacheOptions())))
+            .Use(embeddingGenerator);
+
+        Assert.NotNull(pipeline.GetService<DistributedCachingEmbeddingGenerator<string, Embedding<float>>>());
+        Assert.NotNull(pipeline.GetService<CachingEmbeddingGenerator<string, Embedding<float>>>());
+        Assert.NotNull(pipeline.GetService<OpenTelemetryEmbeddingGenerator<string, Embedding<float>>>());
+
+        Assert.Same(client, pipeline.GetService<EmbeddingsClient>());
+        Assert.IsType<OpenTelemetryEmbeddingGenerator<string, Embedding<float>>>(pipeline.GetService<IEmbeddingGenerator<string, Embedding<float>>>());
+    }
+
+    [Fact]
+    public async Task GenerateAsync_ExpectedRequestResponse()
+    {
+        const string Input = """
+            {"input":["hello, world!","red, white, blue"],"encoding_format":"base64","model":"text-embedding-3-small"}
+            """;
+
+        const string Output = """
+            {
+              "object": "list",
+              "data": [
+                {
+                  "object": "embedding",
+                  "index": 0,
+                  "embedding": "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"
+                },
+                {
+                  "object": "embedding",
+                  "index": 1,
+                  "embedding": "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"
+                }
+              ],
+              "model": "text-embedding-3-small",
+              "usage": {
+                "prompt_tokens": 9,
+                "total_tokens": 9
+              }
+            }
+            """;
+
+        using VerbatimHttpHandler handler = new(Input, Output);
+        using HttpClient httpClient = new(handler);
+        using IEmbeddingGenerator<string, Embedding<float>> generator = new EmbeddingsClient(new("http://somewhere"), new AzureKeyCredential("key"), new()
+        {
+            Transport = new HttpClientTransport(httpClient),
+        }).AsEmbeddingGenerator("text-embedding-3-small");
+
+        var response = await generator.GenerateAsync([
+            "hello, world!",
+            "red, white, blue",
+        ]);
+        Assert.NotNull(response);
+        Assert.Equal(2, response.Count);
+
+        Assert.NotNull(response.Usage);
+        Assert.Equal(9, response.Usage.InputTokenCount);
+        Assert.Equal(9, response.Usage.TotalTokenCount);
+
+        foreach (Embedding<float> e in response)
+        {
+            Assert.Equal("text-embedding-3-small", e.ModelId);
+            Assert.NotNull(e.CreatedAt);
+            Assert.Equal(1536, e.Vector.Length);
+            Assert.Contains(e.Vector.ToArray(), f => !f.Equals(0));
+        }
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/IntegrationTestHelpers.cs b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/IntegrationTestHelpers.cs
index 4c4086e1157..e1a2076a6c7 100644
--- a/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/IntegrationTestHelpers.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.AzureAIInference.Tests/IntegrationTestHelpers.cs
@@ -10,22 +10,23 @@ namespace Microsoft.Extensions.AI;
 /// <summary>Shared utility methods for integration tests.</summary>
 internal static class IntegrationTestHelpers
 {
-    /// <summary>Gets an <see cref="ChatCompletionsClient"/> to use for testing, or null if the associated tests should be disabled.</summary>
-    public static ChatCompletionsClient? GetChatCompletionsClient()
-    {
-        string? apiKey =
-            Environment.GetEnvironmentVariable("AZURE_AI_INFERENCE_APIKEY") ??
-            Environment.GetEnvironmentVariable("OPENAI_API_KEY");
+    private static readonly string? _apiKey =
+        Environment.GetEnvironmentVariable("AZURE_AI_INFERENCE_APIKEY") ??
+        Environment.GetEnvironmentVariable("OPENAI_API_KEY");
 
-        if (apiKey is not null)
-        {
-            string? endpoint =
-                Environment.GetEnvironmentVariable("AZURE_AI_INFERENCE_ENDPOINT") ??
-                "https://api.openai.com/v1";
+    private static readonly string _endpoint =
+        Environment.GetEnvironmentVariable("AZURE_AI_INFERENCE_ENDPOINT") ??
+        "https://api.openai.com/v1";
 
-            return new(new Uri(endpoint), new AzureKeyCredential(apiKey));
-        }
+    /// <summary>Gets an <see cref="ChatCompletionsClient"/> to use for testing, or null if the associated tests should be disabled.</summary>
+    public static ChatCompletionsClient? GetChatCompletionsClient() =>
+        _apiKey is string apiKey ?
+            new ChatCompletionsClient(new Uri(_endpoint), new AzureKeyCredential(apiKey)) :
+            null;
 
-        return null;
-    }
+    /// <summary>Gets an <see cref="EmbeddingsClient"/> to use for testing, or null if the associated tests should be disabled.</summary>
+    public static EmbeddingsClient? GetEmbeddingsClient() =>
+        _apiKey is string apiKey ?
+            new EmbeddingsClient(new Uri(_endpoint), new AzureKeyCredential(apiKey)) :
+            null;
 }
diff --git a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
index 3f5ce32fc37..0863e31db37 100644
--- a/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
+++ b/test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
@@ -110,7 +110,13 @@ public virtual async Task CompleteStreamingAsync_UsageDataAvailable()
     {
         SkipIfNotEnabled();
 
-        var response = _chatClient.CompleteStreamingAsync("Explain in 10 words how AI works");
+        var response = _chatClient.CompleteStreamingAsync("Explain in 10 words how AI works", new()
+        {
+            AdditionalProperties = new()
+            {
+                ["stream_options"] = new Dictionary<string, object> { ["include_usage"] = true, },
+            },
+        });
 
         List<StreamingChatCompletionUpdate> chunks = [];
         await foreach (var chunk in response)