Skip to content

addding dotnet 7 #49

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

Merged
merged 10 commits into from
Dec 25, 2022
Merged

addding dotnet 7 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
06a2e8b
addding net7
shacharPash Dec 25, 2022
8be6e32
addding net7 to nuget-release
shacharPash Dec 25, 2022
368f6c2
delete duplicate coverlet.collector
shacharPash Dec 25, 2022
a444e1d
Update NRedisStack.csproj
AviAvni Dec 25, 2022
0fde894
Update NRedisStack.Tests.csproj
AviAvni Dec 25, 2022
5ecd584
Update integration.yml
AviAvni Dec 25, 2022
6424524
Update integration.yml
AviAvni Dec 25, 2022
56bc9ed
Update nuget-release.yml
AviAvni Dec 25, 2022
cc96058
fix name line
shacharPash Dec 25, 2022
209e64f
change to v2
shacharPash Dec 25, 2022
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
13 changes: 7 additions & 6 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@ env:
jobs:

build_and_test:
name: Build and test [dotnet ${{matrix.dotnet-version}}]
name: Build and test
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ['6.0.x', '7.0.x']
steps:
- uses: actions/checkout@v3
- name: install dotnet tools
- name: .NET Core 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{matrix.dotnet-version}}
dotnet-version: '6.0.x'
- name: .NET Core 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'
- name: run redis-stack-server docker
run: docker run -p 6379:6379 -d redislabs/redismod:edge
- name: Restore dependencies
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/nuget-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up .NET Core
uses: actions/setup-dotnet@v1
- name: Set up .NET Core 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
- name: Set up .NET Core 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'
- name: Build
run: dotnet pack -c Release --output .

Expand All @@ -21,5 +25,5 @@ jobs:
with:
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
PROJECT_FILE_PATH: src/NRedisStack/NRedisStack.csproj
PROJECT_NAME: NRedisStack
PACKAGE_NAME: NRedisStack
TAG_COMMIT: false
2 changes: 1 addition & 1 deletion src/NRedisStack/NRedisStack.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Authors>Redis Open Source</Authors>
Expand Down
3 changes: 1 addition & 2 deletions tests/NRedisStack.Tests/NRedisStack.Tests.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -18,7 +18,6 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.18.1" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="StackExchange.Redis" Version="2.6.45" />
Expand Down