Skip to content

Commit 934c31c

Browse files
catcherwongcatcherwong
authored
Merge pull request #193 from dotnetcore/dev
Fixed some known issue and upgrade dependencies
2 parents 82dd4e1 + 63efb51 commit 934c31c

31 files changed

+279
-165
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: csharp
22
solution: EasyCaching.sln
33
dist: bionic
44
sudo: required
5-
dotnet: 3.0.100
5+
dotnet: 3.1.100
66
mono: none
77

88
services:

‎build/releasenotes.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Redis provider support some geo methods.
4+
1. Upgrading dependencies.
55
</EasyCachingCorePackageNotes>
66
<EasyCachingMemcachedPackageNotes>
77
1. Upgrading dependencies.
88
</EasyCachingMemcachedPackageNotes>
99
<EasyCachingRedisPackageNotes>
10-
1. Support some geo methods.
10+
1. Upgrading dependencies.
1111
</EasyCachingRedisPackageNotes>
1212
<EasyCachingSQLitePackageNotes>
1313
1. Upgrading dependencies.
1414
</EasyCachingSQLitePackageNotes>
1515
<EasyCachingInMemoryPackageNotes>
16-
1. Fix datetime exception.
17-
2. Upgrading dependencies.
16+
1. Upgrading dependencies.
1817
</EasyCachingInMemoryPackageNotes>
1918
<EasyCachingHybridPackageNotes>
2019
1. Upgrading dependencies.
@@ -38,7 +37,7 @@
3837
1. Upgrading dependencies.
3938
</EasyCachingProtobufPackageNotes>
4039
<EasyCachingCSRedisPackageNotes>
41-
1. Support some geo methods.
40+
1. Upgrading dependencies.
4241
</EasyCachingCSRedisPackageNotes>
4342
<EasyCachingCSRedisBusPackageNotes>
4443
1. Upgrading dependencies.

‎build/version.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>0.8.3</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>0.8.3</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>0.8.3</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>0.8.3</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>0.8.3</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>0.8.3</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>0.8.3</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>0.8.3</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>0.8.3</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>0.8.3</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>0.8.3</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>0.8.3</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>0.8.3</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>0.8.3</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>0.8.3</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>0.8.3</EasyCachingRabbitBusPackageVersion>
19-
<EasyCachingDiskPackageVersion>0.8.3</EasyCachingDiskPackageVersion>
3+
<EasyCachingCorePackageVersion>0.8.5</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>0.8.5</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>0.8.5</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>0.8.5</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>0.8.5</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>0.8.5</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>0.8.5</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>0.8.5</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>0.8.5</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>0.8.5</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>0.8.5</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>0.8.5</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>0.8.5</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>0.8.5</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>0.8.5</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>0.8.5</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingDiskPackageVersion>0.8.5</EasyCachingDiskPackageVersion>
2020
</PropertyGroup>
2121
</Project>

‎sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<Folder Include="Services\" />
99
</ItemGroup>
1010

11+
<ItemGroup>
12+
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.0.0" />
13+
</ItemGroup>
14+
1115
<ItemGroup>
1216
<ProjectReference Include="..\..\src\EasyCaching.Interceptor.Castle\EasyCaching.Interceptor.Castle.csproj" />
1317
<ProjectReference Include="..\..\src\EasyCaching.Interceptor.AspectCore\EasyCaching.Interceptor.AspectCore.csproj" />

‎sample/EasyCaching.Demo.Interceptors/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace EasyCaching.Demo.Interceptors
22
{
33
using AspectCore.Extensions.DependencyInjection;
4+
using AspectCore.Extensions.Hosting;
45
using Autofac.Extensions.DependencyInjection;
56
using Microsoft.AspNetCore.Hosting;
67
using Microsoft.Extensions.Hosting;
@@ -18,10 +19,10 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
1819
{
1920
webBuilder.UseStartup<Startup>();
2021
})
21-
// for aspcectcore
22-
.UseServiceProviderFactory(new AspectCoreServiceProviderFactory())
23-
//// for castle
24-
//.UseServiceProviderFactory(new AutofacServiceProviderFactory())
22+
// for aspcectcore
23+
.UseServiceContext()
24+
//// for castle
25+
//.UseServiceProviderFactory(new AutofacServiceProviderFactory())
2526
;
2627
}
2728
}

‎sample/EasyCaching.Demo.Interceptors/Startup.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace EasyCaching.Demo.Interceptors
22
{
3-
using AspectCore.Injector;
3+
using AspectCore.Extensions.DependencyInjection;
44
using Autofac;
55
using EasyCaching.Core;
66
using EasyCaching.Demo.Interceptors.Services;
@@ -51,11 +51,11 @@ public void ConfigureServices(IServiceCollection services)
5151
}
5252

5353
#region ConfigureContainer should be only one
54-
// for aspectcore
55-
public void ConfigureContainer(IServiceContainer builder)
56-
{
57-
builder.ConfigureAspectCoreInterceptor();
58-
}
54+
//// for aspectcore
55+
//public void ConfigureContainer(IServiceContainer builder)
56+
//{
57+
// builder.ConfigureAspectCoreInterceptor();
58+
//}
5959

6060
//// ConfigureContainer is where you can register things directly
6161
//// with Autofac. This runs after ConfigureServices so the things

‎src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="CSRedisCore" Version="3.1.17" />
34+
<PackageReference Include="CSRedisCore" Version="3.4.0" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

‎src/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
39-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.1" />
4040
</ItemGroup>
4141
</Project>

‎src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Set.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public long SAdd<T>(string cacheKey, IList<T> cacheValues, TimeSpan? expiration
2525

2626
if (expiration.HasValue)
2727
{
28-
_cache.Expire(cacheKey, expiration.Value.Seconds);
28+
_cache.Expire(cacheKey, (int)expiration.Value.TotalSeconds);
2929
}
3030

3131
return len;
@@ -131,7 +131,7 @@ public async Task<long> SAddAsync<T>(string cacheKey, IList<T> cacheValues, Time
131131

132132
if (expiration.HasValue)
133133
{
134-
await _cache.ExpireAsync(cacheKey, expiration.Value.Seconds);
134+
await _cache.ExpireAsync(cacheKey, (int)expiration.Value.TotalSeconds);
135135
}
136136

137137
return len;

‎src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="CSRedisCore" Version="3.1.17" />
34+
<PackageReference Include="CSRedisCore" Version="3.2.0" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

0 commit comments

Comments
 (0)