Skip to content

Commit

Permalink
Merge pull request #339 from dotnetcore/depend
Browse files Browse the repository at this point in the history
Upgrading Dependencies
  • Loading branch information
catcherwong authored Jan 23, 2022
2 parents e6831a4 + 45f6067 commit 2eab148
Show file tree
Hide file tree
Showing 36 changed files with 996 additions and 947 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build

on:
push:
branches: [ dev, main, master, '**' ]
pull_request:
branches: [ dev, main, master ]

jobs:

windows:
name: build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-latest ]

steps:
- uses: actions/checkout@v2
- name: Setup .NET SDK 6.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: Show dotnet Version
run: |
dotnet --list-sdks
dotnet --list-runtimes
- name: Build with dotnet
run: |
dotnet build --configuration Release D:\a\EasyCaching\EasyCaching\EasyCaching.sln
62 changes: 62 additions & 0 deletions .github/workflows/buildandtest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build&Test

on:
push:
branches: [ dev, main, master, '**' ]
pull_request:
branches: [ dev, main, master ]

jobs:

linux:
name: build and test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest ]

services:
redis6379:
image: redis
ports:
- 6379:6379
redis6380:
image: redis
ports:
- 6380:6379
redis6388:
image: redis
ports:
- 6388:6379
memcached1:
image: bitnami/memcached
ports:
- 11211:11211
memcached2:
image: bitnami/memcached
ports:
- 11212:11211

steps:
- uses: actions/checkout@v2
- name: Setup .NET SDK 6.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: Show dotnet Version
run: |
dotnet --list-sdks
dotnet --list-runtimes
- name: Show docker info
run: |
docker ps -a
- name: Build with dotnet
run: |
dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
- name: Run tests on net6.0
run: |
dotnet test --framework=net6.0 /home/runner/work/EasyCaching/EasyCaching/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- dev
- master
- main

jobs:
build_artifact:
Expand All @@ -16,7 +17,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.200
dotnet-version: 6.0.x
- name: Build with dotnet
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
- name: Pack with dotnet
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.200
dotnet-version: 6.0.x
- name: Build with dotnet
run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln
- name: Pack with dotnet
Expand Down
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ EasyCaching is an open source caching library that contains basic usages and som

| Platform | Build Server | Master Status | Dev Status |
|--------- |------------- |---------|---------|
| 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)|
| 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) |
| 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) |

## Nuget Packages

Expand Down
73 changes: 0 additions & 73 deletions appveyor.yml

This file was deleted.

40 changes: 20 additions & 20 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Project>
<PropertyGroup>
<EasyCachingCorePackageVersion>1.4.1</EasyCachingCorePackageVersion>
<EasyCachingMemcachedPackageVersion>1.4.1</EasyCachingMemcachedPackageVersion>
<EasyCachingRedisPackageVersion>1.4.1</EasyCachingRedisPackageVersion>
<EasyCachingSQLitePackageVersion>1.4.1</EasyCachingSQLitePackageVersion>
<EasyCachingInMemoryPackageVersion>1.4.1</EasyCachingInMemoryPackageVersion>
<EasyCachingHybridPackageVersion>1.4.1</EasyCachingHybridPackageVersion>
<EasyCachingAspectCorePackageVersion>1.4.1</EasyCachingAspectCorePackageVersion>
<EasyCachingCastlePackageVersion>1.4.1</EasyCachingCastlePackageVersion>
<EasyCachingResponseCachingPackageVersion>1.4.1</EasyCachingResponseCachingPackageVersion>
<EasyCachingJsonPackageVersion>1.4.1</EasyCachingJsonPackageVersion>
<EasyCachingMessagePackPackageVersion>1.4.1</EasyCachingMessagePackPackageVersion>
<EasyCachingProtobufPackageVersion>1.4.1</EasyCachingProtobufPackageVersion>
<EasyCachingCSRedisPackageVersion>1.4.1</EasyCachingCSRedisPackageVersion>
<EasyCachingRedisBusPackageVersion>1.4.1</EasyCachingRedisBusPackageVersion>
<EasyCachingCSRedisBusPackageVersion>1.4.1</EasyCachingCSRedisBusPackageVersion>
<EasyCachingRabbitBusPackageVersion>1.4.1</EasyCachingRabbitBusPackageVersion>
<EasyCachingDiskPackageVersion>1.4.1</EasyCachingDiskPackageVersion>
<EasyCachingMsExtPackageVersion>1.4.1</EasyCachingMsExtPackageVersion>
<EasyCachingLiteDBPackageVersion>1.4.1</EasyCachingLiteDBPackageVersion>
<EasyCachingSTJsonPackageVersion>1.4.1</EasyCachingSTJsonPackageVersion>
<EasyCachingCorePackageVersion>1.5.0</EasyCachingCorePackageVersion>
<EasyCachingMemcachedPackageVersion>1.5.0</EasyCachingMemcachedPackageVersion>
<EasyCachingRedisPackageVersion>1.5.0</EasyCachingRedisPackageVersion>
<EasyCachingSQLitePackageVersion>1.5.0</EasyCachingSQLitePackageVersion>
<EasyCachingInMemoryPackageVersion>1.5.0</EasyCachingInMemoryPackageVersion>
<EasyCachingHybridPackageVersion>1.5.0</EasyCachingHybridPackageVersion>
<EasyCachingAspectCorePackageVersion>1.5.0</EasyCachingAspectCorePackageVersion>
<EasyCachingCastlePackageVersion>1.5.0</EasyCachingCastlePackageVersion>
<EasyCachingResponseCachingPackageVersion>1.5.0</EasyCachingResponseCachingPackageVersion>
<EasyCachingJsonPackageVersion>1.5.0</EasyCachingJsonPackageVersion>
<EasyCachingMessagePackPackageVersion>1.5.0</EasyCachingMessagePackPackageVersion>
<EasyCachingProtobufPackageVersion>1.5.0</EasyCachingProtobufPackageVersion>
<EasyCachingCSRedisPackageVersion>1.5.0</EasyCachingCSRedisPackageVersion>
<EasyCachingRedisBusPackageVersion>1.5.0</EasyCachingRedisBusPackageVersion>
<EasyCachingCSRedisBusPackageVersion>1.5.0</EasyCachingCSRedisBusPackageVersion>
<EasyCachingRabbitBusPackageVersion>1.5.0</EasyCachingRabbitBusPackageVersion>
<EasyCachingDiskPackageVersion>1.5.0</EasyCachingDiskPackageVersion>
<EasyCachingMsExtPackageVersion>1.5.0</EasyCachingMsExtPackageVersion>
<EasyCachingLiteDBPackageVersion>1.5.0</EasyCachingLiteDBPackageVersion>
<EasyCachingSTJsonPackageVersion>1.5.0</EasyCachingSTJsonPackageVersion>
</PropertyGroup>
</Project>
76 changes: 38 additions & 38 deletions bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../build/version.props" />
<Import Project="../../build/releasenotes.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Owners>ncc;Catcher Wong</Owners>
<Authors>ncc;Catcher Wong</Authors>
<VersionPrefix>$(EasyCachingCSRedisBusPackageVersion)</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Description>
A simple caching bus(message bus) based on CSRedis.
</Description>
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
<PackageIcon>nuget-icon.png</PackageIcon>
<PackageReleaseNotes>
$(EasyCachingCSRedisBusPackageNotes)
</PackageReleaseNotes>
</PropertyGroup>
<Import Project="../../build/version.props" />
<Import Project="../../build/releasenotes.props" />
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<Owners>ncc;Catcher Wong</Owners>
<Authors>ncc;Catcher Wong</Authors>
<VersionPrefix>$(EasyCachingCSRedisBusPackageVersion)</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Description>
A simple caching bus(message bus) based on CSRedis.
</Description>
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
<PackageIcon>nuget-icon.png</PackageIcon>
<PackageReleaseNotes>
$(EasyCachingCSRedisBusPackageNotes)
</PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Configurations\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.6.8" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Configurations\" />
</ItemGroup>
</Project>
Loading

0 comments on commit 2eab148

Please sign in to comment.