diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f467b087ddf2..3c737fc32b41 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,181 +9,181 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="dotnet-ef" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="dotnet-ef" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.23363.2">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.23368.1">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c50e2f6f1ab8681c9912cdd3443769988160aa31</Sha>
+      <Sha>926b37073d9a721432513ba7fdaee03543cc2d91</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Options" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23355.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -195,139 +195,139 @@
       <Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
       <SourceBuild RepoName="symreader" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <Dependency Name="System.Drawing.Common" Version="8.0.0-preview.7.23356.8">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>5d54b08d5fc40d0b1c156f430a487a94c1e34f79</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.IO.Pipelines" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Net.Http.Json" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Reflection.Metadata" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Security.Permissions" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Text.Json" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Threading.Channels" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.RateLimiting" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Threading.RateLimiting" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <!-- Transitive package to provide coherency in dotnet/extensions -->
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Collections.Immutable" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.IO.Hashing" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -357,16 +357,16 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
     </Dependency>
-    <Dependency Name="System.Composition" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="System.Composition" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23363.19">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23367.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>40480e8e82b734a54c210f656361ff073353ffbe</Sha>
+      <Sha>58bca2c54dcd1cc3b76989657bf218621668d836</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23360.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 86a6894873a3..a52adc100e2a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,88 +63,88 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCoreAppRefVersion>8.0.0-preview.7.23363.19</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23363.19</MicrosoftNETCoreAppRuntimewinx64Version>
-    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.7.23363.19</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
-    <MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.7.23363.19</MicrosoftNETRuntimeWebAssemblySdkVersion>
-    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.7.23363.19</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.7.23363.19</MicrosoftNETCoreBrowserDebugHostTransportVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationCommandLineVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationFileExtensionsVersion>
-    <MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationIniVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationUserSecretsVersion>
-    <MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsConfigurationXmlVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsFileProvidersAbstractionsVersion>
-    <MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsFileProvidersCompositeVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsFileProvidersPhysicalVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingDebugVersion>
-    <MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingEventSourceVersion>
-    <MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingEventLogVersion>
-    <MicrosoftExtensionsLoggingVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsLoggingTraceSourceVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsOptionsDataAnnotationsVersion>
-    <MicrosoftExtensionsOptionsVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.7.23363.19</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.7.23363.19</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
-    <SystemConfigurationConfigurationManagerVersion>8.0.0-preview.7.23363.19</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.7.23363.19</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsEventLogVersion>8.0.0-preview.7.23363.19</SystemDiagnosticsEventLogVersion>
-    <SystemDirectoryServicesProtocolsVersion>8.0.0-preview.7.23363.19</SystemDirectoryServicesProtocolsVersion>
+    <MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftNETCoreAppRefVersion>8.0.0-preview.7.23367.14</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23367.14</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.7.23367.14</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.7.23367.14</MicrosoftNETRuntimeWebAssemblySdkVersion>
+    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.7.23367.14</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.7.23367.14</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationCommandLineVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationFileExtensionsVersion>
+    <MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationIniVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationUserSecretsVersion>
+    <MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsConfigurationXmlVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsFileProvidersAbstractionsVersion>
+    <MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsFileProvidersCompositeVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsFileProvidersPhysicalVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingDebugVersion>
+    <MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingEventSourceVersion>
+    <MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingEventLogVersion>
+    <MicrosoftExtensionsLoggingVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsLoggingTraceSourceVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsOptionsDataAnnotationsVersion>
+    <MicrosoftExtensionsOptionsVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.7.23367.14</MicrosoftExtensionsPrimitivesVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.7.23367.14</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+    <SystemConfigurationConfigurationManagerVersion>8.0.0-preview.7.23367.14</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.7.23367.14</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsEventLogVersion>8.0.0-preview.7.23367.14</SystemDiagnosticsEventLogVersion>
+    <SystemDirectoryServicesProtocolsVersion>8.0.0-preview.7.23367.14</SystemDirectoryServicesProtocolsVersion>
     <SystemDrawingCommonVersion>8.0.0-preview.7.23356.8</SystemDrawingCommonVersion>
-    <SystemIOPipelinesVersion>8.0.0-preview.7.23363.19</SystemIOPipelinesVersion>
-    <SystemNetHttpJsonVersion>8.0.0-preview.7.23363.19</SystemNetHttpJsonVersion>
-    <SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.7.23363.19</SystemNetHttpWinHttpHandlerVersion>
-    <SystemReflectionMetadataVersion>8.0.0-preview.7.23363.19</SystemReflectionMetadataVersion>
-    <SystemResourcesExtensionsVersion>8.0.0-preview.7.23363.19</SystemResourcesExtensionsVersion>
-    <SystemSecurityCryptographyPkcsVersion>8.0.0-preview.7.23363.19</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>8.0.0-preview.7.23363.19</SystemSecurityCryptographyXmlVersion>
-    <SystemSecurityPermissionsVersion>8.0.0-preview.7.23363.19</SystemSecurityPermissionsVersion>
-    <SystemServiceProcessServiceControllerVersion>8.0.0-preview.7.23363.19</SystemServiceProcessServiceControllerVersion>
-    <SystemTextEncodingsWebVersion>8.0.0-preview.7.23363.19</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>8.0.0-preview.7.23363.19</SystemTextJsonVersion>
-    <SystemThreadingAccessControlVersion>8.0.0-preview.7.23363.19</SystemThreadingAccessControlVersion>
-    <SystemThreadingChannelsVersion>8.0.0-preview.7.23363.19</SystemThreadingChannelsVersion>
-    <SystemThreadingRateLimitingVersion>8.0.0-preview.7.23363.19</SystemThreadingRateLimitingVersion>
+    <SystemIOPipelinesVersion>8.0.0-preview.7.23367.14</SystemIOPipelinesVersion>
+    <SystemNetHttpJsonVersion>8.0.0-preview.7.23367.14</SystemNetHttpJsonVersion>
+    <SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.7.23367.14</SystemNetHttpWinHttpHandlerVersion>
+    <SystemReflectionMetadataVersion>8.0.0-preview.7.23367.14</SystemReflectionMetadataVersion>
+    <SystemResourcesExtensionsVersion>8.0.0-preview.7.23367.14</SystemResourcesExtensionsVersion>
+    <SystemSecurityCryptographyPkcsVersion>8.0.0-preview.7.23367.14</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>8.0.0-preview.7.23367.14</SystemSecurityCryptographyXmlVersion>
+    <SystemSecurityPermissionsVersion>8.0.0-preview.7.23367.14</SystemSecurityPermissionsVersion>
+    <SystemServiceProcessServiceControllerVersion>8.0.0-preview.7.23367.14</SystemServiceProcessServiceControllerVersion>
+    <SystemTextEncodingsWebVersion>8.0.0-preview.7.23367.14</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>8.0.0-preview.7.23367.14</SystemTextJsonVersion>
+    <SystemThreadingAccessControlVersion>8.0.0-preview.7.23367.14</SystemThreadingAccessControlVersion>
+    <SystemThreadingChannelsVersion>8.0.0-preview.7.23367.14</SystemThreadingChannelsVersion>
+    <SystemThreadingRateLimitingVersion>8.0.0-preview.7.23367.14</SystemThreadingRateLimitingVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsVersion>8.0.0-preview.7.23363.19</MicrosoftNETCorePlatformsVersion>
-    <MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.7.23363.19</MicrosoftBclAsyncInterfacesVersion>
+    <MicrosoftNETCorePlatformsVersion>8.0.0-preview.7.23367.14</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.7.23367.14</MicrosoftBclAsyncInterfacesVersion>
     <!-- Transitive package to provide coherency in dotnet/extensions -->
-    <MicrosoftBclTimeProviderVersion>8.0.0-preview.7.23363.19</MicrosoftBclTimeProviderVersion>
-    <SystemCollectionsImmutableVersion>8.0.0-preview.7.23363.19</SystemCollectionsImmutableVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.7.23363.19</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>8.0.0-preview.7.23363.19</SystemIOHashingVersion>
-    <SystemRuntimeCachingVersion>8.0.0-preview.7.23363.19</SystemRuntimeCachingVersion>
+    <MicrosoftBclTimeProviderVersion>8.0.0-preview.7.23367.14</MicrosoftBclTimeProviderVersion>
+    <SystemCollectionsImmutableVersion>8.0.0-preview.7.23367.14</SystemCollectionsImmutableVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.7.23367.14</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>8.0.0-preview.7.23367.14</SystemIOHashingVersion>
+    <SystemRuntimeCachingVersion>8.0.0-preview.7.23367.14</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
     <MicrosoftExtensionsTelemetryTestingVersion>8.0.0-preview.7.23359.3</MicrosoftExtensionsTelemetryTestingVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>8.0.0-preview.7.23363.2</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.7.23363.2</MicrosoftEntityFrameworkCoreDesignVersion>
+    <dotnetefVersion>8.0.0-preview.7.23368.1</dotnetefVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.7.23368.1</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCommonVersion>
     <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
@@ -168,7 +168,7 @@
     <!-- Packages from dotnet/symreader -->
     <MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
     <!-- Packages from dotnet/runtime -->
-    <SystemCompositionVersion>8.0.0-preview.7.23363.19</SystemCompositionVersion>
+    <SystemCompositionVersion>8.0.0-preview.7.23367.14</SystemCompositionVersion>
     <!-- Packages from dotnet/xdt -->
     <MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
   </PropertyGroup>
diff --git a/src/HttpClientFactory/Polly/test/DependencyInjection/PollyHttpClientBuilderExtensionsTest.cs b/src/HttpClientFactory/Polly/test/DependencyInjection/PollyHttpClientBuilderExtensionsTest.cs
index 0dc29491984d..9e1fc96b00fc 100644
--- a/src/HttpClientFactory/Polly/test/DependencyInjection/PollyHttpClientBuilderExtensionsTest.cs
+++ b/src/HttpClientFactory/Polly/test/DependencyInjection/PollyHttpClientBuilderExtensionsTest.cs
@@ -40,16 +40,13 @@ public async Task AddPolicyHandler_Policy_AddsPolicyHandler()
     {
         var serviceCollection = new ServiceCollection();
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddPolicyHandler(RetryPolicy)
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -61,7 +58,7 @@ public async Task AddPolicyHandler_Policy_AddsPolicyHandler()
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -78,16 +75,13 @@ public async Task AddPolicyHandler_PolicySelector_AddsPolicyHandler()
     {
         var serviceCollection = new ServiceCollection();
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddPolicyHandler((req) => req.RequestUri.AbsolutePath == "/" ? RetryPolicy : NoOpPolicy)
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -99,7 +93,7 @@ public async Task AddPolicyHandler_PolicySelector_AddsPolicyHandler()
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -119,16 +113,13 @@ public async Task AddPolicyHandler_PolicySelectorWithServices_AddsPolicyHandler(
     {
         var serviceCollection = new ServiceCollection();
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddPolicyHandler((req) => req.RequestUri.AbsolutePath == "/" ? RetryPolicy : NoOpPolicy)
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -140,7 +131,7 @@ public async Task AddPolicyHandler_PolicySelectorWithServices_AddsPolicyHandler(
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -163,17 +154,13 @@ public async Task AddPolicyHandlerFromRegistry_Name_AddsPolicyHandler()
         var registry = serviceCollection.AddPolicyRegistry();
         registry.Add<IAsyncPolicy<HttpResponseMessage>>("retry", RetryPolicy);
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddPolicyHandlerFromRegistry("retry")
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -185,7 +172,7 @@ public async Task AddPolicyHandlerFromRegistry_Name_AddsPolicyHandler()
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -206,7 +193,7 @@ public async Task AddPolicyHandlerFromRegistry_Dynamic_AddsPolicyHandler()
         registry.Add<IAsyncPolicy<HttpResponseMessage>>("noop", NoOpPolicy);
         registry.Add<IAsyncPolicy<HttpResponseMessage>>("retry", RetryPolicy);
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
@@ -216,11 +203,8 @@ public async Task AddPolicyHandlerFromRegistry_Dynamic_AddsPolicyHandler()
                     reg.Get<IAsyncPolicy<HttpResponseMessage>>("retry") :
                     reg.Get<IAsyncPolicy<HttpResponseMessage>>("noop");
             })
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -232,7 +216,7 @@ public async Task AddPolicyHandlerFromRegistry_Dynamic_AddsPolicyHandler()
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -267,16 +251,13 @@ public async Task AddTransientHttpErrorPolicy_AddsPolicyHandler_HandlesStatusCod
 
         var serviceCollection = new ServiceCollection();
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddTransientHttpErrorPolicy(b => b.RetryAsync(5))
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = handler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => handler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -288,7 +269,7 @@ public async Task AddTransientHttpErrorPolicy_AddsPolicyHandler_HandlesStatusCod
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -315,16 +296,13 @@ public async Task AddTransientHttpErrorPolicy_AddsPolicyHandler_HandlesHttpReque
 
         var serviceCollection = new ServiceCollection();
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddTransientHttpErrorPolicy(b => b.RetryAsync(5))
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = handler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => handler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -336,7 +314,7 @@ public async Task AddTransientHttpErrorPolicy_AddsPolicyHandler_HandlesHttpReque
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -353,7 +331,7 @@ public async Task AddPolicyHandlerFromRegistry_PolicySelectorWithKey_AddsPolicyH
     {
         var serviceCollection = new ServiceCollection();
         var registry = serviceCollection.AddPolicyRegistry();
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("Service")
@@ -367,11 +345,8 @@ public async Task AddPolicyHandlerFromRegistry_PolicySelectorWithKey_AddsPolicyH
                 return r.RequestUri.Host;
             }
             )
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -382,7 +357,7 @@ public async Task AddPolicyHandlerFromRegistry_PolicySelectorWithKey_AddsPolicyH
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
@@ -435,17 +410,13 @@ public async Task AddPolicyHandlerFromRegistry_WithConfigureDelegate_AddsPolicyH
             registry.Add<IAsyncPolicy<HttpResponseMessage>>(policyName, RetryPolicy);
         });
 
-        HttpMessageHandlerBuilder builder = null;
+        IList<DelegatingHandler> additionalHandlers = null;
 
         // Act1
         serviceCollection.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
             .AddPolicyHandlerFromRegistry(options.PolicyName)
-            .ConfigureHttpMessageHandlerBuilder(b =>
-            {
-                b.PrimaryHandler = PrimaryHandler;
-
-                builder = b;
-            });
+            .ConfigurePrimaryHttpMessageHandler(() => PrimaryHandler)
+            .ConfigureAdditionalHttpMessageHandlers((handlers, _) => additionalHandlers = handlers);
 
         var services = serviceCollection.BuildServiceProvider();
         var factory = services.GetRequiredService<IHttpClientFactory>();
@@ -457,7 +428,7 @@ public async Task AddPolicyHandlerFromRegistry_WithConfigureDelegate_AddsPolicyH
         Assert.NotNull(client);
 
         Assert.Collection(
-            builder.AdditionalHandlers,
+            additionalHandlers,
             h => Assert.IsType<LoggingScopeHttpMessageHandler>(h),
             h => Assert.IsType<PolicyHttpMessageHandler>(h),
             h => Assert.IsType<LoggingHttpMessageHandler>(h));
diff --git a/src/Middleware/HeaderPropagation/test/HeaderPropagationIntegrationTest.cs b/src/Middleware/HeaderPropagation/test/HeaderPropagationIntegrationTest.cs
index 00546f93681e..111b692d1e32 100644
--- a/src/Middleware/HeaderPropagation/test/HeaderPropagationIntegrationTest.cs
+++ b/src/Middleware/HeaderPropagation/test/HeaderPropagationIntegrationTest.cs
@@ -207,10 +207,7 @@ private async Task<IHost> CreateHost(Action<HeaderPropagationOptions> configure,
                 {
                     services.AddHeaderPropagation(configure);
                     var client = services.AddHttpClient("example.com", c => c.BaseAddress = new Uri("http://example.com"))
-                        .ConfigureHttpMessageHandlerBuilder(b =>
-                        {
-                            b.PrimaryHandler = primaryHandler;
-                        });
+                        .ConfigurePrimaryHttpMessageHandler(() => primaryHandler);
 
                     if (configureClient != null)
                     {