dotnetcore · catcherwong · Jul 15, 2019 · May 28, 2019 · Jun 2, 2019 · Jun 2, 2019
diff --git a/EasyCaching.sln b/EasyCaching.sln
@@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.CSRedis", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Bus.CSRedis", "src\EasyCaching.Bus.CSRedis\EasyCaching.Bus.CSRedis.csproj", "{861E5373-BEF6-4AA2-92C7-8F4941A079E7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Disk", "src\EasyCaching.Disk\EasyCaching.Disk.csproj", "{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -139,6 +141,10 @@ Global
 		{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CE61FAA2-0233-451C-991D-4222ED61C84B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
@@ -162,5 +168,6 @@ Global
 		{6EBE36A2-F128-4C63-B90A-B700D8C2F2E8} = {EBB55F65-7D07-4281-8D5E-7B0CA88E1AD0}
 		{6584761E-E51C-408F-BE51-CA0F6269589B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
 		{861E5373-BEF6-4AA2-92C7-8F4941A079E7} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
+		{3D48FD75-01D6-44F9-B7C3-CB6DE784F476} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
 	EndGlobalSection
 EndGlobal
diff --git a/build/releasenotes.props b/build/releasenotes.props
@@ -1,34 +1,44 @@
 <Project>
 	<PropertyGroup>
-		<EasyCachingCorePackageNotes>                
-        1. fix typo: IsHightAvailability -> IsHighAvailability.
+		<EasyCachingCorePackageNotes>                                
+        1. Named Serializer
+        2. Add a new CachingProviderType for DiskCachingProvider
+        3. Remove Refresh/RefreshAsync methods
+        4. HybridCachingProvider add GetAsync method with type        
         </EasyCachingCorePackageNotes>
 		<EasyCachingMemcachedPackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingMemcachedPackageNotes>
 		<EasyCachingRedisPackageNotes>        
-        1. Fixed zrange error.
+        1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingRedisPackageNotes>
 		<EasyCachingSQLitePackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingSQLitePackageNotes>
 		<EasyCachingInMemoryPackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingInMemoryPackageNotes>
 		<EasyCachingHybridPackageNotes>
-        1. Can be downgraded to LocalCacheProvider.
+        1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingHybridPackageNotes>
 		<EasyCachingAspectCorePackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingAspectCorePackageNotes>
 		<EasyCachingCastlePackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingCastlePackageNotes>
 		<EasyCachingResponseCachingPackageNotes>
-        1. Upgrading dependencies.
+        1. Upgrading dependencies.        
         </EasyCachingResponseCachingPackageNotes>
 		<EasyCachingJsonPackageNotes>
-        1. Upgrading dependencies.
+        1. Upgrading dependencies.        
         </EasyCachingJsonPackageNotes>
 		<EasyCachingMessagePackPackageNotes>
         1. Upgrading dependencies.
@@ -38,12 +48,16 @@
         </EasyCachingProtobufPackageNotes>
         <EasyCachingCSRedisPackageNotes>
         1. Upgrading dependencies.
+        2. Remove Refresh/RefreshAsync methods
         </EasyCachingCSRedisPackageNotes>
         <EasyCachingRedisBusPackageNotes>
         1. Upgrading dependencies.
         </EasyCachingRedisBusPackageNotes>
         <EasyCachingRabbitBusPackageNotes>
         1. Upgrading dependencies.
         </EasyCachingRabbitBusPackageNotes>
+        <EasyCachingDiskPackageNotes>
+        1. init.
+        </EasyCachingDiskPackageNotes>
 	</PropertyGroup>
 </Project>
diff --git a/build/version.props b/build/version.props
@@ -1,20 +1,21 @@
 <Project>
 	<PropertyGroup>
-		<EasyCachingCorePackageVersion>0.5.6</EasyCachingCorePackageVersion>
-		<EasyCachingMemcachedPackageVersion>0.5.6</EasyCachingMemcachedPackageVersion>
-		<EasyCachingRedisPackageVersion>0.5.6.1</EasyCachingRedisPackageVersion>
-		<EasyCachingSQLitePackageVersion>0.5.6</EasyCachingSQLitePackageVersion>
-		<EasyCachingInMemoryPackageVersion>0.5.6</EasyCachingInMemoryPackageVersion>
-		<EasyCachingHybridPackageVersion>0.5.6.1</EasyCachingHybridPackageVersion>
-		<EasyCachingAspectCorePackageVersion>0.5.6</EasyCachingAspectCorePackageVersion>
-		<EasyCachingCastlePackageVersion>0.5.6</EasyCachingCastlePackageVersion>
-		<EasyCachingResponseCachingPackageVersion>0.5.6</EasyCachingResponseCachingPackageVersion>
-		<EasyCachingJsonPackageVersion>0.5.6</EasyCachingJsonPackageVersion>
-		<EasyCachingMessagePackPackageVersion>0.5.6</EasyCachingMessagePackPackageVersion>
-		<EasyCachingProtobufPackageVersion>0.5.6</EasyCachingProtobufPackageVersion>
-		<EasyCachingCSRedisPackageVersion>0.5.6</EasyCachingCSRedisPackageVersion>
-		<EasyCachingRedisBusPackageVersion>0.5.6</EasyCachingRedisBusPackageVersion>
-		<EasyCachingCSRedisBusPackageVersion>0.5.6</EasyCachingCSRedisBusPackageVersion>
-		<EasyCachingRabbitBusPackageVersion>0.5.6</EasyCachingRabbitBusPackageVersion>
+		<EasyCachingCorePackageVersion>0.6.0</EasyCachingCorePackageVersion>
+		<EasyCachingMemcachedPackageVersion>0.6.0</EasyCachingMemcachedPackageVersion>
+		<EasyCachingRedisPackageVersion>0.6.0</EasyCachingRedisPackageVersion>
+		<EasyCachingSQLitePackageVersion>0.6.0</EasyCachingSQLitePackageVersion>
+		<EasyCachingInMemoryPackageVersion>0.6.0</EasyCachingInMemoryPackageVersion>
+		<EasyCachingHybridPackageVersion>0.6.0</EasyCachingHybridPackageVersion>
+		<EasyCachingAspectCorePackageVersion>0.6.0</EasyCachingAspectCorePackageVersion>
+		<EasyCachingCastlePackageVersion>0.6.0</EasyCachingCastlePackageVersion>
+		<EasyCachingResponseCachingPackageVersion>0.6.0</EasyCachingResponseCachingPackageVersion>
+		<EasyCachingJsonPackageVersion>0.6.0</EasyCachingJsonPackageVersion>
+		<EasyCachingMessagePackPackageVersion>0.6.0</EasyCachingMessagePackPackageVersion>
+		<EasyCachingProtobufPackageVersion>0.6.0</EasyCachingProtobufPackageVersion>
+		<EasyCachingCSRedisPackageVersion>0.6.0</EasyCachingCSRedisPackageVersion>
+		<EasyCachingRedisBusPackageVersion>0.6.0</EasyCachingRedisBusPackageVersion>
+		<EasyCachingCSRedisBusPackageVersion>0.6.0</EasyCachingCSRedisBusPackageVersion>
+		<EasyCachingRabbitBusPackageVersion>0.6.0</EasyCachingRabbitBusPackageVersion>
+		<EasyCachingDiskPackageVersion>0.6.0</EasyCachingDiskPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj b/src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj
@@ -3,15 +3,15 @@
   <Import Project="../../build/releasenotes.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Owners>Catcher Wong</Owners>
-    <Authors>Catcher Wong</Authors>    
+    <Owners>ncc;Catcher Wong</Owners>
+    <Authors>ncc;Catcher Wong</Authors>      
     <Version>$(EasyCachingRedisBusPackageVersion)</Version>
     <Description>      
       A simple caching bus(message bus) based on CSRedis.
     </Description>    
     <PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
     <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>    
     <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -26,7 +26,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.0.52" />    
+    <None Include="../../LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CSRedisCore" Version="3.0.62" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

diff --git a/src/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj b/src/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj
@@ -3,15 +3,15 @@
   <Import Project="../../build/releasenotes.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Owners>Catcher Wong</Owners>
-    <Authors>Catcher Wong</Authors>    
+    <Owners>ncc;Catcher Wong</Owners>
+    <Authors>ncc;Catcher Wong</Authors>    
     <Version>$(EasyCachingRabbitBusPackageVersion)</Version>
     <Description>      
       A simple caching bus(message bus) based on RabbitMQ.
     </Description>    
     <PackageTags>Bus,Hybrid,RabbitMQ,Caching,Cache</PackageTags>
     <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>    
     <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -25,13 +25,19 @@
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../../LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />    
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.2.0" />    
   </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Configurations\" />
   </ItemGroup>

diff --git a/src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj b/src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj
@@ -3,15 +3,15 @@
   <Import Project="../../build/releasenotes.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Owners>Catcher Wong</Owners>
-    <Authors>Catcher Wong</Authors>    
+    <Owners>ncc;Catcher Wong</Owners>
+    <Authors>ncc;Catcher Wong</Authors>     
     <Version>$(EasyCachingRedisBusPackageVersion)</Version>
     <Description>      
       A simple caching bus(message bus) based on StackExchange.Redis.
     </Description>    
     <PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
     <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>    
     <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -25,6 +25,9 @@
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../../LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="StackExchange.Redis" Version="2.0.601" />    
   </ItemGroup>

diff --git a/src/EasyCaching.CSRedis/Configurations/EasyCachingOptionsExtensions.cs b/src/EasyCaching.CSRedis/Configurations/EasyCachingOptionsExtensions.cs
@@ -41,10 +41,8 @@ public static EasyCachingOptions UseCSRedis(this EasyCachingOptions options, ICo
 
             void configure(RedisOptions x)
             {
-                x.CachingProviderType = redisOptions.CachingProviderType;
                 x.EnableLogging = redisOptions.EnableLogging;
                 x.MaxRdSecond = redisOptions.MaxRdSecond;
-                x.Order = redisOptions.Order;
                 x.DBConfig = redisOptions.DBConfig;
             }
 

diff --git a/src/EasyCaching.CSRedis/Configurations/RedisOptions.cs b/src/EasyCaching.CSRedis/Configurations/RedisOptions.cs
@@ -7,7 +7,7 @@ public class RedisOptions : BaseProviderOptions
     {
         public RedisOptions()
         {
-            this.CachingProviderType = CachingProviderType.Redis;
+
         }
 
         /// <summary>

diff --git a/src/EasyCaching.CSRedis/Configurations/RedisOptionsExtension.cs b/src/EasyCaching.CSRedis/Configurations/RedisOptionsExtension.cs
@@ -75,11 +75,11 @@ public void AddServices(IServiceCollection services)
             Func<IServiceProvider, DefaultCSRedisCachingProvider> createFactory = x =>
             {
                 var clients = x.GetServices<EasyCachingCSRedisClient>();
-                var serializer = x.GetRequiredService<IEasyCachingSerializer>();
+                var serializers = x.GetServices<IEasyCachingSerializer>();
                 var optionsMon = x.GetRequiredService<IOptionsMonitor<RedisOptions>>();
                 var options = optionsMon.Get(_name);
                 var factory = x.GetService<ILoggerFactory>();
-                return new DefaultCSRedisCachingProvider(_name, clients, serializer, options, factory);
+                return new DefaultCSRedisCachingProvider(_name, clients, serializers, options, factory);
             };
 
             services.AddSingleton<IEasyCachingProvider, DefaultCSRedisCachingProvider>(createFactory);

diff --git a/src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.cs b/src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.cs
@@ -48,31 +48,30 @@ public partial class DefaultCSRedisCachingProvider : EasyCachingAbstractProvider
         /// </summary>
         /// <param name="name">Name.</param>
         /// <param name="clients">Clients.</param>
-        /// <param name="serializer">Serializer.</param>
+        /// <param name="serializers">Serializers.</param>
         /// <param name="options">Options.</param>
         /// <param name="loggerFactory">Logger factory.</param>
         public DefaultCSRedisCachingProvider(
            string name,
            IEnumerable<EasyCachingCSRedisClient> clients,
-           IEasyCachingSerializer serializer,
+           IEnumerable<IEasyCachingSerializer> serializers,
            RedisOptions options,
            ILoggerFactory loggerFactory = null)
         {
             this._name = name;
-            this._serializer = serializer;
+            this._serializer = serializers.FirstOrDefault(x => x.Name.Equals(_name)) ?? serializers.Single(x => x.Name.Equals(EasyCachingConstValue.DefaultSerializerName));
             this._options = options;
             this._logger = loggerFactory?.CreateLogger<DefaultCSRedisCachingProvider>();
             this._cache = clients.Single(x => x.Name.Equals(_name));
             this._cacheStats = new CacheStats();
 
             this.ProviderName = this._name;
+            this.ProviderType = CachingProviderType.Redis;
             this.ProviderStats = this._cacheStats;
-            this.ProviderType = _options.CachingProviderType;
-            this.ProviderOrder = _options.Order;
             this.ProviderMaxRdSecond = _options.MaxRdSecond;
             this.IsDistributedProvider = true;
         }
-        
+
         /// <summary>
         /// Exists the specified cacheKey.
         /// </summary>
@@ -498,42 +497,7 @@ public override int BaseGetCount(string prefix = "")
 
             return this.SearchRedisKeys(this.HandlePrefix(prefix)).Length;
         }
-
-        /// <summary>
-        /// Refresh the specified cacheKey, cacheValue and expiration.
-        /// </summary>
-        /// <param name="cacheKey">Cache key.</param>
-        /// <param name="cacheValue">Cache value.</param>
-        /// <param name="expiration">Expiration.</param>
-        /// <typeparam name="T">The 1st type parameter.</typeparam>
-        public override void BaseRefresh<T>(string cacheKey, T cacheValue, TimeSpan expiration)
-        {
-            ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
-            ArgumentCheck.NotNull(cacheValue, nameof(cacheValue));
-            ArgumentCheck.NotNegativeOrZero(expiration, nameof(expiration));
-
-            this.Remove(cacheKey);
-            this.Set(cacheKey, cacheValue, expiration);
-        }
-
-        /// <summary>
-        /// Refreshs the async.
-        /// </summary>
-        /// <returns>The async.</returns>
-        /// <param name="cacheKey">Cache key.</param>
-        /// <param name="cacheValue">Cache value.</param>
-        /// <param name="expiration">Expiration.</param>
-        /// <typeparam name="T">The 1st type parameter.</typeparam>
-        public override async Task BaseRefreshAsync<T>(string cacheKey, T cacheValue, TimeSpan expiration)
-        {
-            ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
-            ArgumentCheck.NotNull(cacheValue, nameof(cacheValue));
-            ArgumentCheck.NotNegativeOrZero(expiration, nameof(expiration));
-
-            await this.RemoveAsync(cacheKey);
-            await this.SetAsync(cacheKey, cacheValue, expiration);
-        }
-
+
         /// <summary>
         /// Remove the specified cacheKey.
         /// </summary>

diff --git a/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj b/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj
@@ -3,15 +3,15 @@
   <Import Project="../../build/releasenotes.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Owners>Catcher Wong</Owners>
-    <Authors>Catcher Wong</Authors>
+    <Owners>ncc;Catcher Wong</Owners>
+    <Authors>ncc;Catcher Wong</Authors>    
     <Version>$(EasyCachingCSRedisPackageVersion)</Version>
     <Description>
       A simple distributed caching provider based on csredis.
     </Description>    
     <PackageTags>Redis,DistributedCache,Caching,Cache</PackageTags>
     <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>    
     <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -26,7 +26,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.0.52" />    
+    <None Include="../../LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CSRedisCore" Version="3.0.62" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ public class RedisOptions : BaseProviderOptions @@
         {
             public RedisOptions()
             {
-                this.CachingProviderType = CachingProviderType.Redis;
             }
             /// <summary>
@@ Expand Down @@