Merge branch 'dev' into rmq-stream-merge-branch

dotnetcore · Sep 17, 2023 · 57df435 · 57df435
2 parents 93c7bf8 + c74ad32
commit 57df435
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 41 deletions.
diff --git a/build/releasenotes.props b/build/releasenotes.props
@@ -1,13 +1,13 @@
 <Project>
 	<PropertyGroup>
 		<EasyCachingCorePackageNotes>
+			1. Support IServiceProvider in setupActions
 		</EasyCachingCorePackageNotes>
 		<EasyCachingMemcachedPackageNotes>
 			1. Upgrading dependencies.
 		</EasyCachingMemcachedPackageNotes>
 		<EasyCachingRedisPackageNotes>
-			1. Fixed redis distributed lock for different process.
-			2. Support code configuration for StackExchange.Redis.
+			1. Upgrading dependencies.
 		</EasyCachingRedisPackageNotes>
 		<EasyCachingSQLitePackageNotes>
 			1. Upgrading dependencies.
@@ -40,26 +40,22 @@
 			1. Upgrading dependencies.
 		</EasyCachingCSRedisPackageNotes>
 		<EasyCachingCSRedisBusPackageNotes>
-			1. Support async version of subscribe.
+			1. Upgrading dependencies.
 		</EasyCachingCSRedisBusPackageNotes>
 		<EasyCachingRedisBusPackageNotes>
-			1. Support code configuration for StackExchange.Redis.
-			2. Support async version of subscribe.
-			3. fix: Using IConfiguration for WithRedisBus configuration cause DefaultRedisBus throw "Sequence contains no matching element" exception
+			1. Upgrading dependencies.
 		</EasyCachingRedisBusPackageNotes>
 		<EasyCachingRabbitBusPackageNotes>
-			1. Support async version of subscribe.
+			1. Upgrading dependencies.
 		</EasyCachingRabbitBusPackageNotes>
 		<EasyCachingKafkaBusPackageNotes>
-			1. Support async version of subscribe.
+			1. Upgrading dependencies.
 		</EasyCachingKafkaBusPackageNotes>
 		<EasyCachingZookeeperBusPackageNotes>
-			1. Support async version of subscribe.
-			2. Rename WithConfluentKafkaBus to WithZookeeeperBus.
+			1. Upgrading dependencies.
 		</EasyCachingZookeeperBusPackageNotes>
 		<EasyCachingDiskPackageNotes>
-			1. Support custom serializer.
-			2. Fixed DiskCachingProvider async warning.
+			1. Upgrading dependencies.
 		</EasyCachingDiskPackageNotes>
 		<EasyCachingLiteDBPackageNotes>
 			1. Upgrading dependencies.

diff --git a/build/version.props b/build/version.props
@@ -1,29 +1,29 @@
 <Project>
 	<PropertyGroup>
-		<EasyCachingCorePackageVersion>1.9.9</EasyCachingCorePackageVersion>
-		<EasyCachingMemcachedPackageVersion>1.9.9</EasyCachingMemcachedPackageVersion>
-		<EasyCachingRedisPackageVersion>1.9.9</EasyCachingRedisPackageVersion>
-		<EasyCachingSQLitePackageVersion>1.9.9</EasyCachingSQLitePackageVersion>
-		<EasyCachingInMemoryPackageVersion>1.9.9</EasyCachingInMemoryPackageVersion>
-		<EasyCachingHybridPackageVersion>1.9.9</EasyCachingHybridPackageVersion>
-		<EasyCachingAspectCorePackageVersion>1.9.9</EasyCachingAspectCorePackageVersion>
-		<EasyCachingCastlePackageVersion>1.9.9</EasyCachingCastlePackageVersion>
-		<EasyCachingResponseCachingPackageVersion>1.9.9</EasyCachingResponseCachingPackageVersion>
-		<EasyCachingJsonPackageVersion>1.9.9</EasyCachingJsonPackageVersion>
-		<EasyCachingMessagePackPackageVersion>1.9.9</EasyCachingMessagePackPackageVersion>
-		<EasyCachingProtobufPackageVersion>1.9.9</EasyCachingProtobufPackageVersion>
-		<EasyCachingCSRedisPackageVersion>1.9.9</EasyCachingCSRedisPackageVersion>
-		<EasyCachingRedisBusPackageVersion>1.9.9</EasyCachingRedisBusPackageVersion>
-		<EasyCachingCSRedisBusPackageVersion>1.9.9</EasyCachingCSRedisBusPackageVersion>
-		<EasyCachingRabbitBusPackageVersion>1.9.9</EasyCachingRabbitBusPackageVersion>
-		<EasyCachingRabbitStreamBusPackageVersion>1.9.9</EasyCachingRabbitStreamBusPackageVersion>
-		<EasyCachingKafkaBusPackageVersion>1.9.9</EasyCachingKafkaBusPackageVersion>
-		<EasyCachingZookeeperBusPackageVersion>1.9.9</EasyCachingZookeeperBusPackageVersion>
-		<EasyCachingDiskPackageVersion>1.9.9</EasyCachingDiskPackageVersion>
-		<EasyCachingMsExtPackageVersion>1.9.9</EasyCachingMsExtPackageVersion>
-		<EasyCachingLiteDBPackageVersion>1.9.9</EasyCachingLiteDBPackageVersion>
-		<EasyCachingSTJsonPackageVersion>1.9.9</EasyCachingSTJsonPackageVersion>
-		<EasyCachingMemoryPackageVersion>1.9.9</EasyCachingMemoryPackageVersion>
-		<EasyCachingFaskKVPackageVersion>1.9.9</EasyCachingFaskKVPackageVersion>
+		<EasyCachingCorePackageVersion>1.9.1</EasyCachingCorePackageVersion>
+		<EasyCachingMemcachedPackageVersion>1.9.1</EasyCachingMemcachedPackageVersion>
+		<EasyCachingRedisPackageVersion>1.9.1</EasyCachingRedisPackageVersion>
+		<EasyCachingSQLitePackageVersion>1.9.1</EasyCachingSQLitePackageVersion>
+		<EasyCachingInMemoryPackageVersion>1.9.1</EasyCachingInMemoryPackageVersion>
+		<EasyCachingHybridPackageVersion>1.9.1</EasyCachingHybridPackageVersion>
+		<EasyCachingAspectCorePackageVersion>1.9.1</EasyCachingAspectCorePackageVersion>
+		<EasyCachingCastlePackageVersion>1.9.1</EasyCachingCastlePackageVersion>
+		<EasyCachingResponseCachingPackageVersion>1.9.1</EasyCachingResponseCachingPackageVersion>
+		<EasyCachingJsonPackageVersion>1.9.1</EasyCachingJsonPackageVersion>
+		<EasyCachingMessagePackPackageVersion>1.9.1</EasyCachingMessagePackPackageVersion>
+		<EasyCachingProtobufPackageVersion>1.9.1</EasyCachingProtobufPackageVersion>
+		<EasyCachingCSRedisPackageVersion>1.9.1</EasyCachingCSRedisPackageVersion>
+		<EasyCachingRedisBusPackageVersion>1.9.1</EasyCachingRedisBusPackageVersion>
+		<EasyCachingCSRedisBusPackageVersion>1.9.1</EasyCachingCSRedisBusPackageVersion>
+		<EasyCachingRabbitBusPackageVersion>1.9.1</EasyCachingRabbitBusPackageVersion>
+	  <EasyCachingRabbitStreamBusPackageVersion>1.9.1</EasyCachingRabbitStreamBusPackageVersion>	
+    <EasyCachingKafkaBusPackageVersion>1.9.1</EasyCachingKafkaBusPackageVersion>
+		<EasyCachingZookeeperBusPackageVersion>1.9.1</EasyCachingZookeeperBusPackageVersion>
+		<EasyCachingDiskPackageVersion>1.9.1</EasyCachingDiskPackageVersion>
+		<EasyCachingMsExtPackageVersion>1.9.1</EasyCachingMsExtPackageVersion>
+		<EasyCachingLiteDBPackageVersion>1.9.1</EasyCachingLiteDBPackageVersion>
+		<EasyCachingSTJsonPackageVersion>1.9.1</EasyCachingSTJsonPackageVersion>
+		<EasyCachingMemoryPackageVersion>1.9.1</EasyCachingMemoryPackageVersion>
+		<EasyCachingFaskKVPackageVersion>1.9.1</EasyCachingFaskKVPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/docs/In-Memory.md b/docs/In-Memory.md
@@ -46,7 +46,7 @@ public class Startup
                     // below two settings are added in v0.8.0
                     // enable deep clone when reading object from cache or not, default value is true.
                     EnableReadDeepClone = true,
-                    // enable deep clone when writing object to cache or not, default valuee is false.
+                    // enable deep clone when writing object to cache or not, default value is false.
                     EnableWriteDeepClone = false,
                 };
                 // the max random second will be added to cache's expiration, default value is 120

diff --git a/src/EasyCaching.Core/Configurations/EasyCachingServiceCollectionExtensions.cs b/src/EasyCaching.Core/Configurations/EasyCachingServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
 namespace Microsoft.Extensions.DependencyInjection
 {
     using EasyCaching.Core;
-    using EasyCaching.Core.Configurations;
-    using System;
+    using EasyCaching.Core.Configurations;
+    using System;
 
     /// <summary>
     /// EasyCaching service collection extensions.
     /// </summary>
     public static class EasyCachingServiceCollectionExtensions
     {
         /// <summary>
-        /// Adds the easycaching.
+        /// Adds the EasyCaching.
         /// </summary>
         /// <returns>The easy caching.</returns>
         /// <param name="services">Services.</param>
@@ -30,5 +30,38 @@ public static IServiceCollection AddEasyCaching(this IServiceCollection services
 
             return services;
         }
+
+        /// <summary>
+        /// Adds the EasyCaching.
+        /// </summary>
+        /// <returns>The easy caching.</returns>
+        /// <param name="services">Services.</param>
+        /// <param name="setupAction">Setup action.</param>
+        public static IServiceCollection AddEasyCaching(this IServiceCollection services, Action<IServiceProvider, EasyCachingOptions> setupAction)
+        {
+            ArgumentCheck.NotNull(setupAction, nameof(setupAction));
+
+            // Options
+            services.AddSingleton(sp =>
+            {
+                var options = new EasyCachingOptions();
+                setupAction(sp, options);
+                return options;
+            });
+
+            // Extension services
+            services.AddSingleton(sp =>
+            {
+                var options = sp.GetRequiredService<EasyCachingOptions>();
+                foreach (var serviceExtension in options.Extensions)
+                {
+                    serviceExtension.AddServices(services);
+                }
+
+                return options;
+            });
+
+            return services;
+        }
     }
 }