Merge pull request #193 from dotnetcore/dev

Fixed some known issue and upgrade dependencies
dotnetcore · Feb 19, 2020 · 934c31c · 934c31c
2 parents 82dd4e1 + 63efb51
commit 934c31c
Show file tree

Hide file tree

Showing 31 changed files with 279 additions and 165 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: csharp
 solution: EasyCaching.sln
 dist: bionic
 sudo: required    
-dotnet: 3.0.100
+dotnet: 3.1.100
 mono: none
 
 services:

diff --git a/build/releasenotes.props b/build/releasenotes.props
@@ -1,20 +1,19 @@
 <Project>
 	<PropertyGroup>
 		<EasyCachingCorePackageNotes>                                
-        1. Redis provider support some geo methods.        
+        1. Upgrading dependencies.        
         </EasyCachingCorePackageNotes>
 		<EasyCachingMemcachedPackageNotes>
         1. Upgrading dependencies.    
         </EasyCachingMemcachedPackageNotes>
 		<EasyCachingRedisPackageNotes>        
-        1. Support some geo methods.
+        1. Upgrading dependencies.
         </EasyCachingRedisPackageNotes>
 		<EasyCachingSQLitePackageNotes>
         1. Upgrading dependencies.    
         </EasyCachingSQLitePackageNotes>
 		<EasyCachingInMemoryPackageNotes>
-        1. Fix datetime exception.
-        2. Upgrading dependencies.    
+        1. Upgrading dependencies.  
         </EasyCachingInMemoryPackageNotes>
 		<EasyCachingHybridPackageNotes>
         1. Upgrading dependencies.    
@@ -38,7 +37,7 @@
         1. Upgrading dependencies.    
         </EasyCachingProtobufPackageNotes>
         <EasyCachingCSRedisPackageNotes>
-        1. Support some geo methods.
+        1. Upgrading dependencies.
         </EasyCachingCSRedisPackageNotes>
         <EasyCachingCSRedisBusPackageNotes>
         1. Upgrading dependencies.    

diff --git a/build/version.props b/build/version.props
@@ -1,21 +1,21 @@
 <Project>
 	<PropertyGroup>
-		<EasyCachingCorePackageVersion>0.8.3</EasyCachingCorePackageVersion>
-		<EasyCachingMemcachedPackageVersion>0.8.3</EasyCachingMemcachedPackageVersion>
-		<EasyCachingRedisPackageVersion>0.8.3</EasyCachingRedisPackageVersion>
-		<EasyCachingSQLitePackageVersion>0.8.3</EasyCachingSQLitePackageVersion>
-		<EasyCachingInMemoryPackageVersion>0.8.3</EasyCachingInMemoryPackageVersion>
-		<EasyCachingHybridPackageVersion>0.8.3</EasyCachingHybridPackageVersion>
-		<EasyCachingAspectCorePackageVersion>0.8.3</EasyCachingAspectCorePackageVersion>
-		<EasyCachingCastlePackageVersion>0.8.3</EasyCachingCastlePackageVersion>
-		<EasyCachingResponseCachingPackageVersion>0.8.3</EasyCachingResponseCachingPackageVersion>
-		<EasyCachingJsonPackageVersion>0.8.3</EasyCachingJsonPackageVersion>
-		<EasyCachingMessagePackPackageVersion>0.8.3</EasyCachingMessagePackPackageVersion>
-		<EasyCachingProtobufPackageVersion>0.8.3</EasyCachingProtobufPackageVersion>
-		<EasyCachingCSRedisPackageVersion>0.8.3</EasyCachingCSRedisPackageVersion>
-		<EasyCachingRedisBusPackageVersion>0.8.3</EasyCachingRedisBusPackageVersion>
-		<EasyCachingCSRedisBusPackageVersion>0.8.3</EasyCachingCSRedisBusPackageVersion>
-		<EasyCachingRabbitBusPackageVersion>0.8.3</EasyCachingRabbitBusPackageVersion>
-		<EasyCachingDiskPackageVersion>0.8.3</EasyCachingDiskPackageVersion>
+		<EasyCachingCorePackageVersion>0.8.5</EasyCachingCorePackageVersion>
+		<EasyCachingMemcachedPackageVersion>0.8.5</EasyCachingMemcachedPackageVersion>
+		<EasyCachingRedisPackageVersion>0.8.5</EasyCachingRedisPackageVersion>
+		<EasyCachingSQLitePackageVersion>0.8.5</EasyCachingSQLitePackageVersion>
+		<EasyCachingInMemoryPackageVersion>0.8.5</EasyCachingInMemoryPackageVersion>
+		<EasyCachingHybridPackageVersion>0.8.5</EasyCachingHybridPackageVersion>
+		<EasyCachingAspectCorePackageVersion>0.8.5</EasyCachingAspectCorePackageVersion>
+		<EasyCachingCastlePackageVersion>0.8.5</EasyCachingCastlePackageVersion>
+		<EasyCachingResponseCachingPackageVersion>0.8.5</EasyCachingResponseCachingPackageVersion>
+		<EasyCachingJsonPackageVersion>0.8.5</EasyCachingJsonPackageVersion>
+		<EasyCachingMessagePackPackageVersion>0.8.5</EasyCachingMessagePackPackageVersion>
+		<EasyCachingProtobufPackageVersion>0.8.5</EasyCachingProtobufPackageVersion>
+		<EasyCachingCSRedisPackageVersion>0.8.5</EasyCachingCSRedisPackageVersion>
+		<EasyCachingRedisBusPackageVersion>0.8.5</EasyCachingRedisBusPackageVersion>
+		<EasyCachingCSRedisBusPackageVersion>0.8.5</EasyCachingCSRedisBusPackageVersion>
+		<EasyCachingRabbitBusPackageVersion>0.8.5</EasyCachingRabbitBusPackageVersion>
+		<EasyCachingDiskPackageVersion>0.8.5</EasyCachingDiskPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj b/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj
@@ -8,6 +8,10 @@
     <Folder Include="Services\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="AspectCore.Extensions.Hosting" Version="2.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\EasyCaching.Interceptor.Castle\EasyCaching.Interceptor.Castle.csproj" />
     <ProjectReference Include="..\..\src\EasyCaching.Interceptor.AspectCore\EasyCaching.Interceptor.AspectCore.csproj" />

diff --git a/sample/EasyCaching.Demo.Interceptors/Program.cs b/sample/EasyCaching.Demo.Interceptors/Program.cs
@@ -1,6 +1,7 @@
 namespace EasyCaching.Demo.Interceptors
 {
     using AspectCore.Extensions.DependencyInjection;
+    using AspectCore.Extensions.Hosting;
     using Autofac.Extensions.DependencyInjection;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.Hosting;
@@ -18,10 +19,10 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                // for aspcectcore
-                .UseServiceProviderFactory(new AspectCoreServiceProviderFactory())
-                //// for castle
-                //.UseServiceProviderFactory(new AutofacServiceProviderFactory())
+                 // for aspcectcore
+                 .UseServiceContext()
+            //// for castle
+            //.UseServiceProviderFactory(new AutofacServiceProviderFactory())
             ;
     }
 }
diff --git a/sample/EasyCaching.Demo.Interceptors/Startup.cs b/sample/EasyCaching.Demo.Interceptors/Startup.cs
@@ -1,6 +1,6 @@
 namespace EasyCaching.Demo.Interceptors
 {
-    using AspectCore.Injector;
+    using AspectCore.Extensions.DependencyInjection;
     using Autofac;
     using EasyCaching.Core;
     using EasyCaching.Demo.Interceptors.Services;
@@ -51,11 +51,11 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         #region ConfigureContainer should be only one
-        // for aspectcore
-        public void ConfigureContainer(IServiceContainer builder)
-        {
-            builder.ConfigureAspectCoreInterceptor();
-        }
+        //// for aspectcore
+        //public void ConfigureContainer(IServiceContainer builder)
+        //{
+        //    builder.ConfigureAspectCoreInterceptor();
+        //}
 
         //// ConfigureContainer is where you can register things directly
         //// with Autofac. This runs after ConfigureServices so the things

diff --git a/src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj b/src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.1.17" />
+    <PackageReference Include="CSRedisCore" Version="3.4.0" />
   </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
@@ -36,6 +36,6 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Set.cs b/src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Set.cs
@@ -25,7 +25,7 @@ public long SAdd<T>(string cacheKey, IList<T> cacheValues, TimeSpan? expiration
 
             if (expiration.HasValue)
             {
-                _cache.Expire(cacheKey, expiration.Value.Seconds);
+                _cache.Expire(cacheKey, (int)expiration.Value.TotalSeconds);
             }
 
             return len;
@@ -131,7 +131,7 @@ public async Task<long> SAddAsync<T>(string cacheKey, IList<T> cacheValues, Time
 
             if (expiration.HasValue)
             {
-                await _cache.ExpireAsync(cacheKey, expiration.Value.Seconds);
+                await _cache.ExpireAsync(cacheKey, (int)expiration.Value.TotalSeconds);
             }
 
             return len;

diff --git a/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj b/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.1.17" />
+    <PackageReference Include="CSRedisCore" Version="3.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

diff --git a/src/EasyCaching.Core/EasyCaching.Core.csproj b/src/EasyCaching.Core/EasyCaching.Core.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />    
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.1" />    
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
   </ItemGroup>
 </Project>
diff --git a/src/EasyCaching.Disk/DefaultDiskCachingProvider.Async.cs b/src/EasyCaching.Disk/DefaultDiskCachingProvider.Async.cs
@@ -6,7 +6,8 @@
     using System.Linq;
     using System.Threading.Tasks;
     using EasyCaching.Core;
-    using MessagePack;
+    using MessagePack;
+    using MessagePack.Resolvers;
     using Microsoft.Extensions.Logging;
 
     public partial class DefaultDiskCachingProvider : EasyCachingAbstractProvider
@@ -63,7 +64,7 @@ public override async Task<IDictionary<string, CacheValue<T>>> BaseGetAllAsync<T
 
                     if (cached.Expiration > DateTimeOffset.UtcNow)
                     {
-                        var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+                        var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
 
                         if (!dict.ContainsKey(item))
                         {
@@ -92,12 +93,19 @@ public override async Task<CacheValue<T>> BaseGetAsync<T>(string cacheKey, Func<
 
             if (File.Exists(path))
             {
-                //var cached = await GetDiskCacheValueAsync(path);
-                var cached = GetDiskCacheValue(path);
+                /*
+                 GetAsync_Parallel_Should_Succeed always failed in CI due to this reason, but succeed in local PC
+
+                 MessagePack.MessagePackSerializationException : Failed to deserialize EasyCaching.Disk.DiskCacheValue value.
+                    ---- System.IO.EndOfStreamException : Attempted to read past the end of the stream.
+                 */
+                var cached = await GetDiskCacheValueAsync(path);
+                //var cached = GetDiskCacheValueAsync(path).ConfigureAwait(false).GetAwaiter().GetResult();
+                //var cached = GetDiskCacheValue(path);
 
                 if (cached.Expiration > DateTimeOffset.UtcNow)
                 {
-                    var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+                    var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
 
                     if (_options.EnableLogging)
                         _logger?.LogInformation($"Cache Hit : cachekey = {cacheKey}");
@@ -162,7 +170,7 @@ public override async Task<object> BaseGetAsync(string cacheKey, Type type)
 
                 CacheStats.OnHit();
 
-                var t = MessagePackSerializer.NonGeneric.Deserialize(type, cached.Value);
+                var t = MessagePackSerializer.Deserialize(type, cached.Value, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
                 return t;
             }
             else
@@ -201,7 +209,7 @@ public override async Task<CacheValue<T>> BaseGetAsync<T>(string cacheKey)
 
                 CacheStats.OnHit();
 
-                var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+                var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
                 return new CacheValue<T>(t, true);
             }
             else
@@ -242,7 +250,7 @@ public override async Task<IDictionary<string, CacheValue<T>>> BaseGetByPrefixAs
 
                     if (cached.Expiration > DateTimeOffset.UtcNow)
                     {
-                        var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+                        var t = MessagePackSerializer.Deserialize<T>(cached.Value, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
 
                         if (!dict.ContainsKey(item))
                         {
@@ -420,7 +428,7 @@ private async Task<DiskCacheValue> GetDiskCacheValueAsync(string path)
         {
             using (FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
-                var cached = await MessagePackSerializer.DeserializeAsync<DiskCacheValue>(stream);
+                var cached = await MessagePackSerializer.DeserializeAsync<DiskCacheValue>(stream, MessagePackSerializerOptions.Standard.WithResolver(ContractlessStandardResolver.Instance));
 
                 return cached;
             }