From 858624bd26e439099ba39ceeb2b6bdb56e5cc46a Mon Sep 17 00:00:00 2001
From: gitmln <55032486+gitmln@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:52:55 +0200
Subject: [PATCH 01/30] Revert correct Meter name (#5403)

* Revert correct Meter name

* Unit tests for ResourceMonitoring meter name

* Fixed Windows test on Linuz

---------

Co-authored-by: gitmln <nbaraka@gmail.com>
---
 .../Linux/LinuxUtilizationProvider.cs         |  2 +-
 .../ResourceUtilizationInstruments.cs         |  5 +++
 .../WindowsContainerSnapshotProvider.cs       |  2 +-
 .../Windows/WindowsSnapshotProvider.cs        |  2 +-
 .../Helpers/TestMeterFactory.cs               | 41 +++++++++++++++++++
 .../Linux/LinuxUtilizationProviderTests.cs    | 14 +++++++
 .../Resources/DummyLinuxUtilizationParser.cs  | 18 ++++++++
 .../WindowsContainerSnapshotProviderTests.cs  | 22 ++++++++++
 .../Windows/WindowsSnapshotProviderTests.cs   | 13 ++++++
 9 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Helpers/TestMeterFactory.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Resources/DummyLinuxUtilizationParser.cs

diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationProvider.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationProvider.cs
index 3e2172e9135..d7914104adb 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationProvider.cs
@@ -62,7 +62,7 @@ public LinuxUtilizationProvider(IOptions<ResourceMonitoringOptions> options, ILi
         // We don't dispose the meter because IMeterFactory handles that
         // An issue on analyzer side: https://github.com/dotnet/roslyn-analyzers/issues/6912
         // Related documentation: https://github.com/dotnet/docs/pull/37170
-        var meter = meterFactory.Create(nameof(Microsoft.Extensions.Diagnostics.ResourceMonitoring));
+        var meter = meterFactory.Create(ResourceUtilizationInstruments.MeterName);
 #pragma warning restore CA2000 // Dispose objects before losing scope
 
         _ = meter.CreateObservableGauge(name: ResourceUtilizationInstruments.ContainerCpuLimitUtilization, observeValue: () => CpuUtilization() * _scaleRelativeToCpuLimit, unit: "1");
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs
index f787ec2ecf4..fe8e508afb2 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs
@@ -11,6 +11,11 @@ namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;
 /// <seealso cref="System.Diagnostics.Metrics.Instrument"/>
 internal static class ResourceUtilizationInstruments
 {
+    /// <summary>
+    /// The name of the ResourceMonitoring Meter.
+    /// </summary>
+    public const string MeterName = "Microsoft.Extensions.Diagnostics.ResourceMonitoring";
+
     /// <summary>
     /// The name of an instrument to retrieve CPU limit consumption of all processes running inside a container or control group in range <c>[0, 1]</c>.
     /// </summary>
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsContainerSnapshotProvider.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsContainerSnapshotProvider.cs
index 56dbb4ae33a..3f2c4b8638a 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsContainerSnapshotProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsContainerSnapshotProvider.cs
@@ -105,7 +105,7 @@ internal WindowsContainerSnapshotProvider(
         // We don't dispose the meter because IMeterFactory handles that
         // An issue on analyzer side: https://github.com/dotnet/roslyn-analyzers/issues/6912
         // Related documentation: https://github.com/dotnet/docs/pull/37170
-        var meter = meterFactory.Create(nameof(Microsoft.Extensions.Diagnostics.ResourceMonitoring));
+        var meter = meterFactory.Create(ResourceUtilizationInstruments.MeterName);
 #pragma warning restore CA2000 // Dispose objects before losing scope
 
         // Container based metrics:
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs
index 7104b7b9e5f..7197499afd9 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs
@@ -81,7 +81,7 @@ internal WindowsSnapshotProvider(
         // We don't dispose the meter because IMeterFactory handles that
         // An issue on analyzer side: https://github.com/dotnet/roslyn-analyzers/issues/6912
         // Related documentation: https://github.com/dotnet/docs/pull/37170
-        var meter = meterFactory.Create(nameof(Microsoft.Extensions.Diagnostics.ResourceMonitoring));
+        var meter = meterFactory.Create(ResourceUtilizationInstruments.MeterName);
 #pragma warning restore CA2000 // Dispose objects before losing scope
 
         _ = meter.CreateObservableGauge(name: ResourceUtilizationInstruments.ProcessCpuUtilization, observeValue: CpuPercentage);
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Helpers/TestMeterFactory.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Helpers/TestMeterFactory.cs
new file mode 100644
index 00000000000..42ac54926c4
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Helpers/TestMeterFactory.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+
+namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Helpers;
+
+internal class TestMeterFactory : IMeterFactory
+{
+    public List<Meter> Meters { get; } = new List<Meter>();
+
+    public Meter Create(MeterOptions options)
+    {
+        var meter = new Meter(options.Name, options.Version, Array.Empty<KeyValuePair<string, object?>>(), scope: this);
+        Meters.Add(meter);
+
+        return meter;
+    }
+
+    public Meter Create(string name)
+    {
+        return Create(new MeterOptions(name)
+        {
+            Version = null,
+            Tags = null,
+            Scope = null
+        });
+    }
+
+    public void Dispose()
+    {
+        foreach (var meter in Meters)
+        {
+            meter.Dispose();
+        }
+
+        Meters.Clear();
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationProviderTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationProviderTests.cs
index 44297768a70..8a9b10ff460 100644
--- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationProviderTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationProviderTests.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Helpers;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.TestUtilities;
 using Moq;
@@ -191,4 +192,17 @@ public Task Provider_EmitsLogRecord()
 
         return Verifier.Verify(logRecords).UseDirectory(VerifiedDataDirectory);
     }
+
+    [Fact]
+    public void Provider_Creates_Meter_With_Correct_Name()
+    {
+        var options = Options.Options.Create<ResourceMonitoringOptions>(new());
+        using var meterFactory = new TestMeterFactory();
+
+        var parser = new DummyLinuxUtilizationParser();
+        _ = new LinuxUtilizationProvider(options, parser, meterFactory);
+
+        var meter = meterFactory.Meters.Single();
+        Assert.Equal(ResourceUtilizationInstruments.MeterName, meter.Name);
+    }
 }
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Resources/DummyLinuxUtilizationParser.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Resources/DummyLinuxUtilizationParser.cs
new file mode 100644
index 00000000000..b06b8134a39
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Resources/DummyLinuxUtilizationParser.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux;
+
+namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
+
+internal class DummyLinuxUtilizationParser : ILinuxUtilizationParser
+{
+    public ulong GetAvailableMemoryInBytes() => 1;
+    public long GetCgroupCpuUsageInNanoseconds() => 0;
+    public float GetCgroupLimitedCpus() => 1;
+    public float GetCgroupRequestCpu() => 1;
+    public ulong GetHostAvailableMemory() => 0;
+    public float GetHostCpuCount() => 1;
+    public long GetHostCpuUsageInNanoseconds() => 0;
+    public ulong GetMemoryUsageInBytes() => 0;
+}
\ No newline at end of file
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsContainerSnapshotProviderTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsContainerSnapshotProviderTests.cs
index 3310f70d798..c013c77d7b4 100644
--- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsContainerSnapshotProviderTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsContainerSnapshotProviderTests.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Diagnostics.Metrics;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Helpers;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Interop;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Time.Testing;
@@ -322,4 +324,24 @@ public Task SnapshotProvider_EmitsLogRecord()
 
         return Verifier.Verify(logRecords).UniqueForRuntime().UseDirectory(VerifiedDataDirectory);
     }
+
+    [Fact]
+    public void Provider_Creates_Meter_With_Correct_Name()
+    {
+        var options = Options.Options.Create<ResourceMonitoringOptions>(new());
+        using var meterFactory = new TestMeterFactory();
+
+        _ = new WindowsContainerSnapshotProvider(
+            _memoryInfoMock.Object,
+            _systemInfoMock.Object,
+            _processInfoMock.Object,
+            _logger,
+            meterFactory,
+            () => _jobHandleMock.Object,
+            new FakeTimeProvider(),
+            new());
+
+        var meter = meterFactory.Meters.Single();
+        Assert.Equal(ResourceUtilizationInstruments.MeterName, meter.Name);
+    }
 }
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsSnapshotProviderTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsSnapshotProviderTests.cs
index aa53a431b06..6a76d8a95f4 100644
--- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsSnapshotProviderTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsSnapshotProviderTests.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Diagnostics.Metrics;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Helpers;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Interop;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
@@ -155,4 +157,15 @@ public void Provider_Returns_MemoryConsumption()
         var usage = WindowsSnapshotProvider.GetMemoryUsageInBytes();
         Assert.InRange(usage, 0, long.MaxValue);
     }
+
+    [ConditionalFact]
+    public void Provider_Creates_Meter_With_Correct_Name()
+    {
+        using var meterFactory = new TestMeterFactory();
+
+        _ = new WindowsSnapshotProvider(_fakeLogger, meterFactory, _options);
+
+        var meter = meterFactory.Meters.Single();
+        Assert.Equal(ResourceUtilizationInstruments.MeterName, meter.Name);
+    }
 }

From 1cc5737bff32f71e4c73eea0c4c15940175755ab Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:12:07 +0000
Subject: [PATCH 02/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240905.6 (#5405)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 156 ++++++++++++++++++++--------------------
 eng/Versions.props      |  78 ++++++++++----------
 2 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d4c73506e52..eceb189013c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,164 +1,164 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24429.19" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d0f3235d312f7cf9683012b3fe96b2c6f20a1743</Sha>
+      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24453.17">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24455.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>b4a37b11c6a29a19f2015de0d0818c3f8f2d35e6</Sha>
+      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8a8676279af..93537c79dc5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,46 +28,46 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24429.19</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24429.19</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24429.19</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24429.19</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24429.19</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24429.19</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24429.19</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24429.19</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rc.2.24429.19</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rc.2.24429.19</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rc.2.24429.19</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24429.19</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24429.19</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24429.19</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24429.19</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24453.5</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24453.5</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24453.5</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24453.5</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24453.5</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24453.5</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24453.5</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rc.2.24453.5</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rc.2.24453.5</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rc.2.24453.5</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24453.5</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24453.5</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24453.5</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rc.2.24453.5</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24453.17</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24453.17</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24453.17</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24453.17</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24453.17</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24453.17</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24453.17</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24453.17</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 2739017e9731a7722a63b1814b749e5562a6b848 Mon Sep 17 00:00:00 2001
From: Iliar Turdushev <iliarturdu@microsoft.com>
Date: Mon, 9 Sep 2024 12:45:02 +0200
Subject: [PATCH 03/30] Disable HttpClient's timeout for Standard Resilience
 and Hedging (#5363)

* Fixes #4924 and #4770

Disables HttpClient Timeout for standard resilience and hending handlers

* Fixes #4924

Adds a note mentioning requirements on the Grpc.Net.ClientFactory version to avoid issues with the M.E.Http.Resilience package

* Fixes #4924

Added a target that notifies users that they use a version of the Grpc.Net.ClientFactory package that might cause the #4924 issue

* Fixes #4924

Revert changes to the Directory.Build.targets

* Fixes #4924

Adds a target that checks whether M.E.Http.Resilience package is used together with Grpc.Net.ClientFactory 2.64.0 or later. If not the target warns a user.

* Fixes #4924

Adds a Known issues section to the doc describing the issue with Grpc.Net.ClientFactory

* Fixes #4924

* Moves the contents of the .props file into the .targets file
* For net462 we now import the contents of the .targets file instead of setting it as a CDATA value in the .csproj file

* Fixes #4924

Replaces the name of the project file with the MSBuildProjectName variable

* Fixes #4924

* Add conditions to pack buildTransitive .targets for net462 only when net462 is included as a target framework
* Changed the documentation link to the learn.microsoft.com site

* Fixes #4924

* Applies editorial changes to the Known issues section

* Fixes #4924

* Changes the level of the compatibility log messages from Error to Warning
* Updates the logic of copying buildTransitive files

* Removed extra spaces

* Applied suggestions to update the documentation

* Removed locale from the URL
---
 eng/MSBuild/Packaging.targets                 |  8 +--
 eng/packages/TestOnly.props                   |  2 +-
 ...enceHttpClientBuilderExtensions.Hedging.cs |  4 ++
 ...icrosoft.Extensions.Http.Resilience.csproj | 35 ++++++++++++
 .../README.md                                 | 30 +++++++++++
 ...entBuilderExtensions.StandardResilience.cs |  4 ++
 ...crosoft.Extensions.Http.Resilience.targets | 54 +++++++++++++++++++
 .../Hedging/StandardHedgingTests.cs           |  8 +++
 ...tpClientBuilderExtensionsTests.Standard.cs | 11 ++++
 9 files changed, 152 insertions(+), 4 deletions(-)
 create mode 100644 src/Libraries/Microsoft.Extensions.Http.Resilience/buildTransitive/Microsoft.Extensions.Http.Resilience.targets

diff --git a/eng/MSBuild/Packaging.targets b/eng/MSBuild/Packaging.targets
index e233142f1fa..14a5a04d492 100644
--- a/eng/MSBuild/Packaging.targets
+++ b/eng/MSBuild/Packaging.targets
@@ -11,15 +11,17 @@
   <PropertyGroup>
     <IsPackable Condition="'$(Stage)' == ''">false</IsPackable>
     <BeforePack>$(BeforePack);_VerifyMinimumSupportedTfmForPackagingIsUsed;_AddNETStandardCompatErrorFileForPackaging</BeforePack>
+    <IsPackNet462 Condition="'$(MinimumSupportedTfmForPackaging)' != '' and
+                             '$(ConditionalNet462)' != '' and
+                             ($(TargetFrameworks.Contains('$(MinimumSupportedTfmForPackaging)')) and $(TargetFrameworks.Contains('$(ConditionalNet462)')))"
+                  >true</IsPackNet462>
   </PropertyGroup>
 
   <!-- Include a compat warning for users trying to use our packages on unsupported TFMs -->
   <ItemGroup>
     <NETStandardCompatError Include="$(ConditionalNet462)"
                             Supported="$(MinimumSupportedTfmForPackaging)"
-                            Condition="'$(MinimumSupportedTfmForPackaging)' != '' and
-                                       '$(ConditionalNet462)' != '' and
-                                       ($(TargetFrameworks.Contains('$(MinimumSupportedTfmForPackaging)')) and $(TargetFrameworks.Contains('$(ConditionalNet462)')))" />
+                            Condition="'$(IsPackNet462)' == 'true'" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(IsPackable)' == 'true' and '$(IsShipping)' == 'true' ">
diff --git a/eng/packages/TestOnly.props b/eng/packages/TestOnly.props
index 2f35392510e..df39b892596 100644
--- a/eng/packages/TestOnly.props
+++ b/eng/packages/TestOnly.props
@@ -5,7 +5,7 @@
     <PackageVersion Include="autofixture" Version="4.17.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="Grpc.AspNetCore" Version="2.57.0" />
+    <PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.3" />
     <PackageVersion Include="Moq.AutoMock" Version="3.1.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/ResilienceHttpClientBuilderExtensions.Hedging.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/ResilienceHttpClientBuilderExtensions.Hedging.cs
index e6039bd65c4..3f7b82ba0de 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/ResilienceHttpClientBuilderExtensions.Hedging.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/ResilienceHttpClientBuilderExtensions.Hedging.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Net.Http;
+using System.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience;
@@ -139,6 +140,9 @@ public static IStandardHedgingHandlerBuilder AddStandardHedgingHandler(this IHtt
             })
             .SelectPipelineByAuthority();
 
+        // Disable the HttpClient timeout to allow the timeout strategies to control the timeout.
+        _ = builder.ConfigureHttpClient(client => client.Timeout = Timeout.InfiniteTimeSpan);
+
         return new StandardHedgingHandlerBuilder(builder.Name, builder.Services, routingBuilder);
     }
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
index 7bf27efddb3..f0499dada26 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
@@ -38,4 +38,39 @@
     <InternalsVisibleToTest Include="$(AssemblyName).Tests" />
     <InternalsVisibleToDynamicProxyGenAssembly2 Include="*" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Include="buildTransitive\**\*"
+          CopyToOutputDirectory="PreserveNewest"
+          Pack="true"
+          PackagePath="buildTransitive\$(MinimumSupportedTfmForPackaging)\"
+          Condition="'$(MinimumSupportedTfmForPackaging)' != '' and $(TargetFrameworks.Contains('$(MinimumSupportedTfmForPackaging)'))" />
+
+    <!-- For net462 we copy all buildTransitive files except the .targets file. We have to rename the .targets file
+         when copying it because our build process automatically adds a .targets file with the same name as the project
+         file. Then we'll import the renamed .targets file in the automatically added .targets file. For that we need
+         to set the _AdditionalNETStandardCompatErrorFileContents variable. -->
+    <None Include="buildTransitive\**\*"
+          Exclude="buildTransitive\$(MSBuildProjectName).targets"
+          CopyToOutputDirectory="PreserveNewest"
+          Pack="true"
+          PackagePath="buildTransitive\net462\"
+          Condition="'$(IsPackNet462)' == 'true'" />
+    
+    <None Include="buildTransitive\$(MSBuildProjectName).targets"
+          CopyToOutputDirectory="PreserveNewest"
+          Pack="true"
+          PackagePath="buildTransitive\net462\$(MSBuildProjectName).net462.targets"
+          Condition="'$(IsPackNet462)' == 'true'" />
+  </ItemGroup>
+
+  <!-- For net462 we automatically add the .targets file, and to include the code that checks the version of the
+       Grpc.Net.ClientFactory package we need to set the _AdditionalNETStandardCompatErrorFileContents variable. -->
+  <PropertyGroup>
+    <_AdditionalNETStandardCompatErrorFileContents>
+      <![CDATA[
+  <Import Project="%24(MSBuildThisFileDirectory)\$(MSBuildProjectName).net462.targets" />
+]]>
+    </_AdditionalNETStandardCompatErrorFileContents>
+  </PropertyGroup>
 </Project>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/README.md b/src/Libraries/Microsoft.Extensions.Http.Resilience/README.md
index a157dcfa4bc..d4ad24b5e00 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/README.md
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/README.md
@@ -73,6 +73,36 @@ clientBuilder.AddResilienceHandler("myHandler", b =>
 });
 ```
 
+## Known issues
+
+The following sections detail various known issues.
+
+### Compatibility with the `Grpc.Net.ClientFactory` package
+
+If you're using `Grpc.Net.ClientFactory` version `2.63.0` or earlier, then enabling the standard resilience or hedging handlers for a gRPC client could cause a runtime exception. Specifically, consider the following code sample:
+
+```csharp
+services
+    .AddGrpcClient<Greeter.GreeterClient>()
+    .AddStandardResilienceHandler();
+```
+
+The preceding code results in the following exception:
+
+```Output
+System.InvalidOperationException: The ConfigureHttpClient method is not supported when creating gRPC clients. Unable to create client with name 'GreeterClient'.
+```
+
+To resolve this issue, we recommend upgrading to `Grpc.Net.ClientFactory` version `2.64.0` or later.
+
+There's a build time check that verifies if you're using `Grpc.Net.ClientFactory` version `2.63.0` or earlier, and if you are the check produces a compilation warning. You can suppress the warning by setting the following property in your project file:
+
+```xml
+<PropertyGroup>
+  <SuppressCheckGrpcNetClientFactoryVersion>true</SuppressCheckGrpcNetClientFactoryVersion>
+</PropertyGroup>
+```
+
 ## Feedback & Contributing
 
 We welcome feedback and contributions in [our GitHub repo](https://github.com/dotnet/extensions).
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/ResilienceHttpClientBuilderExtensions.StandardResilience.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/ResilienceHttpClientBuilderExtensions.StandardResilience.cs
index f27c2e76eac..a4315eaa006 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/ResilienceHttpClientBuilderExtensions.StandardResilience.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/ResilienceHttpClientBuilderExtensions.StandardResilience.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Threading;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Http.Resilience;
@@ -86,6 +87,9 @@ public static IHttpStandardResiliencePipelineBuilder AddStandardResilienceHandle
                 .AddTimeout(options.AttemptTimeout);
         });
 
+        // Disable the HttpClient timeout to allow the timeout strategies to control the timeout.
+        _ = builder.ConfigureHttpClient(client => client.Timeout = Timeout.InfiniteTimeSpan);
+
         return new HttpStandardResiliencePipelineBuilder(optionsName, builder.Services);
     }
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/buildTransitive/Microsoft.Extensions.Http.Resilience.targets b/src/Libraries/Microsoft.Extensions.Http.Resilience/buildTransitive/Microsoft.Extensions.Http.Resilience.targets
new file mode 100644
index 00000000000..268f0720433
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/buildTransitive/Microsoft.Extensions.Http.Resilience.targets
@@ -0,0 +1,54 @@
+<Project>
+  <PropertyGroup>
+    <_GrpcNetClientFactory>Grpc.Net.ClientFactory</_GrpcNetClientFactory>
+    <_CompatibleGrpcNetClientFactoryVersion>2.64.0</_CompatibleGrpcNetClientFactoryVersion>
+    <_GrpcNetClientFactoryVersionIsIncorrect>Grpc.Net.ClientFactory 2.63.0 or earlier could cause issues when used together with Microsoft.Extensions.Http.Resilience. For more details, see https://learn.microsoft.com/dotnet/core/resilience/http-resilience#known-issues. Consider using Grpc.Net.ClientFactory $(_CompatibleGrpcNetClientFactoryVersion) or later. To suppress the warning set SuppressCheckGrpcNetClientFactoryVersion=true.</_GrpcNetClientFactoryVersionIsIncorrect>
+  </PropertyGroup>
+
+  <!--
+    Check whether the project is referencing Grpc.Net.ClientFactory 2.64.0 or later.
+    If the vesion is earlier warn the user to update.
+    See https://learn.microsoft.com/en-us/dotnet/core/resilience/http-resilience#known-issues for more details.
+    -->
+  <Target Name="_CheckGrpcNetClientFactoryVersion"
+          BeforeTargets="ResolveReferences"
+          Condition=" '$(SuppressCheckGrpcNetClientFactoryVersion)' != 'true' ">
+    <ItemGroup>
+      <!-- Find the package in the .csproj file. -->
+      <_GrpcNetClientFactoryPackageReference Include="@(PackageReference)" Condition=" '%(PackageReference.Identity)' == '$(_GrpcNetClientFactory)' " />
+
+      <!-- Find the version of the package in the Central Package Source. The solution uses the Central Package Management. -->
+      <_GrpcNetClientFactoryPackageVersion Include="@(PackageVersion)" Condition=" '%(PackageVersion.Identity)' == '$(_GrpcNetClientFactory)' " />
+      
+      <!-- The package is added to the project as a transitive dependency. -->
+      <_GrpcNetClientFactoryTransitiveDependency Include="@(ReferencePath)" Condition=" '%(ReferencePath.NuGetPackageId)' == '$(_GrpcNetClientFactory)' " />
+    </ItemGroup>
+
+    <!-- The version of the package is included in the .csproj file. -->
+    <Warning Condition=" @(_GrpcNetClientFactoryPackageReference->Count()) &gt; 0
+                         AND '%(_GrpcNetClientFactoryPackageReference.Version)' != ''
+                         AND $([MSBuild]::VersionLessThan('%(_GrpcNetClientFactoryPackageReference.Version)', '$(_CompatibleGrpcNetClientFactoryVersion)')) "
+             Text="$(_GrpcNetClientFactoryVersionIsIncorrect)" />
+
+    <!-- The solution uses the Central Package Management and the version of the package is overridden in the .csproj file using the VersionOverride property. -->
+    <Warning Condition=" '$(ManagePackageVersionsCentrally)' == 'true'
+                         AND @(_GrpcNetClientFactoryPackageReference->Count()) &gt; 0
+                         AND '%(_GrpcNetClientFactoryPackageReference.VersionOverride)' != ''
+                         AND $([MSBuild]::VersionLessThan('%(_GrpcNetClientFactoryPackageReference.VersionOverride)', '$(_CompatibleGrpcNetClientFactoryVersion)')) "
+             Text="$(_GrpcNetClientFactoryVersionIsIncorrect)" />
+
+    <!-- The solution uses the Central Package Management and the version of the package is included in the Central Package Source. -->
+    <Warning Condition=" '$(ManagePackageVersionsCentrally)' == 'true'
+                         AND @(_GrpcNetClientFactoryPackageReference->Count()) &gt; 0
+                         AND '%(_GrpcNetClientFactoryPackageVersion.Version)' != ''
+                         AND $([MSBuild]::VersionLessThan('%(_GrpcNetClientFactoryPackageVersion.Version)', '$(_CompatibleGrpcNetClientFactoryVersion)')) "
+             Text="$(_GrpcNetClientFactoryVersionIsIncorrect)" />
+
+    <!-- This condition handles a case when the package is added to the project as a transitive dependency. -->
+    <Warning Condition=" @(_GrpcNetClientFactoryPackageReference->Count()) == 0
+                         AND @(_GrpcNetClientFactoryTransitiveDependency->Count()) &gt; 0
+                         AND '%(_GrpcNetClientFactoryTransitiveDependency.NuGetPackageVersion)' != ''
+                         AND $([MSBuild]::VersionLessThan('%(_GrpcNetClientFactoryTransitiveDependency.NuGetPackageVersion)', '$(_CompatibleGrpcNetClientFactoryVersion)')) "
+             Text="$(_GrpcNetClientFactoryVersionIsIncorrect)" />
+  </Target>
+</Project>
diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs
index 237ccfa6e73..7db71a08873 100644
--- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs
@@ -265,6 +265,14 @@ public async Task DynamicReloads_Ok(bool asynchronous = true)
         AssertNoResponse();
     }
 
+    [Fact]
+    public void AddStandardResilienceHandler_EnsureHttpClientTimeoutDisabled()
+    {
+        var client = CreateClientWithHandler();
+
+        client.Timeout.Should().Be(Timeout.InfiniteTimeSpan);
+    }
+
     [Theory]
 #if NET6_0_OR_GREATER
     [CombinatorialData]
diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs
index 79ce7aa654d..faecd6e317d 100644
--- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs
+++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.Extensions.Configuration;
@@ -257,6 +258,16 @@ public async Task DynamicReloads_Ok(bool asynchronous = true)
         requests.Should().HaveCount(11);
     }
 
+    [Fact]
+    public void AddStandardResilienceHandler_EnsureHttpClientTimeoutDisabled()
+    {
+        var builder = new ServiceCollection().AddLogging().AddMetrics().AddHttpClient("test").AddStandardResilienceHandler();
+
+        using var client = builder.Services.BuildServiceProvider().GetRequiredService<IHttpClientFactory>().CreateClient("test");
+
+        client.Timeout.Should().Be(Timeout.InfiniteTimeSpan);
+    }
+
     private static void AddStandardResilienceHandler(
         MethodArgs mode,
         IHttpClientBuilder builder,

From c5b0871fa152d57e93afb8f9e040a238b947eb04 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 13:24:31 +0000
Subject: [PATCH 04/30] Update dependencies from
 https://github.com/dotnet/arcade build 20240903.1 (#5410)

[dev] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index eceb189013c..d040771acf8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -162,13 +162,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24429.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24453.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d21db44e84b9038ea7b2add139adee2303d46800</Sha>
+      <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24429.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24453.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d21db44e84b9038ea7b2add139adee2303d46800</Sha>
+      <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index e806d3acccd..558e1fd8d2e 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.5",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24429.5"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1"
   }
 }

From 892c5e9ac03f40ee2865ea4f55aaa01ed6a772ea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:31:27 +1000
Subject: [PATCH 05/30] Update .NET SDK (#5409)

Update .NET SDK to version 9.0.100-rc.2.24459.3.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 558e1fd8d2e..fcf12d8c925 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.2.24452.3"
+    "version": "9.0.100-rc.2.24459.3"
   },
   "tools": {
-    "dotnet": "9.0.100-rc.2.24452.3",
+    "dotnet": "9.0.100-rc.2.24459.3",
     "runtimes": {
       "dotnet/x64": [
         "8.0.0",

From 39f5d27bf5503b42d8743d47d853aac973d12b49 Mon Sep 17 00:00:00 2001
From: Brandon Williams <willibrandon@gmail.com>
Date: Mon, 9 Sep 2024 15:31:47 -0700
Subject: [PATCH 06/30] ResourceUtilizationHealthCheck - Report both CPU and
 Memory issues (#5407)

* Report both CPU and Memory issues

* Use dedicated strings for each case and fix capitalization

* Fix test
---
 .../ResourceUtilizationHealthCheck.cs         |  56 +++++++---
 .../ResourceHealthCheckTests.cs               | 105 +++++++++++-------
 2 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheck.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheck.cs
index b60a6068b50..13ac4cac9bc 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheck.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheck.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring;
@@ -14,7 +15,6 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks;
 /// </summary>
 internal sealed class ResourceUtilizationHealthCheck : IHealthCheck
 {
-    private static readonly Task<HealthCheckResult> _healthy = Task.FromResult(HealthCheckResult.Healthy());
     private readonly ResourceUtilizationHealthCheckOptions _options;
     private readonly IResourceMonitor _dataTracker;
 
@@ -39,26 +39,56 @@ public ResourceUtilizationHealthCheck(IOptions<ResourceUtilizationHealthCheckOpt
     public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
         var utilization = _dataTracker.GetUtilization(_options.SamplingWindow);
-        if (utilization.CpuUsedPercentage > _options.CpuThresholds.UnhealthyUtilizationPercentage)
+        IReadOnlyDictionary<string, object> data = new Dictionary<string, object>
         {
-            return Task.FromResult(HealthCheckResult.Unhealthy("CPU usage is above the limit"));
-        }
+            { nameof(utilization.CpuUsedPercentage), utilization.CpuUsedPercentage },
+            { nameof(utilization.MemoryUsedPercentage), utilization.MemoryUsedPercentage },
+        };
 
-        if (utilization.MemoryUsedPercentage > _options.MemoryThresholds.UnhealthyUtilizationPercentage)
-        {
-            return Task.FromResult(HealthCheckResult.Unhealthy("Memory usage is above the limit"));
-        }
+        bool cpuUnhealthy = utilization.CpuUsedPercentage > _options.CpuThresholds.UnhealthyUtilizationPercentage;
+        bool memoryUnhealthy = utilization.MemoryUsedPercentage > _options.MemoryThresholds.UnhealthyUtilizationPercentage;
 
-        if (utilization.CpuUsedPercentage > _options.CpuThresholds.DegradedUtilizationPercentage)
+        if (cpuUnhealthy || memoryUnhealthy)
         {
-            return Task.FromResult(HealthCheckResult.Degraded("CPU usage is close to the limit"));
+            string message = string.Empty;
+            if (cpuUnhealthy && memoryUnhealthy)
+            {
+                message = "CPU and memory usage is above the limit";
+            }
+            else if (cpuUnhealthy)
+            {
+                message = "CPU usage is above the limit";
+            }
+            else
+            {
+                message = "Memory usage is above the limit";
+            }
+
+            return Task.FromResult(HealthCheckResult.Unhealthy(message, default, data));
         }
 
-        if (utilization.MemoryUsedPercentage > _options.MemoryThresholds.DegradedUtilizationPercentage)
+        bool cpuDegraded = utilization.CpuUsedPercentage > _options.CpuThresholds.DegradedUtilizationPercentage;
+        bool memoryDegraded = utilization.MemoryUsedPercentage > _options.MemoryThresholds.DegradedUtilizationPercentage;
+
+        if (cpuDegraded || memoryDegraded)
         {
-            return Task.FromResult(HealthCheckResult.Degraded("Memory usage is close to the limit"));
+            string message = string.Empty;
+            if (cpuDegraded && memoryDegraded)
+            {
+                message = "CPU and memory usage is close to the limit";
+            }
+            else if (cpuDegraded)
+            {
+                message = "CPU usage is close to the limit";
+            }
+            else
+            {
+                message = "Memory usage is close to the limit";
+            }
+
+            return Task.FromResult(HealthCheckResult.Degraded(message, default, data));
         }
 
-        return _healthy;
+        return Task.FromResult(HealthCheckResult.Healthy(default, data));
     }
 }
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckTests.cs
index d6129017d79..77a145c218a 100644
--- a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckTests.cs
@@ -23,6 +23,7 @@ public class ResourceHealthCheckTests
                 0UL,
                 1000UL,
                 new ResourceUsageThresholds(),
+                new ResourceUsageThresholds(),
                 "",
             },
             new object[]
@@ -32,6 +33,7 @@ public class ResourceHealthCheckTests
                 0UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.2 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.2 },
                 ""
             },
             new object[]
@@ -41,6 +43,7 @@ public class ResourceHealthCheckTests
                 2UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.2 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.2 },
                 ""
             },
             new object[]
@@ -50,7 +53,8 @@ public class ResourceHealthCheckTests
                 3UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
-                " usage is close to the limit"
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                "CPU and memory usage is close to the limit"
             },
             new object[]
             {
@@ -59,7 +63,8 @@ public class ResourceHealthCheckTests
                 5UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
-                " usage is above the limit"
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                "CPU and memory usage is above the limit"
             },
             new object[]
             {
@@ -68,7 +73,8 @@ public class ResourceHealthCheckTests
                 5UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.4, UnhealthyUtilizationPercentage = 0.2 },
-                " usage is above the limit"
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.4, UnhealthyUtilizationPercentage = 0.2 },
+                "CPU and memory usage is above the limit"
             },
             new object[]
             {
@@ -77,7 +83,8 @@ public class ResourceHealthCheckTests
                 3UL,
                 1000UL,
                 new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2 },
-                " usage is close to the limit"
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2 },
+                "CPU and memory usage is close to the limit"
             },
             new object[]
             {
@@ -86,67 +93,79 @@ public class ResourceHealthCheckTests
                 5UL,
                 1000UL,
                 new ResourceUsageThresholds { UnhealthyUtilizationPercentage = 0.4 },
-                " usage is above the limit"
+                new ResourceUsageThresholds { UnhealthyUtilizationPercentage = 0.4 },
+                "CPU and memory usage is above the limit"
+            },
+            new object[]
+            {
+                HealthStatus.Degraded,
+                0.3,
+                3UL,
+                1000UL,
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.9, UnhealthyUtilizationPercentage = 0.9 },
+                "CPU usage is close to the limit"
+            },
+            new object[]
+            {
+                HealthStatus.Degraded,
+                0.1,
+                3UL,
+                1000UL,
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.9, UnhealthyUtilizationPercentage = 0.9 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                "Memory usage is close to the limit"
+            },
+            new object[]
+            {
+                HealthStatus.Unhealthy,
+                0.5,
+                5UL,
+                1000UL,
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.9, UnhealthyUtilizationPercentage = 0.9 },
+                "CPU usage is above the limit"
+            },
+            new object[]
+            {
+                HealthStatus.Unhealthy,
+                0.1,
+                5UL,
+                1000UL,
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.9, UnhealthyUtilizationPercentage = 0.9 },
+                new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 },
+                "Memory usage is above the limit"
             },
         };
 
     [Theory]
     [MemberData(nameof(Data))]
-#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-    public async Task TestCpuChecks(HealthStatus expected, double utilization, ulong _, ulong totalMemory, ResourceUsageThresholds thresholds, string expectedDescription)
-#pragma warning restore xUnit1026 // Theory methods should use all of their parameters
-    {
-        var systemResources = new SystemResources(1.0, 1.0, totalMemory, totalMemory);
-        var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
-        dataTracker
-            .Setup(tracker => tracker.GetUtilization(samplingWindow))
-            .Returns(new ResourceUtilization(cpuUsedPercentage: utilization, memoryUsedInBytes: 0, systemResources));
-
-        var checkContext = new HealthCheckContext();
-        var cpuCheckOptions = new ResourceUtilizationHealthCheckOptions
-        {
-            CpuThresholds = thresholds,
-            SamplingWindow = samplingWindow
-        };
-
-        var options = Microsoft.Extensions.Options.Options.Create(cpuCheckOptions);
-        var healthCheck = new ResourceUtilizationHealthCheck(options, dataTracker.Object);
-        var healthCheckResult = await healthCheck.CheckHealthAsync(checkContext);
-        Assert.Equal(expected, healthCheckResult.Status);
-        if (healthCheckResult.Status != HealthStatus.Healthy)
-        {
-            Assert.Equal("CPU" + expectedDescription, healthCheckResult.Description);
-        }
-    }
-
-    [Theory]
-    [MemberData(nameof(Data))]
-#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-    public async Task TestMemoryChecks(HealthStatus expected, double _, ulong memoryUsed, ulong totalMemory, ResourceUsageThresholds thresholds, string expectedDescription)
-#pragma warning restore xUnit1026 // Theory methods should use all of their parameters
+    public async Task TestCpuAndMemoryChecks(HealthStatus expected, double utilization, ulong memoryUsed, ulong totalMemory,
+        ResourceUsageThresholds cpuThresholds, ResourceUsageThresholds memoryThresholds, string expectedDescription)
     {
         var systemResources = new SystemResources(1.0, 1.0, totalMemory, totalMemory);
         var dataTracker = new Mock<IResourceMonitor>();
         var samplingWindow = TimeSpan.FromSeconds(1);
         dataTracker
             .Setup(tracker => tracker.GetUtilization(samplingWindow))
-            .Returns(new ResourceUtilization(cpuUsedPercentage: 0, memoryUsedInBytes: memoryUsed, systemResources));
+            .Returns(new ResourceUtilization(cpuUsedPercentage: utilization, memoryUsedInBytes: memoryUsed, systemResources));
 
         var checkContext = new HealthCheckContext();
-        var memCheckOptions = new ResourceUtilizationHealthCheckOptions
+        var checkOptions = new ResourceUtilizationHealthCheckOptions
         {
-            MemoryThresholds = thresholds,
+            CpuThresholds = cpuThresholds,
+            MemoryThresholds = memoryThresholds,
             SamplingWindow = samplingWindow
         };
 
-        var options = Microsoft.Extensions.Options.Options.Create(memCheckOptions);
+        var options = Microsoft.Extensions.Options.Options.Create(checkOptions);
         var healthCheck = new ResourceUtilizationHealthCheck(options, dataTracker.Object);
         var healthCheckResult = await healthCheck.CheckHealthAsync(checkContext);
         Assert.Equal(expected, healthCheckResult.Status);
+        Assert.NotEmpty(healthCheckResult.Data);
         if (healthCheckResult.Status != HealthStatus.Healthy)
         {
-            Assert.Equal("Memory" + expectedDescription, healthCheckResult.Description);
+            Assert.Equal(expectedDescription, healthCheckResult.Description);
         }
     }
 

From 0bc18d71b728f79fe931764fb95362ee29973735 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 10 Sep 2024 13:24:30 -0700
Subject: [PATCH 07/30] Branding updates for 9.0 Preview 9

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 93537c79dc5..39d0a76a18a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,7 +4,7 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>8</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>9</PreReleaseVersionIteration>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <ValidateBaseline>true</ValidateBaseline>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>

From e19702b8eb456201097434967e91a485a4048933 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 12:40:32 +0000
Subject: [PATCH 08/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240910.5 (#5417)

[dev] Update dependencies from dotnet/aspnetcore
---
 eng/Version.Details.xml | 32 ++++++++++++++++----------------
 eng/Versions.props      | 16 ++++++++--------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d040771acf8..752392c3455 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -128,37 +128,37 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24455.6">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>07da5601559ba66827c1b89ada58ff9d2ea676bc</Sha>
+      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 39d0a76a18a..79a87cb5bd0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,14 +60,14 @@
     <SystemTextEncodingsWebVersion>9.0.0-rc.2.24453.5</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>9.0.0-rc.2.24453.5</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24455.6</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24455.6</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 579b89e29d35f171d503b1c18d35c4178732e8be Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Thu, 12 Sep 2024 00:41:14 +0100
Subject: [PATCH 09/30] Migrate HybridCache from aspnetcore to extensions
 (#5391)

this is a direct snapshot from dotnet/aspnetcore, with modifications to:

1. satisfy local repo style rules
2. work with different build setup

Minor global changes:

1. support netstandard2.1 on some legacy shim includes
2. add some additional required packages (for testing)
---
 Directory.Build.targets                       |   2 +-
 docs/list-of-diagnostics.md                   |   3 +-
 eng/MSBuild/LegacySupport.props               |   6 +-
 eng/Version.Details.xml                       |   8 +
 eng/Versions.props                            |   2 +
 eng/packages/General.props                    |   3 +
 eng/spellchecking_exclusions.dic              | Bin 26 -> 176 bytes
 .../HybridCacheBuilderExtensions.cs           |  62 +++
 .../HybridCacheOptions.cs                     |  44 ++
 .../HybridCacheServiceExtensions.cs           |  44 ++
 .../IHybridCacheBuilder.cs                    |  17 +
 .../Internal/BufferChunk.cs                   |  94 ++++
 .../Internal/DefaultHybridCache.CacheItem.cs  | 109 ++++
 .../Internal/DefaultHybridCache.Debug.cs      |  81 +++
 .../DefaultHybridCache.ImmutableCacheItem.cs  |  47 ++
 .../Internal/DefaultHybridCache.L2.cs         | 154 ++++++
 .../DefaultHybridCache.MutableCacheItem.cs    |  73 +++
 .../DefaultHybridCache.Serialization.cs       |  54 ++
 .../Internal/DefaultHybridCache.Stampede.cs   | 111 ++++
 .../DefaultHybridCache.StampedeKey.cs         |  54 ++
 .../DefaultHybridCache.StampedeState.cs       | 109 ++++
 .../DefaultHybridCache.StampedeStateT.cs      | 304 +++++++++++
 .../Internal/DefaultHybridCache.SyncLock.cs   |  44 ++
 .../Internal/DefaultHybridCache.cs            | 170 +++++++
 .../Internal/DefaultJsonSerializerFactory.cs  |  42 ++
 .../Internal/HybridCacheBuilder.cs            |  16 +
 .../Internal/ImmutableTypeCache.T.cs          |  15 +
 .../Internal/ImmutableTypeCache.cs            |  79 +++
 .../Internal/InbuiltTypeSerializer.cs         |  58 +++
 .../Internal/RecyclableArrayBufferWriter.cs   | 202 ++++++++
 .../Internal/readme.md                        |  27 +
 ...Microsoft.Extensions.Caching.Hybrid.csproj |  39 ++
 .../Microsoft.Extensions.Caching.Hybrid.json  | Bin 0 -> 8282 bytes
 .../README.md                                 |  81 +++
 .../BasicConfig.json                          |  12 +
 .../BufferReleaseTests.cs                     | 235 +++++++++
 .../DistributedCacheTests.cs                  | 397 +++++++++++++++
 .../FunctionalTests.cs                        |  82 +++
 .../L2Tests.cs                                | 274 ++++++++++
 ...oft.Extensions.Caching.Hybrid.Tests.csproj |  29 ++
 .../RedisFixture.cs                           |  30 ++
 .../RedisTests.cs                             |  90 ++++
 .../SampleUsage.cs                            | 199 ++++++++
 .../ServiceConstructionTests.cs               | 263 ++++++++++
 .../SqlServerTests.cs                         |  50 ++
 .../StampedeTests.cs                          | 474 ++++++++++++++++++
 .../TypeTests.cs                              |  87 ++++
 47 files changed, 4371 insertions(+), 5 deletions(-)
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheBuilderExtensions.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheOptions.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheServiceExtensions.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/IHybridCacheBuilder.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/BufferChunk.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Debug.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Serialization.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Stampede.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeKey.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeState.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.SyncLock.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultJsonSerializerFactory.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/HybridCacheBuilder.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.T.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/InbuiltTypeSerializer.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/RecyclableArrayBufferWriter.cs
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/readme.md
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.json
 create mode 100644 src/Libraries/Microsoft.Extensions.Caching.Hybrid/README.md
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BasicConfig.json
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisFixture.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SqlServerTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/TypeTests.cs

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 956a4cf8078..5ee66133050 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -22,7 +22,7 @@
     <NoWarn>$(NoWarn);AD0001</NoWarn>
 
     <!-- Experimental warnings are for customers, not for this repo -->
-    <NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012;EXTEXP0013;EXTEXP0014;EXTEXP0015;EXTEXP0016;EXTEXP0017</NoWarn>
+    <NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012;EXTEXP0013;EXTEXP0014;EXTEXP0015;EXTEXP0016;EXTEXP0017;EXTEXP0018</NoWarn>
 
     <!-- Obsoletion warnings are for customers, not for this repo -->
     <NoWarn>$(NoWarn);EXTOBS0001;</NoWarn>
diff --git a/docs/list-of-diagnostics.md b/docs/list-of-diagnostics.md
index ba8e170a878..4ba19ed1099 100644
--- a/docs/list-of-diagnostics.md
+++ b/docs/list-of-diagnostics.md
@@ -40,6 +40,7 @@ if desired.
 | `EXTEXP0015` | Environmental probes experiments |
 | `EXTEXP0016` | Hosting integration testing experiments |
 | `EXTEXP0017` | Contextual options experiments |
+| `EXTEXP0018` | HybridCache experiments |
 
 # Obsoletions
 
@@ -81,7 +82,7 @@ You may continue using obsolete APIs in your application, but we advise explorin
 | `LOGGEN023` | Tag provider method is inaccessible |
 | `LOGGEN024` | Property provider method has an invalid signature |
 | `LOGGEN025` | Logging method parameters can't have "ref" or "out" modifiers |
-| `LOGGEN026` | Parameters with a custom tag provider are not subject to redaciton |
+| `LOGGEN026` | Parameters with a custom tag provider are not subject to redaction |
 | `LOGGEN027` | Multiple logging methods shouldn't use the same event name |
 | `LOGGEN028` | Logging method parameter's type has a hidden property |
 | `LOGGEN029` | A logging method parameter causes name conflicts |
diff --git a/eng/MSBuild/LegacySupport.props b/eng/MSBuild/LegacySupport.props
index c96a83d34d6..8ebacbd60f7 100644
--- a/eng/MSBuild/LegacySupport.props
+++ b/eng/MSBuild/LegacySupport.props
@@ -7,11 +7,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\IsExternalInit\*.cs" LinkBase="LegacySupport\IsExternalInit" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectTrimAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectTrimAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1')">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\TrimAttributes\*.cs" LinkBase="LegacySupport\TrimAttributes" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectCallerAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+  <ItemGroup Condition="'$(InjectCallerAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1')">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\CallerAttributes\*.cs" LinkBase="LegacySupport\CallerAttributes" />
   </ItemGroup>
 
@@ -47,7 +47,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\TaskWaitAsync\*.cs" LinkBase="LegacySupport\TaskWaitAsync" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectExperimentalAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0')">
+  <ItemGroup Condition="'$(InjectExperimentalAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0')">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\ExperimentalAttribute\*.cs" LinkBase="LegacySupport\ExperimentalAttribute" />
   </ItemGroup>
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 752392c3455..fefd81bb5c0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,6 +8,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
@@ -144,6 +148,10 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24460.5">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>2b865e33f2c7c9484c28a3b62e8ff07966e23434</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24460.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 79a87cb5bd0..3d593320c18 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,6 +30,7 @@
     <!-- Packages from dotnet/runtime -->
     <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24453.5</MicrosoftBclTimeProviderVersion>
     <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsCachingMemoryVersion>
     <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
     <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationBinderVersion>
     <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationJsonVersion>
@@ -64,6 +65,7 @@
     <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
     <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreMvcTestingVersion>
     <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsCachingSqlServerVersion>
     <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
     <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
     <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsHttpPollyVersion>
diff --git a/eng/packages/General.props b/eng/packages/General.props
index 8f34cf9271a..00a79452d92 100644
--- a/eng/packages/General.props
+++ b/eng/packages/General.props
@@ -10,6 +10,9 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsCachingStackExchangeRedisVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
diff --git a/eng/spellchecking_exclusions.dic b/eng/spellchecking_exclusions.dic
index 2f00ad64f92db410379819095977af7004cf3e3e..2fc9b74699b3a4f15d47904fb03678d52114bd26 100644
GIT binary patch
literal 176
zcmZvVu?m1N5JTTA_*Kq+gti?-t5{w1<E^o_gCNIoNl0?>3OH6KI(DHM!$D0&yu7$)
tVc-;cwIMk|W>&hPutptE-l@%Dv*%GKO|NShv)Zb)*ZzGf$?yLyd2i5%D~$jE

delta 5
McmdnMC^bO}00jX7b^rhX

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheBuilderExtensions.cs
new file mode 100644
index 00000000000..d8fa3a3a3ad
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheBuilderExtensions.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Configuration extension methods for <see cref="IHybridCacheBuilder"/> / <see cref="HybridCache"/>.
+/// </summary>
+public static class HybridCacheBuilderExtensions
+{
+    /// <summary>
+    /// Serialize values of type <typeparamref name="T"/> with the specified serializer from <paramref name="serializer"/>.
+    /// </summary>
+    /// <typeparam name="T">The type to be serialized.</typeparam>
+    /// <returns>The <see cref="IHybridCacheBuilder"/> instance.</returns>
+    public static IHybridCacheBuilder AddSerializer<T>(this IHybridCacheBuilder builder, IHybridCacheSerializer<T> serializer)
+    {
+        _ = Throw.IfNull(builder).Services.AddSingleton<IHybridCacheSerializer<T>>(serializer);
+        return builder;
+    }
+
+    /// <summary>
+    /// Serialize values of type <typeparamref name="T"/> with the serializer of type <typeparamref name="TImplementation"/>.
+    /// </summary>
+    /// <typeparam name="T">The type to be serialized.</typeparam>
+    /// <typeparam name="TImplementation">The serializer to use for this type.</typeparam>
+    /// <returns>The <see cref="IHybridCacheBuilder"/> instance.</returns>
+    public static IHybridCacheBuilder AddSerializer<T,
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TImplementation>(this IHybridCacheBuilder builder)
+        where TImplementation : class, IHybridCacheSerializer<T>
+    {
+        _ = Throw.IfNull(builder).Services.AddSingleton<IHybridCacheSerializer<T>, TImplementation>();
+        return builder;
+    }
+
+    /// <summary>
+    /// Add <paramref name="factory"/> as an additional serializer factory, which can provide serializers for multiple types.
+    /// </summary>
+    /// <returns>The <see cref="IHybridCacheBuilder"/> instance.</returns>
+    public static IHybridCacheBuilder AddSerializerFactory(this IHybridCacheBuilder builder, IHybridCacheSerializerFactory factory)
+    {
+        _ = Throw.IfNull(builder).Services.AddSingleton<IHybridCacheSerializerFactory>(factory);
+        return builder;
+    }
+
+    /// <summary>
+    /// Add a factory of type <typeparamref name="TImplementation"/> as an additional serializer factory, which can provide serializers for multiple types.
+    /// </summary>
+    /// <typeparam name="TImplementation">The type of the serializer factory.</typeparam>
+    /// <returns>The <see cref="IHybridCacheBuilder"/> instance.</returns>
+    public static IHybridCacheBuilder AddSerializerFactory<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TImplementation>(this IHybridCacheBuilder builder)
+        where TImplementation : class, IHybridCacheSerializerFactory
+    {
+        _ = Throw.IfNull(builder).Services.AddSingleton<IHybridCacheSerializerFactory, TImplementation>();
+        return builder;
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheOptions.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheOptions.cs
new file mode 100644
index 00000000000..982ea55a6af
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheOptions.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Caching.Hybrid;
+
+/// <summary>
+/// Options for configuring the default <see cref="HybridCache"/> implementation.
+/// </summary>
+public class HybridCacheOptions
+{
+    private const int ShiftBytesToMibiBytes = 20;
+
+    /// <summary>
+    /// Gets or sets the default global options to be applied to <see cref="HybridCache"/> operations; if options are
+    /// specified at the individual call level, the non-null values are merged (with the per-call
+    /// options being used in preference to the global options). If no value is specified for a given
+    /// option (globally or per-call), the implementation may choose a reasonable default.
+    /// </summary>
+    public HybridCacheEntryOptions? DefaultEntryOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether compression for this <see cref="HybridCache"/> instance is disabled.
+    /// </summary>
+    public bool DisableCompression { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum size of cache items; attempts to store values over this size will be logged
+    /// and the value will not be stored in cache.
+    /// </summary>
+    /// <remarks>The default value is 1 MiB.</remarks>
+    public long MaximumPayloadBytes { get; set; } = 1 << ShiftBytesToMibiBytes; // 1MiB
+
+    /// <summary>
+    /// Gets or sets the maximum permitted length (in characters) of keys; attempts to use keys over this size will be logged.
+    /// </summary>
+    /// <remark>The default value is 1024 characters.</remark>
+    public int MaximumKeyLength { get; set; } = 1024; // characters
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to use "tags" data as dimensions on metric reporting; if enabled, care should be used to ensure that
+    /// tags do not contain data that should not be visible in metrics systems.
+    /// </summary>
+    public bool ReportTagMetrics { get; set; }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheServiceExtensions.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheServiceExtensions.cs
new file mode 100644
index 00000000000..d28dc4e47d5
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheServiceExtensions.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Configuration extension methods for <see cref="HybridCache"/>.
+/// </summary>
+public static class HybridCacheServiceExtensions
+{
+    /// <summary>
+    /// Adds support for multi-tier caching services.
+    /// </summary>
+    /// <returns>A builder instance that allows further configuration of the <see cref="HybridCache"/> system.</returns>
+    public static IHybridCacheBuilder AddHybridCache(this IServiceCollection services, Action<HybridCacheOptions> setupAction)
+    {
+        _ = Throw.IfNull(setupAction);
+        _ = AddHybridCache(services);
+        _ = services.Configure(setupAction);
+        return new HybridCacheBuilder(services);
+    }
+
+    /// <summary>
+    /// Adds support for multi-tier caching services.
+    /// </summary>
+    /// <returns>A builder instance that allows further configuration of the <see cref="HybridCache"/> system.</returns>
+    public static IHybridCacheBuilder AddHybridCache(this IServiceCollection services)
+    {
+        _ = Throw.IfNull(services);
+        services.TryAddSingleton(TimeProvider.System);
+        _ = services.AddOptions().AddMemoryCache();
+        services.TryAddSingleton<IHybridCacheSerializerFactory, DefaultJsonSerializerFactory>();
+        services.TryAddSingleton<IHybridCacheSerializer<string>>(InbuiltTypeSerializer.Instance);
+        services.TryAddSingleton<IHybridCacheSerializer<byte[]>>(InbuiltTypeSerializer.Instance);
+        services.TryAddSingleton<HybridCache, DefaultHybridCache>();
+        return new HybridCacheBuilder(services);
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/IHybridCacheBuilder.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/IHybridCacheBuilder.cs
new file mode 100644
index 00000000000..55c1f47ae3e
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/IHybridCacheBuilder.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid;
+
+/// <summary>
+/// Helper API for configuring <see cref="HybridCache"/>.
+/// </summary>
+public interface IHybridCacheBuilder
+{
+    /// <summary>
+    /// Gets the services collection associated with this instance.
+    /// </summary>
+    IServiceCollection Services { get; }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/BufferChunk.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/BufferChunk.cs
new file mode 100644
index 00000000000..0d7d54cfdd6
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/BufferChunk.cs
@@ -0,0 +1,94 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Buffers;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+// Used to convey buffer status; like ArraySegment<byte>, but Offset is always
+// zero, and we use the most significant bit of the length (usually the sign flag,
+// but we do not need to support negative length) to track whether or not
+// to recycle this value.
+internal readonly struct BufferChunk
+{
+    private const int FlagReturnToPool = (1 << 31);
+
+    private readonly int _lengthAndPoolFlag;
+
+    public byte[]? Array { get; } // null for default
+
+    public int Length => _lengthAndPoolFlag & ~FlagReturnToPool;
+
+    public bool ReturnToPool => (_lengthAndPoolFlag & FlagReturnToPool) != 0;
+
+    public BufferChunk(byte[] array)
+    {
+        Debug.Assert(array is not null, "expected valid array input");
+        Array = array;
+        _lengthAndPoolFlag = array!.Length;
+
+        // assume not pooled, if exact-sized
+        // (we don't expect array.Length to be negative; we're really just saying
+        // "we expect the result of assigning array.Length to _lengthAndPoolFlag
+        // to give the expected Length *and* not have the MSB set; we're just
+        // checking that we haven't fat-fingered our MSB logic)
+        Debug.Assert(!ReturnToPool, "do not return right-sized arrays");
+        Debug.Assert(Length == array.Length, "array length not respected");
+    }
+
+    public BufferChunk(byte[] array, int length, bool returnToPool)
+    {
+        Debug.Assert(array is not null, "expected valid array input");
+        Debug.Assert(length >= 0, "expected valid length");
+        Array = array;
+        _lengthAndPoolFlag = length | (returnToPool ? FlagReturnToPool : 0);
+        Debug.Assert(ReturnToPool == returnToPool, "return-to-pool not respected");
+        Debug.Assert(Length == length, "length not respected");
+    }
+
+    public byte[] ToArray()
+    {
+        var length = Length;
+        if (length == 0)
+        {
+            return [];
+        }
+
+        var copy = new byte[length];
+        Buffer.BlockCopy(Array!, 0, copy, 0, length);
+        return copy;
+
+        // Note on nullability of Array; the usage here is that a non-null array
+        // is always provided during construction, so the only null scenario is for default(BufferChunk).
+        // Since the constructor explicitly accesses array.Length, any null array passed to the constructor
+        // will cause an exception, even in release (the Debug.Assert only covers debug) - although in
+        // reality we do not expect this to ever occur (internal type, usage checked, etc). In the case of
+        // default(BufferChunk), we know that Length will be zero, which means we will hit the [] case.
+    }
+
+    internal void RecycleIfAppropriate()
+    {
+        if (ReturnToPool)
+        {
+            ArrayPool<byte>.Shared.Return(Array!);
+        }
+
+        Unsafe.AsRef(in this) = default; // anti foot-shotgun double-return guard; not 100%, but worth doing
+        Debug.Assert(Array is null && !ReturnToPool, "expected clean slate after recycle");
+    }
+
+    // get the data as a ROS; for note on null-logic of Array!, see comment in ToArray
+    internal ReadOnlySequence<byte> AsSequence() => Length == 0 ? default : new ReadOnlySequence<byte>(Array!, 0, Length);
+
+    internal BufferChunk DoNotReturnToPool()
+    {
+        var copy = this;
+        Unsafe.AsRef(in copy._lengthAndPoolFlag) &= ~FlagReturnToPool;
+        Debug.Assert(copy.Length == Length, "same length expected");
+        Debug.Assert(!copy.ReturnToPool, "do not return to pool");
+        return copy;
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
new file mode 100644
index 00000000000..1f8585d95d5
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
@@ -0,0 +1,109 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    internal abstract class CacheItem
+    {
+        private int _refCount = 1; // the number of pending operations against this cache item
+
+        public abstract bool DebugIsImmutable { get; }
+
+        // Note: the ref count is the number of callers anticipating this value at any given time. Initially,
+        // it is one for a simple "get the value" flow, but if another call joins with us, it'll be incremented.
+        // If either cancels, it will get decremented, with the entire flow being cancelled if it ever becomes
+        // zero.
+        // This counter also drives cache lifetime, with the cache itself incrementing the count by one. In the
+        // case of mutable data, cache eviction may reduce this to zero (in cooperation with any concurrent readers,
+        // who incr/decr around their fetch), allowing safe buffer recycling.
+
+        internal int RefCount => Volatile.Read(ref _refCount);
+
+        internal static readonly PostEvictionDelegate SharedOnEviction = static (key, value, reason, state) =>
+        {
+            if (value is CacheItem item)
+            {
+                _ = item.Release();
+            }
+        };
+
+        public virtual bool NeedsEvictionCallback => false; // do we need to call Release when evicted?
+
+        public abstract bool TryReserveBuffer(out BufferChunk buffer);
+
+        /// <summary>
+        /// Signal that the consumer is done with this item (ref-count decr).
+        /// </summary>
+        /// <returns>True if this is the final release.</returns>
+        public bool Release()
+        {
+            int newCount = Interlocked.Decrement(ref _refCount);
+            Debug.Assert(newCount >= 0, "over-release detected");
+            if (newCount == 0)
+            {
+                // perform per-item clean-up, i.e. buffer recycling (if defensive copies needed)
+                OnFinalRelease();
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool TryReserve()
+        {
+            // This is basically interlocked increment, but with a check against:
+            // a) incrementing upwards from zero
+            // b) overflowing *back* to zero
+            int oldValue = Volatile.Read(ref _refCount);
+            do
+            {
+                if (oldValue is 0 or -1)
+                {
+                    return false; // already burned, or about to roll around back to zero
+                }
+
+                var updated = Interlocked.CompareExchange(ref _refCount, oldValue + 1, oldValue);
+                if (updated == oldValue)
+                {
+                    return true; // we exchanged
+                }
+
+                oldValue = updated; // we failed, but we have an updated state
+            }
+            while (true);
+        }
+
+        protected virtual void OnFinalRelease() // any required release semantics
+        {
+        }
+    }
+
+    internal abstract class CacheItem<T> : CacheItem
+    {
+        // attempt to get a value that was *not* previously reserved
+        public abstract bool TryGetValue(out T value);
+
+        // get a value that *was* reserved, countermanding our reservation in the process
+        public T GetReservedValue()
+        {
+            if (!TryGetValue(out var value))
+            {
+                Throw();
+            }
+
+            _ = Release();
+            return value;
+
+            static void Throw() => throw new ObjectDisposedException("The cache item has been recycled before the value was obtained");
+        }
+
+        internal static CacheItem<T> Create() => ImmutableTypeCache<T>.IsImmutable ? new ImmutableCacheItem<T>() : new MutableCacheItem<T>();
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Debug.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Debug.cs
new file mode 100644
index 00000000000..a9901103555
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Debug.cs
@@ -0,0 +1,81 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+#if DEBUG
+using System.Threading;
+#endif
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    /// <summary>
+    /// Auxiliary API for testing purposes, allowing confirmation of the internal state independent of the public API.
+    /// </summary>
+    internal bool DebugTryGetCacheItem(string key, [NotNullWhen(true)] out CacheItem? value)
+    {
+        if (_localCache.TryGetValue(key, out var untyped) && untyped is CacheItem typed)
+        {
+            value = typed;
+            return true;
+        }
+
+        value = null;
+        return false;
+    }
+
+#if DEBUG // enable ref-counted buffers
+
+    private int _outstandingBufferCount;
+
+    internal int DebugOnlyGetOutstandingBuffers(bool flush = false)
+                => flush ? Interlocked.Exchange(ref _outstandingBufferCount, 0) : Volatile.Read(ref _outstandingBufferCount);
+
+    [Conditional("DEBUG")]
+    internal void DebugOnlyDecrementOutstandingBuffers()
+    {
+        _ = Interlocked.Decrement(ref _outstandingBufferCount);
+    }
+
+    [Conditional("DEBUG")]
+    internal void DebugOnlyIncrementOutstandingBuffers()
+    {
+        _ = Interlocked.Increment(ref _outstandingBufferCount);
+    }
+#endif
+
+    private partial class MutableCacheItem<T>
+    {
+#if DEBUG
+        private DefaultHybridCache? _cache; // for buffer-tracking - only needed in DEBUG
+#endif
+
+        [Conditional("DEBUG")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Instance state used in debug")]
+        internal void DebugOnlyTrackBuffer(DefaultHybridCache cache)
+        {
+#if DEBUG
+            _cache = cache;
+            if (_buffer.ReturnToPool)
+            {
+                _cache?.DebugOnlyIncrementOutstandingBuffers();
+            }
+#endif
+        }
+
+        [Conditional("DEBUG")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Instance state used in debug")]
+        private void DebugOnlyDecrementOutstandingBuffers()
+        {
+#if DEBUG
+            if (_buffer.ReturnToPool)
+            {
+                _cache?.DebugOnlyDecrementOutstandingBuffers();
+            }
+#endif
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
new file mode 100644
index 00000000000..2118fc39247
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    private sealed class ImmutableCacheItem<T> : CacheItem<T> // used to hold types that do not require defensive copies
+    {
+        private static ImmutableCacheItem<T>? _sharedDefault;
+
+        private T _value = default!; // deferred until SetValue
+
+        public override bool DebugIsImmutable => true;
+
+        // get a shared instance that passes as "reserved"; doesn't need to be 100% singleton,
+        // but we don't want to break the reservation rules either; if we can't reserve: create new
+        public static ImmutableCacheItem<T> GetReservedShared()
+        {
+            ImmutableCacheItem<T>? obj = Volatile.Read(ref _sharedDefault);
+            if (obj is null || !obj.TryReserve())
+            {
+                obj = new();
+                _ = obj.TryReserve(); // this is reliable on a new instance
+                Volatile.Write(ref _sharedDefault, obj);
+            }
+
+            return obj;
+        }
+
+        public void SetValue(T value) => _value = value;
+
+        public override bool TryGetValue(out T value)
+        {
+            value = _value;
+            return true; // always available
+        }
+
+        public override bool TryReserveBuffer(out BufferChunk buffer)
+        {
+            buffer = default;
+            return false; // we don't have one to reserve!
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
new file mode 100644
index 00000000000..5c08aecb9ef
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
@@ -0,0 +1,154 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    [SuppressMessage("Performance", "CA1849:Call async methods when in an async method", Justification = "Manual sync check")]
+    [SuppressMessage("Usage", "VSTHRD003:Avoid awaiting foreign Tasks", Justification = "Manual sync check")]
+    internal ValueTask<BufferChunk> GetFromL2Async(string key, CancellationToken token)
+    {
+        switch (GetFeatures(CacheFeatures.BackendCache | CacheFeatures.BackendBuffers))
+        {
+            case CacheFeatures.BackendCache: // legacy byte[]-based
+                var pendingLegacy = _backendCache!.GetAsync(key, token);
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+                if (!pendingLegacy.IsCompletedSuccessfully)
+#else
+                if (pendingLegacy.Status != TaskStatus.RanToCompletion)
+#endif
+                {
+                    return new(AwaitedLegacyAsync(pendingLegacy, this));
+                }
+
+                return new(GetValidPayloadSegment(pendingLegacy.Result)); // already complete
+
+            case CacheFeatures.BackendCache | CacheFeatures.BackendBuffers: // IBufferWriter<byte>-based
+                var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes);
+                var cache = Unsafe.As<IBufferDistributedCache>(_backendCache!); // type-checked already
+                var pendingBuffers = cache.TryGetAsync(key, writer, token);
+                if (!pendingBuffers.IsCompletedSuccessfully)
+                {
+                    return new(AwaitedBuffersAsync(pendingBuffers, writer));
+                }
+
+                BufferChunk result = pendingBuffers.GetAwaiter().GetResult()
+                    ? new(writer.DetachCommitted(out var length), length, returnToPool: true)
+                    : default;
+                writer.Dispose(); // it is not accidental that this isn't "using"; avoid recycling if not 100% sure what happened
+                return new(result);
+        }
+
+        return default;
+
+        static async Task<BufferChunk> AwaitedLegacyAsync(Task<byte[]?> pending, DefaultHybridCache @this)
+        {
+            var bytes = await pending.ConfigureAwait(false);
+            return @this.GetValidPayloadSegment(bytes);
+        }
+
+        static async Task<BufferChunk> AwaitedBuffersAsync(ValueTask<bool> pending, RecyclableArrayBufferWriter<byte> writer)
+        {
+            BufferChunk result = await pending.ConfigureAwait(false)
+                    ? new(writer.DetachCommitted(out var length), length, returnToPool: true)
+                    : default;
+            writer.Dispose(); // it is not accidental that this isn't "using"; avoid recycling if not 100% sure what happened
+            return result;
+        }
+    }
+
+    internal ValueTask SetL2Async(string key, in BufferChunk buffer, HybridCacheEntryOptions? options, CancellationToken token)
+    {
+        Debug.Assert(buffer.Array is not null, "array should be non-null");
+        switch (GetFeatures(CacheFeatures.BackendCache | CacheFeatures.BackendBuffers))
+        {
+            case CacheFeatures.BackendCache: // legacy byte[]-based
+                var arr = buffer.Array!;
+                if (arr.Length != buffer.Length)
+                {
+                    // we'll need a right-sized snapshot
+                    arr = buffer.ToArray();
+                }
+
+                return new(_backendCache!.SetAsync(key, arr, GetOptions(options), token));
+            case CacheFeatures.BackendCache | CacheFeatures.BackendBuffers: // ReadOnlySequence<byte>-based
+                var cache = Unsafe.As<IBufferDistributedCache>(_backendCache!); // type-checked already
+                return cache.SetAsync(key, buffer.AsSequence(), GetOptions(options), token);
+        }
+
+        return default;
+    }
+
+    internal void SetL1<T>(string key, CacheItem<T> value, HybridCacheEntryOptions? options)
+    {
+        // incr ref-count for the the cache itself; this *may* be released via the NeedsEvictionCallback path
+        if (value.TryReserve())
+        {
+            // based on CacheExtensions.Set<TItem>, but with post-eviction recycling
+            using var cacheEntry = _localCache.CreateEntry(key);
+            cacheEntry.AbsoluteExpirationRelativeToNow = options?.LocalCacheExpiration ?? _defaultLocalCacheExpiration;
+            cacheEntry.Value = value;
+            if (value.NeedsEvictionCallback)
+            {
+                _ = cacheEntry.RegisterPostEvictionCallback(CacheItem.SharedOnEviction);
+            }
+        }
+    }
+
+    private BufferChunk GetValidPayloadSegment(byte[]? payload)
+    {
+        if (payload is not null)
+        {
+            if (payload.Length > MaximumPayloadBytes)
+            {
+                ThrowPayloadLengthExceeded(payload.Length);
+            }
+
+            return new(payload);
+        }
+
+        return default;
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void ThrowPayloadLengthExceeded(int size) // splitting the exception bits out to a different method
+    {
+        // also add via logger when possible
+        throw new InvalidOperationException($"Maximum cache length ({MaximumPayloadBytes} bytes) exceeded");
+    }
+
+#if NET8_0_OR_GREATER
+    [SuppressMessage("Maintainability", "CA1508:Avoid dead conditional code", Justification = "False positive from unsafe accessor")]
+#endif
+    private DistributedCacheEntryOptions GetOptions(HybridCacheEntryOptions? options)
+    {
+        DistributedCacheEntryOptions? result = null;
+        if (options is not null && options.Expiration.HasValue && options.Expiration.GetValueOrDefault() != _defaultExpiration)
+        {
+            result = ToDistributedCacheEntryOptions(options);
+        }
+
+        return result ?? _defaultDistributedCacheExpiration;
+
+#if NET8_0_OR_GREATER
+        // internal method memoizes this allocation; since it is "init", it is immutable (outside reflection)
+        [UnsafeAccessor(UnsafeAccessorKind.Method, Name = nameof(ToDistributedCacheEntryOptions))]
+        extern static DistributedCacheEntryOptions? ToDistributedCacheEntryOptions(HybridCacheEntryOptions options);
+#else
+        // without that helper method, we'll just eat the alloc (down-level TFMs)
+        static DistributedCacheEntryOptions ToDistributedCacheEntryOptions(HybridCacheEntryOptions options)
+            => new() { AbsoluteExpirationRelativeToNow = options.Expiration };
+#endif
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
new file mode 100644
index 00000000000..8ce93b79c4a
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
@@ -0,0 +1,73 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    private sealed partial class MutableCacheItem<T> : CacheItem<T> // used to hold types that require defensive copies
+    {
+        private IHybridCacheSerializer<T> _serializer = null!; // deferred until SetValue
+        private BufferChunk _buffer;
+
+        public override bool NeedsEvictionCallback => _buffer.ReturnToPool;
+
+        public override bool DebugIsImmutable => false;
+
+        public void SetValue(ref BufferChunk buffer, IHybridCacheSerializer<T> serializer)
+        {
+            _serializer = serializer;
+            _buffer = buffer;
+            buffer = default; // we're taking over the lifetime; the caller no longer has it!
+        }
+
+        public void SetValue(T value, IHybridCacheSerializer<T> serializer, int maxLength)
+        {
+            _serializer = serializer;
+            var writer = RecyclableArrayBufferWriter<byte>.Create(maxLength);
+            serializer.Serialize(value, writer);
+
+            _buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true);
+            writer.Dispose(); // no buffers left (we just detached them), but just in case of other logic
+        }
+
+        public override bool TryGetValue(out T value)
+        {
+            // only if we haven't already burned
+            if (!TryReserve())
+            {
+                value = default!;
+                return false;
+            }
+
+            try
+            {
+                value = _serializer.Deserialize(_buffer.AsSequence());
+                return true;
+            }
+            finally
+            {
+                _ = Release();
+            }
+        }
+
+        public override bool TryReserveBuffer(out BufferChunk buffer)
+        {
+            // only if we haven't already burned
+            if (TryReserve())
+            {
+                buffer = _buffer.DoNotReturnToPool(); // not up to them!
+                return true;
+            }
+
+            buffer = default;
+            return false;
+        }
+
+        protected override void OnFinalRelease()
+        {
+            DebugOnlyDecrementOutstandingBuffers();
+            _buffer.RecycleIfAppropriate();
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Serialization.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Serialization.cs
new file mode 100644
index 00000000000..523a95e279a
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Serialization.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    // Per instance cache of typed serializers; each serializer is a
+    // IHybridCacheSerializer<T> for the corresponding Type, but we can't
+    // know which here - and undesirable to add an artificial non-generic
+    // IHybridCacheSerializer base that serves no other purpose.
+    private readonly ConcurrentDictionary<Type, object> _serializers = new();
+
+    internal int MaximumPayloadBytes { get; }
+
+    internal IHybridCacheSerializer<T> GetSerializer<T>()
+    {
+        return _serializers.TryGetValue(typeof(T), out var serializer)
+            ? Unsafe.As<IHybridCacheSerializer<T>>(serializer) : ResolveAndAddSerializer(this);
+
+        static IHybridCacheSerializer<T> ResolveAndAddSerializer(DefaultHybridCache @this)
+        {
+            // It isn't critical that we get only one serializer instance during start-up; what matters
+            // is that we don't get a new serializer instance *every time*.
+            var serializer = @this._services.GetService<IHybridCacheSerializer<T>>();
+            if (serializer is null)
+            {
+                foreach (var factory in @this._serializerFactories)
+                {
+                    if (factory.TryCreateSerializer<T>(out var current))
+                    {
+                        serializer = current;
+                        break; // we've already reversed the factories, so: the first hit is what we want
+                    }
+                }
+            }
+
+            if (serializer is null)
+            {
+                throw new InvalidOperationException($"No {nameof(IHybridCacheSerializer<T>)} configured for type '{typeof(T).Name}'");
+            }
+
+            // store the result so we don't repeat this in future
+            @this._serializers[typeof(T)] = serializer;
+            return serializer;
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Stampede.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Stampede.cs
new file mode 100644
index 00000000000..ef5c570c670
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Stampede.cs
@@ -0,0 +1,111 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    private readonly ConcurrentDictionary<StampedeKey, StampedeState> _currentOperations = new();
+
+    // returns true for a new session (in which case: we need to start the work), false for a pre-existing session
+    public bool GetOrCreateStampedeState<TState, T>(string key, HybridCacheEntryFlags flags, out StampedeState<TState, T> stampedeState, bool canBeCanceled)
+    {
+        var stampedeKey = new StampedeKey(key, flags);
+
+        // Double-checked locking to try to avoid unnecessary sessions in race conditions,
+        // while avoiding the lock completely whenever possible.
+        if (TryJoinExistingSession(this, stampedeKey, out var existing))
+        {
+            stampedeState = existing;
+            return false; // someone ELSE is running the work
+        }
+
+        // Most common scenario here, then, is that we're not fighting with anyone else
+        // go ahead and create a placeholder state object and *try* to add it.
+        stampedeState = new StampedeState<TState, T>(this, stampedeKey, canBeCanceled);
+        if (_currentOperations.TryAdd(stampedeKey, stampedeState))
+        {
+            // successfully added; indeed, no-one else was fighting: we're done
+            return true; // the CURRENT caller is responsible for making the work happen
+        }
+
+        // Hmmm, failed to add - there's concurrent activity on the same key; we're now
+        // in very rare race condition territory; go ahead and take a lock while we
+        // collect our thoughts.
+
+        // see notes in SyncLock.cs
+        lock (GetPartitionedSyncLock(in stampedeKey))
+        {
+            // check again while we hold the lock
+            if (TryJoinExistingSession(this, stampedeKey, out existing))
+            {
+                // we found an existing state we can join; do that
+                stampedeState.SetCanceled(); // to be thorough: mark our speculative one as doomed (no-one has seen it, though)
+                stampedeState = existing; // and replace with the one we found
+                return false; // someone ELSE is running the work
+
+                // Note that in this case we allocated a StampedeState<TState, T> that got dropped on
+                // the floor; in the grand scheme of things, that's OK; this is a rare outcome.
+            }
+
+            // Check whether the value was L1-cached by an outgoing operation (for *us* to check needs local-cache-read,
+            // and for *them* to have updated needs local-cache-write, but since the shared us/them key includes flags,
+            // we can skip this if *either* flag is set).
+            if ((flags & HybridCacheEntryFlags.DisableLocalCache) == 0 && _localCache.TryGetValue(key, out var untyped)
+                && untyped is CacheItem<T> typed && typed.TryReserve())
+            {
+                stampedeState.SetResultDirect(typed);
+                return false; // the work has ALREADY been done
+            }
+
+            // Otherwise, either nothing existed - or the thing that already exists can't be joined
+            // in that case, go ahead and use the state that we invented a moment ago (outside of the lock).
+            _currentOperations[stampedeKey] = stampedeState;
+            return true; // the CURRENT caller is responsible for making the work happen
+        }
+
+        static bool TryJoinExistingSession(DefaultHybridCache @this, in StampedeKey stampedeKey,
+            [NotNullWhen(true)] out StampedeState<TState, T>? stampedeState)
+        {
+            if (@this._currentOperations.TryGetValue(stampedeKey, out var found))
+            {
+                if (found is not StampedeState<TState, T> tmp)
+                {
+                    ThrowWrongType(stampedeKey.Key, found.Type, typeof(T));
+                }
+
+                if (tmp.TryAddCaller())
+                {
+                    // we joined an existing session
+                    stampedeState = tmp;
+                    return true;
+                }
+            }
+
+            stampedeState = null;
+            return false;
+        }
+
+        [DoesNotReturn]
+        static void ThrowWrongType(string key, Type existingType, Type newType)
+        {
+            Debug.Assert(existingType != newType, "should be different types");
+            throw new InvalidOperationException(
+                $"All calls to {nameof(HybridCache)} with the same key should use the same data type; the same key is being used for '{existingType.FullName}' and '{newType.FullName}' data")
+            {
+                Data = { { "CacheKey", key } }
+            };
+        }
+    }
+
+    internal int DebugGetCallerCount(string key, HybridCacheEntryFlags? flags = null)
+    {
+        var stampedeKey = new StampedeKey(key, flags ?? _defaultFlags);
+        return _currentOperations.TryGetValue(stampedeKey, out var state) ? state.DebugCallerCount : 0;
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeKey.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeKey.cs
new file mode 100644
index 00000000000..bbb519b2992
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeKey.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    [SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Prefer explicit field in this case")]
+    internal readonly struct StampedeKey : IEquatable<StampedeKey>
+    {
+        private readonly string _key;
+        private readonly HybridCacheEntryFlags _flags;
+        private readonly int _hashCode; // we know we'll need it; compute it once only
+        public StampedeKey(string key, HybridCacheEntryFlags flags)
+        {
+            // We'll use both the key *and* the flags as combined flag; in reality, we *expect*
+            // the flags to be consistent between calls on the same operation, and it must be
+            // noted that the *cache items* only use the key (not the flags), but: it gets
+            // very hard to grok what the correct behaviour should be if combining two calls
+            // with different flags, since they could have mutually exclusive behaviours!
+
+            // As such, we'll treat conflicting calls entirely separately from a stampede
+            // perspective.
+            _key = key;
+            _flags = flags;
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+            _hashCode = System.HashCode.Combine(key, flags);
+#else
+            _hashCode = key.GetHashCode() ^ (int)flags;
+#endif
+        }
+
+        public string Key => _key;
+        public HybridCacheEntryFlags Flags => _flags;
+
+        // Allow direct access to the pre-computed hash-code, semantically emphasizing that
+        // this is a constant-time operation against a known value.
+        internal int HashCode => _hashCode;
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Blocker Code Smell", "S2178:Short-circuit logic should be used in boolean contexts",
+            Justification = "Non-short-circuiting intentional to remove unnecessary branch")]
+        public bool Equals(StampedeKey other) => _flags == other._flags & _key == other._key;
+
+        public override bool Equals([NotNullWhen(true)] object? obj)
+            => obj is StampedeKey other && Equals(other);
+
+        public override int GetHashCode() => _hashCode;
+
+        public override string ToString() => $"{_key} ({_flags})";
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeState.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeState.cs
new file mode 100644
index 00000000000..eba71774395
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeState.cs
@@ -0,0 +1,109 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+
+#if !NETCOREAPP3_0_OR_GREATER
+using System.Runtime.CompilerServices;
+#endif
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    internal abstract class StampedeState
+#if NETCOREAPP3_0_OR_GREATER
+        : IThreadPoolWorkItem
+#endif
+    {
+        internal readonly CancellationToken SharedToken; // this might have a value even when _sharedCancellation is null
+
+        // Because multiple callers can enlist, we need to track when the *last* caller cancels
+        // (and keep going until then); that means we need to run with custom cancellation.
+        private readonly CancellationTokenSource? _sharedCancellation;
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Keep usage explicit")]
+        private readonly DefaultHybridCache _cache;
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Keep usage explicit")]
+        private readonly CacheItem _cacheItem;
+
+        // we expose the key as a by-ref readonly; this minimizes the stack work involved in passing the key around
+        // (both in terms of width and copy-semantics)
+        private readonly StampedeKey _key;
+        public ref readonly StampedeKey Key => ref _key;
+        protected CacheItem CacheItem => _cacheItem;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StampedeState"/> class optionally with shared cancellation support.
+        /// </summary>
+        protected StampedeState(DefaultHybridCache cache, in StampedeKey key, CacheItem cacheItem, bool canBeCanceled)
+        {
+            _cache = cache;
+            _key = key;
+            _cacheItem = cacheItem;
+            if (canBeCanceled)
+            {
+                // If the first (or any) caller can't be cancelled;,we'll never get to zero: n point tracking.
+                // (in reality, all callers usually use the same path, so cancellation is usually "all" or "none")
+                _sharedCancellation = new();
+                SharedToken = _sharedCancellation.Token;
+            }
+            else
+            {
+                SharedToken = CancellationToken.None;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StampedeState"/> class using a fixed cancellation token.
+        /// </summary>
+        protected StampedeState(DefaultHybridCache cache, in StampedeKey key, CacheItem cacheItem, CancellationToken token)
+        {
+            _cache = cache;
+            _key = key;
+            _cacheItem = cacheItem;
+            SharedToken = token;
+        }
+
+#if !NETCOREAPP3_0_OR_GREATER
+        protected static readonly WaitCallback SharedWaitCallback = static obj => Unsafe.As<StampedeState>(obj).Execute();
+#endif
+
+        protected DefaultHybridCache Cache => _cache;
+
+        public abstract void Execute();
+
+        protected int MaximumPayloadBytes => _cache.MaximumPayloadBytes;
+
+        public override string ToString() => Key.ToString();
+
+        public abstract void SetCanceled();
+
+        public int DebugCallerCount => _cacheItem.RefCount;
+
+        public abstract Type Type { get; }
+
+        public void CancelCaller()
+        {
+            // note that TryAddCaller has protections to avoid getting back from zero
+            if (_cacheItem.Release())
+            {
+                // we're the last to leave; turn off the lights
+                _sharedCancellation?.Cancel();
+                SetCanceled();
+            }
+        }
+
+        public bool TryAddCaller() => _cacheItem.TryReserve();
+    }
+
+    private void RemoveStampedeState(in StampedeKey key)
+    {
+        // see notes in SyncLock.cs
+        lock (GetPartitionedSyncLock(in key))
+        {
+            _ = _currentOperations.TryRemove(key, out _);
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
new file mode 100644
index 00000000000..842444c8666
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -0,0 +1,304 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    internal sealed class StampedeState<TState, T> : StampedeState
+    {
+        [DoesNotReturn]
+        private static CacheItem<T> ThrowUnexpectedCacheItem() => throw new InvalidOperationException("Unexpected cache item");
+
+        private readonly TaskCompletionSource<CacheItem<T>>? _result;
+        private TState? _state;
+        private Func<TState, CancellationToken, ValueTask<T>>? _underlying; // main data factory
+        private HybridCacheEntryOptions? _options;
+        private Task<T>? _sharedUnwrap; // allows multiple non-cancellable callers to share a single task (when no defensive copy needed)
+
+        // ONLY set the result, without any other side-effects
+        internal void SetResultDirect(CacheItem<T> value)
+            => _result?.TrySetResult(value);
+
+        public StampedeState(DefaultHybridCache cache, in StampedeKey key, bool canBeCanceled)
+            : base(cache, key, CacheItem<T>.Create(), canBeCanceled)
+        {
+            _result = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        }
+
+        public StampedeState(DefaultHybridCache cache, in StampedeKey key, CancellationToken token)
+            : base(cache, key, CacheItem<T>.Create(), token)
+        {
+            // no TCS in this case - this is for SetValue only
+        }
+
+        public override Type Type => typeof(T);
+
+        public void QueueUserWorkItem(in TState state, Func<TState, CancellationToken, ValueTask<T>> underlying, HybridCacheEntryOptions? options)
+        {
+            Debug.Assert(_underlying is null, "should not already have factory field");
+            Debug.Assert(underlying is not null, "factory argument should be meaningful");
+
+            // initialize the callback state
+            _state = state;
+            _underlying = underlying;
+            _options = options;
+
+#if NETCOREAPP3_0_OR_GREATER
+            ThreadPool.UnsafeQueueUserWorkItem(this, false);
+#else
+            ThreadPool.UnsafeQueueUserWorkItem(SharedWaitCallback, this);
+#endif
+        }
+
+        [SuppressMessage("Resilience", "EA0014:The async method doesn't support cancellation", Justification = "Cancellation is handled separately via SharedToken")]
+        public Task ExecuteDirectAsync(in TState state, Func<TState, CancellationToken, ValueTask<T>> underlying, HybridCacheEntryOptions? options)
+        {
+            Debug.Assert(_underlying is null, "should not already have factory field");
+            Debug.Assert(underlying is not null, "factory argument should be meaningful");
+
+            // initialize the callback state
+            _state = state;
+            _underlying = underlying;
+            _options = options;
+
+            return BackgroundFetchAsync();
+        }
+
+        public override void Execute() => _ = BackgroundFetchAsync();
+
+        public override void SetCanceled() => _result?.TrySetCanceled(SharedToken);
+
+        [SuppressMessage("Usage", "VSTHRD003:Avoid awaiting foreign Tasks", Justification = "Custom task management")]
+        public ValueTask<T> JoinAsync(CancellationToken token)
+        {
+            // If the underlying has already completed, and/or our local token can't cancel: we
+            // can simply wrap the shared task; otherwise, we need our own cancellation state.
+            return token.CanBeCanceled && !Task.IsCompleted ? WithCancellationAsync(this, token) : UnwrapReservedAsync();
+
+            static async ValueTask<T> WithCancellationAsync(StampedeState<TState, T> stampede, CancellationToken token)
+            {
+                var cancelStub = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                using var reg = token.Register(static obj =>
+                {
+                    _ = ((TaskCompletionSource<bool>)obj!).TrySetResult(true);
+                }, cancelStub);
+
+                CacheItem<T> result;
+                try
+                {
+                    var first = await System.Threading.Tasks.Task.WhenAny(stampede.Task, cancelStub.Task).ConfigureAwait(false);
+                    if (ReferenceEquals(first, cancelStub.Task))
+                    {
+                        // we expect this to throw, because otherwise we wouldn't have gotten here
+                        token.ThrowIfCancellationRequested(); // get an appropriate exception
+                    }
+
+                    Debug.Assert(ReferenceEquals(first, stampede.Task), "should not be cancelled");
+
+                    // this has already completed, but we'll get the stack nicely
+                    result = await stampede.Task.ConfigureAwait(false);
+                }
+                catch
+                {
+                    stampede.CancelCaller();
+                    throw;
+                }
+
+                // outside the catch, so we know we only decrement one way or the other
+                return result.GetReservedValue();
+            }
+        }
+
+        [SuppressMessage("Maintainability", "CA1508:Avoid dead conditional code", Justification = "Reliability")]
+        public Task<CacheItem<T>> Task
+        {
+            get
+            {
+                Debug.Assert(_result is not null, "result should be assigned");
+                return _result is null ? InvalidAsync() : _result.Task;
+
+                static Task<CacheItem<T>> InvalidAsync() => System.Threading.Tasks.Task.FromException<CacheItem<T>>(
+                    new InvalidOperationException("Task should not be accessed for non-shared instances"));
+            }
+        }
+
+        [SuppressMessage("Resilience", "EA0014:The async method doesn't support cancellation", Justification = "No cancellable operation")]
+        [SuppressMessage("Performance", "CA1849:Call async methods when in an async method", Justification = "Checked manual unwrap")]
+        [SuppressMessage("Usage", "VSTHRD003:Avoid awaiting foreign Tasks", Justification = "Checked manual unwrap")]
+        [SuppressMessage("Major Code Smell", "S1121:Assignments should not be made from within sub-expressions", Justification = "Unusual, but legit here")]
+        internal ValueTask<T> UnwrapReservedAsync()
+        {
+            var task = Task;
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+            if (task.IsCompletedSuccessfully)
+#else
+            if (task.Status == TaskStatus.RanToCompletion)
+#endif
+            {
+                return new(task.Result.GetReservedValue());
+            }
+
+            // if the type is immutable, callers can share the final step too (this may leave dangling
+            // reservation counters, but that's OK)
+            var result = ImmutableTypeCache<T>.IsImmutable ? (_sharedUnwrap ??= AwaitedAsync(Task)) : AwaitedAsync(Task);
+            return new(result);
+
+            static async Task<T> AwaitedAsync(Task<CacheItem<T>> task)
+                => (await task.ConfigureAwait(false)).GetReservedValue();
+        }
+
+        [SuppressMessage("Resilience", "EA0014:The async method doesn't support cancellation", Justification = "In this case the cancellation token is provided internally via SharedToken")]
+        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exception is passed through to faulted task result")]
+        private async Task BackgroundFetchAsync()
+        {
+            try
+            {
+                // read from L2 if appropriate
+                if ((Key.Flags & HybridCacheEntryFlags.DisableDistributedCacheRead) == 0)
+                {
+                    var result = await Cache.GetFromL2Async(Key.Key, SharedToken).ConfigureAwait(false);
+
+                    if (result.Array is not null)
+                    {
+                        SetResultAndRecycleIfAppropriate(ref result);
+                        return;
+                    }
+                }
+
+                // nothing from L2; invoke the underlying data store
+                if ((Key.Flags & HybridCacheEntryFlags.DisableUnderlyingData) == 0)
+                {
+                    var cacheItem = SetResult(await _underlying!(_state!, SharedToken).ConfigureAwait(false));
+
+                    // note that at this point we've already released most or all of the waiting callers; everything
+                    // else here is background
+
+                    // write to L2 if appropriate
+                    if ((Key.Flags & HybridCacheEntryFlags.DisableDistributedCacheWrite) == 0)
+                    {
+                        if (cacheItem.TryReserveBuffer(out var buffer))
+                        {
+                            // mutable: we've already serialized it for the shared cache item
+                            await Cache.SetL2Async(Key.Key, in buffer, _options, SharedToken).ConfigureAwait(false);
+                            _ = cacheItem.Release(); // because we reserved
+                        }
+                        else if (cacheItem.TryGetValue(out var value))
+                        {
+                            // immutable: we'll need to do the serialize ourselves
+                            var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes); // note this lifetime spans the SetL2Async
+                            Cache.GetSerializer<T>().Serialize(value, writer);
+                            buffer = new(writer.GetBuffer(out var length), length, returnToPool: false); // writer still owns the buffer
+                            await Cache.SetL2Async(Key.Key, in buffer, _options, SharedToken).ConfigureAwait(false);
+                            writer.Dispose(); // recycle on success
+                        }
+                    }
+                }
+                else
+                {
+                    // can't read from data store; implies we shouldn't write
+                    // back to anywhere else, either
+                    SetDefaultResult();
+                }
+            }
+            catch (Exception ex)
+            {
+                SetException(ex);
+            }
+        }
+
+        private void SetException(Exception ex)
+        {
+            if (_result is not null)
+            {
+                Cache.RemoveStampedeState(in Key);
+                _ = _result.TrySetException(ex);
+            }
+        }
+
+        private void SetDefaultResult()
+        {
+            // note we don't store this dummy result in L1 or L2
+            if (_result is not null)
+            {
+                Cache.RemoveStampedeState(in Key);
+                _ = _result.TrySetResult(ImmutableCacheItem<T>.GetReservedShared());
+            }
+        }
+
+        private void SetResultAndRecycleIfAppropriate(ref BufferChunk value)
+        {
+            // set a result from L2 cache
+            Debug.Assert(value.Array is not null, "expected buffer");
+
+            var serializer = Cache.GetSerializer<T>();
+            CacheItem<T> cacheItem;
+            switch (CacheItem)
+            {
+                case ImmutableCacheItem<T> immutable:
+                    // deserialize; and store object; buffer can be recycled now
+                    immutable.SetValue(serializer.Deserialize(new(value.Array!, 0, value.Length)));
+                    value.RecycleIfAppropriate();
+                    cacheItem = immutable;
+                    break;
+                case MutableCacheItem<T> mutable:
+                    // use the buffer directly as the backing in the cache-item; do *not* recycle now
+                    mutable.SetValue(ref value, serializer);
+                    mutable.DebugOnlyTrackBuffer(Cache);
+                    cacheItem = mutable;
+                    break;
+                default:
+                    cacheItem = ThrowUnexpectedCacheItem();
+                    break;
+            }
+
+            SetResult(cacheItem);
+        }
+
+        private CacheItem<T> SetResult(T value)
+        {
+            // set a result from a value we calculated directly
+            CacheItem<T> cacheItem;
+            switch (CacheItem)
+            {
+                case ImmutableCacheItem<T> immutable:
+                    // no serialize needed
+                    immutable.SetValue(value);
+                    cacheItem = immutable;
+                    break;
+                case MutableCacheItem<T> mutable:
+                    // serialization happens here
+                    mutable.SetValue(value, Cache.GetSerializer<T>(), MaximumPayloadBytes);
+                    mutable.DebugOnlyTrackBuffer(Cache);
+                    cacheItem = mutable;
+                    break;
+                default:
+                    cacheItem = ThrowUnexpectedCacheItem();
+                    break;
+            }
+
+            SetResult(cacheItem);
+            return cacheItem;
+        }
+
+        private void SetResult(CacheItem<T> value)
+        {
+            if ((Key.Flags & HybridCacheEntryFlags.DisableLocalCacheWrite) == 0)
+            {
+                Cache.SetL1(Key.Key, value, _options); // we can do this without a TCS, for SetValue
+            }
+
+            if (_result is not null)
+            {
+                Cache.RemoveStampedeState(in Key);
+                _ = _result.TrySetResult(value);
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.SyncLock.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.SyncLock.cs
new file mode 100644
index 00000000000..4672818d056
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.SyncLock.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal partial class DefaultHybridCache
+{
+    // HybridCache's stampede protection requires some level of synchronization to avoid unnecessary runs
+    // of the underlying data fetch; this is *minimized* by the use of double-checked locking and
+    // interlocked join (adding a new request to an existing execution), but: that would leave a race
+    // condition where the *remove* step of the stampede would be in a race with the *add new* step; the
+    // *add new* step is inside a lock, but we need to *remove* step to share that lock, to avoid
+    // the race. We deal with that by taking the same lock during remove, but *that* means we're locking
+    // on all executions.
+    //
+    // To minimize lock contention, we will therefore use partitioning of the lock-token, by using the
+    // low 3 bits of the hash-code (which we calculate eagerly only once, so: already known). This gives
+    // us a fast way to split contention by 8, almost an order-of-magnitude, which is sufficient. We *could*
+    // use an array for this, but: for directness, let's inline it instead (avoiding bounds-checks,
+    // an extra layer of dereferencing, and the allocation; I will acknowledge these are miniscule, but:
+    // it costs us nothing to do)
+
+    private readonly object _syncLock0 = new();
+    private readonly object _syncLock1 = new();
+    private readonly object _syncLock2 = new();
+    private readonly object _syncLock3 = new();
+    private readonly object _syncLock4 = new();
+    private readonly object _syncLock5 = new();
+    private readonly object _syncLock6 = new();
+    private readonly object _syncLock7 = new();
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S109:Magic numbers should not be used", Justification = "Trivial low 3 bits")]
+    internal object GetPartitionedSyncLock(in StampedeKey key) => (key.HashCode & 0b111) switch // generate 8 partitions using the low 3 bits
+    {
+        0 => _syncLock0,
+        1 => _syncLock1,
+        2 => _syncLock2,
+        3 => _syncLock3,
+        4 => _syncLock4,
+        5 => _syncLock5,
+        6 => _syncLock6,
+        _ => _syncLock7,
+    };
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.cs
new file mode 100644
index 00000000000..c789e7c6652
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.cs
@@ -0,0 +1,170 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+/// <summary>
+/// The inbuilt implementation of <see cref="HybridCache"/>, as registered via <see cref="HybridCacheServiceExtensions.AddHybridCache(IServiceCollection)"/>.
+/// </summary>
+internal sealed partial class DefaultHybridCache : HybridCache
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Keep usage explicit")]
+    private readonly IDistributedCache? _backendCache;
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Keep usage explicit")]
+    private readonly IMemoryCache _localCache;
+    private readonly IServiceProvider _services; // we can't resolve per-type serializers until we see each T
+    private readonly IHybridCacheSerializerFactory[] _serializerFactories;
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "Keep usage explicit")]
+    private readonly HybridCacheOptions _options;
+    private readonly ILogger _logger;
+    private readonly CacheFeatures _features; // used to avoid constant type-testing
+
+    private readonly HybridCacheEntryFlags _hardFlags; // *always* present (for example, because no L2)
+    private readonly HybridCacheEntryFlags _defaultFlags; // note this already includes hardFlags
+    private readonly TimeSpan _defaultExpiration;
+    private readonly TimeSpan _defaultLocalCacheExpiration;
+
+    private readonly DistributedCacheEntryOptions _defaultDistributedCacheExpiration;
+
+    [Flags]
+    internal enum CacheFeatures
+    {
+        None = 0,
+        BackendCache = 1 << 0,
+        BackendBuffers = 1 << 1,
+    }
+
+    internal CacheFeatures GetFeatures() => _features;
+
+    // used to restrict features in test suite
+    internal void DebugRemoveFeatures(CacheFeatures features) => Unsafe.AsRef(in _features) &= ~features;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private CacheFeatures GetFeatures(CacheFeatures mask) => _features & mask;
+
+    public DefaultHybridCache(IOptions<HybridCacheOptions> options, IServiceProvider services)
+    {
+        _services = Throw.IfNull(services);
+        _localCache = services.GetRequiredService<IMemoryCache>();
+        _options = options.Value;
+        _logger = services.GetService<ILoggerFactory>()?.CreateLogger(typeof(HybridCache)) ?? NullLogger.Instance;
+
+        _backendCache = services.GetService<IDistributedCache>(); // note optional
+
+        // ignore L2 if it is really just the same L1, wrapped
+        // (note not just an "is" test; if someone has a custom subclass, who knows what it does?)
+        if (_backendCache is not null
+            && _backendCache.GetType() == typeof(MemoryDistributedCache)
+            && _localCache.GetType() == typeof(MemoryCache))
+        {
+            _backendCache = null;
+        }
+
+        // perform type-tests on the backend once only
+        _features |= _backendCache switch
+        {
+            IBufferDistributedCache => CacheFeatures.BackendCache | CacheFeatures.BackendBuffers,
+            not null => CacheFeatures.BackendCache,
+            _ => CacheFeatures.None
+        };
+
+        // When resolving serializers via the factory API, we will want the *last* instance,
+        // i.e. "last added wins"; we can optimize by reversing the array ahead of time, and
+        // taking the first match
+        var factories = services.GetServices<IHybridCacheSerializerFactory>().ToArray();
+        Array.Reverse(factories);
+        _serializerFactories = factories;
+
+        MaximumPayloadBytes = checked((int)_options.MaximumPayloadBytes); // for now hard-limit to 2GiB
+
+        var defaultEntryOptions = _options.DefaultEntryOptions;
+
+        if (_backendCache is null)
+        {
+            _hardFlags |= HybridCacheEntryFlags.DisableDistributedCache;
+        }
+
+        _defaultFlags = (defaultEntryOptions?.Flags ?? HybridCacheEntryFlags.None) | _hardFlags;
+        _defaultExpiration = defaultEntryOptions?.Expiration ?? TimeSpan.FromMinutes(5);
+        _defaultLocalCacheExpiration = defaultEntryOptions?.LocalCacheExpiration ?? TimeSpan.FromMinutes(1);
+        _defaultDistributedCacheExpiration = new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = _defaultExpiration };
+    }
+
+    internal IDistributedCache? BackendCache => _backendCache;
+    internal IMemoryCache LocalCache => _localCache;
+
+    internal HybridCacheOptions Options => _options;
+
+    public override ValueTask<T> GetOrCreateAsync<TState, T>(string key, TState state, Func<TState, CancellationToken, ValueTask<T>> underlyingDataCallback,
+        HybridCacheEntryOptions? options = null, IEnumerable<string>? tags = null, CancellationToken cancellationToken = default)
+    {
+        var canBeCanceled = cancellationToken.CanBeCanceled;
+        if (canBeCanceled)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+        }
+
+        var flags = GetEffectiveFlags(options);
+        if ((flags & HybridCacheEntryFlags.DisableLocalCacheRead) == 0 && _localCache.TryGetValue(key, out var untyped)
+            && untyped is CacheItem<T> typed && typed.TryGetValue(out var value))
+        {
+            // short-circuit
+            return new(value);
+        }
+
+        if (GetOrCreateStampedeState<TState, T>(key, flags, out var stampede, canBeCanceled))
+        {
+            // new query; we're responsible for making it happen
+            if (canBeCanceled)
+            {
+                // *we* might cancel, but someone else might be depending on the result; start the
+                // work independently, then we'll with join the outcome
+                stampede.QueueUserWorkItem(in state, underlyingDataCallback, options);
+            }
+            else
+            {
+                // we're going to run to completion; no need to get complicated
+                _ = stampede.ExecuteDirectAsync(in state, underlyingDataCallback, options); // this larger task includes L2 write etc
+                return stampede.UnwrapReservedAsync();
+            }
+        }
+
+        return stampede.JoinAsync(cancellationToken);
+    }
+
+    public override ValueTask RemoveAsync(string key, CancellationToken token = default)
+    {
+        _localCache.Remove(key);
+        return _backendCache is null ? default : new(_backendCache.RemoveAsync(key, token));
+    }
+
+    public override ValueTask RemoveByTagAsync(string tag, CancellationToken token = default)
+        => default; // tags not yet implemented
+
+    public override ValueTask SetAsync<T>(string key, T value, HybridCacheEntryOptions? options = null, IEnumerable<string>? tags = null, CancellationToken token = default)
+    {
+        // since we're forcing a write: disable L1+L2 read; we'll use a direct pass-thru of the value as the callback, to reuse all the code
+        // note also that stampede token is not shared with anyone else
+        var flags = GetEffectiveFlags(options) | (HybridCacheEntryFlags.DisableLocalCacheRead | HybridCacheEntryFlags.DisableDistributedCacheRead);
+        var state = new StampedeState<T, T>(this, new StampedeKey(key, flags), token);
+        return new(state.ExecuteDirectAsync(value, static (state, _) => new(state), options)); // note this spans L2 write etc
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private HybridCacheEntryFlags GetEffectiveFlags(HybridCacheEntryOptions? options)
+    => (options?.Flags | _hardFlags) ?? _defaultFlags;
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultJsonSerializerFactory.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultJsonSerializerFactory.cs
new file mode 100644
index 00000000000..63ce186e1ec
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultJsonSerializerFactory.cs
@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal sealed class DefaultJsonSerializerFactory : IHybridCacheSerializerFactory
+{
+    public bool TryCreateSerializer<T>([NotNullWhen(true)] out IHybridCacheSerializer<T>? serializer)
+    {
+        // no restriction
+        serializer = new DefaultJsonSerializer<T>();
+        return true;
+    }
+
+    internal sealed class DefaultJsonSerializer<T> : IHybridCacheSerializer<T>
+    {
+        T IHybridCacheSerializer<T>.Deserialize(ReadOnlySequence<byte> source)
+        {
+            var reader = new Utf8JsonReader(source);
+#pragma warning disable IDE0079 // unnecessary suppression: TFM-dependent
+#pragma warning disable IL2026, IL3050 // AOT bits
+            return JsonSerializer.Deserialize<T>(ref reader)!;
+#pragma warning restore IL2026, IL3050
+#pragma warning restore IDE0079
+        }
+
+        void IHybridCacheSerializer<T>.Serialize(T value, IBufferWriter<byte> target)
+        {
+            using var writer = new Utf8JsonWriter(target);
+#pragma warning disable IDE0079 // unnecessary suppression: TFM-dependent
+#pragma warning disable IL2026, IL3050 // AOT bits
+            JsonSerializer.Serialize<T>(writer, value, JsonSerializerOptions.Default);
+#pragma warning restore IL2026, IL3050
+#pragma warning restore IDE0079
+        }
+    }
+
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/HybridCacheBuilder.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/HybridCacheBuilder.cs
new file mode 100644
index 00000000000..814bd4c84a8
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/HybridCacheBuilder.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal sealed class HybridCacheBuilder : IHybridCacheBuilder
+{
+    public HybridCacheBuilder(IServiceCollection services)
+    {
+        Services = services;
+    }
+
+    public IServiceCollection Services { get; }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.T.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.T.cs
new file mode 100644
index 00000000000..51566cd0e68
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.T.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+/// <summary>
+/// Simple memoize storage for whether the type <typeparamref name="T"/> is blittable, in particular to avoid repeated runtime tests
+/// in down-level TFMs where this is trickier to determine. The JIT is very effective at accessing this memoized value.
+/// </summary>
+/// <typeparam name="T">The type being processed.</typeparam>
+internal static class ImmutableTypeCache<T> // lazy memoize; T doesn't change per cache instance
+{
+    // note for blittable types: a pure struct will be a full copy every time - nothing shared to mutate
+    public static readonly bool IsImmutable = (typeof(T).IsValueType && ImmutableTypeCache.IsBlittable<T>()) || ImmutableTypeCache.IsTypeImmutable(typeof(T));
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.cs
new file mode 100644
index 00000000000..87b86e56cf1
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/ImmutableTypeCache.cs
@@ -0,0 +1,79 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+using System.Runtime.CompilerServices;
+#else
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+#endif
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+/// <summary>
+/// Utility type for determining whether a type is blittable; the logic for this is very
+/// TFM dependent.
+/// </summary>
+internal static class ImmutableTypeCache
+{
+    internal static bool IsBlittable<T>() // minimize the generic portion (twinned with IsTypeImmutable)
+    {
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+        return !RuntimeHelpers.IsReferenceOrContainsReferences<T>();
+#else
+        // down-level: only blittable types can be pinned
+        try
+        {
+            // get a typed, zeroed, non-null boxed instance of the appropriate type
+            // (can't use (object)default(T), as that would box to null for nullable types)
+            var obj = FormatterServices.GetUninitializedObject(Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T));
+            GCHandle.Alloc(obj, GCHandleType.Pinned).Free();
+            return true;
+        }
+#pragma warning disable CA1031 // Do not catch general exception types: interpret any failure here as "nope"
+        catch
+        {
+            return false;
+        }
+#pragma warning restore CA1031
+
+#endif
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Blocker Code Smell", "S2178:Short-circuit logic should be used in boolean contexts",
+        Justification = "Non-short-circuiting intentional to remove unnecessary branch")]
+    internal static bool IsTypeImmutable(Type type)
+    {
+        // check for known types
+        if (type == typeof(string))
+        {
+            return true;
+        }
+
+        if (type.IsValueType)
+        {
+            // switch from Foo? to Foo if necessary
+            if (Nullable.GetUnderlyingType(type) is { } nullable)
+            {
+                type = nullable;
+            }
+        }
+
+        if (type.IsValueType || (type.IsClass & type.IsSealed))
+        {
+            // check for [ImmutableObject(true)]; note we're looking at this as a statement about
+            // the overall nullability; for example, a type could contain a private int[] field,
+            // where the field is mutable and the list is mutable; but if the type is annotated:
+            // we're trusting that the API and use-case is such that the type is immutable
+            return type.GetCustomAttribute<ImmutableObjectAttribute>() is { Immutable: true };
+        }
+
+        // don't trust interfaces and non-sealed types; we might have any concrete
+        // type that has different behaviour
+        return false;
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/InbuiltTypeSerializer.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/InbuiltTypeSerializer.cs
new file mode 100644
index 00000000000..3ef26341433
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/InbuiltTypeSerializer.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Text;
+
+#if !NET5_0_OR_GREATER
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+#endif
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+internal sealed class InbuiltTypeSerializer : IHybridCacheSerializer<string>, IHybridCacheSerializer<byte[]>
+{
+    public static InbuiltTypeSerializer Instance { get; } = new();
+
+    string IHybridCacheSerializer<string>.Deserialize(ReadOnlySequence<byte> source)
+    {
+#if NET5_0_OR_GREATER
+        return Encoding.UTF8.GetString(source);
+#else
+        if (source.IsSingleSegment && MemoryMarshal.TryGetArray(source.First, out var segment))
+        {
+            // we can use the existing single chunk as-is
+            return Encoding.UTF8.GetString(segment.Array, segment.Offset, segment.Count);
+        }
+
+        var length = checked((int)source.Length);
+        var oversized = ArrayPool<byte>.Shared.Rent(length);
+        source.CopyTo(oversized);
+        var s = Encoding.UTF8.GetString(oversized, 0, length);
+        ArrayPool<byte>.Shared.Return(oversized);
+        return s;
+#endif
+    }
+
+    void IHybridCacheSerializer<string>.Serialize(string value, IBufferWriter<byte> target)
+    {
+#if NET5_0_OR_GREATER
+        Encoding.UTF8.GetBytes(value, target);
+#else
+        var length = Encoding.UTF8.GetByteCount(value);
+        var oversized = ArrayPool<byte>.Shared.Rent(length);
+        var actual = Encoding.UTF8.GetBytes(value, 0, value.Length, oversized, 0);
+        Debug.Assert(actual == length, "encoding length mismatch");
+        target.Write(new(oversized, 0, length));
+        ArrayPool<byte>.Shared.Return(oversized);
+#endif
+    }
+
+    byte[] IHybridCacheSerializer<byte[]>.Deserialize(ReadOnlySequence<byte> source)
+        => source.ToArray();
+
+    void IHybridCacheSerializer<byte[]>.Serialize(byte[] value, IBufferWriter<byte> target)
+        => target.Write(value);
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/RecyclableArrayBufferWriter.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/RecyclableArrayBufferWriter.cs
new file mode 100644
index 00000000000..2f2da2c7019
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/RecyclableArrayBufferWriter.cs
@@ -0,0 +1,202 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Buffers;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Internal;
+
+// this is effectively a cut-down re-implementation of ArrayBufferWriter
+// from https://github.com/dotnet/runtime/blob/6cd9bf1937c3b4d2f7304a6c534aacde58a202b6/src/libraries/Common/src/System/Buffers/ArrayBufferWriter.cs
+// except it uses the array pool for allocations
+internal sealed class RecyclableArrayBufferWriter<T> : IBufferWriter<T>, IDisposable
+{
+    // Usage note: *normally* you might want to use "using" for this, and that is fine
+    // however, caution should be exercised in exception scenarios where we don't 100%
+    // know that the caller has stopped touching the buffer; in particular, this means
+    // scenarios involving a combination of external code and (for example) "async".
+    // In those cases, it may be preferable to manually dispose in the success case,
+    // and just drop the buffers in the failure case, i.e. instead of:
+    //
+    // using (writer)
+    // { DoStuff(); }
+    //
+    // simply:
+    //
+    // DoStuff();
+    // writer.Dispose();
+    //
+    // This does not represent a problem, and is consistent with many ArrayPool use-cases.
+
+    // Copy of Array.MaxLength.
+    // Used by projects targeting .NET Framework.
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S125:Sections of code should not be commented out", Justification = "Usage example, please retain")]
+    private const int ArrayMaxLength = 0x7FFFFFC7;
+
+    private const int DefaultInitialBufferSize = 256;
+
+    private T[] _buffer;
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "It is preferable to keep this usage explicit")]
+    private int _index;
+    private int _maxLength;
+
+    public int CommittedBytes => _index;
+    public int FreeCapacity => _buffer.Length - _index;
+
+    private static RecyclableArrayBufferWriter<T>? _spare;
+    public static RecyclableArrayBufferWriter<T> Create(int maxLength)
+    {
+        var obj = Interlocked.Exchange(ref _spare, null) ?? new();
+        Debug.Assert(obj._index == 0, "index should be zero initially");
+        obj._maxLength = maxLength;
+        return obj;
+    }
+
+    private RecyclableArrayBufferWriter()
+    {
+        _buffer = [];
+        _index = 0;
+        _maxLength = int.MaxValue;
+    }
+
+    public void Dispose()
+    {
+        // attempt to reuse everything via "spare"; if that isn't possible,
+        // recycle the buffers instead
+        _index = 0;
+        if (Interlocked.CompareExchange(ref _spare, this, null) != null)
+        {
+            var tmp = _buffer;
+            _buffer = [];
+            if (tmp.Length != 0)
+            {
+                ArrayPool<T>.Shared.Return(tmp);
+            }
+        }
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S3928:Parameter names used into ArgumentException constructors should match an existing one ",
+        Justification = "False positive; parameter exists")]
+    public void Advance(int count)
+    {
+        _ = Throw.IfLessThan(count, 0);
+
+        if (_index > _buffer.Length - count)
+        {
+            ThrowCount();
+        }
+
+        if (_index + count > _maxLength)
+        {
+            ThrowQuota();
+        }
+
+        _index += count;
+
+        static void ThrowCount()
+            => throw new ArgumentOutOfRangeException(nameof(count));
+
+        static void ThrowQuota()
+            => throw new InvalidOperationException("Max length exceeded");
+    }
+
+    public void ResetInPlace()
+    {
+        // resets the writer *without* resetting the buffer.
+        // the existing memory should be considered "gone"
+        // (to claim the buffer instead, use DetachCommitted)
+        _index = 0;
+    }
+
+    public ReadOnlyMemory<T> GetCommittedMemory() => new(_buffer, 0, _index); // could also directly expose a ReadOnlySpan<byte> if useful
+
+    public Memory<T> GetMemory(int sizeHint = 0)
+    {
+        CheckAndResizeBuffer(sizeHint);
+        Debug.Assert(_buffer.Length > _index, "should have some space");
+        return _buffer.AsMemory(_index);
+    }
+
+    public Span<T> GetSpan(int sizeHint = 0)
+    {
+        CheckAndResizeBuffer(sizeHint);
+        Debug.Assert(_buffer.Length > _index, "should have some space");
+        return _buffer.AsSpan(_index);
+    }
+
+    // create a standalone isolated copy of the buffer
+    public T[] ToArray() => _buffer.AsSpan(0, _index).ToArray();
+
+    /// <summary>
+    /// Disconnect the current buffer so that we can store it without it being recycled.
+    /// </summary>
+    internal T[] DetachCommitted(out int length)
+    {
+        var tmp = _index == 0 ? [] : _buffer;
+        length = _index;
+
+        _buffer = [];
+        _index = 0;
+
+        return tmp;
+    }
+
+    internal T[] GetBuffer(out int length)
+    {
+        length = _index;
+        return _index == 0 ? [] : _buffer;
+    }
+
+    private void CheckAndResizeBuffer(int sizeHint)
+    {
+        if (sizeHint <= 0)
+        {
+            sizeHint = 1;
+        }
+
+        if (sizeHint > FreeCapacity)
+        {
+            var currentLength = _buffer.Length;
+
+            // Attempt to grow by the larger of the sizeHint and double the current size.
+            var growBy = Math.Max(sizeHint, currentLength);
+
+            if (currentLength == 0)
+            {
+                growBy = Math.Max(growBy, DefaultInitialBufferSize);
+            }
+
+            var newSize = currentLength + growBy;
+
+            if ((uint)newSize > int.MaxValue)
+            {
+                // Attempt to grow to ArrayMaxLength.
+                var needed = (uint)(currentLength - FreeCapacity + sizeHint);
+                Debug.Assert(needed > currentLength, "should need to grow");
+
+                if (needed > ArrayMaxLength)
+                {
+                    ThrowOutOfMemoryException();
+                }
+
+                newSize = ArrayMaxLength;
+            }
+
+            // resize the backing buffer
+            var oldArray = _buffer;
+            _buffer = ArrayPool<T>.Shared.Rent(newSize);
+            oldArray.AsSpan(0, _index).CopyTo(_buffer);
+            if (oldArray.Length != 0)
+            {
+                ArrayPool<T>.Shared.Return(oldArray);
+            }
+        }
+
+        Debug.Assert(FreeCapacity > 0 && FreeCapacity >= sizeHint, "should be space");
+
+        static void ThrowOutOfMemoryException() => throw new InvalidOperationException("Unable to grow buffer as requested");
+    }
+}
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/readme.md b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/readme.md
new file mode 100644
index 00000000000..8d6a7d87848
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/readme.md
@@ -0,0 +1,27 @@
+# HybridCache internal design
+
+`HybridCache` encapsulates serialization, caching and stampede protection.
+
+The `DefaultHybridCache` implementation keeps a collection of `StampedeState` entries
+that represent the current in-flight operations (keyed by `StampedeKey`); if a duplicate
+operation occurs during the execution, the second operation will be joined with that
+same flow, rather than executing independently. When attempting to merge with an
+existing flow, interlocked counting is used: we can only join if we can successfully
+increment the value from a non-zero value (zero meaning all existing consumers have
+canceled, and the shared token is therefore canceled)
+
+The `StampedeState<>` performs back-end fetch operations, resulting not in a `T` (of the final
+value), but instead a `CacheItem<T>`; this is the object that gets put into L1 cache,
+and can describe both mutable and immutable types; the significance here is that for
+mutable types, we need a defensive copy per-call to prevent callers impacting each-other.
+
+`StampedeState<>` combines cancellation (so that operations proceed as long as *a* caller
+is still active); this covers all L2 access and serialization operations, releasing all pending
+shared callers for the same operation. Note that L2 storage can occur *after* callers
+have been released.
+
+To ensure correct buffer recycling, when dealing with cache entries that need defensive copies
+we use more ref-counting while reading the buffer, combined with an eviction callback which
+decrements that counter. This means that we recycle things when evicted, without impacting
+in-progress deserialize operations. To simplify tracking, `BufferChunk` acts like a `byte[]`+`int`
+(we don't need non-zero offset), but also tracking "should this be returned to the pool?".
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj
new file mode 100644
index 00000000000..f460c4ee0cc
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Multi-level caching implementation building on and extending IDistributedCache</Description>
+    <TargetFrameworks>$(NetCoreTargetFrameworks)$(ConditionalNet462);netstandard2.0;netstandard2.1</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>cache;distributedcache;hybrid</PackageTags>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
+    <InjectCallerAttributesOnLegacy>true</InjectCallerAttributesOnLegacy>
+    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
+    <IsPackable>true</IsPackable>
+    <Stage>dev</Stage>
+    <StageDevDiagnosticId>EXTEXP0018</StageDevDiagnosticId>
+    <MinCodeCoverage>75</MinCodeCoverage>
+    <MinMutationScore>50</MinMutationScore>
+    <Workstream>Fundamentals</Workstream>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Options" />
+
+    <!-- this provides the default L1 implementation; L2 is optional -->
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Microsoft.Extensions.Caching.Hybrid.Tests" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="Microsoft.Bcl.TimeProvider" />
+  </ItemGroup>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.json b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.json
new file mode 100644
index 0000000000000000000000000000000000000000..2c1a811b223e6ab9931cc251f1f7e4a25b6d283f
GIT binary patch
literal 8282
zcmeHMTaVH}82z42{0|LJYhoJB>PFp*S=lvi6eTY4#rVLbi&dZ-3TDyp*VS`o7)sk=
zxwQx@A*FL|XU?4YzB6C{{Qf2P<(@eB7395Cr7a#(FI2uHzSN~FfrPlOq$jSN%MI?H
zbWrA_ly_H(=vkMqDCtNO`8P6<8hZNDkcW8IC-mr!dmPJiw0ShX*rF(XY2nFzwDaT`
z&+(A%Ay-8?Ta=NnA<Z$pMeRT;c>i~#I%vNyk5PMt`!jhe2k6y6`aqtbejg<TJR_QE
z1--9P6OQKkd0a;%B21Xm*q9y$n-F8G;^Jr=TrK26{2ZAdwKI%>qv&9){I6qF7r1{z
zuCAU<eB)>uq&;~BJbb*DeY@6mnVfSplS?)7CVH8<=n`VfvIwWBPYE?WtZ#s~*)cP1
z)7Y7s0+8{*uNwZl<9Ek#oF6-bgN<=6P@H6-X`94slh(?WQ()VWONEXPHj(K+RqhB(
zKaoAP0{(&=Gjm@Jr&^3_+>Lp!)N~viAV3DiF?t|}R_;dZo5g!$9ZV12hnC&I@*T?~
z`)(MP++B80aXZV&tO|B-8+MV_h~B89>=i97t>Gr^gB|Clt^FeQA#X2un`M0sJ4;U+
zz@7|t7FObTIM7p*`0V(8xA;z7@xR;Jq}TrvI|(HHf7<UCfT2E17&X1zS->#MuG8#l
z_5-}6@rzXDHswA`_1OC4r}nc_jq~6!?c5YcZBO#DYH4QKur9;%1nLynRckrzOlnkV
znt`Uqe!j{V@pGll=sV-6zRd81FyC5JMbKO6D8jUHQMo&aQ1CQ+h!jr}IyJQJp9tGo
z`zX2E?3uJ4=4p$rVGRrkpobSxRjb<*SI(fhLtv^S14WF1x}5PDMmn?}-%dnnWqWJK
zvji+}fLj|ZZI5DD?|>#_W{j?ECzdVnf-_h*JL71Uf$ac$B*49a*w_GwlBe5=>A%|X
zAA#95Fr+W40Li9`*)a;sIOqD&Oj^~|)mc2=xSUp7?Zm1hTR#+{-Y#y7ooc=mY+l@U
z_F9?ff?cI77qgw0Ul*fjvEdRubW6p}qOS)gT58&aI3+mfH^6SDg>2*d!s*1<hNH|P
zyLLq4I`IT!(Hg7|yE8eCyi|EwgHx3)s>tG2BrA=*X<sewBKz~=Rra1rYgB&e&`~%K
oJY6r-vWqBe&M7xr+q&NMa1-`Et;g~?#m?fksn_aks3K^80gSI4A^-pY

literal 0
HcmV?d00001

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/README.md b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/README.md
new file mode 100644
index 00000000000..02dc3e5bae5
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/README.md
@@ -0,0 +1,81 @@
+# Microsoft.Extensions.Caching.Hybrid
+
+This package contains a concrete implementation of [the `HybridCache` API](https://learn.microsoft.com/dotnet/api/microsoft.extensions.caching.hybrid),
+simplifying and enhancing cache usage that might previously have been built on top of [`IDistributedCache`](https://learn.microsoft.com/dotnet/api/microsoft.extensions.caching.distributed.idistributedcache).
+
+Key features:
+
+- built on top of `IDistributedCache` - all existing cache backends (Redis, SQL Server, CosmosDB, etc) should work immediately
+- simple API (all the cache, serialization, etc details from are encapsulated)
+- cache-stampede protection (combining of concurrent requests for the same data)
+- performance enhancements such as inbuilt support for the newer [`IBufferDistributedCache`](https://learn.microsoft.com/dotnet/api/microsoft.extensions.caching.distributed.ibufferdistributedcache) API
+- fully configurable serialization
+
+Full `HybridCache` documentation is [here](https://learn.microsoft.com/aspnet/core/performance/caching/hybrid).
+
+## Full documentation
+
+See [learn.microsoft.com](https://learn.microsoft.com/aspnet/core/performance/caching/hybrid) for full discussion of `HybridCache`.
+
+## Install the package
+
+From the command-line:
+
+```console
+dotnet add package Microsoft.Extensions.Caching.Hybrid
+```
+
+Or directly in the C# project file:
+
+```xml
+<ItemGroup>
+  <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="[CURRENTVERSION]" />
+</ItemGroup>
+```
+
+## Usage example
+
+The `HybridCache` service can be registered and configured via `IServiceCollection`, for example:
+
+```csharp
+builder.Services.AddHybridCache(/* optional configuration /*);
+```
+
+Note that in many cases you may also wish to register a distributed cache backend, as
+[discussed here](https://learn.microsoft.com/aspnet/core/performance/caching/distributed); for example
+a Redis instance:
+
+```csharp
+builder.Services.AddStackExchangeRedisCache(options =>
+{
+    options.Configuration = builder.Configuration.GetConnectionString("MyRedisConStr");
+});
+```
+
+Once registered, the `HybridCache` instance can be obtained via dependency-injection, allowing the
+`GetOrCreateAsync` API to be used to obtain data:
+
+```csharp
+public class SomeService(HybridCache cache)
+{
+    private HybridCache _cache = cache;
+
+    public async Task<SomeDataType> GetSomeInfoAsync(string name, int id, CancellationToken token = default)
+    {
+        return await _cache.GetOrCreateAsync(
+            $"{name}-{id}", // Unique key to the cache entry
+            async cancel => await GetDataFromTheSourceAsync(name, id, cancel),
+            cancellationToken: token
+        );
+    }
+
+    private async Task<SomeDataType> GetDataFromTheSourceAsync(string name, int id, CancellationToken token)
+    {
+        // talk to the underlying data store here - could be SQL, gRPC, HTTP, etc
+    }
+}
+```
+
+Additional usage guidance - including expiration, custom serialization support, and alternate usage
+to reduce delegate allocation - is available
+on [learn.microsoft.com](https://learn.microsoft.com/aspnet/core/performance/caching/hybrid).
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BasicConfig.json b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BasicConfig.json
new file mode 100644
index 00000000000..374114fb1db
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BasicConfig.json
@@ -0,0 +1,12 @@
+{
+  "no_entry_options": {
+    "MaximumKeyLength": 937
+  },
+  "with_entry_options": {
+    "MaximumKeyLength": 937,
+    "DefaultEntryOptions": {
+      "LocalCacheExpiration": "00:02:00",
+      "Flags": "DisableCompression,DisableLocalCacheRead"
+    }
+  }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
new file mode 100644
index 00000000000..3318a86fd70
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
@@ -0,0 +1,235 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using static Microsoft.Extensions.Caching.Hybrid.Internal.DefaultHybridCache;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class BufferReleaseTests // note that buffer ref-counting is only enabled for DEBUG builds; can only verify general behaviour without that
+{
+    private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache, Action<ServiceCollection>? config = null)
+    {
+        var services = new ServiceCollection();
+        config?.Invoke(services);
+        services.AddHybridCache();
+        var provider = services.BuildServiceProvider();
+        cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+        return provider;
+    }
+
+    [Fact]
+    public async Task BufferGetsReleased_NoL2()
+    {
+        using var provider = GetDefaultCache(out var cache);
+#if DEBUG
+        cache.DebugOnlyGetOutstandingBuffers(flush: true);
+#endif
+
+        var key = Me();
+#if DEBUG
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        var first = await cache.GetOrCreateAsync(key, _ => GetAsync());
+        Assert.NotNull(first);
+#if DEBUG
+        Assert.Equal(1, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        Assert.True(cache.DebugTryGetCacheItem(key, out var cacheItem));
+
+        // assert that we can reserve the buffer *now* (mostly to see that it behaves differently later)
+        Assert.True(cacheItem.NeedsEvictionCallback, "should be pooled memory");
+        Assert.True(cacheItem.TryReserveBuffer(out _));
+        cacheItem.Release(); // for the above reserve
+
+        var second = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.NotNull(second);
+        Assert.NotSame(first, second);
+
+        Assert.Equal(1, cacheItem.RefCount);
+        await cache.RemoveAsync(key);
+        var third = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.Null(third);
+
+        // give it a moment for the eviction callback to kick in
+        for (var i = 0; i < 10 && cacheItem.NeedsEvictionCallback; i++)
+        {
+            await Task.Delay(250);
+        }
+#if DEBUG
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+
+        // assert that we can *no longer* reserve this buffer, because we've already recycled it
+        Assert.False(cacheItem.TryReserveBuffer(out _));
+        Assert.Equal(0, cacheItem.RefCount);
+        Assert.False(cacheItem.NeedsEvictionCallback, "should be recycled now");
+        static ValueTask<Customer> GetAsync() => new(new Customer { Id = 42, Name = "Fred" });
+    }
+
+    private static readonly HybridCacheEntryOptions _noUnderlying = new() { Flags = HybridCacheEntryFlags.DisableUnderlyingData };
+
+    private class TestCache : MemoryDistributedCache, IBufferDistributedCache
+    {
+        public TestCache(IOptions<MemoryDistributedCacheOptions> options)
+            : base(options)
+        {
+        }
+
+        void IBufferDistributedCache.Set(string key, ReadOnlySequence<byte> value, DistributedCacheEntryOptions options)
+            => Set(key, value.ToArray(), options); // efficiency not important for this
+
+        ValueTask IBufferDistributedCache.SetAsync(string key, ReadOnlySequence<byte> value, DistributedCacheEntryOptions options, CancellationToken token)
+            => new(SetAsync(key, value.ToArray(), options, token)); // efficiency not important for this
+
+        bool IBufferDistributedCache.TryGet(string key, IBufferWriter<byte> destination)
+            => Write(destination, Get(key));
+
+        async ValueTask<bool> IBufferDistributedCache.TryGetAsync(string key, IBufferWriter<byte> destination, CancellationToken token)
+            => Write(destination, await GetAsync(key, token));
+
+        private static bool Write(IBufferWriter<byte> destination, byte[]? buffer)
+        {
+            if (buffer is null)
+            {
+                return false;
+            }
+
+            destination.Write(buffer);
+            return true;
+        }
+    }
+
+    [Fact]
+    public async Task BufferDoesNotNeedRelease_LegacyL2() // byte[] API; not pooled
+    {
+        using var provider = GetDefaultCache(out var cache,
+            services => services.AddSingleton<IDistributedCache, TestCache>());
+
+        cache.DebugRemoveFeatures(CacheFeatures.BackendBuffers);
+
+        // prep the backend with our data
+        var key = Me();
+        Assert.NotNull(cache.BackendCache);
+        var serializer = cache.GetSerializer<Customer>();
+        using (var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
+        {
+            serializer.Serialize(await GetAsync(), writer);
+            cache.BackendCache.Set(key, writer.ToArray());
+        }
+#if DEBUG
+        cache.DebugOnlyGetOutstandingBuffers(flush: true);
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        var first = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying); // we expect this to come from L2, hence NoUnderlying
+        Assert.NotNull(first);
+#if DEBUG
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        Assert.True(cache.DebugTryGetCacheItem(key, out var cacheItem));
+
+        // assert that we can reserve the buffer *now* (mostly to see that it behaves differently later)
+        Assert.False(cacheItem.NeedsEvictionCallback, "should NOT be pooled memory");
+        Assert.True(cacheItem.TryReserveBuffer(out _));
+        cacheItem.Release(); // for the above reserve
+
+        var second = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.NotNull(second);
+        Assert.NotSame(first, second);
+
+        Assert.Equal(1, cacheItem.RefCount);
+        await cache.RemoveAsync(key);
+        var third = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.Null(third);
+        Assert.Null(await cache.BackendCache.GetAsync(key)); // should be gone from L2 too
+
+        // give it a moment for the eviction callback to kick in
+        for (var i = 0; i < 10 && cacheItem.NeedsEvictionCallback; i++)
+        {
+            await Task.Delay(250);
+        }
+#if DEBUG
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+
+        // assert that we can *no longer* reserve this buffer, because we've already recycled it
+        Assert.True(cacheItem.TryReserveBuffer(out _)); // always readable
+        cacheItem.Release();
+        Assert.Equal(1, cacheItem.RefCount); // not decremented because there was no need to add the hook
+
+        Assert.False(cacheItem.NeedsEvictionCallback, "should still not need recycling");
+        static ValueTask<Customer> GetAsync() => new(new Customer { Id = 42, Name = "Fred" });
+    }
+
+    [Fact]
+    public async Task BufferGetsReleased_BufferL2() // IBufferWriter<byte> API; pooled
+    {
+        using var provider = GetDefaultCache(out var cache,
+            services => services.AddSingleton<IDistributedCache, TestCache>());
+
+        // prep the backend with our data
+        var key = Me();
+        Assert.NotNull(cache.BackendCache);
+        var serializer = cache.GetSerializer<Customer>();
+        using (var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
+        {
+            serializer.Serialize(await GetAsync(), writer);
+            cache.BackendCache.Set(key, writer.ToArray());
+        }
+#if DEBUG
+        cache.DebugOnlyGetOutstandingBuffers(flush: true);
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        var first = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying); // we expect this to come from L2, hence NoUnderlying
+        Assert.NotNull(first);
+#if DEBUG
+        Assert.Equal(1, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+        Assert.True(cache.DebugTryGetCacheItem(key, out var cacheItem));
+
+        // assert that we can reserve the buffer *now* (mostly to see that it behaves differently later)
+        Assert.True(cacheItem.NeedsEvictionCallback, "should be pooled memory");
+        Assert.True(cacheItem.TryReserveBuffer(out _));
+        cacheItem.Release(); // for the above reserve
+
+        var second = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.NotNull(second);
+        Assert.NotSame(first, second);
+
+        Assert.Equal(1, cacheItem.RefCount);
+        await cache.RemoveAsync(key);
+        var third = await cache.GetOrCreateAsync(key, _ => GetAsync(), _noUnderlying);
+        Assert.Null(third);
+        Assert.Null(await cache.BackendCache.GetAsync(key)); // should be gone from L2 too
+
+        // give it a moment for the eviction callback to kick in
+        for (var i = 0; i < 10 && cacheItem.NeedsEvictionCallback; i++)
+        {
+            await Task.Delay(250);
+        }
+#if DEBUG
+        Assert.Equal(0, cache.DebugOnlyGetOutstandingBuffers());
+#endif
+
+        // assert that we can *no longer* reserve this buffer, because we've already recycled it
+        Assert.False(cacheItem.TryReserveBuffer(out _)); // released now
+        Assert.Equal(0, cacheItem.RefCount);
+
+        Assert.False(cacheItem.NeedsEvictionCallback, "should be recycled by now");
+        static ValueTask<Customer> GetAsync() => new(new Customer { Id = 42, Name = "Fred" });
+    }
+
+    public class Customer
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = "";
+    }
+
+    private static string Me([CallerMemberName] string caller = "") => caller;
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
new file mode 100644
index 00000000000..4f3766990cc
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
@@ -0,0 +1,397 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+/// <summary>
+/// Validate over-arching expectations of DC implementations, in particular behaviour re IBufferDistributedCache added for HybridCache.
+/// </summary>
+public abstract class DistributedCacheTests
+{
+    protected DistributedCacheTests(ITestOutputHelper log)
+    {
+        Log = log;
+    }
+
+    protected ITestOutputHelper Log { get; }
+    protected abstract ValueTask ConfigureAsync(IServiceCollection services);
+    protected abstract bool CustomClockSupported { get; }
+
+    protected FakeTime Clock { get; } = new();
+
+    protected sealed class FakeTime : TimeProvider, ISystemClock
+    {
+        private DateTimeOffset _now = DateTimeOffset.UtcNow;
+        public void Reset() => _now = DateTimeOffset.UtcNow;
+
+        DateTimeOffset ISystemClock.UtcNow => _now;
+
+        public override DateTimeOffset GetUtcNow() => _now;
+
+        public void Add(TimeSpan delta) => _now += delta;
+    }
+
+    private async ValueTask<IServiceCollection> InitAsync()
+    {
+        Clock.Reset();
+        var services = new ServiceCollection();
+        services.AddSingleton<TimeProvider>(Clock);
+        services.AddSingleton<ISystemClock>(Clock);
+        await ConfigureAsync(services);
+        return services;
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(128)]
+    [InlineData(1024)]
+    [InlineData(16 * 1024)]
+    public async Task SimpleBufferRoundtrip(int size)
+    {
+        var cache = (await InitAsync()).BuildServiceProvider().GetService<IDistributedCache>();
+        if (cache is null)
+        {
+            Log.WriteLine("Cache is not available");
+            return; // inconclusive
+        }
+
+        var key = $"{Me()}:{size}";
+        cache.Remove(key);
+        Assert.Null(cache.Get(key));
+
+        var expected = new byte[size];
+        new Random().NextBytes(expected);
+        cache.Set(key, expected, _fiveMinutes);
+
+        var actual = cache.Get(key);
+        Assert.NotNull(actual);
+        Assert.True(expected.SequenceEqual(actual));
+        Log.WriteLine("Data validated");
+
+        if (CustomClockSupported)
+        {
+            Clock.Add(TimeSpan.FromMinutes(4));
+            actual = cache.Get(key);
+            Assert.NotNull(actual);
+            Assert.True(expected.SequenceEqual(actual));
+
+            Clock.Add(TimeSpan.FromMinutes(2));
+            actual = cache.Get(key);
+            Assert.Null(actual);
+
+            Log.WriteLine("Expiration validated");
+        }
+        else
+        {
+            Log.WriteLine("Expiration not validated - TimeProvider not supported");
+        }
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(128)]
+    [InlineData(1024)]
+    [InlineData(16 * 1024)]
+    public async Task SimpleBufferRoundtripAsync(int size)
+    {
+        var cache = (await InitAsync()).BuildServiceProvider().GetService<IDistributedCache>();
+        if (cache is null)
+        {
+            Log.WriteLine("Cache is not available");
+            return; // inconclusive
+        }
+
+        var key = $"{Me()}:{size}";
+        await cache.RemoveAsync(key);
+        Assert.Null(cache.Get(key));
+
+        var expected = new byte[size];
+        new Random().NextBytes(expected);
+        await cache.SetAsync(key, expected, _fiveMinutes);
+
+        var actual = await cache.GetAsync(key);
+        Assert.NotNull(actual);
+        Assert.True(expected.SequenceEqual(actual));
+        Log.WriteLine("Data validated");
+
+        if (CustomClockSupported)
+        {
+            Clock.Add(TimeSpan.FromMinutes(4));
+            actual = await cache.GetAsync(key);
+            Assert.NotNull(actual);
+            Assert.True(expected.SequenceEqual(actual));
+
+            Clock.Add(TimeSpan.FromMinutes(2));
+            actual = await cache.GetAsync(key);
+            Assert.Null(actual);
+
+            Log.WriteLine("Expiration validated");
+        }
+        else
+        {
+            Log.WriteLine("Expiration not validated - TimeProvider not supported");
+        }
+    }
+
+    public enum SequenceKind
+    {
+        FullArray,
+        PaddedArray,
+        CustomMemory,
+        MultiSegment,
+    }
+
+    [Theory]
+    [InlineData(0, SequenceKind.FullArray)]
+    [InlineData(128, SequenceKind.FullArray)]
+    [InlineData(1024, SequenceKind.FullArray)]
+    [InlineData(16 * 1024, SequenceKind.FullArray)]
+    [InlineData(0, SequenceKind.PaddedArray)]
+    [InlineData(128, SequenceKind.PaddedArray)]
+    [InlineData(1024, SequenceKind.PaddedArray)]
+    [InlineData(16 * 1024, SequenceKind.PaddedArray)]
+    [InlineData(0, SequenceKind.CustomMemory)]
+    [InlineData(128, SequenceKind.CustomMemory)]
+    [InlineData(1024, SequenceKind.CustomMemory)]
+    [InlineData(16 * 1024, SequenceKind.CustomMemory)]
+    [InlineData(0, SequenceKind.MultiSegment)]
+    [InlineData(128, SequenceKind.MultiSegment)]
+    [InlineData(1024, SequenceKind.MultiSegment)]
+    [InlineData(16 * 1024, SequenceKind.MultiSegment)]
+    public async Task ReadOnlySequenceBufferRoundtrip(int size, SequenceKind kind)
+    {
+        var cache = (await InitAsync()).BuildServiceProvider().GetService<IDistributedCache>() as IBufferDistributedCache;
+        if (cache is null)
+        {
+            Log.WriteLine("Cache is not available or does not support IBufferDistributedCache");
+            return; // inconclusive
+        }
+
+        var key = $"{Me()}:{size}/{kind}";
+        cache.Remove(key);
+        Assert.Null(cache.Get(key));
+
+        var payload = Invent(size, kind);
+        ReadOnlyMemory<byte> expected = payload.ToArray(); // simplify for testing
+        Assert.Equal(size, expected.Length);
+        cache.Set(key, payload, _fiveMinutes);
+
+        var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
+        Assert.True(cache.TryGet(key, writer));
+        Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
+        writer.ResetInPlace();
+        Log.WriteLine("Data validated");
+
+        if (CustomClockSupported)
+        {
+            Clock.Add(TimeSpan.FromMinutes(4));
+            Assert.True(cache.TryGet(key, writer));
+            Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
+            writer.ResetInPlace();
+
+            Clock.Add(TimeSpan.FromMinutes(2));
+            Assert.False(cache.TryGet(key, writer));
+            Assert.Equal(0, writer.CommittedBytes);
+
+            Log.WriteLine("Expiration validated");
+        }
+        else
+        {
+            Log.WriteLine("Expiration not validated - TimeProvider not supported");
+        }
+
+        writer.Dispose(); // intentionally only recycle on success
+    }
+
+    [Theory]
+    [InlineData(0, SequenceKind.FullArray)]
+    [InlineData(128, SequenceKind.FullArray)]
+    [InlineData(1024, SequenceKind.FullArray)]
+    [InlineData(16 * 1024, SequenceKind.FullArray)]
+    [InlineData(0, SequenceKind.PaddedArray)]
+    [InlineData(128, SequenceKind.PaddedArray)]
+    [InlineData(1024, SequenceKind.PaddedArray)]
+    [InlineData(16 * 1024, SequenceKind.PaddedArray)]
+    [InlineData(0, SequenceKind.CustomMemory)]
+    [InlineData(128, SequenceKind.CustomMemory)]
+    [InlineData(1024, SequenceKind.CustomMemory)]
+    [InlineData(16 * 1024, SequenceKind.CustomMemory)]
+    [InlineData(0, SequenceKind.MultiSegment)]
+    [InlineData(128, SequenceKind.MultiSegment)]
+    [InlineData(1024, SequenceKind.MultiSegment)]
+    [InlineData(16 * 1024, SequenceKind.MultiSegment)]
+    public async Task ReadOnlySequenceBufferRoundtripAsync(int size, SequenceKind kind)
+    {
+        var cache = (await InitAsync()).BuildServiceProvider().GetService<IDistributedCache>() as IBufferDistributedCache;
+        if (cache is null)
+        {
+            Log.WriteLine("Cache is not available or does not support IBufferDistributedCache");
+            return; // inconclusive
+        }
+
+        var key = $"{Me()}:{size}/{kind}";
+        await cache.RemoveAsync(key);
+        Assert.Null(await cache.GetAsync(key));
+
+        var payload = Invent(size, kind);
+        ReadOnlyMemory<byte> expected = payload.ToArray(); // simplify for testing
+        Assert.Equal(size, expected.Length);
+        await cache.SetAsync(key, payload, _fiveMinutes);
+
+        var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
+        Assert.True(await cache.TryGetAsync(key, writer));
+        Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
+        writer.ResetInPlace();
+        Log.WriteLine("Data validated");
+
+        if (CustomClockSupported)
+        {
+            Clock.Add(TimeSpan.FromMinutes(4));
+            Assert.True(await cache.TryGetAsync(key, writer));
+            Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
+            writer.ResetInPlace();
+
+            Clock.Add(TimeSpan.FromMinutes(2));
+            Assert.False(await cache.TryGetAsync(key, writer));
+            Assert.Equal(0, writer.CommittedBytes);
+
+            Log.WriteLine("Expiration validated");
+        }
+        else
+        {
+            Log.WriteLine("Expiration not validated - TimeProvider not supported");
+        }
+
+        writer.Dispose(); // intentionally only recycle on success
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Not relevant for this test - no-op")]
+    private static ReadOnlySequence<byte> Invent(int size, SequenceKind kind)
+    {
+        var rand = new Random();
+        ReadOnlySequence<byte> payload;
+        switch (kind)
+        {
+            case SequenceKind.FullArray:
+                var arr = new byte[size];
+                rand.NextBytes(arr);
+                payload = new(arr);
+                break;
+            case SequenceKind.PaddedArray:
+                arr = new byte[size + 10];
+                rand.NextBytes(arr);
+                payload = new(arr, 5, arr.Length - 10);
+                break;
+            case SequenceKind.CustomMemory:
+                var mem = new CustomMemory(size, rand).Memory;
+                payload = new(mem);
+                break;
+            case SequenceKind.MultiSegment:
+                if (size == 0)
+                {
+                    payload = default;
+                    break;
+                }
+
+                if (size < 10)
+                {
+                    throw new ArgumentException("small segments not considered"); // a pain to construct
+                }
+
+                CustomSegment first = new(10, rand, null); // we'll take the last 3 of this 10
+                CustomSegment second = new(size - 7, rand, first); // we'll take all of this one
+                CustomSegment third = new(10, rand, second); // we'll take the first 4 of this 10
+                payload = new(first, 7, third, 4);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(kind));
+        }
+
+        // now validate what we expect of that payload
+        Assert.Equal(size, payload.Length);
+        switch (kind)
+        {
+            case SequenceKind.CustomMemory or SequenceKind.MultiSegment when size == 0:
+                Assert.True(payload.IsSingleSegment);
+                Assert.True(MemoryMarshal.TryGetArray(payload.First, out _));
+                break;
+            case SequenceKind.MultiSegment:
+                Assert.False(payload.IsSingleSegment);
+                break;
+            case SequenceKind.CustomMemory:
+                Assert.True(payload.IsSingleSegment);
+                Assert.False(MemoryMarshal.TryGetArray(payload.First, out _));
+                break;
+            case SequenceKind.FullArray:
+                Assert.True(payload.IsSingleSegment);
+                Assert.True(MemoryMarshal.TryGetArray(payload.First, out var segment));
+                Assert.Equal(0, segment.Offset);
+                Assert.NotNull(segment.Array);
+                Assert.Equal(size, segment.Count);
+                Assert.Equal(size, segment.Array.Length);
+                break;
+            case SequenceKind.PaddedArray:
+                Assert.True(payload.IsSingleSegment);
+                Assert.True(MemoryMarshal.TryGetArray(payload.First, out segment));
+                Assert.NotEqual(0, segment.Offset);
+                Assert.NotNull(segment.Array);
+                Assert.Equal(size, segment.Count);
+                Assert.NotEqual(size, segment.Array.Length);
+                break;
+        }
+
+        return payload;
+    }
+
+    private class CustomSegment : ReadOnlySequenceSegment<byte>
+    {
+        public CustomSegment(int size, Random? rand, CustomSegment? previous)
+        {
+            var arr = new byte[size + 10];
+            rand?.NextBytes(arr);
+            Memory = new(arr, 5, arr.Length - 10);
+            if (previous is not null)
+            {
+                RunningIndex = previous.RunningIndex + previous.Memory.Length;
+                previous.Next = this;
+            }
+        }
+    }
+
+    private class CustomMemory : MemoryManager<byte>
+    {
+        private readonly byte[] _data;
+        public CustomMemory(int size, Random? rand = null)
+        {
+            _data = new byte[size + 10];
+            rand?.NextBytes(_data);
+        }
+
+        public override Span<byte> GetSpan() => new(_data, 5, _data.Length - 10);
+        public override MemoryHandle Pin(int elementIndex = 0) => throw new NotSupportedException();
+        public override void Unpin() => throw new NotSupportedException();
+        protected override void Dispose(bool disposing)
+        {
+        }
+
+        protected override bool TryGetArray(out ArraySegment<byte> segment)
+        {
+            segment = default;
+            return false;
+        }
+    }
+
+    private static readonly DistributedCacheEntryOptions _fiveMinutes
+        = new() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5) };
+
+    protected static string Me([CallerMemberName] string caller = "") => caller;
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
new file mode 100644
index 00000000000..4cacdd59f6f
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
@@ -0,0 +1,82 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+public class FunctionalTests
+{
+    private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache, Action<ServiceCollection>? config = null)
+    {
+        var services = new ServiceCollection();
+        config?.Invoke(services);
+        services.AddHybridCache();
+        var provider = services.BuildServiceProvider();
+        cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+        return provider;
+    }
+
+    [Fact]
+    public async Task RemoveSingleKey()
+    {
+        using var provider = GetDefaultCache(out var cache);
+        var key = Me();
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(42)));
+
+        // now slightly different func to show delta; should use cached value initially
+        await cache.RemoveAsync("unrelated");
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+
+        // now remove and repeat - should get updated value
+        await cache.RemoveAsync(key);
+        Assert.Equal(96, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+    }
+
+    [Fact]
+    public async Task RemoveNoKeyViaArray()
+    {
+        using var provider = GetDefaultCache(out var cache);
+        var key = Me();
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(42)));
+
+        // now slightly different func to show delta; should use same cached value
+        await cache.RemoveAsync([]);
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+    }
+
+    [Fact]
+    public async Task RemoveSingleKeyViaArray()
+    {
+        using var provider = GetDefaultCache(out var cache);
+        var key = Me();
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(42)));
+
+        // now slightly different func to show delta; should use cached value initially
+        await cache.RemoveAsync(["unrelated"]);
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+
+        // now remove and repeat - should get updated value
+        await cache.RemoveAsync([key]);
+        Assert.Equal(96, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+    }
+
+    [Fact]
+    public async Task RemoveMultipleKeysViaArray()
+    {
+        using var provider = GetDefaultCache(out var cache);
+        var key = Me();
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(42)));
+
+        // now slightly different func to show delta; should use cached value initially
+        Assert.Equal(42, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+
+        // now remove and repeat - should get updated value
+        await cache.RemoveAsync([key, "unrelated"]);
+        Assert.Equal(96, await cache.GetOrCreateAsync(key, _ => new ValueTask<int>(96)));
+    }
+
+    private static string Me([CallerMemberName] string caller = "") => caller;
+
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
new file mode 100644
index 00000000000..bf1f7a35fee
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
@@ -0,0 +1,274 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+public class L2Tests(ITestOutputHelper log)
+{
+    private static string CreateString(bool work = false)
+    {
+        Assert.True(work, "we didn't expect this to be invoked");
+        return Guid.NewGuid().ToString();
+    }
+
+    private static readonly HybridCacheEntryOptions _expiry = new() { Expiration = TimeSpan.FromMinutes(3.5) };
+
+    private static readonly HybridCacheEntryOptions _expiryNoL1 = new() { Flags = HybridCacheEntryFlags.DisableLocalCache, Expiration = TimeSpan.FromMinutes(3.5) };
+
+    private ITestOutputHelper Log => log;
+
+    private class Options<T>(T value) : IOptions<T>
+        where T : class
+    {
+        T IOptions<T>.Value => value;
+    }
+
+    private ServiceProvider GetDefaultCache(bool buffers, out DefaultHybridCache cache)
+    {
+        var services = new ServiceCollection();
+        var localCacheOptions = new Options<MemoryDistributedCacheOptions>(new());
+        var localCache = new MemoryDistributedCache(localCacheOptions);
+        services.AddSingleton<IDistributedCache>(buffers ? new BufferLoggingCache(Log, localCache) : new LoggingCache(Log, localCache));
+        services.AddHybridCache();
+        var provider = services.BuildServiceProvider();
+        cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+        return provider;
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task AssertL2Operations_Immutable(bool buffers)
+    {
+        using var provider = GetDefaultCache(buffers, out var cache);
+        var backend = Assert.IsAssignableFrom<LoggingCache>(cache.BackendCache);
+        Log.WriteLine("Inventing key...");
+        var s = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<string>(CreateString(true)));
+        Assert.Equal(2, backend.OpCount); // GET, SET
+
+        Log.WriteLine("Reading with L1...");
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<string>(CreateString()));
+            Assert.Equal(s, x);
+            Assert.Same(s, x);
+        }
+
+        Assert.Equal(2, backend.OpCount); // shouldn't be hit
+
+        Log.WriteLine("Reading without L1...");
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<string>(CreateString()), _expiryNoL1);
+            Assert.Equal(s, x);
+            Assert.NotSame(s, x);
+        }
+
+        Assert.Equal(7, backend.OpCount); // should be read every time
+
+        Log.WriteLine("Setting value directly");
+        s = CreateString(true);
+        await cache.SetAsync(Me(), s);
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<string>(CreateString()));
+            Assert.Equal(s, x);
+            Assert.Same(s, x);
+        }
+
+        Assert.Equal(8, backend.OpCount); // SET
+
+        Log.WriteLine("Removing key...");
+        await cache.RemoveAsync(Me());
+        Assert.Equal(9, backend.OpCount); // DEL
+
+        Log.WriteLine("Fetching new...");
+        var t = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<string>(CreateString(true)));
+        Assert.NotEqual(s, t);
+        Assert.Equal(11, backend.OpCount); // GET, SET
+    }
+
+    public sealed class Foo
+    {
+        public string Value { get; set; } = "";
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task AssertL2Operations_Mutable(bool buffers)
+    {
+        using var provider = GetDefaultCache(buffers, out var cache);
+        var backend = Assert.IsAssignableFrom<LoggingCache>(cache.BackendCache);
+        Log.WriteLine("Inventing key...");
+        var s = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<Foo>(new Foo { Value = CreateString(true) }), _expiry);
+        Assert.Equal(2, backend.OpCount); // GET, SET
+
+        Log.WriteLine("Reading with L1...");
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<Foo>(new Foo { Value = CreateString() }), _expiry);
+            Assert.Equal(s.Value, x.Value);
+            Assert.NotSame(s, x);
+        }
+
+        Assert.Equal(2, backend.OpCount); // shouldn't be hit
+
+        Log.WriteLine("Reading without L1...");
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<Foo>(new Foo { Value = CreateString() }), _expiryNoL1);
+            Assert.Equal(s.Value, x.Value);
+            Assert.NotSame(s, x);
+        }
+
+        Assert.Equal(7, backend.OpCount); // should be read every time
+
+        Log.WriteLine("Setting value directly");
+        s = new Foo { Value = CreateString(true) };
+        await cache.SetAsync(Me(), s);
+        for (var i = 0; i < 5; i++)
+        {
+            var x = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<Foo>(new Foo { Value = CreateString() }), _expiry);
+            Assert.Equal(s.Value, x.Value);
+            Assert.NotSame(s, x);
+        }
+
+        Assert.Equal(8, backend.OpCount); // SET
+
+        Log.WriteLine("Removing key...");
+        await cache.RemoveAsync(Me());
+        Assert.Equal(9, backend.OpCount); // DEL
+
+        Log.WriteLine("Fetching new...");
+        var t = await cache.GetOrCreateAsync(Me(), ct => new ValueTask<Foo>(new Foo { Value = CreateString(true) }), _expiry);
+        Assert.NotEqual(s.Value, t.Value);
+        Assert.Equal(11, backend.OpCount); // GET, SET
+    }
+
+    private class BufferLoggingCache : LoggingCache, IBufferDistributedCache
+    {
+        public BufferLoggingCache(ITestOutputHelper log, IDistributedCache tail)
+            : base(log, tail)
+        {
+        }
+
+        void IBufferDistributedCache.Set(string key, ReadOnlySequence<byte> value, DistributedCacheEntryOptions options)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"Set (ROS-byte): {key}");
+            Tail.Set(key, value.ToArray(), options);
+        }
+
+        ValueTask IBufferDistributedCache.SetAsync(string key, ReadOnlySequence<byte> value, DistributedCacheEntryOptions options, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"SetAsync (ROS-byte): {key}");
+            return new(Tail.SetAsync(key, value.ToArray(), options, token));
+        }
+
+        bool IBufferDistributedCache.TryGet(string key, IBufferWriter<byte> destination)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"TryGet: {key}");
+            var buffer = Tail.Get(key);
+            if (buffer is null)
+            {
+                return false;
+            }
+
+            destination.Write(buffer);
+            return true;
+        }
+
+        async ValueTask<bool> IBufferDistributedCache.TryGetAsync(string key, IBufferWriter<byte> destination, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"TryGetAsync: {key}");
+            var buffer = await Tail.GetAsync(key, token);
+            if (buffer is null)
+            {
+                return false;
+            }
+
+            destination.Write(buffer);
+            return true;
+        }
+    }
+
+    private class LoggingCache(ITestOutputHelper log, IDistributedCache tail) : IDistributedCache
+    {
+        protected ITestOutputHelper Log => log;
+        protected IDistributedCache Tail => tail;
+
+        protected int ProtectedOpCount;
+
+        public int OpCount => Volatile.Read(ref ProtectedOpCount);
+
+        byte[]? IDistributedCache.Get(string key)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"Get: {key}");
+            return Tail.Get(key);
+        }
+
+        Task<byte[]?> IDistributedCache.GetAsync(string key, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"GetAsync: {key}");
+            return Tail.GetAsync(key, token);
+        }
+
+        void IDistributedCache.Refresh(string key)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"Refresh: {key}");
+            Tail.Refresh(key);
+        }
+
+        Task IDistributedCache.RefreshAsync(string key, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"RefreshAsync: {key}");
+            return Tail.RefreshAsync(key, token);
+        }
+
+        void IDistributedCache.Remove(string key)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"Remove: {key}");
+            Tail.Remove(key);
+        }
+
+        Task IDistributedCache.RemoveAsync(string key, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"RemoveAsync: {key}");
+            return Tail.RemoveAsync(key, token);
+        }
+
+        void IDistributedCache.Set(string key, byte[] value, DistributedCacheEntryOptions options)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"Set (byte[]): {key}");
+            Tail.Set(key, value, options);
+        }
+
+        Task IDistributedCache.SetAsync(string key, byte[] value, DistributedCacheEntryOptions options, CancellationToken token)
+        {
+            Interlocked.Increment(ref ProtectedOpCount);
+            Log.WriteLine($"SetAsync (byte[]): {key}");
+            return Tail.SetAsync(key, value, options, token);
+        }
+    }
+
+    private static string Me([CallerMemberName] string caller = "") => caller;
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
new file mode 100644
index 00000000000..ff23283e066
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCoreTargetFrameworks)$(ConditionalNet462)</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Caching.Hybrid\Microsoft.Extensions.Caching.Hybrid.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="BasicConfig.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisFixture.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisFixture.cs
new file mode 100644
index 00000000000..09b37e16466
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisFixture.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using StackExchange.Redis;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public sealed class RedisFixture : IDisposable
+{
+    private ConnectionMultiplexer? _muxer;
+    private Task<IConnectionMultiplexer?>? _sharedConnect;
+    public Task<IConnectionMultiplexer?> ConnectAsync() => _sharedConnect ??= DoConnectAsync();
+
+    public void Dispose() => _muxer?.Dispose();
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "catch-all")]
+    private async Task<IConnectionMultiplexer?> DoConnectAsync()
+    {
+        try
+        {
+            _muxer = await ConnectionMultiplexer.ConnectAsync("127.0.0.1:6379");
+            await _muxer.GetDatabase().PingAsync();
+            return _muxer;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
new file mode 100644
index 00000000000..d482f566a16
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
@@ -0,0 +1,90 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.StackExchangeRedis;
+using Microsoft.Extensions.DependencyInjection;
+using StackExchange.Redis;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class RedisTests : DistributedCacheTests, IClassFixture<RedisFixture>
+{
+    private readonly RedisFixture _fixture;
+    public RedisTests(RedisFixture fixture, ITestOutputHelper log)
+        : base(log)
+    {
+        _fixture = fixture;
+    }
+
+    protected override bool CustomClockSupported => false;
+
+    protected override async ValueTask ConfigureAsync(IServiceCollection services)
+    {
+        var redis = await _fixture.ConnectAsync();
+        if (redis is null)
+        {
+            Log.WriteLine("Redis is not available");
+            return; // inconclusive
+        }
+
+        Log.WriteLine("Redis is available");
+        services.AddSingleton<IConnectionMultiplexer>(redis);
+        services.AddStackExchangeRedisCache(options =>
+        {
+            options.ConnectionMultiplexerFactory = () => Task.FromResult(redis);
+        });
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task BasicUsage(bool useBuffers)
+    {
+        var services = new ServiceCollection();
+        await ConfigureAsync(services);
+        services.AddHybridCache();
+        var provider = services.BuildServiceProvider(); // not "using" - that will tear down our redis; use the fixture for that
+
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+        if (cache.BackendCache is null)
+        {
+            Log.WriteLine("Backend cache not available; inconclusive");
+            return;
+        }
+
+        Assert.IsAssignableFrom<RedisCache>(cache.BackendCache);
+
+        if (!useBuffers)
+        {
+            // force byte[] mode
+            cache.DebugRemoveFeatures(DefaultHybridCache.CacheFeatures.BackendBuffers);
+        }
+
+        Log.WriteLine($"features: {cache.GetFeatures()}");
+
+        var key = Me();
+        var redis = provider.GetRequiredService<IConnectionMultiplexer>();
+        await redis.GetDatabase().KeyDeleteAsync(key); // start from known state
+        Assert.False(await redis.GetDatabase().KeyExistsAsync(key));
+
+        var count = 0;
+        for (var i = 0; i < 10; i++)
+        {
+            await cache.GetOrCreateAsync<Guid>(key, _ =>
+            {
+                Interlocked.Increment(ref count);
+                return new(Guid.NewGuid());
+            });
+        }
+
+        Assert.Equal(1, count);
+
+        await Task.Delay(500); // the L2 write continues in the background; give it a chance
+
+        var ttl = await redis.GetDatabase().KeyTimeToLiveAsync(key);
+        Log.WriteLine($"ttl: {ttl}");
+        Assert.NotNull(ttl);
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
new file mode 100644
index 00000000000..300fd6e4188
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
@@ -0,0 +1,199 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Text.Json;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class SampleUsage
+{
+    [Fact]
+    public async Task DistributedCacheWorks()
+    {
+        var services = new ServiceCollection();
+        services.AddDistributedMemoryCache();
+        services.AddTransient<SomeDCService>();
+        using var provider = services.BuildServiceProvider();
+
+        var obj = provider.GetRequiredService<SomeDCService>();
+        string name = "abc";
+        int id = 42;
+        var x = await obj.GetSomeInformationAsync(name, id);
+        var y = await obj.GetSomeInformationAsync(name, id);
+        Assert.NotSame(x, y);
+        Assert.Equal(id, x.Id);
+        Assert.Equal(name, x.Name);
+        Assert.Equal(id, y.Id);
+        Assert.Equal(name, y.Name);
+    }
+
+    [Fact]
+    public async Task HybridCacheWorks()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        services.AddTransient<SomeHCService>();
+        using var provider = services.BuildServiceProvider();
+
+        var obj = provider.GetRequiredService<SomeHCService>();
+        string name = "abc";
+        int id = 42;
+        var x = await obj.GetSomeInformationAsync(name, id);
+        var y = await obj.GetSomeInformationAsync(name, id);
+        Assert.NotSame(x, y);
+        Assert.Equal(id, x.Id);
+        Assert.Equal(name, x.Name);
+        Assert.Equal(id, y.Id);
+        Assert.Equal(name, y.Name);
+    }
+
+    [Fact]
+    public async Task HybridCacheNoCaptureWorks()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        services.AddTransient<SomeHCServiceNoCapture>();
+        using var provider = services.BuildServiceProvider();
+
+        var obj = provider.GetRequiredService<SomeHCServiceNoCapture>();
+        string name = "abc";
+        int id = 42;
+        var x = await obj.GetSomeInformationAsync(name, id);
+        var y = await obj.GetSomeInformationAsync(name, id);
+        Assert.NotSame(x, y);
+        Assert.Equal(id, x.Id);
+        Assert.Equal(name, x.Name);
+        Assert.Equal(id, y.Id);
+        Assert.Equal(name, y.Name);
+    }
+
+    [Fact]
+    public async Task HybridCacheNoCaptureObjReuseWorks()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        services.AddTransient<SomeHCServiceNoCaptureObjReuse>();
+        using var provider = services.BuildServiceProvider();
+
+        var obj = provider.GetRequiredService<SomeHCServiceNoCaptureObjReuse>();
+        string name = "abc";
+        int id = 42;
+        var x = await obj.GetSomeInformationAsync(name, id);
+        var y = await obj.GetSomeInformationAsync(name, id);
+        Assert.Same(x, y);
+        Assert.Equal(id, x.Id);
+        Assert.Equal(name, x.Name);
+    }
+
+    public class SomeDCService(IDistributedCache cache)
+    {
+        public async Task<SomeInformation> GetSomeInformationAsync(string name, int id, CancellationToken token = default)
+        {
+            var key = $"someinfo:{name}:{id}"; // unique key for this combination
+
+            var bytes = await cache.GetAsync(key, token); // try to get from cache
+            SomeInformation info;
+            if (bytes is null)
+            {
+                // cache miss; get the data from the real source
+                info = await SomeExpensiveOperationAsync(name, id, token);
+
+                // serialize and cache it
+                bytes = SomeSerializer.Serialize(info);
+                await cache.SetAsync(key, bytes, token);
+            }
+            else
+            {
+                // cache hit; deserialize it
+                info = SomeSerializer.Deserialize<SomeInformation>(bytes);
+            }
+
+            return info;
+        }
+    }
+
+    public class SomeHCService(HybridCache cache)
+    {
+        public async Task<SomeInformation> GetSomeInformationAsync(string name, int id, CancellationToken token = default)
+        {
+            return await cache.GetOrCreateAsync(
+                $"someinfo:{name}:{id}", // unique key for this combination
+                async ct => await SomeExpensiveOperationAsync(name, id, ct),
+                cancellationToken: token);
+        }
+    }
+
+    // this is the work we're trying to cache
+    private static Task<SomeInformation> SomeExpensiveOperationAsync(string name, int id,
+        CancellationToken token = default)
+    {
+        _ = token;
+        return Task.FromResult(new SomeInformation { Id = id, Name = name });
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S3398:\"private\" methods called only by inner classes should be moved to those classes",
+        Justification = "Allow future sharing")]
+    private static Task<SomeInformationReuse> SomeExpensiveOperationReuseAsync(string name, int id,
+        CancellationToken token = default)
+    {
+        _ = token;
+        return Task.FromResult(new SomeInformationReuse { Id = id, Name = name });
+    }
+
+    public class SomeHCServiceNoCapture(HybridCache cache)
+    {
+        public async Task<SomeInformation> GetSomeInformationAsync(string name, int id, CancellationToken token = default)
+        {
+            return await cache.GetOrCreateAsync(
+                $"someinfo:{name}:{id}", // unique key for this combination
+                (name, id), // all of the state we need for the final call, if needed
+                static async (state, token) =>
+                    await SomeExpensiveOperationAsync(state.name, state.id, token),
+                cancellationToken: token);
+        }
+    }
+
+    public class SomeHCServiceNoCaptureObjReuse(HybridCache cache, CancellationToken token = default)
+    {
+        public async Task<SomeInformationReuse> GetSomeInformationAsync(string name, int id)
+        {
+            return await cache.GetOrCreateAsync(
+                $"someinfo:{name}:{id}", // unique key for this combination
+                (name, id), // all of the state we need for the final call, if needed
+                static async (state, token) =>
+                    await SomeExpensiveOperationReuseAsync(state.name, state.id, token),
+                cancellationToken: token);
+        }
+    }
+
+    private static class SomeSerializer
+    {
+        internal static T Deserialize<T>(byte[] bytes)
+        {
+            return JsonSerializer.Deserialize<T>(bytes)!;
+        }
+
+        internal static byte[] Serialize<T>(T info)
+        {
+            using var ms = new MemoryStream();
+            JsonSerializer.Serialize(ms, info);
+            return ms.ToArray();
+        }
+    }
+
+    public class SomeInformation
+    {
+        public int Id { get; set; }
+        public string? Name { get; set; }
+    }
+
+    [ImmutableObject(true)]
+    public sealed class SomeInformationReuse
+    {
+        public int Id { get; set; }
+        public string? Name { get; set; }
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
new file mode 100644
index 00000000000..14f18e72c1e
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
@@ -0,0 +1,263 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+#if NET9_0_OR_GREATER
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
+#endif
+
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+#pragma warning disable CS8769 // Nullability of reference types in type of parameter doesn't match implemented member (possibly because of nullability attributes).
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class ServiceConstructionTests
+{
+    [Fact]
+    public void CanCreateDefaultService()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        Assert.IsType<DefaultHybridCache>(provider.GetService<HybridCache>());
+    }
+
+    [Fact]
+    public void CanCreateServiceWithManualOptions()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache(options =>
+        {
+            options.MaximumKeyLength = 937;
+            options.DefaultEntryOptions = new() { Expiration = TimeSpan.FromSeconds(120), Flags = HybridCacheEntryFlags.DisableLocalCacheRead };
+        });
+        using var provider = services.BuildServiceProvider();
+        var obj = Assert.IsType<DefaultHybridCache>(provider.GetService<HybridCache>());
+        var options = obj.Options;
+        Assert.Equal(937, options.MaximumKeyLength);
+        var defaults = options.DefaultEntryOptions;
+        Assert.NotNull(defaults);
+        Assert.Equal(TimeSpan.FromSeconds(120), defaults.Expiration);
+        Assert.Equal(HybridCacheEntryFlags.DisableLocalCacheRead, defaults.Flags);
+        Assert.Null(defaults.LocalCacheExpiration); // wasn't specified
+    }
+
+#if NET9_0_OR_GREATER // for Bind API
+    [Fact]
+    public void CanParseOptions_NoEntryOptions()
+    {
+        var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
+        var configBuilder = new ConfigurationBuilder { Sources = { source } };
+        var config = configBuilder.Build();
+        var options = new HybridCacheOptions();
+        ConfigurationBinder.Bind(config, "no_entry_options", options);
+
+        Assert.Equal(937, options.MaximumKeyLength);
+        Assert.Null(options.DefaultEntryOptions);
+    }
+
+    [Fact]
+    public void CanParseOptions_WithEntryOptions() // in particular, check we can parse the timespan and [Flags] enums
+    {
+        var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
+        var configBuilder = new ConfigurationBuilder { Sources = { source } };
+        var config = configBuilder.Build();
+        var options = new HybridCacheOptions();
+        ConfigurationBinder.Bind(config, "with_entry_options", options);
+
+        Assert.Equal(937, options.MaximumKeyLength);
+        var defaults = options.DefaultEntryOptions;
+        Assert.NotNull(defaults);
+        Assert.Equal(HybridCacheEntryFlags.DisableCompression | HybridCacheEntryFlags.DisableLocalCacheRead, defaults.Flags);
+        Assert.Equal(TimeSpan.FromSeconds(120), defaults.LocalCacheExpiration);
+        Assert.Null(defaults.Expiration); // wasn't specified
+    }
+#endif
+
+    [Fact]
+    public async Task BasicStatelessUsage()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = provider.GetRequiredService<HybridCache>();
+
+        var expected = Guid.NewGuid().ToString();
+        var actual = await cache.GetOrCreateAsync(Me(), async _ => expected);
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public async Task BasicStatefulUsage()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = provider.GetRequiredService<HybridCache>();
+
+        var expected = Guid.NewGuid().ToString();
+        var actual = await cache.GetOrCreateAsync(Me(), expected, async (state, _) => state);
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void DefaultSerializerConfiguration()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.IsType<InbuiltTypeSerializer>(cache.GetSerializer<string>());
+        Assert.IsType<InbuiltTypeSerializer>(cache.GetSerializer<byte[]>());
+        Assert.IsType<DefaultJsonSerializerFactory.DefaultJsonSerializer<Customer>>(cache.GetSerializer<Customer>());
+        Assert.IsType<DefaultJsonSerializerFactory.DefaultJsonSerializer<Order>>(cache.GetSerializer<Order>());
+    }
+
+    [Fact]
+    public void CustomSerializerConfiguration()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache().AddSerializer<Customer, CustomerSerializer>();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.IsType<CustomerSerializer>(cache.GetSerializer<Customer>());
+        Assert.IsType<DefaultJsonSerializerFactory.DefaultJsonSerializer<Order>>(cache.GetSerializer<Order>());
+    }
+
+    [Fact]
+    public void CustomSerializerFactoryConfiguration()
+    {
+        var services = new ServiceCollection();
+        services.AddHybridCache().AddSerializerFactory<CustomFactory>();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.IsType<CustomerSerializer>(cache.GetSerializer<Customer>());
+        Assert.IsType<DefaultJsonSerializerFactory.DefaultJsonSerializer<Order>>(cache.GetSerializer<Order>());
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void DefaultMemoryDistributedCacheIsIgnored(bool manual)
+    {
+        var services = new ServiceCollection();
+        if (manual)
+        {
+            services.AddSingleton<IDistributedCache, MemoryDistributedCache>();
+        }
+        else
+        {
+            services.AddDistributedMemoryCache();
+        }
+
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.Null(cache.BackendCache);
+    }
+
+    [Fact]
+    public void SubclassMemoryDistributedCacheIsNotIgnored()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<IDistributedCache, CustomMemoryDistributedCache>();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.NotNull(cache.BackendCache);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void SubclassMemoryCacheIsNotIgnored(bool manual)
+    {
+        var services = new ServiceCollection();
+        if (manual)
+        {
+            services.AddSingleton<IDistributedCache, MemoryDistributedCache>();
+        }
+        else
+        {
+            services.AddDistributedMemoryCache();
+        }
+
+        services.AddSingleton<IMemoryCache, CustomMemoryCache>();
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        Assert.NotNull(cache.BackendCache);
+    }
+
+    private class CustomMemoryCache : MemoryCache
+    {
+        public CustomMemoryCache(IOptions<MemoryCacheOptions> options)
+            : base(options)
+        {
+        }
+
+        public CustomMemoryCache(IOptions<MemoryCacheOptions> options, ILoggerFactory loggerFactory)
+            : base(options, loggerFactory)
+        {
+        }
+    }
+
+    private class CustomMemoryDistributedCache : MemoryDistributedCache
+    {
+        public CustomMemoryDistributedCache(IOptions<MemoryDistributedCacheOptions> options)
+            : base(options)
+        {
+        }
+
+        public CustomMemoryDistributedCache(IOptions<MemoryDistributedCacheOptions> options, ILoggerFactory loggerFactory)
+            : base(options, loggerFactory)
+        {
+        }
+    }
+
+    private class Customer
+    {
+    }
+
+    private class Order
+    {
+    }
+
+    private class CustomerSerializer : IHybridCacheSerializer<Customer>
+    {
+        Customer IHybridCacheSerializer<Customer>.Deserialize(ReadOnlySequence<byte> source) => throw new NotSupportedException();
+        void IHybridCacheSerializer<Customer>.Serialize(Customer value, IBufferWriter<byte> target) => throw new NotSupportedException();
+    }
+
+    private class CustomFactory : IHybridCacheSerializerFactory
+    {
+        bool IHybridCacheSerializerFactory.TryCreateSerializer<T>(out IHybridCacheSerializer<T>? serializer)
+        {
+            if (typeof(T) == typeof(Customer))
+            {
+                serializer = (IHybridCacheSerializer<T>)new CustomerSerializer();
+                return true;
+            }
+
+            serializer = null;
+            return false;
+        }
+    }
+
+    private static string Me([CallerMemberName] string caller = "") => caller;
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SqlServerTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SqlServerTests.cs
new file mode 100644
index 00000000000..e2859ec9f0b
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SqlServerTests.cs
@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class SqlServerTests : DistributedCacheTests
+{
+    public SqlServerTests(ITestOutputHelper log)
+        : base(log)
+    {
+    }
+
+    protected override bool CustomClockSupported => true;
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Caught and logged")]
+    protected override async ValueTask ConfigureAsync(IServiceCollection services)
+    {
+        // create a local DB named CacheBench, then
+        // dotnet tool install --global dotnet-sql-cache
+        // dotnet sql-cache create "Data Source=.;Initial Catalog=CacheBench;Integrated Security=True;Trust Server Certificate=True" dbo BenchmarkCache
+
+        const string ConnectionString = "Data Source=.;Initial Catalog=CacheBench;Integrated Security=True;Trust Server Certificate=True";
+
+        try
+        {
+            using var conn = new SqlConnection(ConnectionString);
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = "truncate table dbo.BenchmarkCache";
+            await conn.OpenAsync();
+            await cmd.ExecuteNonQueryAsync();
+
+            // if that worked: we should be fine
+            services.AddDistributedSqlServerCache(options =>
+            {
+                options.SchemaName = "dbo";
+                options.TableName = "BenchmarkCache";
+                options.ConnectionString = ConnectionString;
+                options.SystemClock = Clock;
+            });
+        }
+        catch (Exception ex)
+        {
+            Log.WriteLine(ex.Message);
+        }
+    }
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
new file mode 100644
index 00000000000..b804fad503f
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
@@ -0,0 +1,474 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class StampedeTests
+{
+    private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache)
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<IDistributedCache, InvalidCache>();
+        services.AddSingleton<IMemoryCache, InvalidCache>();
+        services.AddHybridCache(options =>
+        {
+            options.DefaultEntryOptions = new()
+            {
+                Flags = HybridCacheEntryFlags.DisableDistributedCache | HybridCacheEntryFlags.DisableLocalCache
+            };
+        });
+        var provider = services.BuildServiceProvider();
+        cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+        return provider;
+    }
+
+    public sealed class InvalidCache : IDistributedCache, IMemoryCache
+    {
+        public void Dispose()
+        {
+            // nothing to do
+        }
+
+        ICacheEntry IMemoryCache.CreateEntry(object key) => throw new NotSupportedException("Intentionally not provided");
+
+        byte[]? IDistributedCache.Get(string key) => throw new NotSupportedException("Intentionally not provided");
+
+        Task<byte[]?> IDistributedCache.GetAsync(string key, CancellationToken token) => throw new NotSupportedException("Intentionally not provided");
+
+        void IDistributedCache.Refresh(string key) => throw new NotSupportedException("Intentionally not provided");
+
+        Task IDistributedCache.RefreshAsync(string key, CancellationToken token) => throw new NotSupportedException("Intentionally not provided");
+
+        void IDistributedCache.Remove(string key) => throw new NotSupportedException("Intentionally not provided");
+
+        void IMemoryCache.Remove(object key) => throw new NotSupportedException("Intentionally not provided");
+
+        Task IDistributedCache.RemoveAsync(string key, CancellationToken token) => throw new NotSupportedException("Intentionally not provided");
+
+        void IDistributedCache.Set(string key, byte[] value, DistributedCacheEntryOptions options) => throw new NotSupportedException("Intentionally not provided");
+
+        Task IDistributedCache.SetAsync(string key, byte[] value, DistributedCacheEntryOptions options, CancellationToken token) => throw new NotSupportedException("Intentionally not provided");
+
+        bool IMemoryCache.TryGetValue(object key, out object? value) => throw new NotSupportedException("Intentionally not provided");
+    }
+
+    [Theory]
+    [InlineData(1, false)]
+    [InlineData(1, true)]
+    [InlineData(10, false)]
+    [InlineData(10, true)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S5034:\"ValueTask\" should be consumed correctly", Justification = "False positive, is only awaited once")]
+    public async Task MultipleCallsShareExecution_NoCancellation(int callerCount, bool canBeCanceled)
+    {
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        using var cts = canBeCanceled ? new CancellationTokenSource() : null;
+        var token = cts?.Token ?? CancellationToken.None;
+
+        int executeCount = 0;
+        int cancelCount = 0;
+        var results = new Task<Guid>[callerCount];
+        for (var i = 0; i < callerCount; i++)
+        {
+            results[i] = cache.GetOrCreateAsync(Me(), async ct =>
+            {
+                using var reg = ct.Register(() => Interlocked.Increment(ref cancelCount));
+                if (!await semaphore.WaitAsync(5_000, CancellationToken.None))
+                {
+                    throw new TimeoutException("Failed to activate");
+                }
+
+                Interlocked.Increment(ref executeCount);
+                ct.ThrowIfCancellationRequested(); // assert not cancelled
+                return Guid.NewGuid();
+            }, cancellationToken: token).AsTask();
+        }
+
+        Assert.Equal(callerCount, cache.DebugGetCallerCount(Me()));
+
+        // everyone is queued up; release the hounds and check
+        // that we all got the same result
+        Assert.Equal(0, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+        semaphore.Release();
+        var first = await results[0];
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+        foreach (var result in results)
+        {
+            Assert.Equal(first, await result);
+        }
+
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+
+        // and do it a second time; we expect different results
+        Volatile.Write(ref executeCount, 0);
+        for (var i = 0; i < callerCount; i++)
+        {
+            results[i] = cache.GetOrCreateAsync(Me(), async ct =>
+            {
+                using var reg = ct.Register(() => Interlocked.Increment(ref cancelCount));
+                if (!await semaphore.WaitAsync(5_000, CancellationToken.None))
+                {
+                    throw new TimeoutException("Failed to activate");
+                }
+
+                Interlocked.Increment(ref executeCount);
+                ct.ThrowIfCancellationRequested(); // assert not cancelled
+                return Guid.NewGuid();
+            }, cancellationToken: token).AsTask();
+        }
+
+        Assert.Equal(callerCount, cache.DebugGetCallerCount(Me()));
+
+        // everyone is queued up; release the hounds and check
+        // that we all got the same result
+        Assert.Equal(0, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+        semaphore.Release();
+        var second = await results[0];
+        Assert.NotEqual(first, second);
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+        foreach (var result in results)
+        {
+            Assert.Equal(second, await result);
+        }
+
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount));
+    }
+
+    [Theory]
+    [InlineData(1)]
+    [InlineData(10)]
+    public async Task MultipleCallsShareExecution_EveryoneCancels(int callerCount)
+    {
+        // what we want to prove here is that everyone ends up cancelling promptly by
+        // *their own* cancellation (not dependent on the shared task), and that
+        // the shared task becomes cancelled (which can be later)
+
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        int executeCount = 0;
+        int cancelCount = 0;
+        var results = new Task<Guid>[callerCount];
+        var cancels = new CancellationTokenSource[callerCount];
+        for (var i = 0; i < callerCount; i++)
+        {
+            cancels[i] = new CancellationTokenSource();
+            results[i] = cache.GetOrCreateAsync(Me(), async ct =>
+            {
+                using var reg = ct.Register(() => Interlocked.Increment(ref cancelCount));
+                if (!await semaphore.WaitAsync(5_000, CancellationToken.None))
+                {
+                    throw new TimeoutException("Failed to activate");
+                }
+
+                try
+                {
+                    Interlocked.Increment(ref executeCount);
+                    ct.ThrowIfCancellationRequested();
+                    return Guid.NewGuid();
+                }
+                finally
+                {
+                    semaphore.Release(); // handshake so we can check when available again
+                }
+            }, cancellationToken: cancels[i].Token).AsTask();
+        }
+
+        Assert.Equal(callerCount, cache.DebugGetCallerCount(Me()));
+
+        // everyone is queued up; release the hounds and check
+        // that we all got the same result
+        foreach (var cancel in cancels)
+        {
+            cancel.Cancel();
+        }
+
+        await Task.Delay(500); // cancellation happens on a worker; need to allow a moment
+        for (var i = 0; i < callerCount; i++)
+        {
+            var result = results[i];
+
+            // should have already cancelled, even though underlying task hasn't finished yet
+            Assert.Equal(TaskStatus.Canceled, result.Status);
+            var ex = Assert.Throws<OperationCanceledException>(() => result.GetAwaiter().GetResult());
+            Assert.Equal(cancels[i].Token, ex.CancellationToken); // each gets the correct blame
+        }
+
+        Assert.Equal(0, Volatile.Read(ref executeCount));
+        semaphore.Release();
+
+        // wait for underlying task to hand back to us
+        if (!await semaphore.WaitAsync(5_000))
+        {
+            throw new TimeoutException("Didn't get handshake back from task");
+        }
+
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(1, Volatile.Read(ref cancelCount));
+    }
+
+    [Theory]
+    [InlineData(2, 0)]
+    [InlineData(2, 1)]
+    [InlineData(10, 0)]
+    [InlineData(10, 1)]
+    [InlineData(10, 7)]
+    public async Task MultipleCallsShareExecution_MostCancel(int callerCount, int remaining)
+    {
+        Assert.True(callerCount >= 2); // "most" is not "one"
+
+        // what we want to prove here is that everyone ends up cancelling promptly by
+        // *their own* cancellation (not dependent on the shared task), and that
+        // the shared task becomes cancelled (which can be later)
+
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        int executeCount = 0;
+        int cancelCount = 0;
+        var results = new Task<Guid>[callerCount];
+        var cancels = new CancellationTokenSource[callerCount];
+        for (var i = 0; i < callerCount; i++)
+        {
+            cancels[i] = new CancellationTokenSource();
+            results[i] = cache.GetOrCreateAsync(Me(), async ct =>
+            {
+                using var reg = ct.Register(() => Interlocked.Increment(ref cancelCount));
+                if (!await semaphore.WaitAsync(5_000, CancellationToken.None))
+                {
+                    throw new TimeoutException("Failed to activate");
+                }
+
+                try
+                {
+                    Interlocked.Increment(ref executeCount);
+                    ct.ThrowIfCancellationRequested();
+                    return Guid.NewGuid();
+                }
+                finally
+                {
+                    semaphore.Release(); // handshake so we can check when available again
+                }
+            }, cancellationToken: cancels[i].Token).AsTask();
+        }
+
+        Assert.Equal(callerCount, cache.DebugGetCallerCount(Me()));
+
+        // everyone is queued up; release the hounds and check
+        // that we all got the same result
+        for (var i = 0; i < callerCount; i++)
+        {
+            if (i != remaining)
+            {
+                cancels[i].Cancel();
+            }
+        }
+
+        await Task.Delay(500); // cancellation happens on a worker; need to allow a moment
+        for (var i = 0; i < callerCount; i++)
+        {
+            if (i != remaining)
+            {
+                var result = results[i];
+
+                // should have already cancelled, even though underlying task hasn't finished yet
+                Assert.Equal(TaskStatus.Canceled, result.Status);
+                var ex = Assert.Throws<OperationCanceledException>(() => result.GetAwaiter().GetResult());
+                Assert.Equal(cancels[i].Token, ex.CancellationToken); // each gets the correct blame
+            }
+        }
+
+        Assert.Equal(0, Volatile.Read(ref executeCount));
+        semaphore.Release();
+
+        // wait for underlying task to hand back to us
+        if (!await semaphore.WaitAsync(5_000))
+        {
+            throw new TimeoutException("Didn't get handshake back from task");
+        }
+
+        Assert.Equal(1, Volatile.Read(ref executeCount));
+        Assert.Equal(0, Volatile.Read(ref cancelCount)); // ran to completion
+        await results[remaining];
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S5034:\"ValueTask\" should be consumed correctly", Justification = "False positive, is only awaited once")]
+    public async Task ImmutableTypesShareFinalTask(bool withCancelation)
+    {
+        using CancellationTokenSource? cts = withCancelation ? new() : null;
+        var token = cts?.Token ?? CancellationToken.None;
+
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        // note AsTask *in this scenario* fetches the underlying incomplete task
+        var first = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return Guid.NewGuid();
+        }, cancellationToken: token).AsTask();
+
+        var second = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return Guid.NewGuid();
+        }, cancellationToken: token).AsTask();
+
+        if (withCancelation)
+        {
+            Assert.NotSame(first, second);
+        }
+        else
+        {
+            Assert.Same(first, second);
+        }
+
+        semaphore.Release();
+        Assert.Equal(await first, await second);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S5034:\"ValueTask\" should be consumed correctly", Justification = "False positive, is only awaited once")]
+    public async Task ImmutableCustomTypesShareFinalTask(bool withCancelation)
+    {
+        using var cts = withCancelation ? new CancellationTokenSource() : null;
+        var token = cts?.Token ?? CancellationToken.None;
+
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        // AsTask *in this scenario* fetches the underlying incomplete task
+        var first = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return new Immutable(Guid.NewGuid());
+        }, cancellationToken: token).AsTask();
+
+        var second = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return new Immutable(Guid.NewGuid());
+        }, cancellationToken: token).AsTask();
+
+        if (withCancelation)
+        {
+            Assert.NotSame(first, second);
+        }
+        else
+        {
+            Assert.Same(first, second);
+        }
+
+        semaphore.Release();
+
+        var x = await first;
+        var y = await second;
+        Assert.Equal(x.Value, y.Value);
+        Assert.Same(x, y); // same instance regardless of whether the tasks were shared
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S5034:\"ValueTask\" should be consumed correctly", Justification = "False positive, is only awaited once")]
+    public async Task MutableTypesNeverShareFinalTask(bool withCancelation)
+    {
+        using CancellationTokenSource? cts = withCancelation ? new() : null;
+        var token = cts?.Token ?? CancellationToken.None;
+
+        using var scope = GetDefaultCache(out var cache);
+        using var semaphore = new SemaphoreSlim(0);
+
+        // AsTask *in this scenario* fetches the underlying incomplete task
+        var first = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return new Mutable(Guid.NewGuid());
+        }, cancellationToken: token).AsTask();
+
+        var second = cache.GetOrCreateAsync(Me(), async ct =>
+        {
+            await semaphore.WaitAsync(CancellationToken.None);
+            semaphore.Release();
+            return new Mutable(Guid.NewGuid());
+        }, cancellationToken: token).AsTask();
+
+        Assert.NotSame(first, second);
+        semaphore.Release();
+
+        var x = await first;
+        var y = await second;
+        Assert.Equal(x.Value, y.Value);
+        Assert.NotSame(x, y);
+    }
+
+    [Fact]
+    public void ValidatePartitioning()
+    {
+        // we just want to validate that key-level partitioning is
+        // happening to some degree, i.e. it isn't fundamentally broken
+        using var scope = GetDefaultCache(out var cache);
+        Dictionary<object, int> counts = [];
+        for (int i = 0; i < 1024; i++)
+        {
+            var key = new DefaultHybridCache.StampedeKey(Guid.NewGuid().ToString(), default);
+            var obj = cache.GetPartitionedSyncLock(in key);
+            if (!counts.TryGetValue(obj, out var count))
+            {
+                count = 0;
+            }
+
+            counts[obj] = count + 1;
+        }
+
+        // We just want to prove that we got 8 non-empty partitions.
+        // This is *technically* non-deterministic, but: we'd
+        // need to be having a very bad day for the math gods
+        // to conspire against us that badly - if this test
+        // starts failing, maybe buy a lottery ticket?
+        Assert.Equal(8, counts.Count);
+        foreach (var pair in counts)
+        {
+            // the *median* should be 128 here; let's
+            // not be aggressive about it, though
+            Assert.True(pair.Value > 16);
+        }
+    }
+
+    private class Mutable(Guid value)
+    {
+        public Guid Value => value;
+    }
+
+    [ImmutableObject(true)]
+    public sealed class Immutable(Guid value)
+    {
+        public Guid Value => value;
+    }
+
+    private static string Me([CallerMemberName] string caller = "") => caller;
+}
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/TypeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/TypeTests.cs
new file mode 100644
index 00000000000..c2ab242a6b0
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/TypeTests.cs
@@ -0,0 +1,87 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Reflection;
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+public class TypeTests
+{
+    [Theory]
+    [InlineData(typeof(string))]
+    [InlineData(typeof(int))] // primitive
+    [InlineData(typeof(int?))]
+    [InlineData(typeof(Guid))] // non-primitive but blittable
+    [InlineData(typeof(Guid?))]
+    [InlineData(typeof(SealedCustomClassAttribTrue))] // attrib says explicitly true, and sealed
+    [InlineData(typeof(CustomBlittableStruct))] // blittable, and we're copying each time
+    [InlineData(typeof(CustomNonBlittableStructAttribTrue))] // non-blittable, attrib says explicitly true
+    public void ImmutableTypes(Type type)
+    {
+        Assert.True((bool)typeof(ImmutableTypeCache<>).MakeGenericType(type)
+            .GetField(nameof(ImmutableTypeCache<string>.IsImmutable), BindingFlags.Static | BindingFlags.Public)!
+            .GetValue(null)!);
+    }
+
+    [Theory]
+    [InlineData(typeof(byte[]))]
+    [InlineData(typeof(string[]))]
+    [InlineData(typeof(object))]
+    [InlineData(typeof(CustomClassNoAttrib))] // no attrib, who knows?
+    [InlineData(typeof(CustomClassAttribFalse))] // attrib says explicitly no
+    [InlineData(typeof(CustomClassAttribTrue))] // attrib says explicitly true, but not sealed: we might have a sub-class
+    [InlineData(typeof(CustomNonBlittableStructNoAttrib))] // no attrib, who knows?
+    [InlineData(typeof(CustomNonBlittableStructAttribFalse))] // attrib says explicitly no
+    public void MutableTypes(Type type)
+    {
+        Assert.False((bool)typeof(ImmutableTypeCache<>).MakeGenericType(type)
+            .GetField(nameof(ImmutableTypeCache<string>.IsImmutable), BindingFlags.Static | BindingFlags.Public)!
+            .GetValue(null)!);
+    }
+
+    private class CustomClassNoAttrib
+    {
+    }
+
+    [ImmutableObject(false)]
+    private class CustomClassAttribFalse
+    {
+    }
+
+    [ImmutableObject(true)]
+    private class CustomClassAttribTrue
+    {
+    }
+
+    [ImmutableObject(true)]
+    private sealed class SealedCustomClassAttribTrue
+    {
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S1144:Unused private types or members should be removed", Justification = "Needed to be non-trivial blittable")]
+    private struct CustomBlittableStruct(int x)
+    {
+        public readonly int X => x;
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S1144:Unused private types or members should be removed", Justification = "Needed to force non-blittable")]
+    private struct CustomNonBlittableStructNoAttrib(string x)
+    {
+        public readonly string X => x;
+    }
+
+    [ImmutableObject(false)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S1144:Unused private types or members should be removed", Justification = "Needed to force non-blittable")]
+    private struct CustomNonBlittableStructAttribFalse(string x)
+    {
+        public readonly string X => x;
+    }
+
+    [ImmutableObject(true)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S1144:Unused private types or members should be removed", Justification = "Needed to force non-blittable")]
+    private struct CustomNonBlittableStructAttribTrue(string x)
+    {
+        public readonly string X => x;
+    }
+}

From e318fafecfabe705f71d45205d58582db1b567b0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 13:10:13 +0000
Subject: [PATCH 10/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240911.26 (#5419)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24459.11 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 164 ++++++++++++++++++++--------------------
 eng/Versions.props      |  82 ++++++++++----------
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fefd81bb5c0..85215b8aba8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,172 +1,172 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24453.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>31528d082bd760377b8d818fc839a338cd071b1f</Sha>
+      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>2b865e33f2c7c9484c28a3b62e8ff07966e23434</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24460.5">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24461.26">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc4f8810d8df45a9f42e02f688041bf592c18138</Sha>
+      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d593320c18..5c96f717a78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,48 +28,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24453.5</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24453.5</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24453.5</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24453.5</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24453.5</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24453.5</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24453.5</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24453.5</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rc.2.24453.5</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rc.2.24453.5</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rc.2.24453.5</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24453.5</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24453.5</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24453.5</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24453.5</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24459.11</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24459.11</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24459.11</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24459.11</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24459.11</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24459.11</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24459.11</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rc.2.24459.11</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rc.2.24459.11</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rc.2.24459.11</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24459.11</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24459.11</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24459.11</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rc.2.24459.11</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24460.5</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24460.5</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 8c3b9ca3e15a03e9001bc4a5e24cade325466b64 Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Fri, 30 Aug 2024 16:02:27 +0100
Subject: [PATCH 11/30] investigate and resolve
 https://github.com/dotnet/aspnetcore/discussions/57582

---
 .../Internal/DefaultHybridCache.CacheItem.cs  |   2 +
 .../DefaultHybridCache.ImmutableCacheItem.cs  |  14 ++-
 .../Internal/DefaultHybridCache.L2.cs         |  17 ++-
 .../DefaultHybridCache.MutableCacheItem.cs    |  42 +++----
 .../DefaultHybridCache.StampedeStateT.cs      | 106 +++++++++++++-----
 .../SizeTests.cs                              |  95 ++++++++++++++++
 6 files changed, 229 insertions(+), 47 deletions(-)
 create mode 100644 test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
index 1f8585d95d5..5585b9b2a29 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.CacheItem.cs
@@ -87,6 +87,8 @@ protected virtual void OnFinalRelease() // any required release semantics
 
     internal abstract class CacheItem<T> : CacheItem
     {
+        public abstract bool TryGetSize(out long size);
+
         // attempt to get a value that was *not* previously reserved
         public abstract bool TryGetValue(out T value);
 
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
index 2118fc39247..9ae8468ba29 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.ImmutableCacheItem.cs
@@ -13,6 +13,8 @@ internal partial class DefaultHybridCache
 
         private T _value = default!; // deferred until SetValue
 
+        public long Size { get; private set; } = -1;
+
         public override bool DebugIsImmutable => true;
 
         // get a shared instance that passes as "reserved"; doesn't need to be 100% singleton,
@@ -30,7 +32,11 @@ public static ImmutableCacheItem<T> GetReservedShared()
             return obj;
         }
 
-        public void SetValue(T value) => _value = value;
+        public void SetValue(T value, long size)
+        {
+            _value = value;
+            Size = size;
+        }
 
         public override bool TryGetValue(out T value)
         {
@@ -38,6 +44,12 @@ public override bool TryGetValue(out T value)
             return true; // always available
         }
 
+        public override bool TryGetSize(out long size)
+        {
+            size = Size;
+            return size >= 0;
+        }
+
         public override bool TryReserveBuffer(out BufferChunk buffer)
         {
             buffer = default;
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
index 5c08aecb9ef..2bcbe901315 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
@@ -95,13 +95,26 @@ internal void SetL1<T>(string key, CacheItem<T> value, HybridCacheEntryOptions?
         if (value.TryReserve())
         {
             // based on CacheExtensions.Set<TItem>, but with post-eviction recycling
-            using var cacheEntry = _localCache.CreateEntry(key);
+
+            // intentionally use manual Dispose rather than "using"; confusingly, it is Dispose()
+            // that actually commits the add - so: if we fault, we don't want to try
+            // committing a partially configured cache entry
+            var cacheEntry = _localCache.CreateEntry(key);
             cacheEntry.AbsoluteExpirationRelativeToNow = options?.LocalCacheExpiration ?? _defaultLocalCacheExpiration;
             cacheEntry.Value = value;
+
+            if (value.TryGetSize(out var size))
+            {
+                cacheEntry = cacheEntry.SetSize(size);
+            }
+
             if (value.NeedsEvictionCallback)
             {
-                _ = cacheEntry.RegisterPostEvictionCallback(CacheItem.SharedOnEviction);
+                cacheEntry = cacheEntry.RegisterPostEvictionCallback(CacheItem.SharedOnEviction);
             }
+
+            // commit
+            cacheEntry.Dispose();
         }
     }
 
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
index 8ce93b79c4a..2d02c23b6d8 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.MutableCacheItem.cs
@@ -21,34 +21,38 @@ public void SetValue(ref BufferChunk buffer, IHybridCacheSerializer<T> serialize
             buffer = default; // we're taking over the lifetime; the caller no longer has it!
         }
 
-        public void SetValue(T value, IHybridCacheSerializer<T> serializer, int maxLength)
-        {
-            _serializer = serializer;
-            var writer = RecyclableArrayBufferWriter<byte>.Create(maxLength);
-            serializer.Serialize(value, writer);
-
-            _buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true);
-            writer.Dispose(); // no buffers left (we just detached them), but just in case of other logic
-        }
-
         public override bool TryGetValue(out T value)
         {
             // only if we haven't already burned
-            if (!TryReserve())
+            if (TryReserve())
             {
-                value = default!;
-                return false;
+                try
+                {
+                    value = _serializer.Deserialize(_buffer.AsSequence());
+                    return true;
+                }
+                finally
+                {
+                    _ = Release();
+                }
             }
 
-            try
-            {
-                value = _serializer.Deserialize(_buffer.AsSequence());
-                return true;
-            }
-            finally
+            value = default!;
+            return false;
+        }
+
+        public override bool TryGetSize(out long size)
+        {
+            // only if we haven't already burned
+            if (TryReserve())
             {
+                size = _buffer.Length;
                 _ = Release();
+                return true;
             }
+
+            size = 0;
+            return false;
         }
 
         public override bool TryReserveBuffer(out BufferChunk buffer)
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
index 842444c8666..403b5c894e1 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
+using static Microsoft.Extensions.Caching.Hybrid.Internal.DefaultHybridCache;
 
 namespace Microsoft.Extensions.Caching.Hybrid.Internal;
 
@@ -175,29 +176,64 @@ private async Task BackgroundFetchAsync()
                 // nothing from L2; invoke the underlying data store
                 if ((Key.Flags & HybridCacheEntryFlags.DisableUnderlyingData) == 0)
                 {
-                    var cacheItem = SetResult(await _underlying!(_state!, SharedToken).ConfigureAwait(false));
-
-                    // note that at this point we've already released most or all of the waiting callers; everything
-                    // else here is background
-
-                    // write to L2 if appropriate
-                    if ((Key.Flags & HybridCacheEntryFlags.DisableDistributedCacheWrite) == 0)
+                    // invoke the callback supplied by the caller
+                    var newValue = await _underlying!(_state!, SharedToken).ConfigureAwait(false);
+
+                    // If we're writing this value *anywhere*, we're going to need to serialize; this is obvious
+                    // in the case of L2, but we also need it for L1, because MemoryCache might be enforcing
+                    // SizeLimit (we can't know - it is an abstraction), and for *that* we need to know the item size.
+                    // Likewise, if we're writing to a MutableCacheItem, we'll be serializing *anyway* for the payload.
+                    //
+                    // Rephrasing that: the only scenario in which we *do not* need to serialize is if:
+                    // - it is an ImmutableCacheItem
+                    // - we're writing neither to L1 nor L2
+
+                    const HybridCacheEntryFlags DisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
+                    var cacheItem = CacheItem;
+                    bool skipSerialize = cacheItem is ImmutableCacheItem<T> && (Key.Flags & DisableL1AndL2) == DisableL1AndL2;
+
+                    if (skipSerialize)
                     {
-                        if (cacheItem.TryReserveBuffer(out var buffer))
-                        {
-                            // mutable: we've already serialized it for the shared cache item
-                            await Cache.SetL2Async(Key.Key, in buffer, _options, SharedToken).ConfigureAwait(false);
-                            _ = cacheItem.Release(); // because we reserved
-                        }
-                        else if (cacheItem.TryGetValue(out var value))
+                        SetImmutableResultWithoutSerialize(newValue);
+                    }
+                    else if (cacheItem.TryReserve())
+                    {
+                        // ^^^ The first thing we need to do is make sure we're not getting into a thread race over buffer disposal.
+                        // In particular, if this cache item is somehow so short-lived that the buffers would be released *before* we're
+                        // done writing them to L2, which happens *after* we've provided the value to consumers.
+                        var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes); // note this lifetime spans the SetL2Async
+                        var serializer = Cache.GetSerializer<T>();
+                        serializer.Serialize(newValue, writer);
+                        BufferChunk buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true); // remove buffer ownership from the writer
+                        writer.Dispose(); // we're done with the writer
+
+                        // protect "buffer" (this is why we "reserved"); we don't want SetResult to nuke our local
+                        var snapshot = buffer;
+                        SetResultPreSerialized(newValue, ref snapshot, serializer);
+
+                        // Note that at this point we've already released most or all of the waiting callers. Everything
+                        // from this point onwards happens in the background, from the perspective of the calling code.
+
+                        // Write to L2 if appropriate.
+                        if ((Key.Flags & HybridCacheEntryFlags.DisableDistributedCacheWrite) == 0)
                         {
-                            // immutable: we'll need to do the serialize ourselves
-                            var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes); // note this lifetime spans the SetL2Async
-                            Cache.GetSerializer<T>().Serialize(value, writer);
-                            buffer = new(writer.GetBuffer(out var length), length, returnToPool: false); // writer still owns the buffer
+                            // We already have the payload serialized, so this is trivial to do.
                             await Cache.SetL2Async(Key.Key, in buffer, _options, SharedToken).ConfigureAwait(false);
-                            writer.Dispose(); // recycle on success
                         }
+
+                        // Release our hook on the CacheItem (only really important for "mutable").
+                        _ = cacheItem.Release();
+
+                        // Finally, recycle whatever was left over from SetResultPreSerialized; using "snapshot"
+                        // here is NOT a typo; if SetResultPreSerialized left this value alone (immutable), then
+                        // this is our recycle step; if SetResultPreSerialized transferred ownership to the (mutable)
+                        // CacheItem, then this becomes a no-op, and the buffer only gets fully recycled when the
+                        // CacheItem itself is fully clear.
+                        snapshot.RecycleIfAppropriate();
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException("Internal HybridCache failure: unable to reserve cache item to assign result");
                     }
                 }
                 else
@@ -243,7 +279,7 @@ private void SetResultAndRecycleIfAppropriate(ref BufferChunk value)
             {
                 case ImmutableCacheItem<T> immutable:
                     // deserialize; and store object; buffer can be recycled now
-                    immutable.SetValue(serializer.Deserialize(new(value.Array!, 0, value.Length)));
+                    immutable.SetValue(serializer.Deserialize(new(value.Array!, 0, value.Length)), value.Length);
                     value.RecycleIfAppropriate();
                     cacheItem = immutable;
                     break;
@@ -261,7 +297,7 @@ private void SetResultAndRecycleIfAppropriate(ref BufferChunk value)
             SetResult(cacheItem);
         }
 
-        private CacheItem<T> SetResult(T value)
+        private void SetImmutableResultWithoutSerialize(T value)
         {
             // set a result from a value we calculated directly
             CacheItem<T> cacheItem;
@@ -269,12 +305,33 @@ private CacheItem<T> SetResult(T value)
             {
                 case ImmutableCacheItem<T> immutable:
                     // no serialize needed
-                    immutable.SetValue(value);
+                    immutable.SetValue(value, size: -1);
+                    cacheItem = immutable;
+                    break;
+                default:
+                    cacheItem = ThrowUnexpectedCacheItem();
+                    break;
+            }
+
+            SetResult(cacheItem);
+        }
+
+        private void SetResultPreSerialized(T value, ref BufferChunk buffer, IHybridCacheSerializer<T> serializer)
+        {
+            // set a result from a value we calculated directly that
+            // has ALREADY BEEN SERIALIZED (we can optionally consume this buffer)
+            CacheItem<T> cacheItem;
+            switch (CacheItem)
+            {
+                case ImmutableCacheItem<T> immutable:
+                    // no serialize needed
+                    immutable.SetValue(value, size: buffer.Length);
                     cacheItem = immutable;
+
+                    // (but leave the buffer alone)
                     break;
                 case MutableCacheItem<T> mutable:
-                    // serialization happens here
-                    mutable.SetValue(value, Cache.GetSerializer<T>(), MaximumPayloadBytes);
+                    mutable.SetValue(ref buffer, serializer);
                     mutable.DebugOnlyTrackBuffer(Cache);
                     cacheItem = mutable;
                     break;
@@ -284,7 +341,6 @@ private CacheItem<T> SetResult(T value)
             }
 
             SetResult(cacheItem);
-            return cacheItem;
         }
 
         private void SetResult(CacheItem<T> value)
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
new file mode 100644
index 00000000000..5f03e29f7a6
--- /dev/null
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Caching.Hybrid.Tests;
+
+public class SizeTests
+{
+    [Theory]
+    [InlineData(null, true)] // does not enforce size limits
+    [InlineData(8L, false)] // unreasonably small limt; chosen because our test string has length 12 - hence no expectation to find the second time
+    [InlineData(1024L, true)] // reasonable size limit
+    public async Task ValidateSizeLimit_Immutable(long? sizeLimit, bool expectFromL1)
+    {
+        var services = new ServiceCollection();
+        services.AddMemoryCache(options => options.SizeLimit = sizeLimit);
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        const string Key = "abc";
+
+        // this looks weird; it is intentionally not a const - we want to check
+        // same instance without worrying about interning from raw literals
+        string expected = new("simple value".ToArray());
+        var actual = await cache.GetOrCreateAsync<string>(Key, ct => new(expected));
+
+        // expect same contents
+        Assert.Equal(expected, actual);
+
+        // expect same instance, because string is special-cased as a type
+        // that doesn't need defensive copies
+        Assert.Same(expected, actual);
+
+        // rinse and repeat, to check we get the value from L1
+        actual = await cache.GetOrCreateAsync<string>(Key, ct => new(Guid.NewGuid().ToString()));
+
+        if (expectFromL1)
+        {
+            // expect same contents from L1
+            Assert.Equal(expected, actual);
+
+            // expect same instance, because string is special-cased as a type
+            // that doesn't need defensive copies
+            Assert.Same(expected, actual);
+        }
+        else
+        {
+            // L1 cache not used
+            Assert.NotEqual(expected, actual);
+        }
+    }
+
+    [Theory]
+    [InlineData(null, true)] // does not enforce size limits
+    [InlineData(8L, false)] // unreasonably small limt; chosen because our test string has length 12 - hence no expectation to find the second time
+    [InlineData(1024L, true)] // reasonable size limit
+    public async Task ValidateSizeLimit_Mutable(long? sizeLimit, bool expectFromL1)
+    {
+        var services = new ServiceCollection();
+        services.AddMemoryCache(options => options.SizeLimit = sizeLimit);
+        services.AddHybridCache();
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
+
+        const string Key = "abc";
+
+        string expected = "simple value";
+        var actual = await cache.GetOrCreateAsync<MutablePoco>(Key, ct => new(new MutablePoco { Value = expected }));
+
+        // expect same contents
+        Assert.Equal(expected, actual.Value);
+
+        // rinse and repeat, to check we get the value from L1
+        actual = await cache.GetOrCreateAsync<MutablePoco>(Key, ct => new(new MutablePoco { Value = Guid.NewGuid().ToString() }));
+
+        if (expectFromL1)
+        {
+            // expect same contents from L1
+            Assert.Equal(expected, actual.Value);
+        }
+        else
+        {
+            // L1 cache not used
+            Assert.NotEqual(expected, actual.Value);
+        }
+    }
+
+    public class MutablePoco
+    {
+        public string Value { get; set; } = "";
+    }
+}

From c87b90516ef6845b99569ea83dc8573211e7f435 Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Thu, 12 Sep 2024 18:36:41 +0100
Subject: [PATCH 12/30] typos

---
 .../Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
index 5f03e29f7a6..31010e1a235 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
@@ -10,7 +10,7 @@ public class SizeTests
 {
     [Theory]
     [InlineData(null, true)] // does not enforce size limits
-    [InlineData(8L, false)] // unreasonably small limt; chosen because our test string has length 12 - hence no expectation to find the second time
+    [InlineData(8L, false)] // unreasonably small limit; chosen because our test string has length 12 - hence no expectation to find the second time
     [InlineData(1024L, true)] // reasonable size limit
     public async Task ValidateSizeLimit_Immutable(long? sizeLimit, bool expectFromL1)
     {
@@ -55,7 +55,7 @@ public async Task ValidateSizeLimit_Immutable(long? sizeLimit, bool expectFromL1
 
     [Theory]
     [InlineData(null, true)] // does not enforce size limits
-    [InlineData(8L, false)] // unreasonably small limt; chosen because our test string has length 12 - hence no expectation to find the second time
+    [InlineData(8L, false)] // unreasonably small limit; chosen because our test string has length 12 - hence no expectation to find the second time
     [InlineData(1024L, true)] // reasonable size limit
     public async Task ValidateSizeLimit_Mutable(long? sizeLimit, bool expectFromL1)
     {

From 30f96c60e8ce49f07b37e8ae89505f25865ef15d Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Fri, 13 Sep 2024 09:11:57 +0100
Subject: [PATCH 13/30] clarify that _underlying returns T

---
 .../Internal/DefaultHybridCache.StampedeStateT.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
index 403b5c894e1..5304e353152 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -177,7 +177,7 @@ private async Task BackgroundFetchAsync()
                 if ((Key.Flags & HybridCacheEntryFlags.DisableUnderlyingData) == 0)
                 {
                     // invoke the callback supplied by the caller
-                    var newValue = await _underlying!(_state!, SharedToken).ConfigureAwait(false);
+                    T newValue = await _underlying!(_state!, SharedToken).ConfigureAwait(false);
 
                     // If we're writing this value *anywhere*, we're going to need to serialize; this is obvious
                     // in the case of L2, but we also need it for L1, because MemoryCache might be enforcing

From 7bd6739cd085283b78dd8bf26dd19ccfdc3326ea Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:12:38 +0000
Subject: [PATCH 14/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240912.5 (#5422)

[dev] Update dependencies from dotnet/aspnetcore
---
 eng/Version.Details.xml | 36 ++++++++++++++++++------------------
 eng/Versions.props      | 18 +++++++++---------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 85215b8aba8..0471185a50f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -132,41 +132,41 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24461.26">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24462.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a961b93bca44f3013d526f4b879b550afabe2da0</Sha>
+      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5c96f717a78..55f7a1b2263 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -61,15 +61,15 @@
     <SystemTextEncodingsWebVersion>9.0.0-rc.2.24459.11</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>9.0.0-rc.2.24459.11</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24461.26</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24461.26</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 2b9964e3d40d7d7261960c27b09232a9b73421d2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2024 13:17:47 +0000
Subject: [PATCH 15/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240913.6 (#5423)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24462.10 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 164 ++++++++++++++++++++--------------------
 eng/Versions.props      |  82 ++++++++++----------
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0471185a50f..b8101b206b6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,172 +1,172 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24459.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d32b46121993f762367238e1fad834205dc9123c</Sha>
+      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24462.5">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24463.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>37dd88bdfb6cfba5122ad0cc13ace787628b93cb</Sha>
+      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 55f7a1b2263..f98bd62e68a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,48 +28,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24459.11</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24459.11</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24459.11</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24459.11</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24459.11</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24459.11</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24459.11</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24459.11</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rc.2.24459.11</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rc.2.24459.11</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rc.2.24459.11</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24459.11</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24459.11</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24459.11</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24459.11</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24462.10</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24462.10</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24462.10</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24462.10</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24462.10</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rc.2.24462.10</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rc.2.24462.10</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rc.2.24462.10</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24462.10</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24462.10</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24462.10</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rc.2.24462.10</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24462.5</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24462.5</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 2018ae61adf3930045378070b31b5741f5fce667 Mon Sep 17 00:00:00 2001
From: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:32:09 +0200
Subject: [PATCH 16/30] Add internal ResourceMonitor when registering
 ResourceUtilizationHealthCheck (#5413)

---
 ...esourceUtilizationHealthCheckExtensions.cs |   4 +
 .../ResourceHealthCheckExtensionsTests.cs     | 330 ++++++++++++++----
 2 files changed, 266 insertions(+), 68 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckExtensions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckExtensions.cs
index ee5d466e0a3..8ae91b32a0e 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckExtensions.cs
@@ -28,6 +28,8 @@ public static IHealthChecksBuilder AddResourceUtilizationHealthCheck(this IHealt
         _ = Throw.IfNull(builder);
         _ = Throw.IfNull(tags);
 
+        _ = builder.Services.AddResourceMonitoring();
+
         _ = builder.Services.AddOptionsWithValidateOnStart<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
         return builder.AddCheck<ResourceUtilizationHealthCheck>(HealthCheckName, tags: tags);
     }
@@ -44,6 +46,8 @@ public static IHealthChecksBuilder AddResourceUtilizationHealthCheck(this IHealt
         _ = Throw.IfNull(builder);
         _ = Throw.IfNull(tags);
 
+        _ = builder.Services.AddResourceMonitoring();
+
         _ = builder.Services.AddOptionsWithValidateOnStart<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
         return builder.AddCheck<ResourceUtilizationHealthCheck>(HealthCheckName, tags: tags);
     }
diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs
index 60758bf7042..122c283ede8 100644
--- a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs
@@ -16,10 +16,10 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks.Test;
 public class ResourceHealthCheckExtensionsTests
 {
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck()
+    public async Task AddResourceHealthCheck()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -29,17 +29,57 @@ public async Task Extensions_AddResourceHealthCheck()
             .AddResourceUtilizationHealthCheck(options =>
                 options.SamplingWindow = samplingWindow);
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithTags()
+    public async Task AddResourceHealthCheck_WithCustomResourceMonitorAddedAfterInternalResourceMonitor_OverridesIt()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
+
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(options =>
+                options.SamplingWindow = samplingWindow).Services
+            .AddSingleton(dataTracker.Object);
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
+        _ = await service.CheckHealthAsync();
+        dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
+    }
+
+    [Fact]
+    public void AddResourceHealthCheck_RegistersInternalResourceMonitoring()
+    {
+        var dataTracker = new Mock<IResourceMonitor>();
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
+
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddSingleton(dataTracker.Object)
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(options =>
+                options.SamplingWindow = samplingWindow);
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithTags()
+    {
+        var dataTracker = new Mock<IResourceMonitor>();
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -49,17 +89,52 @@ public async Task Extensions_AddResourceHealthCheck_WithTags()
             .AddResourceUtilizationHealthCheck(options =>
                 options.SamplingWindow = samplingWindow, "test");
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithTagsEnumerable()
+    public void AddResourceHealthCheck_WithTags_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck("test");
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithTags_WithCustomResourceMonitorAddedAfterInternalResourceMonitor_OverridesIt()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
+
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(options =>
+                options.SamplingWindow = samplingWindow, "test").Services
+            .AddSingleton(dataTracker.Object);
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
+        _ = await service.CheckHealthAsync();
+        dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithTagsEnumerable()
+    {
+        var dataTracker = new Mock<IResourceMonitor>();
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -69,17 +144,32 @@ public async Task Extensions_AddResourceHealthCheck_WithTagsEnumerable()
             .AddResourceUtilizationHealthCheck(options =>
                 options.SamplingWindow = samplingWindow, new List<string> { "test" });
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithAction()
+    public void AddResourceHealthCheck_WithTagsEnumerable_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(new List<string> { "test" });
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithAction()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -92,17 +182,35 @@ public async Task Extensions_AddResourceHealthCheck_WithAction()
                 o.SamplingWindow = samplingWindow;
             });
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithActionAndTags()
+    public void AddResourceHealthCheck_WithAction_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(o =>
+            {
+                o.CpuThresholds = new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 };
+            });
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithActionAndTags()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -116,17 +224,36 @@ public async Task Extensions_AddResourceHealthCheck_WithActionAndTags()
             },
             "test");
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithActionAndTagsEnumerable()
+    public void AddResourceHealthCheck_WithActionAndTags_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(o =>
+            {
+                o.CpuThresholds = new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 };
+            },
+            "test");
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithActionAndTagsEnumerable()
     {
         var dataTracker = new Mock<IResourceMonitor>();
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -140,18 +267,37 @@ public async Task Extensions_AddResourceHealthCheck_WithActionAndTagsEnumerable(
             },
             new List<string> { "test" });
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithConfigurationSection()
+    public void AddResourceHealthCheck_WithActionAndTagsEnumerable_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(o =>
+            {
+                o.CpuThresholds = new ResourceUsageThresholds { DegradedUtilizationPercentage = 0.2, UnhealthyUtilizationPercentage = 0.4 };
+            },
+            new List<string> { "test" });
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithConfigurationSection()
     {
         var dataTracker = new Mock<IResourceMonitor>();
 
-        var samplingWindow = TimeSpan.FromSeconds(5);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(5);
         var serviceCollection = new ServiceCollection();
         serviceCollection
             .AddLogging()
@@ -159,18 +305,33 @@ public async Task Extensions_AddResourceHealthCheck_WithConfigurationSection()
             .AddHealthChecks()
             .AddResourceUtilizationHealthCheck(SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)));
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithConfigurationSectionAndTags()
+    public void AddResourceHealthCheck_WithConfigurationSection_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)));
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithConfigurationSectionAndTags()
     {
         var dataTracker = new Mock<IResourceMonitor>();
 
-        var samplingWindow = TimeSpan.FromSeconds(5);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(5);
         var serviceCollection = new ServiceCollection();
         serviceCollection
             .AddLogging()
@@ -180,18 +341,34 @@ public async Task Extensions_AddResourceHealthCheck_WithConfigurationSectionAndT
                 SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)),
                 "test");
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public async Task Extensions_AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable()
+    public void AddResourceHealthCheck_WithConfigurationSectionAndTags_RegistersInternalResourceMonitoring()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)),
+                "test");
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public async Task AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable()
     {
         var dataTracker = new Mock<IResourceMonitor>();
 
-        var samplingWindow = TimeSpan.FromSeconds(5);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(5);
         var serviceCollection = new ServiceCollection();
         serviceCollection
             .AddLogging()
@@ -201,16 +378,33 @@ public async Task Extensions_AddResourceHealthCheck_WithConfigurationSectionAndT
                 SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)),
                 new List<string> { "test" });
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var service = serviceProvider.GetRequiredService<HealthCheckService>();
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        HealthCheckService service = serviceProvider.GetRequiredService<HealthCheckService>();
         _ = await service.CheckHealthAsync();
         dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once);
     }
 
     [Fact]
-    public void Extensions_ConfigureResourceUtilizationHealthCheck_WithAction()
+    public void AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable_RegistersInternalResourceMonitoring()
     {
-        var samplingWindow = TimeSpan.FromSeconds(1);
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddHealthChecks()
+            .AddResourceUtilizationHealthCheck(
+                SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)),
+                new List<string> { "test" });
+
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+
+        IResourceMonitor? resourceMonitor = serviceProvider.GetService<IResourceMonitor>();
+        Assert.NotNull(resourceMonitor);
+    }
+
+    [Fact]
+    public void ConfigureResourceUtilizationHealthCheck_WithAction()
+    {
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
@@ -221,8 +415,8 @@ public void Extensions_ConfigureResourceUtilizationHealthCheck_WithAction()
                 o.SamplingWindow = samplingWindow;
             });
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var options = serviceProvider.GetRequiredService<IOptions<ResourceUtilizationHealthCheckOptions>>().Value;
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        ResourceUtilizationHealthCheckOptions options = serviceProvider.GetRequiredService<IOptions<ResourceUtilizationHealthCheckOptions>>().Value;
 
         Assert.Equal(samplingWindow, options.SamplingWindow);
         Assert.Equal(0.2, options.CpuThresholds.DegradedUtilizationPercentage);
@@ -230,17 +424,17 @@ public void Extensions_ConfigureResourceUtilizationHealthCheck_WithAction()
     }
 
     [Fact]
-    public void Extensions_ConfigureResourceUtilizationHealthCheck_WithConfigurationSection()
+    public void ConfigureResourceUtilizationHealthCheck_WithConfigurationSection()
     {
-        var samplingWindow = TimeSpan.FromSeconds(5);
+        TimeSpan samplingWindow = TimeSpan.FromSeconds(5);
 
         var serviceCollection = new ServiceCollection();
         serviceCollection
             .AddHealthChecks()
             .AddResourceUtilizationHealthCheck(SetupResourceHealthCheckConfiguration("0.5", "0.7", "0.5", "0.7", "00:00:05").GetSection(nameof(ResourceUtilizationHealthCheckOptions)));
 
-        var serviceProvider = serviceCollection.BuildServiceProvider();
-        var options = serviceProvider.GetRequiredService<IOptions<ResourceUtilizationHealthCheckOptions>>().Value;
+        ServiceProvider serviceProvider = serviceCollection.BuildServiceProvider();
+        ResourceUtilizationHealthCheckOptions options = serviceProvider.GetRequiredService<IOptions<ResourceUtilizationHealthCheckOptions>>().Value;
 
         Assert.Equal(samplingWindow, options.SamplingWindow);
         Assert.Equal(0.5, options.CpuThresholds.DegradedUtilizationPercentage);
@@ -268,31 +462,31 @@ private static IConfiguration SetupResourceHealthCheckConfiguration(
         ResourceUtilizationHealthCheckOptions resourceHealthCheckOptions;
 
         var configurationDict = new Dictionary<string, string?>
+        {
+            {
+                $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.CpuThresholds)}:"
+                + $"{nameof(resourceHealthCheckOptions.CpuThresholds.DegradedUtilizationPercentage)}",
+                cpuDegradedThreshold
+            },
+            {
+                $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.CpuThresholds)}:"
+                + $"{nameof(resourceHealthCheckOptions.CpuThresholds.UnhealthyUtilizationPercentage)}",
+                cpuUnhealthyThreshold
+            },
+            {
+                $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.MemoryThresholds)}:"
+                + $"{nameof(resourceHealthCheckOptions.MemoryThresholds.DegradedUtilizationPercentage)}",
+                memoryDegradedThreshold
+            },
+            {
+                $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.MemoryThresholds)}:"
+                +$"{nameof(resourceHealthCheckOptions.MemoryThresholds.UnhealthyUtilizationPercentage)}",
+                memoryUnhealthyThreshold
+            },
             {
-               {
-                    $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.CpuThresholds)}:"
-                    + $"{nameof(resourceHealthCheckOptions.CpuThresholds.DegradedUtilizationPercentage)}",
-                    cpuDegradedThreshold
-               },
-               {
-                    $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.CpuThresholds)}:"
-                    + $"{nameof(resourceHealthCheckOptions.CpuThresholds.UnhealthyUtilizationPercentage)}",
-                    cpuUnhealthyThreshold
-               },
-               {
-                    $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.MemoryThresholds)}:"
-                    + $"{nameof(resourceHealthCheckOptions.MemoryThresholds.DegradedUtilizationPercentage)}",
-                    memoryDegradedThreshold
-               },
-               {
-                    $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.MemoryThresholds)}:"
-                    +$"{nameof(resourceHealthCheckOptions.MemoryThresholds.UnhealthyUtilizationPercentage)}",
-                    memoryUnhealthyThreshold
-               },
-               {
-                    $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.SamplingWindow)}", samplingWindow
-               }
-            };
+                $"{nameof(ResourceUtilizationHealthCheckOptions)}:{nameof(resourceHealthCheckOptions.SamplingWindow)}", samplingWindow
+            }
+        };
 
         return new ConfigurationBuilder().AddInMemoryCollection(configurationDict).Build();
     }

From ef51c637075afde1e28df3d78e9e955141f05328 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:29:46 +0000
Subject: [PATCH 17/30] Update dependencies from
 https://github.com/dotnet/arcade build 20240913.3 (#5427)

[main] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62b2edd8175..ae5cafe2d4b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -138,13 +138,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24463.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
+      <Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24463.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
+      <Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index b7d096268bf..44d535df314 100644
--- a/global.json
+++ b/global.json
@@ -16,7 +16,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24463.3"
   }
 }

From 704481f065cac026e1b0d8ebed759834cf5ce09f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 17:57:01 +0000
Subject: [PATCH 18/30] Update dependencies from
 https://github.com/dotnet/arcade build 20240913.2 (#5428)

[dev] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b8101b206b6..f7301389876 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -170,13 +170,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24453.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24463.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
+      <Sha>bcba6939456aa552554eae9ea9538a039cc98d96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24453.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24463.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
+      <Sha>bcba6939456aa552554eae9ea9538a039cc98d96</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index fcf12d8c925..1a3d3778ce7 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24463.2"
   }
 }

From fd052e1db7614cf2819a03ca63916bf4cb759bf9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 07:57:37 +1000
Subject: [PATCH 19/30] Update .NET SDK (#5426)

Update .NET SDK to version 9.0.100-rc.2.24464.3.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 1a3d3778ce7..a6c19a2420a 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.2.24459.3"
+    "version": "9.0.100-rc.2.24464.3"
   },
   "tools": {
-    "dotnet": "9.0.100-rc.2.24459.3",
+    "dotnet": "9.0.100-rc.2.24464.3",
     "runtimes": {
       "dotnet/x64": [
         "8.0.0",

From 17c242962677724bae1987eac2ce8c3419723486 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:19:14 +0000
Subject: [PATCH 20/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240916.12 (#5430)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 164 ++++++++++++++++++++--------------------
 eng/Versions.props      |  82 ++++++++++----------
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7301389876..cc045ace8cc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,172 +1,172 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
+      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rc.2.24463.6">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24466.12">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
+      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index f98bd62e68a..0c218ac7a5e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,48 +28,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24462.10</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24462.10</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24462.10</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24462.10</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24462.10</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24462.10</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rc.2.24462.10</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rc.2.24462.10</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rc.2.24462.10</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24462.10</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24462.10</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24462.10</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24462.10</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24463.7</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24463.7</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24463.7</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24463.7</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24463.7</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rc.2.24463.7</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rc.2.24463.7</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rc.2.24463.7</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24463.7</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24463.7</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24463.7</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rc.2.24463.7</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24463.6</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24463.6</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 8609615968eb0767f1287f50fcdc33c84d04bd1b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 18:11:57 +0000
Subject: [PATCH 21/30] Update dependencies from
 https://github.com/dotnet/arcade build 20240916.2 (#5431)

[dev] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cc045ace8cc..b86f1c261a6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -170,13 +170,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24463.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24466.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bcba6939456aa552554eae9ea9538a039cc98d96</Sha>
+      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24463.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24466.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bcba6939456aa552554eae9ea9538a039cc98d96</Sha>
+      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index a6c19a2420a..ce5358e9a78 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24463.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2"
   }
 }

From d0eb80ba19e5845a0914bcd8f5d25ed52b3f9401 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <RussKie@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:55:08 +1000
Subject: [PATCH 22/30] Fix CVE-2024-21319 (#5418)

* https://dev.azure.com/dnceng/internal/_componentGovernance/dotnet-extensions/alert/10220329
* https://dev.azure.com/dnceng/internal/_componentGovernance/dotnet-extensions/alert/10220330
---
 eng/packages/TestOnly.props                                      | 1 +
 .../Microsoft.Extensions.Caching.Hybrid.Tests.csproj             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eng/packages/TestOnly.props b/eng/packages/TestOnly.props
index e373e7a1714..a14713129cc 100644
--- a/eng/packages/TestOnly.props
+++ b/eng/packages/TestOnly.props
@@ -6,6 +6,7 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageVersion Include="FluentAssertions" Version="6.11.0" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.3" />
     <PackageVersion Include="Moq.AutoMock" Version="3.1.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
index ff23283e066..ef80a84eee9 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj
@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
 
   <ItemGroup>

From 5e3bdbafb8f2b59c811c7d66fb225a11ef379e2a Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Wed, 18 Sep 2024 11:51:22 +0100
Subject: [PATCH 23/30] fewer vars; more explicit types (PR feedback)

---
 .../Internal/DefaultHybridCache.L2.cs         |  4 ++--
 .../DefaultHybridCache.StampedeStateT.cs      | 10 +++++-----
 .../BufferReleaseTests.cs                     | 10 +++++-----
 .../DistributedCacheTests.cs                  |  4 ++--
 .../FunctionalTests.cs                        |  2 +-
 .../L2Tests.cs                                |  2 +-
 .../RedisTests.cs                             |  2 +-
 .../SampleUsage.cs                            |  8 ++++----
 .../ServiceConstructionTests.cs               | 20 +++++++++----------
 .../SizeTests.cs                              |  4 ++--
 .../StampedeTests.cs                          |  2 +-
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
index 2bcbe901315..1e694448737 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs
@@ -34,7 +34,7 @@ internal ValueTask<BufferChunk> GetFromL2Async(string key, CancellationToken tok
                 return new(GetValidPayloadSegment(pendingLegacy.Result)); // already complete
 
             case CacheFeatures.BackendCache | CacheFeatures.BackendBuffers: // IBufferWriter<byte>-based
-                var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes);
+                RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes);
                 var cache = Unsafe.As<IBufferDistributedCache>(_backendCache!); // type-checked already
                 var pendingBuffers = cache.TryGetAsync(key, writer, token);
                 if (!pendingBuffers.IsCompletedSuccessfully)
@@ -99,7 +99,7 @@ internal void SetL1<T>(string key, CacheItem<T> value, HybridCacheEntryOptions?
             // intentionally use manual Dispose rather than "using"; confusingly, it is Dispose()
             // that actually commits the add - so: if we fault, we don't want to try
             // committing a partially configured cache entry
-            var cacheEntry = _localCache.CreateEntry(key);
+            ICacheEntry cacheEntry = _localCache.CreateEntry(key);
             cacheEntry.AbsoluteExpirationRelativeToNow = options?.LocalCacheExpiration ?? _defaultLocalCacheExpiration;
             cacheEntry.Value = value;
 
diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
index 5304e353152..a24584b8275 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -189,7 +189,7 @@ private async Task BackgroundFetchAsync()
                     // - we're writing neither to L1 nor L2
 
                     const HybridCacheEntryFlags DisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
-                    var cacheItem = CacheItem;
+                    CacheItem cacheItem = CacheItem;
                     bool skipSerialize = cacheItem is ImmutableCacheItem<T> && (Key.Flags & DisableL1AndL2) == DisableL1AndL2;
 
                     if (skipSerialize)
@@ -201,14 +201,14 @@ private async Task BackgroundFetchAsync()
                         // ^^^ The first thing we need to do is make sure we're not getting into a thread race over buffer disposal.
                         // In particular, if this cache item is somehow so short-lived that the buffers would be released *before* we're
                         // done writing them to L2, which happens *after* we've provided the value to consumers.
-                        var writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes); // note this lifetime spans the SetL2Async
-                        var serializer = Cache.GetSerializer<T>();
+                        RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(MaximumPayloadBytes); // note this lifetime spans the SetL2Async
+                        IHybridCacheSerializer<T> serializer = Cache.GetSerializer<T>();
                         serializer.Serialize(newValue, writer);
                         BufferChunk buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true); // remove buffer ownership from the writer
                         writer.Dispose(); // we're done with the writer
 
                         // protect "buffer" (this is why we "reserved"); we don't want SetResult to nuke our local
-                        var snapshot = buffer;
+                        BufferChunk snapshot = buffer;
                         SetResultPreSerialized(newValue, ref snapshot, serializer);
 
                         // Note that at this point we've already released most or all of the waiting callers. Everything
@@ -273,7 +273,7 @@ private void SetResultAndRecycleIfAppropriate(ref BufferChunk value)
             // set a result from L2 cache
             Debug.Assert(value.Array is not null, "expected buffer");
 
-            var serializer = Cache.GetSerializer<T>();
+            IHybridCacheSerializer<T> serializer = Cache.GetSerializer<T>();
             CacheItem<T> cacheItem;
             switch (CacheItem)
             {
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
index 3318a86fd70..4996406c09a 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BufferReleaseTests.cs
@@ -19,7 +19,7 @@ private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache, Act
         var services = new ServiceCollection();
         config?.Invoke(services);
         services.AddHybridCache();
-        var provider = services.BuildServiceProvider();
+        ServiceProvider provider = services.BuildServiceProvider();
         cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
         return provider;
     }
@@ -117,8 +117,8 @@ private static bool Write(IBufferWriter<byte> destination, byte[]? buffer)
         // prep the backend with our data
         var key = Me();
         Assert.NotNull(cache.BackendCache);
-        var serializer = cache.GetSerializer<Customer>();
-        using (var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
+        IHybridCacheSerializer<Customer> serializer = cache.GetSerializer<Customer>();
+        using (RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
         {
             serializer.Serialize(await GetAsync(), writer);
             cache.BackendCache.Set(key, writer.ToArray());
@@ -176,8 +176,8 @@ private static bool Write(IBufferWriter<byte> destination, byte[]? buffer)
         // prep the backend with our data
         var key = Me();
         Assert.NotNull(cache.BackendCache);
-        var serializer = cache.GetSerializer<Customer>();
-        using (var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
+        IHybridCacheSerializer<Customer> serializer = cache.GetSerializer<Customer>();
+        using (RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue))
         {
             serializer.Serialize(await GetAsync(), writer);
             cache.BackendCache.Set(key, writer.ToArray());
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
index 4f3766990cc..5a565866f63 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/DistributedCacheTests.cs
@@ -185,7 +185,7 @@ public async Task ReadOnlySequenceBufferRoundtrip(int size, SequenceKind kind)
         Assert.Equal(size, expected.Length);
         cache.Set(key, payload, _fiveMinutes);
 
-        var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
+        RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
         Assert.True(cache.TryGet(key, writer));
         Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
         writer.ResetInPlace();
@@ -247,7 +247,7 @@ public async Task ReadOnlySequenceBufferRoundtripAsync(int size, SequenceKind ki
         Assert.Equal(size, expected.Length);
         await cache.SetAsync(key, payload, _fiveMinutes);
 
-        var writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
+        RecyclableArrayBufferWriter<byte> writer = RecyclableArrayBufferWriter<byte>.Create(int.MaxValue);
         Assert.True(await cache.TryGetAsync(key, writer));
         Assert.True(expected.Span.SequenceEqual(writer.GetCommittedMemory().Span));
         writer.ResetInPlace();
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
index 4cacdd59f6f..5edd99722ac 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/FunctionalTests.cs
@@ -13,7 +13,7 @@ private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache, Act
         var services = new ServiceCollection();
         config?.Invoke(services);
         services.AddHybridCache();
-        var provider = services.BuildServiceProvider();
+        ServiceProvider provider = services.BuildServiceProvider();
         cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
         return provider;
     }
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
index bf1f7a35fee..850c6a054b9 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/L2Tests.cs
@@ -38,7 +38,7 @@ private ServiceProvider GetDefaultCache(bool buffers, out DefaultHybridCache cac
         var localCache = new MemoryDistributedCache(localCacheOptions);
         services.AddSingleton<IDistributedCache>(buffers ? new BufferLoggingCache(Log, localCache) : new LoggingCache(Log, localCache));
         services.AddHybridCache();
-        var provider = services.BuildServiceProvider();
+        ServiceProvider provider = services.BuildServiceProvider();
         cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
         return provider;
     }
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
index d482f566a16..86303044c48 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/RedisTests.cs
@@ -45,7 +45,7 @@ public async Task BasicUsage(bool useBuffers)
         var services = new ServiceCollection();
         await ConfigureAsync(services);
         services.AddHybridCache();
-        var provider = services.BuildServiceProvider(); // not "using" - that will tear down our redis; use the fixture for that
+        ServiceProvider provider = services.BuildServiceProvider(); // not "using" - that will tear down our redis; use the fixture for that
 
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
         if (cache.BackendCache is null)
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
index 300fd6e4188..0172525b128 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SampleUsage.cs
@@ -16,7 +16,7 @@ public async Task DistributedCacheWorks()
         var services = new ServiceCollection();
         services.AddDistributedMemoryCache();
         services.AddTransient<SomeDCService>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
 
         var obj = provider.GetRequiredService<SomeDCService>();
         string name = "abc";
@@ -36,7 +36,7 @@ public async Task HybridCacheWorks()
         var services = new ServiceCollection();
         services.AddHybridCache();
         services.AddTransient<SomeHCService>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
 
         var obj = provider.GetRequiredService<SomeHCService>();
         string name = "abc";
@@ -56,7 +56,7 @@ public async Task HybridCacheNoCaptureWorks()
         var services = new ServiceCollection();
         services.AddHybridCache();
         services.AddTransient<SomeHCServiceNoCapture>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
 
         var obj = provider.GetRequiredService<SomeHCServiceNoCapture>();
         string name = "abc";
@@ -76,7 +76,7 @@ public async Task HybridCacheNoCaptureObjReuseWorks()
         var services = new ServiceCollection();
         services.AddHybridCache();
         services.AddTransient<SomeHCServiceNoCaptureObjReuse>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
 
         var obj = provider.GetRequiredService<SomeHCServiceNoCaptureObjReuse>();
         string name = "abc";
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
index 14f18e72c1e..decc47d3964 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs
@@ -27,7 +27,7 @@ public void CanCreateDefaultService()
     {
         var services = new ServiceCollection();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         Assert.IsType<DefaultHybridCache>(provider.GetService<HybridCache>());
     }
 
@@ -40,7 +40,7 @@ public void CanCreateServiceWithManualOptions()
             options.MaximumKeyLength = 937;
             options.DefaultEntryOptions = new() { Expiration = TimeSpan.FromSeconds(120), Flags = HybridCacheEntryFlags.DisableLocalCacheRead };
         });
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var obj = Assert.IsType<DefaultHybridCache>(provider.GetService<HybridCache>());
         var options = obj.Options;
         Assert.Equal(937, options.MaximumKeyLength);
@@ -88,7 +88,7 @@ public async Task BasicStatelessUsage()
     {
         var services = new ServiceCollection();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = provider.GetRequiredService<HybridCache>();
 
         var expected = Guid.NewGuid().ToString();
@@ -101,7 +101,7 @@ public async Task BasicStatefulUsage()
     {
         var services = new ServiceCollection();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = provider.GetRequiredService<HybridCache>();
 
         var expected = Guid.NewGuid().ToString();
@@ -114,7 +114,7 @@ public void DefaultSerializerConfiguration()
     {
         var services = new ServiceCollection();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.IsType<InbuiltTypeSerializer>(cache.GetSerializer<string>());
@@ -128,7 +128,7 @@ public void CustomSerializerConfiguration()
     {
         var services = new ServiceCollection();
         services.AddHybridCache().AddSerializer<Customer, CustomerSerializer>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.IsType<CustomerSerializer>(cache.GetSerializer<Customer>());
@@ -140,7 +140,7 @@ public void CustomSerializerFactoryConfiguration()
     {
         var services = new ServiceCollection();
         services.AddHybridCache().AddSerializerFactory<CustomFactory>();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.IsType<CustomerSerializer>(cache.GetSerializer<Customer>());
@@ -163,7 +163,7 @@ public void DefaultMemoryDistributedCacheIsIgnored(bool manual)
         }
 
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.Null(cache.BackendCache);
@@ -175,7 +175,7 @@ public void SubclassMemoryDistributedCacheIsNotIgnored()
         var services = new ServiceCollection();
         services.AddSingleton<IDistributedCache, CustomMemoryDistributedCache>();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.NotNull(cache.BackendCache);
@@ -198,7 +198,7 @@ public void SubclassMemoryCacheIsNotIgnored(bool manual)
 
         services.AddSingleton<IMemoryCache, CustomMemoryCache>();
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         Assert.NotNull(cache.BackendCache);
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
index 31010e1a235..119c2297882 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/SizeTests.cs
@@ -17,7 +17,7 @@ public async Task ValidateSizeLimit_Immutable(long? sizeLimit, bool expectFromL1
         var services = new ServiceCollection();
         services.AddMemoryCache(options => options.SizeLimit = sizeLimit);
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         const string Key = "abc";
@@ -62,7 +62,7 @@ public async Task ValidateSizeLimit_Mutable(long? sizeLimit, bool expectFromL1)
         var services = new ServiceCollection();
         services.AddMemoryCache(options => options.SizeLimit = sizeLimit);
         services.AddHybridCache();
-        using var provider = services.BuildServiceProvider();
+        using ServiceProvider provider = services.BuildServiceProvider();
         var cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
 
         const string Key = "abc";
diff --git a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
index b804fad503f..4680f589f98 100644
--- a/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/StampedeTests.cs
@@ -24,7 +24,7 @@ private static ServiceProvider GetDefaultCache(out DefaultHybridCache cache)
                 Flags = HybridCacheEntryFlags.DisableDistributedCache | HybridCacheEntryFlags.DisableLocalCache
             };
         });
-        var provider = services.BuildServiceProvider();
+        ServiceProvider provider = services.BuildServiceProvider();
         cache = Assert.IsType<DefaultHybridCache>(provider.GetRequiredService<HybridCache>());
         return provider;
     }

From 2f35529b3d3b6c5e4bfdf101a7981abfd14fb94e Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Wed, 18 Sep 2024 15:35:15 +0100
Subject: [PATCH 24/30] PR feedback (mostly comments, extra Debug.Assert)

---
 .../DefaultHybridCache.StampedeStateT.cs      | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
index a24584b8275..82210d43097 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -14,8 +14,7 @@ internal partial class DefaultHybridCache
 {
     internal sealed class StampedeState<TState, T> : StampedeState
     {
-        [DoesNotReturn]
-        private static CacheItem<T> ThrowUnexpectedCacheItem() => throw new InvalidOperationException("Unexpected cache item");
+        const HybridCacheEntryFlags FlagsDisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
 
         private readonly TaskCompletionSource<CacheItem<T>>? _result;
         private TState? _state;
@@ -41,6 +40,9 @@ public StampedeState(DefaultHybridCache cache, in StampedeKey key, CancellationT
 
         public override Type Type => typeof(T);
 
+        [DoesNotReturn]
+        private static CacheItem<T> ThrowUnexpectedCacheItem() => throw new InvalidOperationException("Unexpected cache item");
+
         public void QueueUserWorkItem(in TState state, Func<TState, CancellationToken, ValueTask<T>> underlying, HybridCacheEntryOptions? options)
         {
             Debug.Assert(_underlying is null, "should not already have factory field");
@@ -188,9 +190,8 @@ private async Task BackgroundFetchAsync()
                     // - it is an ImmutableCacheItem
                     // - we're writing neither to L1 nor L2
 
-                    const HybridCacheEntryFlags DisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
                     CacheItem cacheItem = CacheItem;
-                    bool skipSerialize = cacheItem is ImmutableCacheItem<T> && (Key.Flags & DisableL1AndL2) == DisableL1AndL2;
+                    bool skipSerialize = cacheItem is ImmutableCacheItem<T> && (Key.Flags & FlagsDisableL1AndL2) == FlagsDisableL1AndL2;
 
                     if (skipSerialize)
                     {
@@ -207,9 +208,18 @@ private async Task BackgroundFetchAsync()
                         BufferChunk buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true); // remove buffer ownership from the writer
                         writer.Dispose(); // we're done with the writer
 
-                        // protect "buffer" (this is why we "reserved"); we don't want SetResult to nuke our local
-                        BufferChunk snapshot = buffer;
-                        SetResultPreSerialized(newValue, ref snapshot, serializer);
+                        // protect "buffer" (this is why we "reserved") for writing to L2 if needed; SetResultPreSerialized
+                        // *may* (depending on context) claim this buffer, in which case "bufferToRelease" gets reset, and
+                        // the final RecycleIfAppropriate() is a no-op; however, the buffer is valid in either event,
+                        // (with TryReserve above guaranteeing that we aren't in a race condition).
+                        BufferChunk bufferToRelease = buffer;
+
+                        // and since "bufferToRelease" is the thing that will be returned at some point, we can make it explicit
+                        // that we do not need or want "buffer" to do any recycling (they're the same memory)
+                        buffer = buffer.DoNotReturnToPool();
+
+                        // set the underlying result for this operation (includes L1 write if appropriate)
+                        SetResultPreSerialized(newValue, ref bufferToRelease, serializer);
 
                         // Note that at this point we've already released most or all of the waiting callers. Everything
                         // from this point onwards happens in the background, from the perspective of the calling code.
@@ -224,12 +234,12 @@ private async Task BackgroundFetchAsync()
                         // Release our hook on the CacheItem (only really important for "mutable").
                         _ = cacheItem.Release();
 
-                        // Finally, recycle whatever was left over from SetResultPreSerialized; using "snapshot"
+                        // Finally, recycle whatever was left over from SetResultPreSerialized; using "bufferToRelease"
                         // here is NOT a typo; if SetResultPreSerialized left this value alone (immutable), then
                         // this is our recycle step; if SetResultPreSerialized transferred ownership to the (mutable)
                         // CacheItem, then this becomes a no-op, and the buffer only gets fully recycled when the
                         // CacheItem itself is fully clear.
-                        snapshot.RecycleIfAppropriate();
+                        bufferToRelease.RecycleIfAppropriate();
                     }
                     else
                     {
@@ -299,6 +309,8 @@ private void SetResultAndRecycleIfAppropriate(ref BufferChunk value)
 
         private void SetImmutableResultWithoutSerialize(T value)
         {
+            Debug.Assert((Key.Flags & FlagsDisableL1AndL2) == FlagsDisableL1AndL2, "Only expected if L1+L2 disabled");
+
             // set a result from a value we calculated directly
             CacheItem<T> cacheItem;
             switch (CacheItem)

From f0da5afb19d4d2aea49241d8380cbe588225321d Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Wed, 18 Sep 2024 16:00:30 +0100
Subject: [PATCH 25/30] build warn should be err ;p

---
 .../Internal/DefaultHybridCache.StampedeStateT.cs         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
index 82210d43097..4e45acae930 100644
--- a/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
+++ b/src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.StampedeStateT.cs
@@ -14,7 +14,7 @@ internal partial class DefaultHybridCache
 {
     internal sealed class StampedeState<TState, T> : StampedeState
     {
-        const HybridCacheEntryFlags FlagsDisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
+        private const HybridCacheEntryFlags FlagsDisableL1AndL2 = HybridCacheEntryFlags.DisableLocalCacheWrite | HybridCacheEntryFlags.DisableDistributedCacheWrite;
 
         private readonly TaskCompletionSource<CacheItem<T>>? _result;
         private TState? _state;
@@ -40,9 +40,6 @@ public StampedeState(DefaultHybridCache cache, in StampedeKey key, CancellationT
 
         public override Type Type => typeof(T);
 
-        [DoesNotReturn]
-        private static CacheItem<T> ThrowUnexpectedCacheItem() => throw new InvalidOperationException("Unexpected cache item");
-
         public void QueueUserWorkItem(in TState state, Func<TState, CancellationToken, ValueTask<T>> underlying, HybridCacheEntryOptions? options)
         {
             Debug.Assert(_underlying is null, "should not already have factory field");
@@ -157,6 +154,9 @@ static async Task<T> AwaitedAsync(Task<CacheItem<T>> task)
                 => (await task.ConfigureAwait(false)).GetReservedValue();
         }
 
+        [DoesNotReturn]
+        private static CacheItem<T> ThrowUnexpectedCacheItem() => throw new InvalidOperationException("Unexpected cache item");
+
         [SuppressMessage("Resilience", "EA0014:The async method doesn't support cancellation", Justification = "In this case the cancellation token is provided internally via SharedToken")]
         [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exception is passed through to faulted task result")]
         private async Task BackgroundFetchAsync()

From 539f3a333963a201230cdaca2ef71de2cb92fa35 Mon Sep 17 00:00:00 2001
From: Ross Wollman <rwoll@users.noreply.github.com>
Date: Thu, 19 Sep 2024 05:12:28 -0700
Subject: [PATCH 26/30] repro and fix (#5416)

---
 .../Parsing/TypeSymbolExtensions.cs           | 19 ++++++-
 .../Generated/LogPropertiesTests.cs           | 41 ++++++++++++-
 .../TestClasses/LogPropertiesExtensions.cs    | 11 +++-
 .../Unit/ParserTests.LogProperties.cs         | 57 +++++++++++++++++++
 ...sts.ClassWithNullableProperty.verified.txt | 44 ++++++++++++++
 5 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 test/Generators/Microsoft.Gen.Logging/Verified/ParserTests.ClassWithNullableProperty.verified.txt

diff --git a/src/Generators/Microsoft.Gen.Logging/Parsing/TypeSymbolExtensions.cs b/src/Generators/Microsoft.Gen.Logging/Parsing/TypeSymbolExtensions.cs
index d52796e85ca..a3d1c9e3b60 100644
--- a/src/Generators/Microsoft.Gen.Logging/Parsing/TypeSymbolExtensions.cs
+++ b/src/Generators/Microsoft.Gen.Logging/Parsing/TypeSymbolExtensions.cs
@@ -15,6 +15,8 @@ internal static bool IsEnumerable(this ITypeSymbol sym, SymbolHolder symbols)
 
     internal static bool ImplementsIConvertible(this ITypeSymbol sym, SymbolHolder symbols)
     {
+        sym = sym.GetPossiblyNullWrappedType();
+
         foreach (var member in sym.GetMembers("ToString"))
         {
             if (member is IMethodSymbol ts)
@@ -36,6 +38,8 @@ internal static bool ImplementsIConvertible(this ITypeSymbol sym, SymbolHolder s
 
     internal static bool ImplementsIFormattable(this ITypeSymbol sym, SymbolHolder symbols)
     {
+        sym = sym.GetPossiblyNullWrappedType();
+
         foreach (var member in sym.GetMembers("ToString"))
         {
             if (member is IMethodSymbol ts)
@@ -57,7 +61,11 @@ internal static bool ImplementsIFormattable(this ITypeSymbol sym, SymbolHolder s
     }
 
     internal static bool ImplementsISpanFormattable(this ITypeSymbol sym, SymbolHolder symbols)
-        => symbols.SpanFormattableSymbol != null && (sym.ImplementsInterface(symbols.SpanFormattableSymbol) || SymbolEqualityComparer.Default.Equals(sym, symbols.SpanFormattableSymbol));
+    {
+        sym = sym.GetPossiblyNullWrappedType();
+
+        return symbols.SpanFormattableSymbol != null && (sym.ImplementsInterface(symbols.SpanFormattableSymbol) || SymbolEqualityComparer.Default.Equals(sym, symbols.SpanFormattableSymbol));
+    }
 
     internal static bool IsSpecialType(this ITypeSymbol typeSymbol, SymbolHolder symbols)
         => typeSymbol.SpecialType != SpecialType.None ||
@@ -82,4 +90,13 @@ internal static bool HasCustomToString(this ITypeSymbol type)
         return false;
     }
 
+    internal static ITypeSymbol GetPossiblyNullWrappedType(this ITypeSymbol sym)
+    {
+        if (sym is INamedTypeSymbol namedTypeSymbol && namedTypeSymbol.IsGenericType && namedTypeSymbol.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
+        {
+            return namedTypeSymbol.TypeArguments[0];
+        }
+
+        return sym;
+    }
 }
diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs
index 506d67f7d59..a8c5d752fc9 100644
--- a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs
+++ b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs
@@ -313,6 +313,45 @@ public void LogPropertiesInTemplateTest()
         _logger.Collector.LatestRecord.StructuredState.Should().NotBeNull().And.Equal(expectedState);
     }
 
+    [Fact]
+    public void LogPropertiesTestNullablePropertyInClass()
+    {
+        var now = new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        var classToLog = new MyClassWithNullableProperty { NullableDateTime = now, NonNullableDateTime = now };
+        LogMethodNullablePropertyInClassMatchesNonNullable(_logger, classToLog);
+        Assert.Equal(1, _logger.Collector.Count);
+        Assert.Equal(LogLevel.Information, _logger.Collector.LatestRecord.Level);
+        Assert.Equal($"Testing nullable property within class here...", _logger.Collector.LatestRecord.Message);
+        var expectedState = new Dictionary<string, string?>
+        {
+            // Note that, regardless of nullability, the datetime fields SHOULD match given the same, non-null input.
+            ["classWithNullablePropertyParam.NullableDateTime"] = "01/01/2024 00:00:00",
+            ["classWithNullablePropertyParam.NonNullableDateTime"] = "01/01/2024 00:00:00",
+            ["{OriginalFormat}"] = "Testing nullable property within class here..."
+        };
+
+        _logger.Collector.LatestRecord.StructuredState.Should().NotBeNull().And.Equal(expectedState);
+    }
+
+    [Fact]
+    public void LogPropertiesTestNullablePropertyInClass_WhenNull()
+    {
+        var now = new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        var classToLog = new MyClassWithNullableProperty { NullableDateTime = null, NonNullableDateTime = now };
+        LogMethodNullablePropertyInClassMatchesNonNullable(_logger, classToLog);
+        Assert.Equal(1, _logger.Collector.Count);
+        Assert.Equal(LogLevel.Information, _logger.Collector.LatestRecord.Level);
+        Assert.Equal($"Testing nullable property within class here...", _logger.Collector.LatestRecord.Message);
+        var expectedState = new Dictionary<string, string?>
+        {
+            ["classWithNullablePropertyParam.NullableDateTime"] = null,
+            ["classWithNullablePropertyParam.NonNullableDateTime"] = "01/01/2024 00:00:00",
+            ["{OriginalFormat}"] = "Testing nullable property within class here..."
+        };
+
+        _logger.Collector.LatestRecord.StructuredState.Should().NotBeNull().And.Equal(expectedState);
+    }
+
     [Fact]
     public void LogPropertiesNonStaticClassTest()
     {
@@ -458,7 +497,7 @@ public void LogPropertiesInterfaceArgument()
         Assert.Equal(1, _logger.Collector.Count);
         var latestRecord = _logger.Collector.LatestRecord;
         Assert.Null(latestRecord.Exception);
-        Assert.Equal(5, latestRecord.Id.Id);
+        Assert.Equal(6, latestRecord.Id.Id);
         Assert.Equal(LogLevel.Information, latestRecord.Level);
         Assert.Equal("Testing interface-typed argument here...", latestRecord.Message);
 
diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs
index eb8aa661cdd..d2b9c05b05b 100644
--- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs
+++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs
@@ -111,6 +111,12 @@ public MyCustomStruct(object _)
             }
         }
 
+        public class MyClassWithNullableProperty
+        {
+            public DateTime? NullableDateTime { get; set; }
+            public DateTime NonNullableDateTime { get; set; }
+        }
+
         public struct MyTransitiveStruct
         {
             public DateTimeOffset DateTimeOffsetProperty { get; set; } = DateTimeOffset.UtcNow;
@@ -230,10 +236,13 @@ public override string ToString()
         [LoggerMessage(4, LogLevel.Information, "Testing explicit nullable struct here...")]
         public static partial void LogMethodExplicitNullableStruct(ILogger logger, [LogProperties] Nullable<MyCustomStruct> structParam);
 
+        [LoggerMessage(5, LogLevel.Information, "Testing nullable property within class here...")]
+        public static partial void LogMethodNullablePropertyInClassMatchesNonNullable(ILogger logger, [LogProperties] MyClassWithNullableProperty classWithNullablePropertyParam);
+
         [LoggerMessage]
         public static partial void LogMethodDefaultAttrCtor(ILogger logger, LogLevel level, [LogProperties] ClassAsParam? complexParam);
 
-        [LoggerMessage(5, LogLevel.Information, "Testing interface-typed argument here...")]
+        [LoggerMessage(6, LogLevel.Information, "Testing interface-typed argument here...")]
         public static partial void LogMethodInterfaceArg(ILogger logger, [LogProperties] IMyInterface complexParam);
     }
 }
diff --git a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
index a5e663dc57e..b6257c2d694 100644
--- a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
+++ b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
@@ -1,8 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Microsoft.Gen.Logging.Parsing;
+using Microsoft.Gen.Shared;
+using VerifyXunit;
 using Xunit;
 
 namespace Microsoft.Gen.Logging.Test;
@@ -433,4 +439,55 @@ static partial void M0(this ILogger logger,
                     MyRecordStruct p6);
             }", DiagDescriptors.DefaultToString);
     }
+
+    [Fact]
+    public async Task ClassWithNullableProperty()
+    {
+        string source = @"
+                namespace Test
+                {
+                    using System;
+
+                    using Microsoft.Extensions.Logging;
+
+                    internal static class LoggerUtils
+                    {
+                        public class MyClassWithNullableProperty
+                        {
+                            public DateTime? NullableDateTime { get; set; }
+                            public DateTime NonNullableDateTime { get; set; }
+                        }
+
+                        partial class MyLogger
+                        {
+                            [LoggerMessage(0, LogLevel.Information, ""Testing nullable property within class here..."")]
+                            public static partial void LogMethodNullablePropertyInClassMatchesNonNullable(ILogger logger, [LogProperties] MyClassWithNullableProperty classWithNullablePropertyParam);
+                        }
+                    }
+                }";
+
+#if NET6_0_OR_GREATER
+        var symbols = new[] { "NET7_0_OR_GREATER", "NET6_0_OR_GREATER", "NET5_0_OR_GREATER" };
+#else
+        var symbols = new[] { "NET5_0_OR_GREATER" };
+#endif
+
+        var (d, r) = await RoslynTestUtils.RunGenerator(
+            new LoggingGenerator(),
+            new[]
+            {
+                Assembly.GetAssembly(typeof(ILogger))!,
+                Assembly.GetAssembly(typeof(LogPropertiesAttribute))!,
+                Assembly.GetAssembly(typeof(LoggerMessageAttribute))!,
+                Assembly.GetAssembly(typeof(DateTime))!,
+            },
+            [source],
+            symbols)
+            .ConfigureAwait(false);
+
+        Assert.Empty(d);
+        await Verifier.Verify(r[0].SourceText.ToString())
+            .AddScrubber(_ => _.Replace(GeneratorUtilities.CurrentVersion, "VERSION"))
+            .UseDirectory(Path.Combine("..", "Verified"));
+    }
 }
diff --git a/test/Generators/Microsoft.Gen.Logging/Verified/ParserTests.ClassWithNullableProperty.verified.txt b/test/Generators/Microsoft.Gen.Logging/Verified/ParserTests.ClassWithNullableProperty.verified.txt
new file mode 100644
index 00000000000..174f9e63faa
--- /dev/null
+++ b/test/Generators/Microsoft.Gen.Logging/Verified/ParserTests.ClassWithNullableProperty.verified.txt
@@ -0,0 +1,44 @@
+
+// <auto-generated/>
+#nullable enable
+#pragma warning disable CS1591 // Compensate for https://github.com/dotnet/roslyn/issues/54103
+
+namespace Test
+{
+    partial class LoggerUtils
+    {
+        partial class MyLogger
+        {
+            /// <summary>
+            /// Logs "Testing nullable property within class here..." at "Information" level.
+            /// </summary>
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Gen.Logging", "VERSION")]
+            public static partial void LogMethodNullablePropertyInClassMatchesNonNullable(global::Microsoft.Extensions.Logging.ILogger logger, global::Test.LoggerUtils.MyClassWithNullableProperty classWithNullablePropertyParam)
+            {
+                if (!logger.IsEnabled(global::Microsoft.Extensions.Logging.LogLevel.Information))
+                {
+                    return;
+                }
+
+                var state = global::Microsoft.Extensions.Logging.LoggerMessageHelper.ThreadLocalState;
+
+                _ = state.ReserveTagSpace(3);
+                state.TagArray[2] = new("classWithNullablePropertyParam.NullableDateTime", classWithNullablePropertyParam?.NullableDateTime);
+                state.TagArray[1] = new("classWithNullablePropertyParam.NonNullableDateTime", classWithNullablePropertyParam?.NonNullableDateTime);
+                state.TagArray[0] = new("{OriginalFormat}", "Testing nullable property within class here...");
+
+                logger.Log(
+                    global::Microsoft.Extensions.Logging.LogLevel.Information,
+                    new(0, nameof(LogMethodNullablePropertyInClassMatchesNonNullable)),
+                    state,
+                    null,
+                    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Gen.Logging", "VERSION")] static string (s, _) =>
+                    {
+                        return "Testing nullable property within class here...";
+                    });
+
+                state.Clear();
+            }
+        }
+    }
+}

From 1d9d44f58d693b3fdd66bd5178625fe1dc2b0c51 Mon Sep 17 00:00:00 2001
From: Makazeu <makazeu@gmail.com>
Date: Thu, 19 Sep 2024 20:25:37 +0800
Subject: [PATCH 27/30] Add NullRedactor to the RedactorProvider during
 initialization (#5424)

* Add NullRedactor to the RedactorProvider during initialization.  Fix #5265

---------

Co-authored-by: Yifan Zhu <yifzhu@microsoft.com>
---
 .../RedactorProvider.cs                       |  7 ++++++
 .../RedactorProviderTests.cs                  | 24 ++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/RedactorProvider.cs b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/RedactorProvider.cs
index 0963784fa80..18a356d1a10 100644
--- a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/RedactorProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/RedactorProvider.cs
@@ -37,6 +37,12 @@ public Redactor GetRedactor(DataClassificationSet classifications)
 
     private static FrozenDictionary<DataClassificationSet, Redactor> GetClassRedactorMap(IEnumerable<Redactor> redactors, Dictionary<DataClassificationSet, Type> map)
     {
+        if (!map.ContainsKey(DataClassification.None))
+        {
+            map.Add(DataClassification.None, typeof(NullRedactor));
+            redactors = [.. redactors, NullRedactor.Instance];
+        }
+
         var dict = new Dictionary<DataClassificationSet, Redactor>(map.Count);
         foreach (var m in map)
         {
@@ -45,6 +51,7 @@ private static FrozenDictionary<DataClassificationSet, Redactor> GetClassRedacto
                 if (r.GetType() == m.Value)
                 {
                     dict[m.Key] = r;
+                    break;
                 }
             }
         }
diff --git a/test/Libraries/Microsoft.Extensions.Compliance.Redaction.Tests/RedactorProviderTests.cs b/test/Libraries/Microsoft.Extensions.Compliance.Redaction.Tests/RedactorProviderTests.cs
index 0a7c97f34f1..9a69e83be50 100644
--- a/test/Libraries/Microsoft.Extensions.Compliance.Redaction.Tests/RedactorProviderTests.cs
+++ b/test/Libraries/Microsoft.Extensions.Compliance.Redaction.Tests/RedactorProviderTests.cs
@@ -10,6 +10,16 @@ namespace Microsoft.Extensions.Compliance.Redaction.Test;
 
 public class RedactorProviderTests
 {
+    [Fact]
+    public void RedactorProvider_Returns_NullRedactor_For_NoneDataClassification()
+    {
+        var redactorProvider = new RedactorProvider(
+            redactors: [ErasingRedactor.Instance],
+            options: Microsoft.Extensions.Options.Options.Create(new RedactorProviderOptions()));
+
+        Assert.IsType<NullRedactor>(redactorProvider.GetRedactor(DataClassification.None));
+    }
+
     [Fact]
     public void RedactorProvider_Returns_Redactor_For_Every_Data_Classification()
     {
@@ -38,13 +48,15 @@ public void RedactorProvider_Returns_Redactor_For_Data_Classifications()
             redactors: new Redactor[] { ErasingRedactor.Instance, NullRedactor.Instance },
             options: Microsoft.Extensions.Options.Options.Create(opt));
 
-        var r1 = redactorProvider.GetRedactor(_dataClassification1);
-        var r2 = redactorProvider.GetRedactor(_dataClassification2);
-        var r3 = redactorProvider.GetRedactor(_dataClassification3);
+        Redactor r1 = redactorProvider.GetRedactor(_dataClassification1);
+        Redactor r2 = redactorProvider.GetRedactor(_dataClassification2);
+        Redactor r3 = redactorProvider.GetRedactor(_dataClassification3);
+        Redactor r4 = redactorProvider.GetRedactor(DataClassification.None);
 
-        Assert.Equal(typeof(ErasingRedactor), r1.GetType());
-        Assert.Equal(typeof(NullRedactor), r2.GetType());
-        Assert.Equal(typeof(ErasingRedactor), r3.GetType());
+        Assert.IsType<ErasingRedactor>(r1);
+        Assert.IsType<NullRedactor>(r2);
+        Assert.IsType<ErasingRedactor>(r3);
+        Assert.IsType<NullRedactor>(r4);
     }
 
     [Fact]

From 230806c8c1af692a5240594fbb11ec33ad951917 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:37:35 +0000
Subject: [PATCH 28/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240918.6 (#5434)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24467.13 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 164 ++++++++++++++++++++--------------------
 eng/Versions.props      |  82 ++++++++++----------
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b86f1c261a6..b07a9b770d2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,172 +1,172 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
+      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24466.12">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24468.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
+      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0c218ac7a5e..5318a60770b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,48 +28,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24463.7</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rc.2.24463.7</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24463.7</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24463.7</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24463.7</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rc.2.24463.7</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rc.2.24463.7</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rc.2.24463.7</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24463.7</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24463.7</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24463.7</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24463.7</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rtm.24467.13</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24467.13</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24467.13</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rtm.24467.13</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rtm.24467.13</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rtm.24467.13</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rtm.24467.13</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rtm.24467.13</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rtm.24467.13</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rtm.24467.13</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rtm.24467.13</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rtm.24467.13</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rtm.24467.13</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rtm.24467.13</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rtm.24466.12</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 

From 05df0833c0b889bd8f795e14643efa270dfdbd1e Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 20 Sep 2024 11:02:25 -0500
Subject: [PATCH 29/30] Fix test warning in 9.0 (#5437)

Test methods should not call ConfigureAwait(false), as it may bypass parallelization limits. Omit ConfigureAwait, or use ConfigureAwait(true) to avoid CA2007. (https://xunit.net/xunit.analyzers/rules/xUnit1030)

See https://github.com/dotnet/extensions/pull/5435/checks?check_run_id=30404388453
---
 .../Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
index b6257c2d694..b638be739b1 100644
--- a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
+++ b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.LogProperties.cs
@@ -482,8 +482,7 @@ partial class MyLogger
                 Assembly.GetAssembly(typeof(DateTime))!,
             },
             [source],
-            symbols)
-            .ConfigureAwait(false);
+            symbols);
 
         Assert.Empty(d);
         await Verifier.Verify(r[0].SourceText.ToString())

From 82f42d75f6edab08d58feb2dc7f36b3a09d47448 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 12:33:05 +0000
Subject: [PATCH 30/30] Update dependencies from
 https://github.com/dotnet/aspnetcore build 20240920.3 (#5438)

[dev] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Diagnostics: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Pipelines: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24468.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
---
 eng/Version.Details.xml | 164 ++++++++++++++++++++--------------------
 eng/Versions.props      |  82 ++++++++++----------
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b07a9b770d2..68047d29a49 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,172 +1,172 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rtm.24467.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rtm.24468.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d1f65c27d9bd28bd141af39d4509d387199cc0bd</Sha>
+      <Sha>db95ac47f72d605e7676ad155db2bab00be889ed</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24468.6">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
+      <Sha>c68cfd0f718c3991e3c38b6f913f17f4b8d0b169</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5318a60770b..0bbe98bc699 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,48 +28,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rtm.24467.13</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rtm.24467.13</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24467.13</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24467.13</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemCollectionsImmutableVersion>9.0.0-rtm.24467.13</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rtm.24467.13</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rtm.24467.13</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rtm.24467.13</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rtm.24467.13</SystemIOHashingVersion>
-    <SystemIOPipelinesVersion>9.0.0-rtm.24467.13</SystemIOPipelinesVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rtm.24467.13</SystemRuntimeCachingVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rtm.24467.13</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rtm.24467.13</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rtm.24467.13</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rtm.24467.13</SystemTextJsonVersion>
+    <MicrosoftBclTimeProviderVersion>9.0.0-rtm.24468.5</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsVersion>9.0.0-rtm.24468.5</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24468.5</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24468.5</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemCollectionsImmutableVersion>9.0.0-rtm.24468.5</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>9.0.0-rtm.24468.5</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rtm.24468.5</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rtm.24468.5</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>9.0.0-rtm.24468.5</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>9.0.0-rtm.24468.5</SystemIOPipelinesVersion>
+    <SystemRuntimeCachingVersion>9.0.0-rtm.24468.5</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>9.0.0-rtm.24468.5</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>9.0.0-rtm.24468.5</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>9.0.0-rtm.24468.5</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rtm.24468.5</SystemTextJsonVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRefVersion>
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsCachingSqlServerVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rtm.24468.6</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24470.3</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24470.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rtm.24470.3</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>9.0.0-rtm.24470.3</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsCachingSqlServerVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsHttpPollyVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--