diff --git a/NuGet.config b/NuGet.config
index 9657f14ac2a4..a070fbcf11d3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,9 +3,9 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <add key="darc-pub-dotnet-extensions-b203982" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-b2039820/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-efcore-d5c09c4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-d5c09c46/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-core-setup-e4ad874" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-e4ad8742/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-extensions-d7dd3dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-d7dd3dd2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-efcore-8fb1dad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-8fb1dad5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-core-setup-07abf29" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-07abf298/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-tooling-f9ccbc7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-f9ccbc71/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fb28c6d0354e..7682d9c628a0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -35,259 +35,259 @@
     </Dependency>
     <Dependency Name="dotnet-ef" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
     <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>d5c09c466b6ec16599f1435ca4ac3e78d39c871c</Sha>
+      <Sha>8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Hosting" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Http" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Localization" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Options" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Primitives" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.JSInterop" Version="3.1.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
@@ -392,15 +392,15 @@
     -->
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.8" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda</Sha>
+      <Sha>07abf29837e67600985eac4956e937955281d23c</Sha>
     </Dependency>
     <Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.8-servicing.20414.1" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda</Sha>
+      <Sha>07abf29837e67600985eac4956e937955281d23c</Sha>
     </Dependency>
     <!-- Keep these dependencies at the bottom of ProductDependencies, else they will be picked as the parent for CoherentParentDependencies -->
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
@@ -414,9 +414,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
       <Sha>36b8b8e26a8e2e06e000f59e19910d117bf0025b</Sha>
     </Dependency>
-    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20213.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
@@ -430,9 +430,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.8-servicing.20414.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.8-servicing.20414.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>b2039820b86e46189766099d9324468814bec063</Sha>
+      <Sha>d7dd3dd2bad597a566915d6c8065fdffefef4be7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/roslyn</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 48a6793e5b8a..871064ce7fdf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,7 +69,7 @@
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
     <MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.8-servicing.20414.1</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.8-servicing.20414.2</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
@@ -102,16 +102,16 @@
     <!-- Packages from aspnet/Blazor -->
     <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
     <!-- Packages from aspnet/Extensions -->
-    <InternalAspNetCoreAnalyzersPackageVersion>3.1.8-servicing.20414.2</InternalAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.8-servicing.20414.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>3.1.8-servicing.20414.2</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
+    <InternalAspNetCoreAnalyzersPackageVersion>3.1.8-servicing.20414.4</InternalAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.8-servicing.20414.4</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>3.1.8-servicing.20414.4</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
     <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.1.8</MicrosoftExtensionsCachingAbstractionsPackageVersion>
     <MicrosoftExtensionsCachingMemoryPackageVersion>3.1.8</MicrosoftExtensionsCachingMemoryPackageVersion>
     <MicrosoftExtensionsCachingSqlServerPackageVersion>3.1.8</MicrosoftExtensionsCachingSqlServerPackageVersion>
     <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.1.8</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.1.8</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
     <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.1.8</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
     <MicrosoftExtensionsConfigurationBinderPackageVersion>3.1.8</MicrosoftExtensionsConfigurationBinderPackageVersion>
@@ -134,10 +134,10 @@
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.1.8</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
     <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.1.8</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.1.8</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
     <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.1.8</MicrosoftExtensionsHostingAbstractionsPackageVersion>
     <MicrosoftExtensionsHostingPackageVersion>3.1.8</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
     <MicrosoftExtensionsHttpPackageVersion>3.1.8</MicrosoftExtensionsHttpPackageVersion>
     <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.1.8</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
     <MicrosoftExtensionsLocalizationPackageVersion>3.1.8</MicrosoftExtensionsLocalizationPackageVersion>
@@ -149,16 +149,16 @@
     <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.1.8</MicrosoftExtensionsLoggingEventSourcePackageVersion>
     <MicrosoftExtensionsLoggingEventLogPackageVersion>3.1.8</MicrosoftExtensionsLoggingEventLogPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>3.1.8</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsLoggingTestingPackageVersion>
     <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.1.8</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>3.1.8</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.1.8</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
     <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.1.8</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
     <MicrosoftExtensionsOptionsPackageVersion>3.1.8</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
+    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>3.1.8</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
-    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.8-servicing.20414.2</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
+    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
+    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.8-servicing.20414.4</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
     <MicrosoftExtensionsWebEncodersPackageVersion>3.1.8</MicrosoftExtensionsWebEncodersPackageVersion>
     <MicrosoftInternalExtensionsRefsPackageVersion>3.1.0-rtm.19565.4</MicrosoftInternalExtensionsRefsPackageVersion>
     <MicrosoftJSInteropPackageVersion>3.1.8</MicrosoftJSInteropPackageVersion>