Skip to content

Commit 1935481

Browse files
catcherwongcatcherwong
authored
Merge pull request #237 from dotnetcore/dev
Adjust struct
2 parents ec25dea + f5d1dfb commit 1935481

File tree

58 files changed

+1438
-941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1438
-941
lines changed

‎Build.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<Compile Remove="sample\**" />
1717
<Compile Remove="src\**" />
1818
<Compile Remove="test\**" />
19+
<Compile Remove="bus\**" />
20+
<Compile Remove="extensions\**" />
21+
<Compile Remove="interceptor\**" />
22+
<Compile Remove="serialization\**" />
1923
<EmbeddedResource Remove="article\**" />
2024
<EmbeddedResource Remove="Build\bin\**" />
2125
<EmbeddedResource Remove="Build\obj\**" />
@@ -27,6 +31,10 @@
2731
<EmbeddedResource Remove="sample\**" />
2832
<EmbeddedResource Remove="src\**" />
2933
<EmbeddedResource Remove="test\**" />
34+
<EmbeddedResource Remove="bus\**" />
35+
<EmbeddedResource Remove="extensions\**" />
36+
<EmbeddedResource Remove="interceptor\**" />
37+
<EmbeddedResource Remove="serialization\**" />
3038
<None Remove="article\**" />
3139
<None Remove="Build\bin\**" />
3240
<None Remove="Build\obj\**" />
@@ -38,6 +46,10 @@
3846
<None Remove="sample\**" />
3947
<None Remove="src\**" />
4048
<None Remove="test\**" />
49+
<None Remove="bus\**" />
50+
<None Remove="extensions\**" />
51+
<None Remove="interceptor\**" />
52+
<None Remove="serialization\**" />
4153
</ItemGroup>
4254

4355
<ItemGroup>

‎EasyCaching.sln

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Core", "src\Eas
1212
EndProject
1313
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.InMemory", "src\EasyCaching.InMemory\EasyCaching.InMemory.csproj", "{B9490432-737B-4518-B851-9D40FD29B392}"
1414
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.MessagePack", "src\EasyCaching.Serialization.MessagePack\EasyCaching.Serialization.MessagePack.csproj", "{50D8C42C-1BC0-4133-8B70-63A6649DBD74}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.MessagePack", "serialization\EasyCaching.Serialization.MessagePack\EasyCaching.Serialization.MessagePack.csproj", "{50D8C42C-1BC0-4133-8B70-63A6649DBD74}"
1616
EndProject
17-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Interceptor.AspectCore", "src\EasyCaching.Interceptor.AspectCore\EasyCaching.Interceptor.AspectCore.csproj", "{BED4832E-A790-42A6-978D-E0C1A215E638}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Interceptor.AspectCore", "interceptor\EasyCaching.Interceptor.AspectCore\EasyCaching.Interceptor.AspectCore.csproj", "{BED4832E-A790-42A6-978D-E0C1A215E638}"
1818
EndProject
19-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.Redis", "src\EasyCaching.Bus.Redis\EasyCaching.Bus.Redis.csproj", "{07326A03-B144-469F-837B-31DD3E0EB1AC}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.Redis", "bus\EasyCaching.Bus.Redis\EasyCaching.Bus.Redis.csproj", "{07326A03-B144-469F-837B-31DD3E0EB1AC}"
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.RabbitMQ", "src\EasyCaching.Bus.RabbitMQ\EasyCaching.Bus.RabbitMQ.csproj", "{265FB0C5-2C34-438D-B671-63836954EB5A}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.RabbitMQ", "bus\EasyCaching.Bus.RabbitMQ\EasyCaching.Bus.RabbitMQ.csproj", "{265FB0C5-2C34-438D-B671-63836954EB5A}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Interceptor.Castle", "src\EasyCaching.Interceptor.Castle\EasyCaching.Interceptor.Castle.csproj", "{7B55B6D9-4221-4E82-AED6-BEC9A60C99D2}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Interceptor.Castle", "interceptor\EasyCaching.Interceptor.Castle\EasyCaching.Interceptor.Castle.csproj", "{7B55B6D9-4221-4E82-AED6-BEC9A60C99D2}"
2424
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.Json", "src\EasyCaching.Serialization.Json\EasyCaching.Serialization.Json.csproj", "{F0302BE8-188A-4EAF-8391-514CA9352DB3}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.Json", "serialization\EasyCaching.Serialization.Json\EasyCaching.Serialization.Json.csproj", "{F0302BE8-188A-4EAF-8391-514CA9352DB3}"
2626
EndProject
27-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.Protobuf", "src\EasyCaching.Serialization.Protobuf\EasyCaching.Serialization.Protobuf.csproj", "{3AAEDDBA-5037-4061-84E5-667F89C11F8E}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Serialization.Protobuf", "serialization\EasyCaching.Serialization.Protobuf\EasyCaching.Serialization.Protobuf.csproj", "{3AAEDDBA-5037-4061-84E5-667F89C11F8E}"
2828
EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.ResponseCaching", "src\EasyCaching.ResponseCaching\EasyCaching.ResponseCaching.csproj", "{261EE728-4965-4C0E-B99B-3B188442263A}"
3030
EndProject
@@ -48,14 +48,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.PerformanceTest
4848
EndProject
4949
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.CSRedis", "src\EasyCaching.CSRedis\EasyCaching.CSRedis.csproj", "{6584761E-E51C-408F-BE51-CA0F6269589B}"
5050
EndProject
51-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.CSRedis", "src\EasyCaching.Bus.CSRedis\EasyCaching.Bus.CSRedis.csproj", "{861E5373-BEF6-4AA2-92C7-8F4941A079E7}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Bus.CSRedis", "bus\EasyCaching.Bus.CSRedis\EasyCaching.Bus.CSRedis.csproj", "{861E5373-BEF6-4AA2-92C7-8F4941A079E7}"
5252
EndProject
5353
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Disk", "src\EasyCaching.Disk\EasyCaching.Disk.csproj", "{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}"
5454
EndProject
5555
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.Demo.ConsoleApp", "sample\EasyCaching.Demo.ConsoleApp\EasyCaching.Demo.ConsoleApp.csproj", "{359AE3CD-B8EE-49B1-95A1-685FD4D5EBE8}"
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build.csproj", "{43AD80E9-696B-4042-9D50-B26F48BE1928}"
5858
EndProject
59+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{B4241D34-A973-4A13-BD89-9BAE3F2BDDF6}"
60+
EndProject
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.EasyCachingLib", "extensions\Microsoft.Extensions.Caching.EasyCachingLib\Microsoft.Extensions.Caching.EasyCachingLib.csproj", "{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}"
62+
EndProject
63+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "interceptor", "interceptor", "{38BD141B-2A15-40F2-942D-2E6A08199D1F}"
64+
EndProject
65+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "serialization", "serialization", "{15070C49-A507-4844-BCFE-D319CFBC9A63}"
66+
EndProject
67+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bus", "bus", "{B337509B-75F9-4851-821F-9BBE87C4E4BC}"
68+
EndProject
5969
Global
6070
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6171
Debug|Any CPU = Debug|Any CPU
@@ -158,20 +168,24 @@ Global
158168
{43AD80E9-696B-4042-9D50-B26F48BE1928}.Debug|Any CPU.Build.0 = Debug|Any CPU
159169
{43AD80E9-696B-4042-9D50-B26F48BE1928}.Release|Any CPU.ActiveCfg = Release|Any CPU
160170
{43AD80E9-696B-4042-9D50-B26F48BE1928}.Release|Any CPU.Build.0 = Release|Any CPU
171+
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172+
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Debug|Any CPU.Build.0 = Debug|Any CPU
173+
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Release|Any CPU.ActiveCfg = Release|Any CPU
174+
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Release|Any CPU.Build.0 = Release|Any CPU
161175
EndGlobalSection
162176
GlobalSection(SolutionProperties) = preSolution
163177
HideSolutionNode = FALSE
164178
EndGlobalSection
165179
GlobalSection(NestedProjects) = preSolution
166180
{CE61FAA2-0233-451C-991D-4222ED61C84B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
167181
{B9490432-737B-4518-B851-9D40FD29B392} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
168-
{50D8C42C-1BC0-4133-8B70-63A6649DBD74} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
169-
{BED4832E-A790-42A6-978D-E0C1A215E638} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
170-
{07326A03-B144-469F-837B-31DD3E0EB1AC} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
171-
{265FB0C5-2C34-438D-B671-63836954EB5A} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
172-
{7B55B6D9-4221-4E82-AED6-BEC9A60C99D2} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
173-
{F0302BE8-188A-4EAF-8391-514CA9352DB3} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
174-
{3AAEDDBA-5037-4061-84E5-667F89C11F8E} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
182+
{50D8C42C-1BC0-4133-8B70-63A6649DBD74} = {15070C49-A507-4844-BCFE-D319CFBC9A63}
183+
{BED4832E-A790-42A6-978D-E0C1A215E638} = {38BD141B-2A15-40F2-942D-2E6A08199D1F}
184+
{07326A03-B144-469F-837B-31DD3E0EB1AC} = {B337509B-75F9-4851-821F-9BBE87C4E4BC}
185+
{265FB0C5-2C34-438D-B671-63836954EB5A} = {B337509B-75F9-4851-821F-9BBE87C4E4BC}
186+
{7B55B6D9-4221-4E82-AED6-BEC9A60C99D2} = {38BD141B-2A15-40F2-942D-2E6A08199D1F}
187+
{F0302BE8-188A-4EAF-8391-514CA9352DB3} = {15070C49-A507-4844-BCFE-D319CFBC9A63}
188+
{3AAEDDBA-5037-4061-84E5-667F89C11F8E} = {15070C49-A507-4844-BCFE-D319CFBC9A63}
175189
{261EE728-4965-4C0E-B99B-3B188442263A} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
176190
{4193DF5A-E034-4917-83F4-380E8D7DCF83} = {F88D727A-9F9C-43D9-90B1-D4A02BF8BC98}
177191
{F7DD4826-1375-42B3-97BA-37685460282E} = {F88D727A-9F9C-43D9-90B1-D4A02BF8BC98}
@@ -183,10 +197,11 @@ Global
183197
{2A8D7103-DF64-47B6-A406-8F8559AF7E7F} = {EBB55F65-7D07-4281-8D5E-7B0CA88E1AD0}
184198
{6EBE36A2-F128-4C63-B90A-B700D8C2F2E8} = {EBB55F65-7D07-4281-8D5E-7B0CA88E1AD0}
185199
{6584761E-E51C-408F-BE51-CA0F6269589B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
186-
{861E5373-BEF6-4AA2-92C7-8F4941A079E7} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
200+
{861E5373-BEF6-4AA2-92C7-8F4941A079E7} = {B337509B-75F9-4851-821F-9BBE87C4E4BC}
187201
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
188202
{359AE3CD-B8EE-49B1-95A1-685FD4D5EBE8} = {F88D727A-9F9C-43D9-90B1-D4A02BF8BC98}
189203
{43AD80E9-696B-4042-9D50-B26F48BE1928} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
204+
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F} = {B4241D34-A973-4A13-BD89-9BAE3F2BDDF6}
190205
EndGlobalSection
191206
GlobalSection(ExtensibilityGlobals) = postSolution
192207
SolutionGuid = {63A57886-054B-476C-AAE1-8D7C8917682E}

‎build/version.props

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

‎src/EasyCaching.Bus.CSRedis/Configurations/CSRedisBusOptions.cs renamed to ‎bus/EasyCaching.Bus.CSRedis/Configurations/CSRedisBusOptions.cs

File renamed without changes.

‎src/EasyCaching.Bus.CSRedis/Configurations/CSRedisOptionsExtension.cs renamed to ‎bus/EasyCaching.Bus.CSRedis/Configurations/CSRedisOptionsExtension.cs

File renamed without changes.

‎src/EasyCaching.Bus.CSRedis/Configurations/EasyCachingCSRedisClient.cs renamed to ‎bus/EasyCaching.Bus.CSRedis/Configurations/EasyCachingCSRedisClient.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
namespace EasyCaching.Bus.CSRedis
1+
namespace EasyCaching.Bus.CSRedis
22
{
33
using System;
4-
using global::CSRedis;
5-
6-
public class EasyCachingCSRedisClient : CSRedisClient
7-
{
8-
private readonly string _name;
9-
10-
public string Name { get { return this._name; } }
11-
12-
public EasyCachingCSRedisClient(string name, string connectionString)
13-
: base(connectionString)
14-
{
15-
this._name = name;
16-
}
17-
18-
public EasyCachingCSRedisClient(string name, Func<string, string> NodeRule, params string[] connectionStrings)
19-
: base(NodeRule, connectionStrings)
20-
{
21-
this._name = name;
22-
}
23-
24-
public EasyCachingCSRedisClient(string name, string connectionString, string[] sentinels, bool readOnly)
25-
: base(connectionString, sentinels, readOnly)
26-
{
27-
this._name = name;
28-
}
29-
}
30-
}
4+
using global::CSRedis;
5+
6+
public class EasyCachingCSRedisClient : CSRedisClient
7+
{
8+
private readonly string _name;
9+
10+
public string Name { get { return this._name; } }
11+
12+
public EasyCachingCSRedisClient(string name, string connectionString)
13+
: base(connectionString)
14+
{
15+
this._name = name;
16+
}
17+
18+
public EasyCachingCSRedisClient(string name, Func<string, string> NodeRule, params string[] connectionStrings)
19+
: base(NodeRule, connectionStrings)
20+
{
21+
this._name = name;
22+
}
23+
24+
public EasyCachingCSRedisClient(string name, string connectionString, string[] sentinels, bool readOnly)
25+
: base(connectionString, sentinels, readOnly)
26+
{
27+
this._name = name;
28+
}
29+
}
30+
}

‎src/EasyCaching.Bus.CSRedis/Configurations/EasyCachingOptionsExtensions.cs renamed to ‎bus/EasyCaching.Bus.CSRedis/Configurations/EasyCachingOptionsExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
namespace Microsoft.Extensions.DependencyInjection
22
{
3-
using EasyCaching.Bus.CSRedis;
3+
using EasyCaching.Bus.CSRedis;
44
using EasyCaching.Core;
55
using EasyCaching.Core.Configurations;
66
using Microsoft.Extensions.Configuration;
7-
using System;
7+
using System;
88

99
/// <summary>
1010
/// EasyCaching options extensions.
@@ -25,8 +25,8 @@ this EasyCachingOptions options
2525

2626
options.RegisterExtension(new CSRedisOptionsExtension(configure));
2727
return options;
28-
}
29-
28+
}
29+
3030
/// <summary>
3131
/// Withs the CSRedis bus (read config from configuration file).
3232
/// </summary>

‎src/EasyCaching.Bus.CSRedis/DefaultCSRedisBus.cs renamed to ‎bus/EasyCaching.Bus.CSRedis/DefaultCSRedisBus.cs

File renamed without changes.

‎src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj renamed to ‎bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../build/version.props" />
3-
<Import Project="../../build/releasenotes.props" />
4-
<PropertyGroup>
5-
<TargetFramework>netstandard2.0</TargetFramework>
6-
<Owners>ncc;Catcher Wong</Owners>
7-
<Authors>ncc;Catcher Wong</Authors>
8-
<Version>$(EasyCachingCSRedisBusPackageVersion)</Version>
9-
<Description>
10-
A simple caching bus(message bus) based on CSRedis.
11-
</Description>
12-
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
13-
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
14-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
15-
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
16-
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
17-
<PackageIcon>nuget-icon.png</PackageIcon>
18-
<PackageReleaseNotes>
19-
$(EasyCachingCSRedisBusPackageNotes)
20-
</PackageReleaseNotes>
21-
</PropertyGroup>
22-
23-
<PropertyGroup>
24-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25-
<NoWarn>$(NoWarn);1591</NoWarn>
26-
</PropertyGroup>
27-
28-
<ItemGroup>
29-
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
30-
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<PackageReference Include="CSRedisCore" Version="3.4.0" />
35-
</ItemGroup>
36-
<ItemGroup>
37-
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
38-
</ItemGroup>
39-
<ItemGroup>
40-
<Folder Include="Configurations\" />
41-
</ItemGroup>
42-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../../build/version.props" />
3+
<Import Project="../../build/releasenotes.props" />
4+
<PropertyGroup>
5+
<TargetFramework>netstandard2.0</TargetFramework>
6+
<Owners>ncc;Catcher Wong</Owners>
7+
<Authors>ncc;Catcher Wong</Authors>
8+
<Version>$(EasyCachingCSRedisBusPackageVersion)</Version>
9+
<Description>
10+
A simple caching bus(message bus) based on CSRedis.
11+
</Description>
12+
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
13+
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
14+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
15+
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
16+
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
17+
<PackageIcon>nuget-icon.png</PackageIcon>
18+
<PackageReleaseNotes>
19+
$(EasyCachingCSRedisBusPackageNotes)
20+
</PackageReleaseNotes>
21+
</PropertyGroup>
22+
23+
<PropertyGroup>
24+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25+
<NoWarn>$(NoWarn);1591</NoWarn>
26+
</PropertyGroup>
27+
28+
<ItemGroup>
29+
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
30+
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<PackageReference Include="CSRedisCore" Version="3.2.0" />
35+
</ItemGroup>
36+
<ItemGroup>
37+
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Folder Include="Configurations\" />
41+
</ItemGroup>
42+
</Project>

‎src/EasyCaching.Bus.RabbitMQ/Configurations/EasyCachingOptionsExtensions.cs renamed to ‎bus/EasyCaching.Bus.RabbitMQ/Configurations/EasyCachingOptionsExtensions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Microsoft.Extensions.DependencyInjection
22
{
3-
using System;
4-
using EasyCaching.Bus.RabbitMQ;
3+
using System;
4+
using EasyCaching.Bus.RabbitMQ;
55
using EasyCaching.Core;
66
using EasyCaching.Core.Configurations;
77
using Microsoft.Extensions.Configuration;
@@ -10,7 +10,7 @@
1010
/// EasyCaching options extensions.
1111
/// </summary>
1212
public static class EasyCachingOptionsExtensions
13-
{
13+
{
1414
/// <summary>
1515
/// Withs the RabbitMQ bus (specify the config via hard code).
1616
/// </summary>
@@ -20,13 +20,13 @@ public static EasyCachingOptions WithRabbitMQBus(
2020
this EasyCachingOptions options
2121
, Action<RabbitMQBusOptions> configure
2222
)
23-
{
23+
{
2424
ArgumentCheck.NotNull(configure, nameof(configure));
2525

2626
options.RegisterExtension(new RabbitMQBusOptionsExtension(configure));
2727
return options;
28-
}
29-
28+
}
29+
3030
/// <summary>
3131
/// Withs the RabbitMQ bus (read config from configuration file).
3232
/// </summary>

0 commit comments

Comments
 (0)