Skip to content

Commit 57df435

Browse files
sarmissarmis
authored
Merge branch 'dev' into rmq-stream-merge-branch
2 parents 93c7bf8 + c74ad32 commit 57df435

File tree

4 files changed

+70
-41
lines changed

4 files changed

+70
-41
lines changed

‎build/releasenotes.props‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4+
1. Support IServiceProvider in setupActions
45
</EasyCachingCorePackageNotes>
56
<EasyCachingMemcachedPackageNotes>
67
1. Upgrading dependencies.
78
</EasyCachingMemcachedPackageNotes>
89
<EasyCachingRedisPackageNotes>
9-
1. Fixed redis distributed lock for different process.
10-
2. Support code configuration for StackExchange.Redis.
10+
1. Upgrading dependencies.
1111
</EasyCachingRedisPackageNotes>
1212
<EasyCachingSQLitePackageNotes>
1313
1. Upgrading dependencies.
@@ -40,26 +40,22 @@
4040
1. Upgrading dependencies.
4141
</EasyCachingCSRedisPackageNotes>
4242
<EasyCachingCSRedisBusPackageNotes>
43-
1. Support async version of subscribe.
43+
1. Upgrading dependencies.
4444
</EasyCachingCSRedisBusPackageNotes>
4545
<EasyCachingRedisBusPackageNotes>
46-
1. Support code configuration for StackExchange.Redis.
47-
2. Support async version of subscribe.
48-
3. fix: Using IConfiguration for WithRedisBus configuration cause DefaultRedisBus throw "Sequence contains no matching element" exception
46+
1. Upgrading dependencies.
4947
</EasyCachingRedisBusPackageNotes>
5048
<EasyCachingRabbitBusPackageNotes>
51-
1. Support async version of subscribe.
49+
1. Upgrading dependencies.
5250
</EasyCachingRabbitBusPackageNotes>
5351
<EasyCachingKafkaBusPackageNotes>
54-
1. Support async version of subscribe.
52+
1. Upgrading dependencies.
5553
</EasyCachingKafkaBusPackageNotes>
5654
<EasyCachingZookeeperBusPackageNotes>
57-
1. Support async version of subscribe.
58-
2. Rename WithConfluentKafkaBus to WithZookeeeperBus.
55+
1. Upgrading dependencies.
5956
</EasyCachingZookeeperBusPackageNotes>
6057
<EasyCachingDiskPackageNotes>
61-
1. Support custom serializer.
62-
2. Fixed DiskCachingProvider async warning.
58+
1. Upgrading dependencies.
6359
</EasyCachingDiskPackageNotes>
6460
<EasyCachingLiteDBPackageNotes>
6561
1. Upgrading dependencies.

‎build/version.props‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>1.9.9</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>1.9.9</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>1.9.9</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>1.9.9</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>1.9.9</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>1.9.9</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>1.9.9</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>1.9.9</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>1.9.9</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>1.9.9</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>1.9.9</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>1.9.9</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>1.9.9</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>1.9.9</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>1.9.9</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>1.9.9</EasyCachingRabbitBusPackageVersion>
19-
<EasyCachingRabbitStreamBusPackageVersion>1.9.9</EasyCachingRabbitStreamBusPackageVersion>
20-
<EasyCachingKafkaBusPackageVersion>1.9.9</EasyCachingKafkaBusPackageVersion>
21-
<EasyCachingZookeeperBusPackageVersion>1.9.9</EasyCachingZookeeperBusPackageVersion>
22-
<EasyCachingDiskPackageVersion>1.9.9</EasyCachingDiskPackageVersion>
23-
<EasyCachingMsExtPackageVersion>1.9.9</EasyCachingMsExtPackageVersion>
24-
<EasyCachingLiteDBPackageVersion>1.9.9</EasyCachingLiteDBPackageVersion>
25-
<EasyCachingSTJsonPackageVersion>1.9.9</EasyCachingSTJsonPackageVersion>
26-
<EasyCachingMemoryPackageVersion>1.9.9</EasyCachingMemoryPackageVersion>
27-
<EasyCachingFaskKVPackageVersion>1.9.9</EasyCachingFaskKVPackageVersion>
3+
<EasyCachingCorePackageVersion>1.9.1</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>1.9.1</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>1.9.1</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>1.9.1</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>1.9.1</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>1.9.1</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>1.9.1</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>1.9.1</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>1.9.1</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>1.9.1</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>1.9.1</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>1.9.1</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>1.9.1</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>1.9.1</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>1.9.1</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>1.9.1</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingRabbitStreamBusPackageVersion>1.9.1</EasyCachingRabbitStreamBusPackageVersion>
20+
<EasyCachingKafkaBusPackageVersion>1.9.1</EasyCachingKafkaBusPackageVersion>
21+
<EasyCachingZookeeperBusPackageVersion>1.9.1</EasyCachingZookeeperBusPackageVersion>
22+
<EasyCachingDiskPackageVersion>1.9.1</EasyCachingDiskPackageVersion>
23+
<EasyCachingMsExtPackageVersion>1.9.1</EasyCachingMsExtPackageVersion>
24+
<EasyCachingLiteDBPackageVersion>1.9.1</EasyCachingLiteDBPackageVersion>
25+
<EasyCachingSTJsonPackageVersion>1.9.1</EasyCachingSTJsonPackageVersion>
26+
<EasyCachingMemoryPackageVersion>1.9.1</EasyCachingMemoryPackageVersion>
27+
<EasyCachingFaskKVPackageVersion>1.9.1</EasyCachingFaskKVPackageVersion>
2828
</PropertyGroup>
2929
</Project>

‎docs/In-Memory.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class Startup
4646
// below two settings are added in v0.8.0
4747
// enable deep clone when reading object from cache or not, default value is true.
4848
EnableReadDeepClone = true,
49-
// enable deep clone when writing object to cache or not, default valuee is false.
49+
// enable deep clone when writing object to cache or not, default value is false.
5050
EnableWriteDeepClone = false,
5151
};
5252
// the max random second will be added to cache's expiration, default value is 120

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

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
namespace Microsoft.Extensions.DependencyInjection
22
{
33
using EasyCaching.Core;
4-
using EasyCaching.Core.Configurations;
5-
using System;
4+
using EasyCaching.Core.Configurations;
5+
using System;
66

77
/// <summary>
88
/// EasyCaching service collection extensions.
99
/// </summary>
1010
public static class EasyCachingServiceCollectionExtensions
1111
{
1212
/// <summary>
13-
/// Adds the easycaching.
13+
/// Adds the EasyCaching.
1414
/// </summary>
1515
/// <returns>The easy caching.</returns>
1616
/// <param name="services">Services.</param>
@@ -30,5 +30,38 @@ public static IServiceCollection AddEasyCaching(this IServiceCollection services
3030

3131
return services;
3232
}
33+
34+
/// <summary>
35+
/// Adds the EasyCaching.
36+
/// </summary>
37+
/// <returns>The easy caching.</returns>
38+
/// <param name="services">Services.</param>
39+
/// <param name="setupAction">Setup action.</param>
40+
public static IServiceCollection AddEasyCaching(this IServiceCollection services, Action<IServiceProvider, EasyCachingOptions> setupAction)
41+
{
42+
ArgumentCheck.NotNull(setupAction, nameof(setupAction));
43+
44+
// Options
45+
services.AddSingleton(sp =>
46+
{
47+
var options = new EasyCachingOptions();
48+
setupAction(sp, options);
49+
return options;
50+
});
51+
52+
// Extension services
53+
services.AddSingleton(sp =>
54+
{
55+
var options = sp.GetRequiredService<EasyCachingOptions>();
56+
foreach (var serviceExtension in options.Extensions)
57+
{
58+
serviceExtension.AddServices(services);
59+
}
60+
61+
return options;
62+
});
63+
64+
return services;
65+
}
3366
}
3467
}

0 commit comments

Comments
 (0)