From fb1cb2664f495f8d9ec7a5cd724d53a201d32798 Mon Sep 17 00:00:00 2001 From: Memoyu Date: Fri, 11 Oct 2024 11:27:45 +0800 Subject: [PATCH 1/5] upgrade: upgrade .net version to .net 8.0 --- .../EasyCaching.Bus.CSRedis.csproj | 2 +- .../EasyCaching.Bus.ConfluentKafka.csproj | 2 +- .../EasyCaching.Bus.RabbitMQ.csproj | 6 +++--- .../EasyCaching.Bus.RabbitMQStream.csproj | 6 +++--- bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj | 2 +- .../EasyCaching.Bus.Zookeeper.csproj | 2 +- .../EasyCaching.Interceptor.AspectCore.csproj | 2 +- .../EasyCaching.Interceptor.Castle.csproj | 2 +- .../EasyCaching.Demo.ConsoleApp.csproj | 2 +- .../EasyCaching.Demo.Interceptors.csproj | 2 +- .../EasyCaching.Demo.Locks.csproj | 2 +- .../EasyCaching.Demo.Providers.csproj | 2 +- .../EasyCaching.Demo.ResponseCaching.csproj | 2 +- .../EasyCaching.Serialization.Json.csproj | 2 +- .../EasyCaching.Serialization.MemoryPack.csproj | 2 +- .../EasyCaching.Serialization.MessagePack.csproj | 2 +- .../EasyCaching.Serialization.Protobuf.csproj | 2 +- .../EasyCaching.Serialization.SystemTextJson.csproj | 4 ++-- src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj | 2 +- src/EasyCaching.Core/EasyCaching.Core.csproj | 10 +++++----- src/EasyCaching.Disk/EasyCaching.Disk.csproj | 2 +- src/EasyCaching.FasterKv/EasyCaching.FasterKv.csproj | 2 +- .../EasyCaching.HybridCache.csproj | 2 +- src/EasyCaching.InMemory/EasyCaching.InMemory.csproj | 2 +- src/EasyCaching.LiteDB/EasyCaching.LiteDB.csproj | 2 +- src/EasyCaching.Memcached/EasyCaching.Memcached.csproj | 2 +- src/EasyCaching.Redis/EasyCaching.Redis.csproj | 2 +- src/EasyCaching.SQLite/EasyCaching.SQLite.csproj | 6 +++--- .../EasyCaching.PerformanceTests.csproj | 3 +-- .../EasyCaching.UnitTests/EasyCaching.UnitTests.csproj | 3 +-- 30 files changed, 41 insertions(+), 43 deletions(-) diff --git a/bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj b/bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj index 044c7fb9..2640f056 100644 --- a/bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj +++ b/bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingCSRedisBusPackageVersion) diff --git a/bus/EasyCaching.Bus.ConfluentKafka/EasyCaching.Bus.ConfluentKafka.csproj b/bus/EasyCaching.Bus.ConfluentKafka/EasyCaching.Bus.ConfluentKafka.csproj index 52779cf2..153d9f08 100644 --- a/bus/EasyCaching.Bus.ConfluentKafka/EasyCaching.Bus.ConfluentKafka.csproj +++ b/bus/EasyCaching.Bus.ConfluentKafka/EasyCaching.Bus.ConfluentKafka.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingKafkaBusPackageVersion) diff --git a/bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj b/bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj index b58ec4f0..aa144182 100644 --- a/bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj +++ b/bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingRabbitBusPackageVersion) @@ -43,7 +43,7 @@ - - + + diff --git a/bus/EasyCaching.Bus.RabbitMQStream/EasyCaching.Bus.RabbitMQStream.csproj b/bus/EasyCaching.Bus.RabbitMQStream/EasyCaching.Bus.RabbitMQStream.csproj index 4a1d9b02..466a445a 100644 --- a/bus/EasyCaching.Bus.RabbitMQStream/EasyCaching.Bus.RabbitMQStream.csproj +++ b/bus/EasyCaching.Bus.RabbitMQStream/EasyCaching.Bus.RabbitMQStream.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Thomas Sarmis ncc;Thomas Sarmis $(EasyCachingRabbitStreamBusPackageVersion) @@ -44,7 +44,7 @@ - - + + diff --git a/bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj b/bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj index f6f506e2..2acde450 100644 --- a/bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj +++ b/bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingRedisBusPackageVersion) diff --git a/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj b/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj index 5d754db8..23c4c22d 100644 --- a/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj +++ b/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj @@ -3,7 +3,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingZookeeperBusPackageVersion) diff --git a/interceptor/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj b/interceptor/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj index 5cd7f675..0333295e 100644 --- a/interceptor/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj +++ b/interceptor/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingAspectCorePackageVersion) diff --git a/interceptor/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj b/interceptor/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj index 2206bab3..09ba1880 100644 --- a/interceptor/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj +++ b/interceptor/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingCastlePackageVersion) diff --git a/sample/EasyCaching.Demo.ConsoleApp/EasyCaching.Demo.ConsoleApp.csproj b/sample/EasyCaching.Demo.ConsoleApp/EasyCaching.Demo.ConsoleApp.csproj index 61cbb702..1d45c7c8 100644 --- a/sample/EasyCaching.Demo.ConsoleApp/EasyCaching.Demo.ConsoleApp.csproj +++ b/sample/EasyCaching.Demo.ConsoleApp/EasyCaching.Demo.ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 false diff --git a/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj b/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj index 1e5c66d0..fdf6b5fb 100644 --- a/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj +++ b/sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/sample/EasyCaching.Demo.Locks/EasyCaching.Demo.Locks.csproj b/sample/EasyCaching.Demo.Locks/EasyCaching.Demo.Locks.csproj index dc06abc5..0e6245ee 100644 --- a/sample/EasyCaching.Demo.Locks/EasyCaching.Demo.Locks.csproj +++ b/sample/EasyCaching.Demo.Locks/EasyCaching.Demo.Locks.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj b/sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj index 116c4206..aac47298 100644 --- a/sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj +++ b/sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/sample/EasyCaching.Demo.ResponseCaching/EasyCaching.Demo.ResponseCaching.csproj b/sample/EasyCaching.Demo.ResponseCaching/EasyCaching.Demo.ResponseCaching.csproj index 78fb4c0e..03f9b2c7 100644 --- a/sample/EasyCaching.Demo.ResponseCaching/EasyCaching.Demo.ResponseCaching.csproj +++ b/sample/EasyCaching.Demo.ResponseCaching/EasyCaching.Demo.ResponseCaching.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/serialization/EasyCaching.Serialization.Json/EasyCaching.Serialization.Json.csproj b/serialization/EasyCaching.Serialization.Json/EasyCaching.Serialization.Json.csproj index 160993d8..2e944bbd 100644 --- a/serialization/EasyCaching.Serialization.Json/EasyCaching.Serialization.Json.csproj +++ b/serialization/EasyCaching.Serialization.Json/EasyCaching.Serialization.Json.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingJsonPackageVersion) diff --git a/serialization/EasyCaching.Serialization.MemoryPack/EasyCaching.Serialization.MemoryPack.csproj b/serialization/EasyCaching.Serialization.MemoryPack/EasyCaching.Serialization.MemoryPack.csproj index 5888b767..e5449fc0 100644 --- a/serialization/EasyCaching.Serialization.MemoryPack/EasyCaching.Serialization.MemoryPack.csproj +++ b/serialization/EasyCaching.Serialization.MemoryPack/EasyCaching.Serialization.MemoryPack.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 ncc;Amir Solhi ncc;Amir Solhi enable diff --git a/serialization/EasyCaching.Serialization.MessagePack/EasyCaching.Serialization.MessagePack.csproj b/serialization/EasyCaching.Serialization.MessagePack/EasyCaching.Serialization.MessagePack.csproj index 4584dc3e..3e143856 100644 --- a/serialization/EasyCaching.Serialization.MessagePack/EasyCaching.Serialization.MessagePack.csproj +++ b/serialization/EasyCaching.Serialization.MessagePack/EasyCaching.Serialization.MessagePack.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingMessagePackPackageVersion) diff --git a/serialization/EasyCaching.Serialization.Protobuf/EasyCaching.Serialization.Protobuf.csproj b/serialization/EasyCaching.Serialization.Protobuf/EasyCaching.Serialization.Protobuf.csproj index 465675d6..1529469e 100644 --- a/serialization/EasyCaching.Serialization.Protobuf/EasyCaching.Serialization.Protobuf.csproj +++ b/serialization/EasyCaching.Serialization.Protobuf/EasyCaching.Serialization.Protobuf.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingProtobufPackageVersion) diff --git a/serialization/EasyCaching.Serialization.SystemTextJson/EasyCaching.Serialization.SystemTextJson.csproj b/serialization/EasyCaching.Serialization.SystemTextJson/EasyCaching.Serialization.SystemTextJson.csproj index 3cbcf13c..968dd3ca 100644 --- a/serialization/EasyCaching.Serialization.SystemTextJson/EasyCaching.Serialization.SystemTextJson.csproj +++ b/serialization/EasyCaching.Serialization.SystemTextJson/EasyCaching.Serialization.SystemTextJson.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 EasyCaching Contributors $(EasyCachingSTJsonPackageVersion) @@ -31,7 +31,7 @@ - + diff --git a/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj b/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj index c651637a..b62ec71e 100644 --- a/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj +++ b/src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingCSRedisPackageVersion) diff --git a/src/EasyCaching.Core/EasyCaching.Core.csproj b/src/EasyCaching.Core/EasyCaching.Core.csproj index f861e7bb..1a373291 100644 --- a/src/EasyCaching.Core/EasyCaching.Core.csproj +++ b/src/EasyCaching.Core/EasyCaching.Core.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingCorePackageVersion) @@ -38,10 +38,10 @@ - - - - + + + + diff --git a/src/EasyCaching.Disk/EasyCaching.Disk.csproj b/src/EasyCaching.Disk/EasyCaching.Disk.csproj index 39ece217..8e66387d 100644 --- a/src/EasyCaching.Disk/EasyCaching.Disk.csproj +++ b/src/EasyCaching.Disk/EasyCaching.Disk.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingDiskPackageVersion) diff --git a/src/EasyCaching.FasterKv/EasyCaching.FasterKv.csproj b/src/EasyCaching.FasterKv/EasyCaching.FasterKv.csproj index a232270b..221f3275 100644 --- a/src/EasyCaching.FasterKv/EasyCaching.FasterKv.csproj +++ b/src/EasyCaching.FasterKv/EasyCaching.FasterKv.csproj @@ -3,7 +3,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;InCerry ncc;InCerry 10 diff --git a/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj b/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj index 6b6d4436..99650e37 100644 --- a/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj +++ b/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingHybridPackageVersion) diff --git a/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj b/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj index 2d1dd05d..2e8755ed 100644 --- a/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj +++ b/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingInMemoryPackageVersion) diff --git a/src/EasyCaching.LiteDB/EasyCaching.LiteDB.csproj b/src/EasyCaching.LiteDB/EasyCaching.LiteDB.csproj index 4c3ccb2b..177d8b99 100644 --- a/src/EasyCaching.LiteDB/EasyCaching.LiteDB.csproj +++ b/src/EasyCaching.LiteDB/EasyCaching.LiteDB.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 maikebing maikebing $(EasyCachingLiteDBPackageVersion) diff --git a/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj b/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj index b6029510..6c27db28 100644 --- a/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj +++ b/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingMemcachedPackageVersion) diff --git a/src/EasyCaching.Redis/EasyCaching.Redis.csproj b/src/EasyCaching.Redis/EasyCaching.Redis.csproj index d096c658..06b06a02 100644 --- a/src/EasyCaching.Redis/EasyCaching.Redis.csproj +++ b/src/EasyCaching.Redis/EasyCaching.Redis.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingRedisPackageVersion) diff --git a/src/EasyCaching.SQLite/EasyCaching.SQLite.csproj b/src/EasyCaching.SQLite/EasyCaching.SQLite.csproj index c5d9d52d..fcd72397 100644 --- a/src/EasyCaching.SQLite/EasyCaching.SQLite.csproj +++ b/src/EasyCaching.SQLite/EasyCaching.SQLite.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 ncc;Catcher Wong ncc;Catcher Wong $(EasyCachingSQLitePackageVersion) @@ -44,8 +44,8 @@ - - + + diff --git a/test/EasyCaching.PerformanceTests/EasyCaching.PerformanceTests.csproj b/test/EasyCaching.PerformanceTests/EasyCaching.PerformanceTests.csproj index cf989173..f63b5ab4 100644 --- a/test/EasyCaching.PerformanceTests/EasyCaching.PerformanceTests.csproj +++ b/test/EasyCaching.PerformanceTests/EasyCaching.PerformanceTests.csproj @@ -2,13 +2,12 @@ Exe - net6.0 + net8.0 false - diff --git a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj index f605ef48..114ba941 100644 --- a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj +++ b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false @@ -18,7 +18,6 @@ - From 308dc41d7b8f9c7adf9ddd8c88bf0a61f1ad7cd1 Mon Sep 17 00:00:00 2001 From: Memoyu Date: Fri, 11 Oct 2024 11:32:21 +0800 Subject: [PATCH 2/5] upgrade: change github action yml --- .github/workflows/build.yml | 39 +++++++------- .github/workflows/buildandtest.yml | 61 +++++++++++----------- .github/workflows/release.yml | 72 +++++++++++++------------- .github/workflows/release_stable.yml | 76 ++++++++++++++-------------- 4 files changed, 123 insertions(+), 125 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b4ab1a7..e12536d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,31 +2,30 @@ name: Build on: push: - branches: [ dev, main, master, '**' ] + branches: [dev, main, master, "**"] pull_request: - branches: [ dev, main, master ] + branches: [dev, main, master] jobs: - - windows: - name: build on ${{ matrix.os }} + windows: + name: build on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ windows-latest ] - + os: [windows-latest] + steps: - - uses: actions/checkout@v4 - - name: Setup .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.0.x + - uses: actions/checkout@v4 + - name: Setup .NET SDK 8.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 8.0.x + + - name: Show dotnet Version + run: | + dotnet --list-sdks + dotnet --list-runtimes - - 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 \ No newline at end of file + - name: Build with dotnet + run: | + dotnet build --configuration Release D:\a\EasyCaching\EasyCaching\EasyCaching.sln diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 2466ba79..d6cdeadc 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -2,18 +2,17 @@ name: Build&Test on: push: - branches: [ dev, main, master, '**' ] + branches: [dev, main, master, "**"] pull_request: - branches: [ dev, main, master ] + branches: [dev, main, master] jobs: - - linux: - name: build and test on ${{ matrix.os }} + linux: + name: build and test on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] services: redis6379: @@ -27,36 +26,36 @@ jobs: redis6388: image: redis ports: - - 6388:6379 + - 6388:6379 memcached1: image: bitnami/memcached ports: - - 11211:11211 + - 11211:11211 memcached2: image: bitnami/memcached ports: - - 11212:11211 + - 11212:11211 steps: - - uses: actions/checkout@v4 - - name: Setup .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 - 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 + - uses: actions/checkout@v4 + - name: Setup .NET SDK 8.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 8.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 net8.0 + run: | + dotnet test --framework=net8.0 /home/runner/work/EasyCaching/EasyCaching/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61396945..69fb722b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,49 +1,49 @@ name: Release on: - push: - branches: + push: + branches: - dev - master - main jobs: - build_artifact: + build_artifact: name: Build and upload artifact runs-on: ubuntu-latest - + steps: - - uses: actions/checkout@v4 - - name: Setup .NET Core - uses: actions/setup-dotnet@v3 - with: - 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 - 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 - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: nugetpkgs - path: /home/runner/work/nugetpkgs + - uses: actions/checkout@v4 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 8.0.x + - name: Build with dotnet + run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln + - name: Pack with dotnet + 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 + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: nugetpkgs + path: /home/runner/work/nugetpkgs release_nuget: - name: Release to Nuget - needs: build_artifact - runs-on: ubuntu-latest - - steps: - - name: Download build artifacts - uses: actions/download-artifact@v3 - with: - name: nugetpkgs - path: nugetpkgs - - name: list nugetpkgs - run: ls nugetpkgs - - name: Release - run: | - for file in nugetpkgs/*.nupkg - do - dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package - done \ No newline at end of file + name: Release to Nuget + needs: build_artifact + runs-on: ubuntu-latest + + steps: + - name: Download build artifacts + uses: actions/download-artifact@v3 + with: + name: nugetpkgs + path: nugetpkgs + - name: list nugetpkgs + run: ls nugetpkgs + - name: Release + run: | + for file in nugetpkgs/*.nupkg + do + dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package + done diff --git a/.github/workflows/release_stable.yml b/.github/workflows/release_stable.yml index b4448612..d6aedfff 100644 --- a/.github/workflows/release_stable.yml +++ b/.github/workflows/release_stable.yml @@ -1,47 +1,47 @@ name: Release_Stable on: - push: - tags: - - '**' - + push: + tags: + - "**" + jobs: - build_artifact: + build_artifact: name: Build and upload artifact runs-on: ubuntu-latest - + steps: - - uses: actions/checkout@v4 - - name: Setup .NET Core - uses: actions/setup-dotnet@v3 - with: - 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 - run: dotnet pack /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln -o /home/runner/work/nugetpkgs -c Release --no-build - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: nugetpkgs - path: /home/runner/work/nugetpkgs + - uses: actions/checkout@v4 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 8.0.x + - name: Build with dotnet + run: dotnet build --configuration Release /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln + - name: Pack with dotnet + run: dotnet pack /home/runner/work/EasyCaching/EasyCaching/EasyCaching.sln -o /home/runner/work/nugetpkgs -c Release --no-build + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: nugetpkgs + path: /home/runner/work/nugetpkgs release_nuget: - name: Release to Nuget - needs: build_artifact - runs-on: ubuntu-latest - - steps: - - name: Download build artifacts - uses: actions/download-artifact@v3 - with: - name: nugetpkgs - path: nugetpkgs - - name: list nugetpkgs - run: ls nugetpkgs - - name: Release - run: | - for file in nugetpkgs/*.nupkg - do - dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package - done + name: Release to Nuget + needs: build_artifact + runs-on: ubuntu-latest + + steps: + - name: Download build artifacts + uses: actions/download-artifact@v3 + with: + name: nugetpkgs + path: nugetpkgs + - name: list nugetpkgs + run: ls nugetpkgs + - name: Release + run: | + for file in nugetpkgs/*.nupkg + do + dotnet nuget push $file -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate -s https://www.nuget.org/api/v2/package + done From c45b688292e75003b3ee6eb8468f19565e6252c0 Mon Sep 17 00:00:00 2001 From: Memoyu Date: Tue, 15 Oct 2024 10:08:55 +0800 Subject: [PATCH 3/5] upgrade: upgrade base test version --- test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj index 114ba941..30b3cb83 100644 --- a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj +++ b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj @@ -17,11 +17,11 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From a361350170b60d2fdba56ee430006756ac2200cb Mon Sep 17 00:00:00 2001 From: Memoyu Date: Tue, 15 Oct 2024 10:18:10 +0800 Subject: [PATCH 4/5] update: update props --- build/releasenotes.props | 50 +++++++++++++++++++--------------------- build/version.props | 50 ++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/build/releasenotes.props b/build/releasenotes.props index 68666432..76195c1b 100644 --- a/build/releasenotes.props +++ b/build/releasenotes.props @@ -1,78 +1,76 @@ - 1. Support IServiceProvider in setupActions + 1. Upgrading .NET version - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. - 2. Fix no check expires when get cache count + 1. Upgrading .NET version - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. - 2. Always use utc to compare the expiry + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Upgrading dependencies. + 1. Upgrading .NET version. - 1. Initial release. + 1. Upgrading .NET version. diff --git a/build/version.props b/build/version.props index 1b54eb7f..121b3728 100644 --- a/build/version.props +++ b/build/version.props @@ -1,29 +1,29 @@ - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 - 1.9.3 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 + 1.9.4 From 7f0680f6c66db784ff8c6f5f0fc59e1e80c08d96 Mon Sep 17 00:00:00 2001 From: Memoyu Date: Tue, 15 Oct 2024 10:46:35 +0800 Subject: [PATCH 5/5] Update: change base test version --- test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj index 30b3cb83..4f531bac 100644 --- a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj +++ b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj @@ -17,7 +17,7 @@ - +