Skip to content

Commit 1cf4e51

Browse files
catcherwongcatcherwong
authored
Merge pull request #242 from dotnetcore/dev
v0.9.0
2 parents 1935481 + 0608c49 commit 1cf4e51

File tree

44 files changed

+1371
-63
lines changed

Some content is hidden

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

44 files changed

+1371
-63
lines changed

‎.github/workflows/release.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
- master
8+
9+
jobs:
10+
build_artifact:
11+
name: Build and upload artifact
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v1
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 3.1.200
20+
- name: Build with dotnet
21+
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
22+
- name: Pack with dotnet
23+
run: dotnet pack /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln --version-suffix alpha`date +%Y%m%d%H%M%S` -o /home/runner/work/nugetpkgs -c Release --no-build
24+
- name: Upload artifact
25+
uses: actions/upload-artifact@v1
26+
with:
27+
name: nugetpkgs
28+
path: /home/runner/work/nugetpkgs
29+
30+
release_nuget:
31+
name: Release to Nuget
32+
needs: build_artifact
33+
runs-on: ubuntu-latest
34+
35+
steps:
36+
- name: Download build artifacts
37+
uses: actions/download-artifact@v1
38+
with:
39+
name: nugetpkgs
40+
- name: list nugetpkgs
41+
run: ls nugetpkgs
42+
- name: Release
43+
run: |
44+
for file in nugetpkgs/*.nupkg
45+
do
46+
dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package
47+
done

‎.github/workflows/release_stable.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Release_Stable
2+
3+
on:
4+
push:
5+
tags:
6+
- '**'
7+
8+
jobs:
9+
build_artifact:
10+
name: Build and upload artifact
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v1
15+
- name: Setup .NET Core
16+
uses: actions/setup-dotnet@v1
17+
with:
18+
dotnet-version: 3.1.200
19+
- name: Build with dotnet
20+
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
21+
- name: Pack with dotnet
22+
run: dotnet pack /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln -o /home/runner/work/nugetpkgs -c Release --no-build
23+
- name: Upload artifact
24+
uses: actions/upload-artifact@v1
25+
with:
26+
name: nugetpkgs
27+
path: /home/runner/work/nugetpkgs
28+
29+
release_nuget:
30+
name: Release to Nuget
31+
needs: build_artifact
32+
runs-on: ubuntu-latest
33+
34+
steps:
35+
- name: Download build artifacts
36+
uses: actions/download-artifact@v1
37+
with:
38+
name: nugetpkgs
39+
- name: list nugetpkgs
40+
run: ls nugetpkgs
41+
- name: Release
42+
run: |
43+
for file in nugetpkgs/*.nupkg
44+
do
45+
dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package
46+
done

‎Build.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<IsPackable>false</IsPackable>
56
</PropertyGroup>
67

78
<ItemGroup>

‎EasyCaching.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "serialization", "serializat
6666
EndProject
6767
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bus", "bus", "{B337509B-75F9-4851-821F-9BBE87C4E4BC}"
6868
EndProject
69+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCaching.LiteDB", "src\EasyCaching.LiteDB\EasyCaching.LiteDB.csproj", "{BA850294-3103-4540-8A27-FC768E1DC8FC}"
70+
EndProject
6971
Global
7072
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7173
Debug|Any CPU = Debug|Any CPU
@@ -172,6 +174,10 @@ Global
172174
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Debug|Any CPU.Build.0 = Debug|Any CPU
173175
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Release|Any CPU.ActiveCfg = Release|Any CPU
174176
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F}.Release|Any CPU.Build.0 = Release|Any CPU
177+
{BA850294-3103-4540-8A27-FC768E1DC8FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178+
{BA850294-3103-4540-8A27-FC768E1DC8FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
179+
{BA850294-3103-4540-8A27-FC768E1DC8FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
180+
{BA850294-3103-4540-8A27-FC768E1DC8FC}.Release|Any CPU.Build.0 = Release|Any CPU
175181
EndGlobalSection
176182
GlobalSection(SolutionProperties) = preSolution
177183
HideSolutionNode = FALSE
@@ -202,6 +208,7 @@ Global
202208
{359AE3CD-B8EE-49B1-95A1-685FD4D5EBE8} = {F88D727A-9F9C-43D9-90B1-D4A02BF8BC98}
203209
{43AD80E9-696B-4042-9D50-B26F48BE1928} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
204210
{711603E1-8363-4F8D-9AA9-8C03EC8BD35F} = {B4241D34-A973-4A13-BD89-9BAE3F2BDDF6}
211+
{BA850294-3103-4540-8A27-FC768E1DC8FC} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
205212
EndGlobalSection
206213
GlobalSection(ExtensibilityGlobals) = postSolution
207214
SolutionGuid = {63A57886-054B-476C-AAE1-8D7C8917682E}

‎build/releasenotes.props

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Add base interface of IHybridProvider and IEasyCachingProvider.
5-
2. Redis provider support zincrby.
6-
3. Redis acl support
4+
1. IRedisProvider support search keys.
5+
2. DefaultEasyCachingKeyGenerator support GenerateCacheKeyForModel.
76
</EasyCachingCorePackageNotes>
87
<EasyCachingMemcachedPackageNotes>
98
1. Upgrading dependencies.
10-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
119
</EasyCachingMemcachedPackageNotes>
1210
<EasyCachingRedisPackageNotes>
13-
1. Upgrading dependencies.
14-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
15-
3. Redis acl support
11+
1. IRedisProvider support search keys.
1612
</EasyCachingRedisPackageNotes>
1713
<EasyCachingSQLitePackageNotes>
1814
1. Upgrading dependencies.
19-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
2015
</EasyCachingSQLitePackageNotes>
2116
<EasyCachingInMemoryPackageNotes>
2217
1. Upgrading dependencies.
23-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
2418
</EasyCachingInMemoryPackageNotes>
2519
<EasyCachingHybridPackageNotes>
2620
1. Upgrading dependencies.
@@ -44,22 +38,22 @@
4438
1. Upgrading dependencies.
4539
</EasyCachingProtobufPackageNotes>
4640
<EasyCachingCSRedisPackageNotes>
47-
1. Upgrading dependencies.
48-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
41+
1. IRedisProvider support search keys.
4942
</EasyCachingCSRedisPackageNotes>
5043
<EasyCachingCSRedisBusPackageNotes>
5144
1. Upgrading dependencies.
5245
</EasyCachingCSRedisBusPackageNotes>
5346
<EasyCachingRedisBusPackageNotes>
5447
1. Upgrading dependencies.
55-
2. Redis acl support
5648
</EasyCachingRedisBusPackageNotes>
5749
<EasyCachingRabbitBusPackageNotes>
5850
1. Upgrading dependencies.
5951
</EasyCachingRabbitBusPackageNotes>
6052
<EasyCachingDiskPackageNotes>
6153
1. Upgrading dependencies.
62-
2. Fixed configuration file can not read LockMs, SleepMs and SerializerName.
6354
</EasyCachingDiskPackageNotes>
55+
<EasyCachingLiteDBPackageNotes>
56+
1. LiteDB joined for the first time.
57+
</EasyCachingLiteDBPackageNotes>
6458
</PropertyGroup>
6559
</Project>

‎build/version.props

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

‎bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<Owners>ncc;Catcher Wong</Owners>
77
<Authors>ncc;Catcher Wong</Authors>
8-
<Version>$(EasyCachingCSRedisBusPackageVersion)</Version>
8+
<VersionPrefix>$(EasyCachingCSRedisBusPackageVersion)</VersionPrefix>
9+
<VersionSuffix></VersionSuffix>
910
<Description>
1011
A simple caching bus(message bus) based on CSRedis.
1112
</Description>

‎bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<Owners>ncc;Catcher Wong</Owners>
77
<Authors>ncc;Catcher Wong</Authors>
8-
<Version>$(EasyCachingRabbitBusPackageVersion)</Version>
8+
<VersionPrefix>$(EasyCachingRabbitBusPackageVersion)</VersionPrefix>
9+
<VersionSuffix></VersionSuffix>
910
<Description>
1011
A simple caching bus(message bus) based on RabbitMQ.
1112
</Description>

‎bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<Owners>ncc;Catcher Wong</Owners>
77
<Authors>ncc;Catcher Wong</Authors>
8-
<Version>$(EasyCachingRedisBusPackageVersion)</Version>
8+
<VersionPrefix>$(EasyCachingRedisBusPackageVersion)</VersionPrefix>
9+
<VersionSuffix></VersionSuffix>
910
<Description>
1011
A simple caching bus(message bus) based on StackExchange.Redis.
1112
</Description>

‎extensions/Microsoft.Extensions.Caching.EasyCachingLib/Microsoft.Extensions.Caching.EasyCachingLib.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<Owners>ncc;Catcher Wong</Owners>
77
<Authors>ncc;Catcher Wong</Authors>
8-
<Version>$(EasyCachingMsExtPackageVersion)</Version>
8+
<VersionPrefix>$(EasyCachingMsExtPackageVersion)</VersionPrefix>
9+
<VersionSuffix></VersionSuffix>
910
<Description>
1011
EasyCaching is a open source caching library that contains basic usages and some advanced usages of caching which can help us to handle caching more easier!
1112
</Description>

0 commit comments

Comments
 (0)