Merge pull request #319 from Senparc/Develop

Develop
Senparc · Dec 4, 2024 · cd93158 · cd93158
2 parents 859d5bf + 77a93e2
commit cd93158
Show file tree

Hide file tree

Showing 22 changed files with 188 additions and 160 deletions.
diff --git a/Sample/Senparc.CO2NET.Sample.net8/Senparc.CO2NET.Sample.net8.csproj b/Sample/Senparc.CO2NET.Sample.net8/Senparc.CO2NET.Sample.net8.csproj
@@ -14,7 +14,7 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
 
-		<PackageReference Include="Senparc.Weixin.MP" Version="16.22.1" />
+		<PackageReference Include="Senparc.Weixin.MP" Version="16.23.6" />
 
 		<ProjectReference Include="..\..\src\Senparc.CO2NET.APM\Senparc.CO2NET.APM.csproj" />
 		<ProjectReference Include="..\..\src\Senparc.CO2NET.AspNet\Senparc.CO2NET.AspNet.csproj" />

diff --git a/src/Senparc.CO2NET.APM/Senparc.CO2NET.APM.csproj b/src/Senparc.CO2NET.APM/Senparc.CO2NET.APM.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
-		<Version>2.0.1-beta1</Version>
+		<Version>2.1.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.APM</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.APM</RootNamespace>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -37,6 +37,7 @@
 			v1.1.0 APM is disabled by default (EnableAPM = false)
 			[2024-09-11] v1.4.6 Update Cache, remove InsertToCache(), add Count(prefix)
 			[2024-11-28] v2.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
+			[2024-12-04] v2.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
 </PackageReleaseNotes>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/Senparc.CO2NET.AspNet/Register.cs b/src/Senparc.CO2NET.AspNet/Register.cs
@@ -12,28 +12,29 @@
     Modification Identifier: Senparc - 20240728
     Modification Description: v1.4.0 .NET 6.0 and .NET 8.0 assemblies no longer depend on Microsoft.AspNetCore.Hosting.Abstractions and Microsoft.AspNetCore.Http.Abstractions
 
-----------------------------------------------------------------*/
-
-#if !NET462
-using Microsoft.AspNetCore.Builder;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Senparc.CO2NET.Cache;
-using Senparc.CO2NET.RegisterServices;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.DependencyInjection;
-#endif
-
-namespace Senparc.CO2NET.AspNet
-{
+----------------------------------------------------------------*/
+
+
+#if !NET462
+using Microsoft.AspNetCore.Builder;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Senparc.CO2NET.Cache;
+using Senparc.CO2NET.RegisterServices;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.DependencyInjection;
+#endif
+
+namespace Senparc.CO2NET.AspNet
+{
     /// <summary>
     /// Senparc.CO2NET.AspNet Basic Information Registration
     /// </summary>
-    public static class Register
-    {
-#if !NET462
-
+    public static class Register
+    {
+#if !NET462
+
         /// <summary>
         /// Start Senparc.CO2NET initialization parameter process (ASP.NET Core)
         /// </summary>
@@ -46,21 +47,21 @@ public static class Register
         /// <para>(LocalContainerCacheStrategy, RedisContainerCacheStrategy, MemcacheContainerCacheStrategy are already automatically registered),</para>
         /// <para>If set to null (note: not delegate returns null, but the entire delegate parameter is null), it will automatically use reflection to scan all possible extension cache strategies</para></param>
         /// <returns></returns>
-        public static IRegisterService UseSenparcGlobal(this IApplicationBuilder registerService,
-            Microsoft.Extensions.Hosting.IHostEnvironment/*IHostingEnvironment*/ env,
-            SenparcSetting senparcSetting = null,
-            Action<RegisterService> registerConfigure = null,
-            bool autoScanExtensionCacheStrategies = false,
-            Func<IList<IDomainExtensionCacheStrategy>> extensionCacheStrategiesFunc = null)
-        {
-            senparcSetting = senparcSetting ?? registerService.ApplicationServices.GetService<IOptions<SenparcSetting>>().Value;
-
+        public static IRegisterService UseSenparcGlobal(this IApplicationBuilder registerService,
+            Microsoft.Extensions.Hosting.IHostEnvironment/*IHostingEnvironment*/ env,
+            SenparcSetting senparcSetting = null,
+            Action<RegisterService> registerConfigure = null,
+            bool autoScanExtensionCacheStrategies = false,
+            Func<IList<IDomainExtensionCacheStrategy>> extensionCacheStrategiesFunc = null)
+        {
+            senparcSetting = senparcSetting ?? Senparc.CO2NET.Config.SenparcSetting; /*registerService.ApplicationServices.GetService<IOptions<SenparcSetting>>().Value;*/
+
             //Initialize the global RegisterService object and store SenparcSetting information
-            var register = Senparc.CO2NET.AspNet.RegisterServices.
-                            RegisterService.Start(env, senparcSetting);
-
-            return Senparc.CO2NET.Register.UseSenparcGlobal(senparcSetting, registerConfigure, autoScanExtensionCacheStrategies, extensionCacheStrategiesFunc);
-        }
-#endif
-    }
-}
+            var register = Senparc.CO2NET.AspNet.RegisterServices.
+                            RegisterService.Start(env/*, senparcSetting*/);
+
+            return Senparc.CO2NET.Register.UseSenparcGlobal(senparcSetting, registerConfigure, autoScanExtensionCacheStrategies, extensionCacheStrategiesFunc);
+        }
+#endif
+    }
+}
diff --git a/src/Senparc.CO2NET.AspNet/RegisterServices/RegisterService.cs b/src/Senparc.CO2NET.AspNet/RegisterServices/RegisterService.cs
@@ -37,11 +37,10 @@ public static class RegisterService
         /// Start Senparc.CO2NET SDK initialization parameter process (.NET Core), supports ASP.NET Core
         /// </summary>
         /// <param name="env">IHostingEnvironment, console programs can input null,</param>
-        /// <param name="senparcSetting"></param>
         /// <returns></returns>
         public static Senparc.CO2NET.RegisterServices.RegisterService Start(
-            Microsoft.Extensions.Hosting.IHostEnvironment/*IHostingEnvironment*/ env,
-            SenparcSetting senparcSetting)
+            Microsoft.Extensions.Hosting.IHostEnvironment/*IHostingEnvironment*/ env
+            , SenparcSetting senparcSetting = null)
         {
             //Provide website root directory
             if (env != null && env.ContentRootPath != null)

diff --git a/src/Senparc.CO2NET.AspNet/Senparc.CO2NET.AspNet.csproj b/src/Senparc.CO2NET.AspNet/Senparc.CO2NET.AspNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
-		<Version>2.0.1-beta1</Version>
+		<Version>2.1.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.AspNet</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.AspNet</RootNamespace>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -33,6 +33,7 @@
 			[2024-09-11] v1.4.3 Update Cache, remove InsertToCache(), add Count(prefix)
 			[2024-10-07] v1.5.0 Stop supporting .NET 6.0
 			[2024-11-28] v2.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
+			[2024-12-04] v2.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
 </PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
 		<Configurations>Debug;Release;Test</Configurations>

diff --git a/src/Senparc.CO2NET.Cache.CsRedis.Tests/InitTests.cs b/src/Senparc.CO2NET.Cache.CsRedis.Tests/InitTests.cs
@@ -35,15 +35,19 @@ public void AutoRegisterConfigurationTest()
 
             var redisServer = "localhost:6379";
 
-            var senparcSetting = new SenparcSetting()
-            {
-                IsDebug = true,
-                Cache_Redis_Configuration = redisServer
-            };
+            Senparc.CO2NET.Config.SenparcSetting.IsDebug = true;
+            Senparc.CO2NET.Config.SenparcSetting.Cache_Redis_Configuration = redisServer;
+
+
+            //var senparcSetting = new SenparcSetting()
+            //{
+            //    IsDebug = true,
+            //    Cache_Redis_Configuration = redisServer
+            //};
 
 
             var registerService = Senparc.CO2NET.AspNet.RegisterServices.
-                                    RegisterService.Start(mockEnv.Object, senparcSetting)
+                                    RegisterService.Start(mockEnv.Object/*, senparcSetting*/)
                  .UseSenparcGlobal();
             Assert.AreEqual(null, RedisManager.ConfigurationOption);// Not registered yet
 

diff --git a/src/Senparc.CO2NET.Cache.CsRedis/Senparc.CO2NET.Cache.CsRedis.csproj b/src/Senparc.CO2NET.Cache.CsRedis/Senparc.CO2NET.Cache.CsRedis.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
-		<Version>2.1.1-beta1</Version>
+		<Version>2.2.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.Cache.CsRedis</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.Cache.CsRedis</RootNamespace>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
 		<Description>
-      CONET cache strategy - Redis module
+			CONET cache strategy - Redis module
 
-      CO2NET open source project:
-      https://github.com/Senparc/Senparc.CO2NET
-    </Description>
+			CO2NET open source project:
+			https://github.com/Senparc/Senparc.CO2NET
+		</Description>
 		<Copyright>Senparc Copyright © 2004~2024</Copyright>
 		<PackageTags>Senparc.CO2NET,Cache,Redis,CO2NET,盛派</PackageTags>
 		<Authors>Jeffrey Su</Authors>
@@ -22,14 +22,15 @@
 		<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
 		<PackageIcon>icon.jpg</PackageIcon>
 		<PackageReleaseNotes>
-		v0.1.0 Genesis
-		v0.5.2 BaseRedisObjectCacheStrategy destructor performs null value check and adds "#{Cache_Redis_Configuration}#" filter check
-		v1.1.4 RedisObjectCacheStrategy and RedisHashSetObjectCacheStrategy.Get() methods add pure string check
-		v1.2.5 Fix bug where GetAllByPrefixAsync(key) method automatically retrieves all keys
-				[2024-09-11] v1.2.6 Update Cache, remove InsertToCache(), add Count(prefix)
+			v0.1.0 Genesis
+			v0.5.2 BaseRedisObjectCacheStrategy destructor performs null value check and adds "#{Cache_Redis_Configuration}#" filter check
+			v1.1.4 RedisObjectCacheStrategy and RedisHashSetObjectCacheStrategy.Get() methods add pure string check
+			v1.2.5 Fix bug where GetAllByPrefixAsync(key) method automatically retrieves all keys
+			[2024-09-11] v1.2.6 Update Cache, remove InsertToCache(), add Count(prefix)
 			[2024-10-24] v2.0.1-beta1 fix: GetCountAsync(string prefix) #306 Thanks to @rendyu
 			[2024-11-28] v2.1.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
-</PackageReleaseNotes>
+			[2024-12-04] v2.2.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
+		</PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
 		<Configurations>Debug;Release;Test</Configurations>
 	</PropertyGroup>

diff --git a/src/Senparc.CO2NET.Cache.Dapr/Senparc.CO2NET.Cache.Dapr.csproj b/src/Senparc.CO2NET.Cache.Dapr/Senparc.CO2NET.Cache.Dapr.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.0.1-beta1</Version>
+		<Version>1.1.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.Cache.Dapr</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.Cache.Dapr</RootNamespace>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -25,7 +25,8 @@
 			v0.1.0 Genesis
 			[2024-09-11] v0.1.3 Update Cache, remove InsertToCache(), add Count(prefix)
 			[2024-11-28] v1.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
-</PackageReleaseNotes>
+			[2024-12-04] v1.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
+		</PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
 		<Configurations>Debug;Release;Test</Configurations>
 	</PropertyGroup>

diff --git a/src/Senparc.CO2NET.Cache.Memcached/Senparc.CO2NET.Cache.Memcached.csproj b/src/Senparc.CO2NET.Cache.Memcached/Senparc.CO2NET.Cache.Memcached.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
-		<Version>5.0.1-beta1</Version>
+		<Version>5.1.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.Cache.Memcached</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.Cache.Memcached</RootNamespace>
 		<Description>
@@ -91,7 +91,8 @@
 			[2024-09-11] v4.2.5 Update Cache, remove InsertToCache(), add Count(prefix)
 			[2024-10-07] v4.3.0 Stop supporting .NET 6.0
 			[2024-11-28] v5.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
-</PackageReleaseNotes>
+			[2024-12-04] v5.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
+		</PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
 		<Configurations>Debug;Release;Test</Configurations>
 		<!--<Product>Senparc.CO2NET.Cache.Memcached.dll</Product>-->

diff --git a/...nparc.CO2NET.Cache.Redis.RedLock/redlock-cs/src/Senparc.CO2NET.Cache.Redis.RedLock.csproj b/...nparc.CO2NET.Cache.Redis.RedLock/redlock-cs/src/Senparc.CO2NET.Cache.Redis.RedLock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
-		<Version>4.0.1-beta1</Version>
+		<Version>4.1.0-beta1</Version>
 		<AssemblyName>Senparc.CO2NET.Cache.Redis.RedLock</AssemblyName>
 		<RootNamespace>Senparc.CO2NET.Cache.Redis.RedLock</RootNamespace>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -56,6 +56,7 @@
 			v2.2.1 Used .ConfigureAwait(false) to avoid asynchronous deadlock
 			v2.2.4 Provided signed nuget package (.snupkg)
 			[2024-11-28] v4.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
+			[2024-12-04] v4.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
 </PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
 		<Configurations>Debug;Release;Test</Configurations>

diff --git a/src/Senparc.CO2NET.Cache.Redis.Tests/InitTests.cs b/src/Senparc.CO2NET.Cache.Redis.Tests/InitTests.cs
@@ -35,15 +35,18 @@ public void AutoRegisterConfigurationTest()
 
             var redisServer = "localhost:6379";
 
-            var senparcSetting = new SenparcSetting()
-            {
-                IsDebug = true,
-                Cache_Redis_Configuration = redisServer
-            };
+            Senparc.CO2NET.Config.SenparcSetting.IsDebug = true;
+            Senparc.CO2NET.Config.SenparcSetting.Cache_Redis_Configuration = redisServer;
 
 
+            //var senparcSetting = new SenparcSetting()
+            //{
+            //    IsDebug = true,
+            //    Cache_Redis_Configuration = redisServer
+            //};
+
             var registerService = Senparc.CO2NET.AspNet.RegisterServices.
-                                    RegisterService.Start(mockEnv.Object, senparcSetting)
+                                    RegisterService.Start(mockEnv.Object/*, senparcSetting*/)
                  .UseSenparcGlobal();
             Assert.AreEqual(null, RedisManager.ConfigurationOption);// Not registered yet