Skip to content

Commit f57fcb2

Browse files
catcherwongcatcherwong
authored
Merge pull request #109 from dotnetcore/dev
Upgrading dependencies
2 parents 60da609 + 83d9913 commit f57fcb2

File tree

31 files changed

+142
-108
lines changed

31 files changed

+142
-108
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
language: csharp
2-
32
solution: EasyCaching.sln
4-
5-
sudo: required
6-
7-
dotnet: 2.1.301
8-
3+
dist: xenial
4+
sudo: required
5+
dotnet: 2.2.203
96
mono: none
107

118
services:

‎README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,26 @@ public class Startup
6767
//use memory cache that named default
6868
option.UseInMemory("default");
6969

70+
// // use memory cache with your own configuration
71+
// config.UseInMemory(options =>
72+
// {
73+
// options.DBConfig = new InMemoryCachingOptions
74+
// {
75+
// // scan time, default value is 60s
76+
// ExpirationScanFrequency = 60,
77+
// // total count of cache items, default value is 10000
78+
// SizeLimit = 100
79+
// };
80+
// // the max random second will be added to cache's expiration, default value is 120
81+
// options.MaxRdSecond = 120;
82+
// // whether enable logging, default is false
83+
// options.EnableLogging = false;
84+
// // mutex key's alive time(ms), default is 5000
85+
// options.LockMs = 5000;
86+
// // when mutex key alive, it will sleep some time, default is 300
87+
// options.SleepMs = 300;
88+
// }, "m2");
89+
7090
//use redis cache that named redis1
7191
option.UseRedis(config =>
7292
{

‎build/releasenotes.props‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,49 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Add GetExpiration/GetExpirationAsync for caching provider.
5-
2. IEasyCachingProviderFactory support multi redis provider instances.
6-
3. IRedisCachingProvider add some string and keys methods.
7-
4. Interceptor attribute add cache provider
4+
1. Upgrading dependencies.
85
</EasyCachingCorePackageNotes>
96
<EasyCachingMemcachedPackageNotes>
10-
1. Add GetExpiration/GetExpirationAsync for caching provider.
7+
1. Upgrading dependencies.
118
</EasyCachingMemcachedPackageNotes>
129
<EasyCachingRedisPackageNotes>
13-
1. Add GetExpiration/GetExpirationAsync for caching provider.
14-
2. Add some string and keys methods.
10+
1. Upgrading dependencies.
1511
</EasyCachingRedisPackageNotes>
1612
<EasyCachingSQLitePackageNotes>
17-
1. Add GetExpiration/GetExpirationAsync for caching provider.
13+
1. Upgrading dependencies.
1814
</EasyCachingSQLitePackageNotes>
1915
<EasyCachingInMemoryPackageNotes>
20-
1. Add GetExpiration/GetExpirationAsync for caching provider.
16+
1. Upgrading dependencies.
2117
</EasyCachingInMemoryPackageNotes>
2218
<EasyCachingHybridPackageNotes>
23-
1. Add DefaultExpirationForTtlFailed for HybridCachingOptions.
24-
2. Get distributed cached item's expiration when local cache is null.
19+
1. Upgrading dependencies.
2520
</EasyCachingHybridPackageNotes>
2621
<EasyCachingAspectCorePackageNotes>
27-
1. Update EasyCaching.Core.
28-
2. Swich caching provider via attribute.
29-
3. Handle exception when method return null.
22+
1. Upgrading dependencies.
3023
</EasyCachingAspectCorePackageNotes>
3124
<EasyCachingCastlePackageNotes>
32-
1. Update EasyCaching.Core.
33-
2. Swich caching provider via attribute.
34-
3. Handle exception when method return null.
25+
1. Upgrading dependencies.
3526
</EasyCachingCastlePackageNotes>
3627
<EasyCachingResponseCachingPackageNotes>
37-
1. Update EasyCaching.Core.
28+
1. Upgrading dependencies.
3829
</EasyCachingResponseCachingPackageNotes>
3930
<EasyCachingJsonPackageNotes>
40-
1. Update EasyCaching.Core.
31+
1. Upgrading dependencies.
4132
</EasyCachingJsonPackageNotes>
4233
<EasyCachingMessagePackPackageNotes>
43-
1. Update EasyCaching.Core.
34+
1. Upgrading dependencies.
4435
</EasyCachingMessagePackPackageNotes>
4536
<EasyCachingProtobufPackageNotes>
46-
1. Update EasyCaching.Core.
37+
1. Upgrading dependencies.
4738
</EasyCachingProtobufPackageNotes>
4839
<EasyCachingCSRedisPackageNotes>
49-
1. Add GetExpiration/GetExpirationAsync for caching provider.
50-
2. Add some string and keys methods.
40+
1. Upgrading dependencies.
5141
</EasyCachingCSRedisPackageNotes>
5242
<EasyCachingRedisBusPackageNotes>
53-
1. Update EasyCaching.Core.
43+
1. Upgrading dependencies.
5444
</EasyCachingRedisBusPackageNotes>
5545
<EasyCachingRabbitBusPackageNotes>
56-
1. Update EasyCaching.Core.
46+
1. Upgrading dependencies.
5747
</EasyCachingRabbitBusPackageNotes>
5848
</PropertyGroup>
5949
</Project>

‎build/version.props‎

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

‎docs/ProviderFactory.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ After releasing v0.4.0 of EasyCaching, we can deal with this scenario.
1414

1515
This usage of `EasyCachingProviderFactory` is similar with `HttpClientFactory`.
1616

17+
There are two types of providers(`IEasyCachingProvider` and `IRedisCachingProvider`) can use `EasyCachingProviderFactory` to create.
18+
1719
Here use two InMemory caching provders and two Redis caching providers to show.
1820

1921
## 1. Install the packages via Nuget
@@ -116,5 +118,21 @@ public class ValuesController : Controller
116118
Console.WriteLine($"Type=redis2,Key=named-provider,Value={res},Time:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
117119
return $"cached value : {res}";
118120
}
121+
122+
// GET api/values/redis3
123+
[HttpGet]
124+
[Route("redis3")]
125+
public string GetRedis3()
126+
{
127+
var redis1 = factory.GetRedisProvider("redis1");
128+
var redis2 = factory.GetRedisProvider("redis2");
129+
130+
_redis1.StringSet("keyredis1", "val");
131+
132+
var res1 = _redis1.StringGet("keyredis1");
133+
var res2 = _redis2.StringGet("keyredis1");
134+
135+
return $"redis1 cached value: {res1}, redis2 cached value : {res2}";
136+
}
119137
}
120138
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
4343
//options.WithProtobuf();
4444
});
4545

46-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
46+
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
4747

4848
//1.1. all default
4949
return services.ConfigureAspectCoreInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);

‎sample/EasyCaching.Demo.Providers/Controllers/MultiRedisController.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
namespace EasyCaching.Demo.Providers.Controllers
2+
{
3+
using EasyCaching.Core;
4+
using Microsoft.AspNetCore.Mvc;
5+
6+
[Route("api/mredis")]
7+
public class MultiRedisController : Controller
8+
{
9+
private readonly IRedisCachingProvider _redis1;
10+
private readonly IRedisCachingProvider _redis2;
11+
12+
public MultiRedisController(IEasyCachingProviderFactory factory)
13+
{
14+
this._redis1 = factory.GetRedisProvider("redis1");
15+
this._redis2 = factory.GetRedisProvider("redis2");
16+
}
17+
18+
// GET api/mredis
19+
[HttpGet]
20+
public string Get()
21+
{
22+
_redis1.StringSet("keyredis1", "val");
23+
24+
var res1 = _redis1.StringGet("keyredis1");
25+
var res2 = _redis2.StringGet("keyredis1");
26+
27+
return $"redis1 cached value: {res1}, redis2 cached value : {res2}";
28+
}
29+
}
30+
}

‎sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Startup(IConfiguration configuration)
2828

2929
public void ConfigureServices(IServiceCollection services)
3030
{
31-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
31+
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
3232

3333
//new configuration
3434
services.AddEasyCaching(option=>
@@ -77,7 +77,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
7777
app.UseDeveloperExceptionPage();
7878
}
7979

80-
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
80+
//loggerFactory.AddConsole(Configuration.GetSection("Logging"));
8181

8282
// Important step for using Memcached Cache or SQLite Cache
8383
app.UseEasyCaching();

0 commit comments

Comments
 (0)