diff --git a/NuGet.config b/NuGet.config
index 3b304f633a1..0dff8158a3d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,8 +6,10 @@
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-3b38386" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3b383860/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  Begin: Package sources from dotnet-extensions -->
+    <add key="darc-int-dotnet-extensions-8e0af0d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-8e0af0db/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-extensions -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,11 +24,19 @@
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-extensions -->
+    <add key="darc-int-dotnet-extensions-8e0af0d" value="true" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="darc-int-dotnet-extensions-4210e7d" value="true" />
     <add key="darc-int-dotnet-extensions-4210e7d" value="true" />
     <!--  End: Package sources from dotnet-extensions -->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-3b38386" value="true" />
+    <add key="darc-int-dotnet-core-setup-593c84e" value="true" />
+    <add key="darc-int-dotnet-core-setup-b3f33a3" value="true" />
+    <add key="darc-int-dotnet-core-setup-c59d3f6" value="true" />
+    <add key="darc-int-dotnet-core-setup-3487563" value="true" />
+    <add key="darc-int-dotnet-core-setup-7af614f" value="true" />
+    <add key="darc-int-dotnet-core-setup-7af614f" value="true" />
     <add key="darc-int-dotnet-core-setup-7af614f" value="true" />
     <add key="darc-int-dotnet-core-setup-64991f8" value="true" />
     <add key="darc-int-dotnet-core-setup-e38b64f" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8806ff817ff..2df11025b4c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</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>
@@ -33,85 +33,85 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
       <Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
     <!-- !!! Pin this again & remove CPD once 3.1.8 is released. -->
     <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.8-servicing.20420.4">
@@ -122,153 +122,153 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
       <Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Http" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Localization" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Options" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.23-servicing.22123.2">
+    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.24-servicing.22180.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.1.23">
+    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="3.1.23">
+    <Dependency Name="Microsoft.JSInterop" Version="3.1.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
+      <Sha>8e0af0dbdd80016da26eab546c3f10e943cea1bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.23" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.24" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>7af614fde0e0da1d20b33a6e2da7ae2994c5eec3</Sha>
+      <Sha>3b3838608327c1d49fcf77fc47487e40e4dc3000</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.23-servicing.22122.4" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.24-servicing.22179.7" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>7af614fde0e0da1d20b33a6e2da7ae2994c5eec3</Sha>
+      <Sha>3b3838608327c1d49fcf77fc47487e40e4dc3000</Sha>
     </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="1.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a1c5fd29614..7a77f2448ea 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,13 +32,13 @@
     <MicrosoftDataSqlClientPackageVersion>1.1.3</MicrosoftDataSqlClientPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from aspnet/Extensions">
-    <MicrosoftExtensionsCachingMemoryPackageVersion>3.1.23</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>3.1.23</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.23</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.23</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.23</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.23-servicing.22123.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>3.1.23</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>3.1.24</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>3.1.24</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.24</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.24</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.24</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.24-servicing.22180.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>3.1.24</MicrosoftExtensionsLoggingPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/corefx">
     <MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
@@ -55,8 +55,8 @@
     <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.23</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.23-servicing.22122.4</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.24</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.24-servicing.22179.7</MicrosoftNETCoreAppInternalPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/roslyn">
diff --git a/global.json b/global.json
index 7793fd043a8..886c2f7081d 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.417",
+    "dotnet": "3.1.418",
     "runtimes": {
       "dotnet": [
         "2.1.30",
@@ -9,7 +9,7 @@
     }
   },
   "sdk": {
-    "version": "3.1.417"
+    "version": "3.1.418"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22159.6"