Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use correct framework #207

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

use correct framework #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0b36ce
use correct framework
kasperk81 Sep 10, 2024
7dc3598
.
kasperk81 Sep 10, 2024
3c0429d
Update pull-request.yml
kasperk81 Sep 19, 2024
15f9ce4
Update release.yml
kasperk81 Sep 19, 2024
48d8b10
Remove net452 example project from sln
kasperk81 Sep 19, 2024
1a836de
cleanup
kasperk81 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
15 changes: 10 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
dotnet nuget push publish/*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
15 changes: 0 additions & 15 deletions FreeRedis.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -193,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
Expand Down Expand Up @@ -271,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}
Expand Down
10 changes: 5 additions & 5 deletions src/FreeRedis.DistributedCache/FreeRedis.DistributedCache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net80;net70;net60;net50;netcoreapp31</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net7.0;net6.0;net5.0;netcoreapp31</TargetFrameworks>
<AssemblyName>FreeRedis.DistributedCache</AssemblyName>
<PackageId>FreeRedis.DistributedCache</PackageId>
<RootNamespace>FreeRedis.DistributedCache</RootNamespace>
Expand All @@ -26,16 +26,16 @@
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net80' or '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp31'">
Expand Down
4 changes: 2 additions & 2 deletions src/FreeRedis.OpenTelemetry/FreeRedis.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net80</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>FreeRedis.OpenTelemetry</AssemblyName>
<PackageId>FreeRedis.OpenTelemetry</PackageId>
<RootNamespace>FreeRedis.OpenTelemetry</RootNamespace>
Expand Down Expand Up @@ -33,4 +33,4 @@
<ProjectReference Include="..\FreeRedis\FreeRedis.csproj" />
</ItemGroup>

</Project>
</Project>