From e88a089fddc9d299e97872ea28df5deec352e1c1 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Sun, 3 Mar 2024 21:07:41 +0800 Subject: [PATCH 1/8] Update dependencies --- FastCache.Core/FastCache.Core.csproj | 6 +++--- FastCache.Redis/FastCache.Redis.csproj | 2 +- IntegrationTests/IntegrationTests.csproj | 12 ++++++------ TestApi/TestApi.csproj | 14 +++++++------- UnitTests/UnitTests.csproj | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/FastCache.Core/FastCache.Core.csproj b/FastCache.Core/FastCache.Core.csproj index 69916b0..36f68e5 100644 --- a/FastCache.Core/FastCache.Core.csproj +++ b/FastCache.Core/FastCache.Core.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/FastCache.Redis/FastCache.Redis.csproj b/FastCache.Redis/FastCache.Redis.csproj index 16137a6..b634439 100644 --- a/FastCache.Redis/FastCache.Redis.csproj +++ b/FastCache.Redis/FastCache.Redis.csproj @@ -15,7 +15,7 @@ - + diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj index cea660c..5c77f46 100644 --- a/IntegrationTests/IntegrationTests.csproj +++ b/IntegrationTests/IntegrationTests.csproj @@ -1,21 +1,21 @@ - net6.0 + net8.0 enable false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/TestApi/TestApi.csproj b/TestApi/TestApi.csproj index 95bbc3f..5cff03e 100644 --- a/TestApi/TestApi.csproj +++ b/TestApi/TestApi.csproj @@ -1,22 +1,22 @@ - net6.0 + net8.0 enable enable - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 097d377..20c8655 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -1,20 +1,20 @@ - net6.0 + net8.0 enable false - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From aed7ceefb85e65da3ec1de17b63d41be11ce308c Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Sun, 3 Mar 2024 21:48:50 +0800 Subject: [PATCH 2/8] chore: fix build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a859f5f..e9eac87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.101 + dotnet-version: 8.0 - name: Set up Redis uses: supercharge/redis-github-action@1.4.0 From 278299dd42758e8af0322ec25c2fa599f158a62b Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Sun, 3 Mar 2024 21:50:49 +0800 Subject: [PATCH 3/8] chore: fixed build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9eac87..e1c43ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v2 with: - dotnet-version: 8.0 + dotnet-version: 8.0.0 - name: Set up Redis uses: supercharge/redis-github-action@1.4.0 From b496ad1d5855a3ddb0021ccd806b5547e6f8c271 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Sun, 3 Mar 2024 21:54:15 +0800 Subject: [PATCH 4/8] chore: fixed build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1c43ca..1a2fc21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v2 with: - dotnet-version: 8.0.0 + dotnet-version: 8.0.100 - name: Set up Redis uses: supercharge/redis-github-action@1.4.0 From dcbeed70dd744bd0fdad872965a5f51bc52d7fd8 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Mon, 4 Mar 2024 19:00:18 +0800 Subject: [PATCH 5/8] chore: remove reference --- FastCache.Core/Attributes/EvictableAttribute.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/FastCache.Core/Attributes/EvictableAttribute.cs b/FastCache.Core/Attributes/EvictableAttribute.cs index 09b1455..7b2f3a6 100644 --- a/FastCache.Core/Attributes/EvictableAttribute.cs +++ b/FastCache.Core/Attributes/EvictableAttribute.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Threading.Tasks; using AspectCore.DynamicProxy; From e1bad9657b3ceabc217e93a8f10250db7bb14b68 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Mon, 4 Mar 2024 19:09:09 +0800 Subject: [PATCH 6/8] chore: fixed build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a2fc21..0edf9fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,6 +98,8 @@ jobs: - name: Pack FastCache.Core run: dotnet pack FastCache.Core -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o Core + - name: show me the dir + run: ls -al ./Core - name: Push FastCache.Core to nuget run: dotnet nuget push Core/FastCache.Core.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json From ef7199b9cda6efd834b02f409ce66aa7de27e7b9 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Mon, 4 Mar 2024 19:15:40 +0800 Subject: [PATCH 7/8] chore: fixed build --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0edf9fa..fb6e071 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,12 +25,12 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - + - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.15 with: versionSpec: '5.12.0' - includePrerelease: true + includePrerelease: true - name: Determine Version id: gitversion @@ -89,7 +89,7 @@ jobs: with: token: ${{secrets.CODECOV_TOKEN}} file: ${{ github.workspace }}/UnitTests/TestResults/**/coverage.cobertura.xml - + - name: Publish Code Coverage IntegrationTests uses: codecov/codecov-action@v1.0.2 with: @@ -101,22 +101,22 @@ jobs: - name: show me the dir run: ls -al ./Core - name: Push FastCache.Core to nuget - run: dotnet nuget push Core/FastCache.Core.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json + run: dotnet nuget push ./Core/FastCache.Core.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true - name: Pack FastCache.InMemory run: dotnet pack FastCache.InMemory -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o InMemory - name: Push FastCache.InMemory to nuget - run: dotnet nuget push InMemory/FastCache.InMemory.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json - + run: dotnet nuget push ./InMemory/FastCache.InMemory.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + - name: Pack FastCache.Redis run: dotnet pack FastCache.Redis -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o Redis - name: Push FastCache.Redis to nuget - run: dotnet nuget push Redis/FastCache.Redis.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json - + run: dotnet nuget push ./Redis/FastCache.Redis.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + - name: Pack FastCache.MultiSource run: dotnet pack FastCache.MultiSource -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o MultiSource - name: Push FastCache.Redis to nuget - run: dotnet nuget push MultiSource/FastCache.MultiSource.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json + run: dotnet nuget push ./MultiSource/FastCache.MultiSource.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true # - name: Push to nuget # run: dotnet nuget push artifacts/NetCoreCache.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json From 623f2cb3496a390d23398402c4e052a848d84ac7 Mon Sep 17 00:00:00 2001 From: "Anson.G" Date: Mon, 4 Mar 2024 19:22:25 +0800 Subject: [PATCH 8/8] chore: fixed build --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb6e071..ae70076 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,22 +101,22 @@ jobs: - name: show me the dir run: ls -al ./Core - name: Push FastCache.Core to nuget - run: dotnet nuget push ./Core/FastCache.Core.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + run: dotnet nuget push ./Core/FastCache.Core.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols - name: Pack FastCache.InMemory run: dotnet pack FastCache.InMemory -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o InMemory - name: Push FastCache.InMemory to nuget - run: dotnet nuget push ./InMemory/FastCache.InMemory.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + run: dotnet nuget push ./InMemory/FastCache.InMemory.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols - name: Pack FastCache.Redis run: dotnet pack FastCache.Redis -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o Redis - name: Push FastCache.Redis to nuget - run: dotnet nuget push ./Redis/FastCache.Redis.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + run: dotnet nuget push ./Redis/FastCache.Redis.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols - name: Pack FastCache.MultiSource run: dotnet pack FastCache.MultiSource -p:PackageVersion=${{ steps.gitversion.outputs.SemVer }} --configuration=Release -o MultiSource - name: Push FastCache.Redis to nuget - run: dotnet nuget push ./MultiSource/FastCache.MultiSource.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true + run: dotnet nuget push ./MultiSource/FastCache.MultiSource.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols # - name: Push to nuget # run: dotnet nuget push artifacts/NetCoreCache.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET}} --source https://api.nuget.org/v3/index.json