From a0b36ceccfefa56b9b32c00532746b09cb4e7e89 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:14:07 +0300 Subject: [PATCH 1/6] use correct framework --- src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj b/src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj index 5176498..345d8d9 100644 --- a/src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj +++ b/src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj @@ -1,7 +1,7 @@  - net80 + net8.0 FreeRedis.OpenTelemetry FreeRedis.OpenTelemetry FreeRedis.OpenTelemetry @@ -33,4 +33,4 @@ - \ No newline at end of file + From 7dc3598fd74d2dfbc1ccb2f0c90727a058aa4286 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:16:23 +0300 Subject: [PATCH 2/6] . --- .../FreeRedis.DistributedCache.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FreeRedis.DistributedCache/FreeRedis.DistributedCache.csproj b/src/FreeRedis.DistributedCache/FreeRedis.DistributedCache.csproj index 1e6584d..5735388 100644 --- a/src/FreeRedis.DistributedCache/FreeRedis.DistributedCache.csproj +++ b/src/FreeRedis.DistributedCache/FreeRedis.DistributedCache.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net80;net70;net60;net50;netcoreapp31 + netstandard2.0;net8.0;net7.0;net6.0;net5.0;netcoreapp31 FreeRedis.DistributedCache FreeRedis.DistributedCache FreeRedis.DistributedCache @@ -26,16 +26,16 @@ 1701;1702;1591 - + - + - + - + From 3c0429daf48e621e22309589c6118f6c664c4a84 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:15:11 +0300 Subject: [PATCH 3/6] Update pull-request.yml --- .github/workflows/pull-request.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3a7e8c9..9a66bbb 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,12 +10,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - - name: Setup .NET Core 3.1 - uses: actions/setup-dotnet@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v4 with: - dotnet-version: 3.1.300 + dotnet-version: | + 3.1.x + 5.0.x + 6.0.x + 7.0.x + 8.0.x - name: Test And Coverage Report 📝 run: | @@ -24,4 +29,4 @@ jobs: find ./test/FreeRedis.tests -name "coverage.cobertura.xml" -type f -exec cp {} ./ \; bash <(curl -s https://codecov.io/bash) -Z -f coverage.cobertura.xml -t $CODECOV_TOKEN env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 15f9ce4cd7ac99aa7781cc75d55d01e94a11bb3c Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:15:42 +0300 Subject: [PATCH 4/6] Update release.yml --- .github/workflows/release.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21a1a7a..6155f94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,12 +14,17 @@ jobs: if: github.repository_owner == '2881099' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v4 with: - dotnet-version: 3.1.300 + dotnet-version: | + 3.1.x + 5.0.x + 6.0.x + 7.0.x + 8.0.x - name: Package and publish to Nuget📦 run: | @@ -28,4 +33,4 @@ jobs: echo "::set-env name=VERSION::${VERSION}" dotnet build dotnet pack src/FreeRedis/FreeRedis.csproj /p:PackageVersion=$VERSION -c Release -o publish - dotnet nuget push publish/*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate \ No newline at end of file + dotnet nuget push publish/*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate From 48d8b10cab487114505ba5e502510721c3245c4c Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:00:28 +0300 Subject: [PATCH 5/6] Remove net452 example project from sln it doesn't build on ubuntu.. --- FreeRedis.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/FreeRedis.sln b/FreeRedis.sln index d96968d..b6c35f5 100644 --- a/FreeRedis.sln +++ b/FreeRedis.sln @@ -41,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console_net8_client_side_ca EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console_net8_norman", "examples\console_net8_norman\console_net8_norman.csproj", "{D6DF0DBA-F181-4F1C-B6AD-9D71A01A4431}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "console_net452_vs", "examples\console_net452_vs\console_net452_vs.csproj", "{7AC68251-83D4-423F-849C-04BD89F4BDFB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeRedis.DistributedCache", "src\FreeRedis.DistributedCache\FreeRedis.DistributedCache.csproj", "{B0B0B55E-4D41-4419-83FE-309F72699A3A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "console_net8_cluster_client_side_caching", "examples\console_net8_cluster_client_side_caching\console_net8_cluster_client_side_caching.csproj", "{1C4387AA-C4BD-4388-97D1-3A769439705D}" From 1a836de2f82305d3f07733c912b6e787062eb531 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:01:54 +0300 Subject: [PATCH 6/6] cleanup --- FreeRedis.sln | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/FreeRedis.sln b/FreeRedis.sln index b6c35f5..87b4fa1 100644 --- a/FreeRedis.sln +++ b/FreeRedis.sln @@ -191,18 +191,6 @@ Global {D6DF0DBA-F181-4F1C-B6AD-9D71A01A4431}.Release|x64.Build.0 = Release|Any CPU {D6DF0DBA-F181-4F1C-B6AD-9D71A01A4431}.Release|x86.ActiveCfg = Release|Any CPU {D6DF0DBA-F181-4F1C-B6AD-9D71A01A4431}.Release|x86.Build.0 = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|x64.ActiveCfg = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|x64.Build.0 = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|x86.ActiveCfg = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Debug|x86.Build.0 = Debug|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|Any CPU.Build.0 = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|x64.ActiveCfg = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|x64.Build.0 = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|x86.ActiveCfg = Release|Any CPU - {7AC68251-83D4-423F-849C-04BD89F4BDFB}.Release|x86.Build.0 = Release|Any CPU {B0B0B55E-4D41-4419-83FE-309F72699A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B0B0B55E-4D41-4419-83FE-309F72699A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0B0B55E-4D41-4419-83FE-309F72699A3A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -269,7 +257,6 @@ Global {36C8EC48-1329-4251-B795-7AEFC446EF60} = {ECEC9840-4A56-4E55-B6C5-E84A79DFDBC4} {DA686F0B-E9F7-4AF1-AD2E-EE6EE0C24BB4} = {DD1426BF-F56F-49A8-9D4E-2BA0E3BEFC72} {D6DF0DBA-F181-4F1C-B6AD-9D71A01A4431} = {DD1426BF-F56F-49A8-9D4E-2BA0E3BEFC72} - {7AC68251-83D4-423F-849C-04BD89F4BDFB} = {DD1426BF-F56F-49A8-9D4E-2BA0E3BEFC72} {B0B0B55E-4D41-4419-83FE-309F72699A3A} = {D8045351-59E4-45B9-81F5-D21CC0996344} {1C4387AA-C4BD-4388-97D1-3A769439705D} = {DD1426BF-F56F-49A8-9D4E-2BA0E3BEFC72} {CA71A937-D939-4922-B1DB-0380833B7270} = {D8045351-59E4-45B9-81F5-D21CC0996344}