Skip to content

Commit 813473d

Browse files
catcherwongcatcherwong
authored
Merge pull request #228 from dotnetcore/dev
release v0.8.10
2 parents daef40c + c3dc515 commit 813473d

21 files changed

+307
-369
lines changed

‎build/releasenotes.props‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,65 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Microsoft.* keep in 3.1.0.
4+
1. Add base interface of IHybridProvider and IEasyCachingProvider.
5+
2. Redis provider support zincrby.
6+
3. Redis acl support
57
</EasyCachingCorePackageNotes>
68
<EasyCachingMemcachedPackageNotes>
7-
1. Microsoft.* keep in 3.1.0.
9+
1. Upgrading dependencies.
10+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
811
</EasyCachingMemcachedPackageNotes>
912
<EasyCachingRedisPackageNotes>
10-
1. Microsoft.* keep in 3.1.0.
13+
1. Upgrading dependencies.
14+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
15+
3. Redis acl support
1116
</EasyCachingRedisPackageNotes>
1217
<EasyCachingSQLitePackageNotes>
13-
1. Microsoft.* keep in 3.1.0.
18+
1. Upgrading dependencies.
19+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
1420
</EasyCachingSQLitePackageNotes>
1521
<EasyCachingInMemoryPackageNotes>
16-
1. Microsoft.* keep in 3.1.0.
22+
1. Upgrading dependencies.
23+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
1724
</EasyCachingInMemoryPackageNotes>
1825
<EasyCachingHybridPackageNotes>
19-
1. Microsoft.* keep in 3.1.0.
26+
1. Upgrading dependencies.
2027
</EasyCachingHybridPackageNotes>
2128
<EasyCachingAspectCorePackageNotes>
22-
1. Microsoft.* keep in 3.1.0.
29+
1. Upgrading dependencies.
2330
</EasyCachingAspectCorePackageNotes>
2431
<EasyCachingCastlePackageNotes>
25-
1. Microsoft.* keep in 3.1.0.
32+
1. Upgrading dependencies.
2633
</EasyCachingCastlePackageNotes>
2734
<EasyCachingResponseCachingPackageNotes>
28-
1. Microsoft.* keep in 3.1.0.
35+
1. Upgrading dependencies.
2936
</EasyCachingResponseCachingPackageNotes>
3037
<EasyCachingJsonPackageNotes>
31-
1. Microsoft.* keep in 3.1.0.
38+
1. Upgrading dependencies.
3239
</EasyCachingJsonPackageNotes>
3340
<EasyCachingMessagePackPackageNotes>
34-
1. Microsoft.* keep in 3.1.0.
41+
1. Upgrading dependencies.
3542
</EasyCachingMessagePackPackageNotes>
3643
<EasyCachingProtobufPackageNotes>
37-
1. Microsoft.* keep in 3.1.0.
44+
1. Upgrading dependencies.
3845
</EasyCachingProtobufPackageNotes>
3946
<EasyCachingCSRedisPackageNotes>
40-
1. Microsoft.* keep in 3.1.0.
41-
2. Fixed bugs of expiration.
47+
1. Upgrading dependencies.
48+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
4249
</EasyCachingCSRedisPackageNotes>
4350
<EasyCachingCSRedisBusPackageNotes>
44-
1. Microsoft.* keep in 3.1.0.
51+
1. Upgrading dependencies.
4552
</EasyCachingCSRedisBusPackageNotes>
4653
<EasyCachingRedisBusPackageNotes>
47-
1. Microsoft.* keep in 3.1.0.
54+
1. Upgrading dependencies.
55+
2. Redis acl support
4856
</EasyCachingRedisBusPackageNotes>
4957
<EasyCachingRabbitBusPackageNotes>
50-
1. Upgrade RabbitMQ.Client to 6.0.0.
58+
1. Upgrading dependencies.
5159
</EasyCachingRabbitBusPackageNotes>
5260
<EasyCachingDiskPackageNotes>
53-
1. Microsoft.* keep in 3.1.0.
61+
1. Upgrading dependencies.
62+
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
5463
</EasyCachingDiskPackageNotes>
5564
</PropertyGroup>
5665
</Project>

‎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.9</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>0.8.9</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>0.8.9</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>0.8.9</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>0.8.9</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>0.8.9</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>0.8.9</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>0.8.9</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>0.8.9</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>0.8.9</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>0.8.9</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>0.8.9</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>0.8.9</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>0.8.9</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>0.8.9</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>0.8.9.1</EasyCachingRabbitBusPackageVersion>
19-
<EasyCachingDiskPackageVersion>0.8.9</EasyCachingDiskPackageVersion>
3+
<EasyCachingCorePackageVersion>0.8.10</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>0.8.10</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>0.8.10</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>0.8.10</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>0.8.10</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>0.8.10</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>0.8.10</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>0.8.10</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>0.8.10</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>0.8.10</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>0.8.10</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>0.8.10</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>0.8.10</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>0.8.10</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>0.8.10</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>0.8.10</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingDiskPackageVersion>0.8.10</EasyCachingDiskPackageVersion>
2020
</PropertyGroup>
2121
</Project>

‎docs/MessagePack.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ Time issues can be solved using a combination of NativeDateTimeResolver+Contract
5454
```cs
5555
public void ConfigureServices(IServiceCollection services)
5656
{
57-
CompositeResolver.RegisterAndSetAsDefault(
58-
// This can solve DateTime time zone problem
59-
NativeDateTimeResolver.Instance,
60-
ContractlessStandardResolver.Instance
61-
);
62-
6357
services.AddControllers();
6458

6559
services.AddEasyCaching(option =>
@@ -77,6 +71,11 @@ public void ConfigureServices(IServiceCollection services)
7771
option.WithMessagePack( x =>
7872
{
7973
x.EnableCustomResolver = true;
74+
x.CustomResolvers = CompositeResolver.Create(
75+
// This can solve DateTime time zone problem
76+
NativeDateTimeResolver.Instance,
77+
ContractlessStandardResolver.Instance
78+
);
8079
},"mymsgpack");
8180
});
8281
}

‎src/EasyCaching.Bus.Redis/Configurations/EasyCachingOptionsExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ void configure(RedisBusOptions x)
5151
x.ConnectionTimeout = redisOptions.ConnectionTimeout;
5252
x.Database = redisOptions.Database;
5353
x.IsSsl = redisOptions.IsSsl;
54+
x.Username = redisOptions.Username;
5455
x.Password = redisOptions.Password;
5556
x.SslHost = redisOptions.SslHost;
5657

‎src/EasyCaching.Bus.Redis/Configurations/RedisSubscriberProvider.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()
4848
var configurationOptions = new ConfigurationOptions
4949
{
5050
ConnectTimeout = _options.ConnectionTimeout,
51+
User = _options.Username,
5152
Password = _options.Password,
5253
Ssl = _options.IsSsl,
5354
SslHost = _options.SslHost,

‎src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
3131
</ItemGroup>
3232
<ItemGroup>
33-
<PackageReference Include="StackExchange.Redis" Version="2.1.28" />
33+
<PackageReference Include="StackExchange.Redis" Version="2.1.58" />
3434
</ItemGroup>
3535
<ItemGroup>
3636
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

‎src/EasyCaching.CSRedis/Configurations/EasyCachingOptionsExtensions.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ void configure(RedisOptions x)
5151
{
5252
x.EnableLogging = redisOptions.EnableLogging;
5353
x.MaxRdSecond = redisOptions.MaxRdSecond;
54+
x.LockMs = redisOptions.LockMs;
55+
x.SleepMs = redisOptions.SleepMs;
56+
x.SerializerName = redisOptions.SerializerName;
5457
x.DBConfig = redisOptions.DBConfig;
5558
}
5659

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@ public long ZCount(string cacheKey, double min, double max)
3838
var len = _cache.ZCount(cacheKey, min, max);
3939
return len;
4040
}
41-
41+
public double ZIncrBy(string cacheKey, string field, double val = 1)
42+
{
43+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
44+
ArgumentCheck.NotNullOrWhiteSpace(field, nameof(field));
45+
46+
var value = _cache.ZIncrBy(cacheKey, field, val);
47+
return value;
48+
}
4249
public long ZLexCount(string cacheKey, string min, string max)
4350
{
4451
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
@@ -133,6 +140,15 @@ public async Task<long> ZCountAsync(string cacheKey, double min, double max)
133140

134141
var len = await _cache.ZCountAsync(cacheKey, min, max);
135142
return len;
143+
}
144+
145+
public async Task<double> ZIncrByAsync(string cacheKey, string field, double val = 1)
146+
{
147+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
148+
ArgumentCheck.NotNullOrWhiteSpace(field, nameof(field));
149+
150+
var value= await _cache.ZIncrByAsync(cacheKey, field, val);
151+
return value;
136152
}
137153

138154
public async Task<long> ZLexCountAsync(string cacheKey, string min, string max)

‎src/EasyCaching.Core/Configurations/BaseRedisOptions.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
/// </summary>
88
public class BaseRedisOptions
99
{
10+
/// <summary>
11+
/// Gets or sets the username to be used to connect to the Redis server.
12+
/// </summary>
13+
/// <value>
14+
/// The username.
15+
/// </value>
16+
public string Username { get; set; } = null;
17+
1018
/// <summary>
1119
/// Gets or sets the password to be used to connect to the Redis server.
1220
/// </summary>

0 commit comments

Comments
 (0)