Skip to content

Commit 2eab148

Browse files
catcherwongcatcherwong
authored
Merge pull request #339 from dotnetcore/depend
Upgrading Dependencies
2 parents e6831a4 + 45f6067 commit 2eab148

File tree

36 files changed

+996
-947
lines changed

36 files changed

+996
-947
lines changed

‎.github/workflows/build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [ dev, main, master, '**' ]
6+
pull_request:
7+
branches: [ dev, main, master ]
8+
9+
jobs:
10+
11+
windows:
12+
name: build on ${{ matrix.os }}
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
matrix:
16+
os: [ windows-latest ]
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Setup .NET SDK 6.0.x
21+
uses: actions/setup-dotnet@v1
22+
with:
23+
dotnet-version: 6.0.x
24+
25+
- name: Show dotnet Version
26+
run: |
27+
dotnet --list-sdks
28+
dotnet --list-runtimes
29+
30+
- name: Build with dotnet
31+
run: |
32+
dotnet build --configuration Release D:\a\EasyCaching\EasyCaching\EasyCaching.sln

‎.github/workflows/buildandtest.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Build&Test
2+
3+
on:
4+
push:
5+
branches: [ dev, main, master, '**' ]
6+
pull_request:
7+
branches: [ dev, main, master ]
8+
9+
jobs:
10+
11+
linux:
12+
name: build and test on ${{ matrix.os }}
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
matrix:
16+
os: [ ubuntu-latest ]
17+
18+
services:
19+
redis6379:
20+
image: redis
21+
ports:
22+
- 6379:6379
23+
redis6380:
24+
image: redis
25+
ports:
26+
- 6380:6379
27+
redis6388:
28+
image: redis
29+
ports:
30+
- 6388:6379
31+
memcached1:
32+
image: bitnami/memcached
33+
ports:
34+
- 11211:11211
35+
memcached2:
36+
image: bitnami/memcached
37+
ports:
38+
- 11212:11211
39+
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Setup .NET SDK 6.0.x
43+
uses: actions/setup-dotnet@v1
44+
with:
45+
dotnet-version: 6.0.x
46+
47+
- name: Show dotnet Version
48+
run: |
49+
dotnet --list-sdks
50+
dotnet --list-runtimes
51+
52+
- name: Show docker info
53+
run: |
54+
docker ps -a
55+
56+
- name: Build with dotnet
57+
run: |
58+
dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
59+
60+
- name: Run tests on net6.0
61+
run: |
62+
dotnet test --framework=net6.0 /home/runner/work/EasyCaching/EasyCaching/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj

‎.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- dev
77
- master
8+
- main
89

910
jobs:
1011
build_artifact:
@@ -16,7 +17,7 @@ jobs:
1617
- name: Setup .NET Core
1718
uses: actions/setup-dotnet@v1
1819
with:
19-
dotnet-version: 3.1.200
20+
dotnet-version: 6.0.x
2021
- name: Build with dotnet
2122
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
2223
- name: Pack with dotnet

‎.github/workflows/release_stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 3.1.200
18+
dotnet-version: 6.0.x
1919
- name: Build with dotnet
2020
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
2121
- name: Pack with dotnet

‎.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ EasyCaching is an open source caching library that contains basic usages and som
1111

1212
| Platform | Build Server | Master Status | Dev Status |
1313
|--------- |------------- |---------|---------|
14-
| AppVeyor | Windows/Linux |[![Build status](https://ci.appveyor.com/api/projects/status/4x6qal9c1r10wn6x/branch/master?svg=true)](https://ci.appveyor.com/project/catcherwong/easycaching-48okb/branch/master) |[![Build status](https://ci.appveyor.com/api/projects/status/4x6qal9c1r10wn6x/branch/dev?svg=true)](https://ci.appveyor.com/project/catcherwong/easycaching-48okb/branch/dev)|
15-
| Travis | Linux/OSX | [![Build Status](https://travis-ci.org/dotnetcore/EasyCaching.svg?branch=master)](https://travis-ci.org/dotnetcore/EasyCaching) | [![Build Status](https://travis-ci.org/dotnetcore/EasyCaching.svg?branch=dev)](https://travis-ci.org/dotnetcore/EasyCaching) |
14+
| Github Action | Linux/Windows | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml) | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml) |
1615

1716
## Nuget Packages
1817

‎appveyor.yml

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎build/version.props

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

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

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<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-
<VersionPrefix>$(EasyCachingCSRedisBusPackageVersion)</VersionPrefix>
9-
<VersionSuffix></VersionSuffix>
10-
<Description>
11-
A simple caching bus(message bus) based on CSRedis.
12-
</Description>
13-
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
14-
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
15-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16-
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
17-
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
18-
<PackageIcon>nuget-icon.png</PackageIcon>
19-
<PackageReleaseNotes>
20-
$(EasyCachingCSRedisBusPackageNotes)
21-
</PackageReleaseNotes>
22-
</PropertyGroup>
2+
<Import Project="../../build/version.props" />
3+
<Import Project="../../build/releasenotes.props" />
4+
<PropertyGroup>
5+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
6+
<Owners>ncc;Catcher Wong</Owners>
7+
<Authors>ncc;Catcher Wong</Authors>
8+
<VersionPrefix>$(EasyCachingCSRedisBusPackageVersion)</VersionPrefix>
9+
<VersionSuffix></VersionSuffix>
10+
<Description>
11+
A simple caching bus(message bus) based on CSRedis.
12+
</Description>
13+
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
14+
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
15+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
17+
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
18+
<PackageIcon>nuget-icon.png</PackageIcon>
19+
<PackageReleaseNotes>
20+
$(EasyCachingCSRedisBusPackageNotes)
21+
</PackageReleaseNotes>
22+
</PropertyGroup>
2323

24-
<PropertyGroup>
25-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26-
<NoWarn>$(NoWarn);1591</NoWarn>
27-
</PropertyGroup>
24+
<PropertyGroup>
25+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26+
<NoWarn>$(NoWarn);1591</NoWarn>
27+
</PropertyGroup>
2828

29-
<ItemGroup>
30-
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
31-
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
32-
</ItemGroup>
29+
<ItemGroup>
30+
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
31+
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
32+
</ItemGroup>
3333

34-
<ItemGroup>
35-
<PackageReference Include="CSRedisCore" Version="3.2.0" />
36-
</ItemGroup>
37-
<ItemGroup>
38-
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
39-
</ItemGroup>
40-
<ItemGroup>
41-
<Folder Include="Configurations\" />
42-
</ItemGroup>
34+
<ItemGroup>
35+
<PackageReference Include="CSRedisCore" Version="3.6.8" />
36+
</ItemGroup>
37+
<ItemGroup>
38+
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<Folder Include="Configurations\" />
42+
</ItemGroup>
4343
</Project>

0 commit comments

Comments
 (0)