Add DI extension method and add UT

Author: Kelly Yin

src/Libraries/Microsoft.Extensions.Caching.Hybrid/HybridCacheServiceExtensions.cs

@@ -2,9 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Hybrid;
 using Microsoft.Extensions.Caching.Hybrid.Internal;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -41,4 +44,35 @@ public static IHybridCacheBuilder AddHybridCache(this IServiceCollection service
         services.TryAddSingleton<HybridCache, DefaultHybridCache>();
         return new HybridCacheBuilder(services);
     }
+
+    /// <summary>
+    /// Adds support for keyed 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, string name, Action<HybridCacheOptions> setupAction)
+    {
+        _ = Throw.IfNull(services);
+        _ = Throw.IfNull(name);
+        _ = Throw.IfNull(setupAction);
+
+        // Register options for this key
+        _ = services.AddOptions<HybridCacheOptions>(name).Configure(setupAction);
+
+        // Register keyed in-memory cache
+        services.TryAddKeyedSingleton<IMemoryCache, MemoryCache>(name);
+
+        // Register keyed HybridCache
+        services.TryAddKeyedSingleton<HybridCache>(name, (sp, _) =>
+            new DefaultHybridCache(
+                Options.Options.Create(sp.GetRequiredService<IOptionsMonitor<HybridCacheOptions>>().Get(name)),
+                sp,
+                sp.GetKeyedService<IMemoryCache>(name),
+                sp.GetKeyedService<IDistributedCache>(name)));
+
+        services.TryAddSingleton<IHybridCacheSerializerFactory, DefaultJsonSerializerFactory>();
+        services.TryAddSingleton<IHybridCacheSerializer<string>>(InbuiltTypeSerializer.Instance);
+        services.TryAddSingleton<IHybridCacheSerializer<byte[]>>(InbuiltTypeSerializer.Instance);
+
+        return new HybridCacheBuilder(services);
+    }
 }

test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs

@@ -7,8 +7,11 @@
 using Microsoft.Extensions.Caching.Hybrid.Internal;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Caching.StackExchangeRedis;
+
 
 #if NET9_0_OR_GREATER
 using Microsoft.Extensions.Configuration;
@@ -51,6 +54,38 @@ public void CanCreateServiceWithManualOptions()
         Assert.Null(defaults.LocalCacheExpiration); // wasn't specified
     }
 
+    [Fact]
+    public void CanCreateKeyedServicesWithManualOptions()
+    {
+        var name = "testName";
+        var services = new ServiceCollection();
+
+        // Mock registering keyed IDistributedCache from client side
+        services.TryAddKeyedSingleton<IDistributedCache, RedisCache>(name);
+
+        services.AddHybridCache(name, options =>
+        {
+            options.MaximumKeyLength = 937;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var hybridCacheOption = provider.GetRequiredService<IOptionsMonitor<HybridCacheOptions>>().Get(name);
+        Assert.NotNull(hybridCacheOption);
+        Assert.Equal(937, hybridCacheOption.MaximumKeyLength);
+
+        var memoryCache = provider.GetRequiredKeyedService<IMemoryCache>(name);
+        Assert.NotNull(memoryCache);
+        Assert.IsType<MemoryCache>(memoryCache);
+
+        var hybridCache = provider.GetRequiredKeyedService<HybridCache>(name);
+        Assert.NotNull(hybridCache);
+        Assert.IsType<DefaultHybridCache>(hybridCache);
+
+        var backendCache = provider.GetRequiredKeyedService<IDistributedCache>(name);
+        Assert.NotNull(backendCache);
+        Assert.IsType<RedisCache>(backendCache);
+    }
+
 #if NET9_0_OR_GREATER // for Bind API
     [Fact]
     public void CanParseOptions_NoEntryOptions()