Skip to content

Commit d5e0d8f

Browse files
shacharPashAviAvni
andauthored
addding dotnet 7 (#49)
* addding net7 * addding net7 to nuget-release * delete duplicate coverlet.collector * Update NRedisStack.csproj * Update NRedisStack.Tests.csproj * Update integration.yml * Update integration.yml * Update nuget-release.yml * fix name line * change to v2 Co-authored-by: Avi Avni <[email protected]>
1 parent 4ad126d commit d5e0d8f

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.github/workflows/integration.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ env:
1717
jobs:
1818

1919
build_and_test:
20-
name: Build and test [dotnet ${{matrix.dotnet-version}}]
20+
name: Build and test
2121
runs-on: ubuntu-latest
22-
strategy:
23-
matrix:
24-
dotnet-version: ['6.0.x', '7.0.x']
2522
steps:
2623
- uses: actions/checkout@v3
27-
- name: install dotnet tools
24+
- name: .NET Core 6
2825
uses: actions/setup-dotnet@v2
2926
with:
30-
dotnet-version: ${{matrix.dotnet-version}}
27+
dotnet-version: '6.0.x'
28+
- name: .NET Core 7
29+
uses: actions/setup-dotnet@v2
30+
with:
31+
dotnet-version: '7.0.x'
3132
- name: run redis-stack-server docker
3233
run: docker run -p 6379:6379 -d redislabs/redismod:edge
3334
- name: Restore dependencies

.github/workflows/nuget-release.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3
12-
- name: Set up .NET Core
13-
uses: actions/setup-dotnet@v1
12+
- name: Set up .NET Core 6
13+
uses: actions/setup-dotnet@v2
1414
with:
1515
dotnet-version: '6.0.x'
16+
- name: Set up .NET Core 7
17+
uses: actions/setup-dotnet@v2
18+
with:
19+
dotnet-version: '7.0.x'
1620
- name: Build
1721
run: dotnet pack -c Release --output .
1822

@@ -21,5 +25,5 @@ jobs:
2125
with:
2226
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
2327
PROJECT_FILE_PATH: src/NRedisStack/NRedisStack.csproj
24-
PROJECT_NAME: NRedisStack
28+
PACKAGE_NAME: NRedisStack
2529
TAG_COMMIT: false

src/NRedisStack/NRedisStack.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Authors>Redis Open Source</Authors>

tests/NRedisStack.Tests/NRedisStack.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -18,7 +18,6 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
2020
<PackageReference Include="Moq" Version="4.18.1" />
21-
<PackageReference Include="coverlet.collector" Version="3.1.2" />
2221
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
2322
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2423
<PackageReference Include="StackExchange.Redis" Version="2.6.45" />

0 commit comments

Comments
 (0)