diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 43f8b289..ec7a3ce0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -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 diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml index 16f832a5..ff128062 100644 --- a/.github/workflows/nuget-release.yml +++ b/.github/workflows/nuget-release.yml @@ -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 . @@ -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 diff --git a/src/NRedisStack/NRedisStack.csproj b/src/NRedisStack/NRedisStack.csproj index 65be7dd9..4bbcb9f8 100644 --- a/src/NRedisStack/NRedisStack.csproj +++ b/src/NRedisStack/NRedisStack.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 enable enable Redis Open Source diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj index 6e61a8a3..0f9f5deb 100644 --- a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj +++ b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 enable enable @@ -18,7 +18,6 @@ all -