From 06a2e8b2752af3851f04a756ecfffbde64339bfe Mon Sep 17 00:00:00 2001 From: Shachar Pashchur Date: Sun, 25 Dec 2022 14:02:34 +0200 Subject: [PATCH 01/10] addding net7 --- src/NRedisStack/NRedisStack.csproj | 2 +- tests/NRedisStack.Tests/NRedisStack.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NRedisStack/NRedisStack.csproj b/src/NRedisStack/NRedisStack.csproj index 65be7dd9..d789e6f0 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..3a653f20 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 From 8be6e3238991a29f29230c39cde14f6f6f226ca5 Mon Sep 17 00:00:00 2001 From: Shachar Pashchur Date: Sun, 25 Dec 2022 14:06:31 +0200 Subject: [PATCH 02/10] addding net7 to nuget-release --- .github/workflows/nuget-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml index 16f832a5..7c7cdaa4 100644 --- a/.github/workflows/nuget-release.yml +++ b/.github/workflows/nuget-release.yml @@ -12,7 +12,7 @@ jobs: - name: Set up .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: ['6.0.x', '7.0.x'] - name: Build run: dotnet pack -c Release --output . @@ -21,5 +21,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 From 368f6c263dab8f8970092e804eab3b13e53561d6 Mon Sep 17 00:00:00 2001 From: Shachar Pashchur Date: Sun, 25 Dec 2022 14:11:45 +0200 Subject: [PATCH 03/10] delete duplicate coverlet.collector --- tests/NRedisStack.Tests/NRedisStack.Tests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj index 3a653f20..770e5ca5 100644 --- a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj +++ b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj @@ -18,7 +18,6 @@ all - From a444e1da1a3acceac12d248847f63c5e7034e1fd Mon Sep 17 00:00:00 2001 From: Avi Avni Date: Sun, 25 Dec 2022 14:22:12 +0200 Subject: [PATCH 04/10] Update NRedisStack.csproj --- src/NRedisStack/NRedisStack.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NRedisStack/NRedisStack.csproj b/src/NRedisStack/NRedisStack.csproj index d789e6f0..4bbcb9f8 100644 --- a/src/NRedisStack/NRedisStack.csproj +++ b/src/NRedisStack/NRedisStack.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net7.0 enable enable Redis Open Source From 0fde894284682eb210762c73e9e42e76d831348e Mon Sep 17 00:00:00 2001 From: Avi Avni Date: Sun, 25 Dec 2022 14:22:27 +0200 Subject: [PATCH 05/10] Update NRedisStack.Tests.csproj --- tests/NRedisStack.Tests/NRedisStack.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj index 770e5ca5..0f9f5deb 100644 --- a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj +++ b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net7.0 enable enable From 5ecd58418158ce0baf237b3a3c249a1ef986f116 Mon Sep 17 00:00:00 2001 From: Avi Avni Date: Sun, 25 Dec 2022 14:27:28 +0200 Subject: [PATCH 06/10] Update integration.yml --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 43f8b289..8cbf408c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['6.0.x', '7.0.x'] + dotnet-version: ['7.0.x'] steps: - uses: actions/checkout@v3 - name: install dotnet tools From 6424524fc7e653bc508071ba7b573a665a101a5a Mon Sep 17 00:00:00 2001 From: Avi Avni Date: Sun, 25 Dec 2022 14:39:22 +0200 Subject: [PATCH 07/10] Update integration.yml --- .github/workflows/integration.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 8cbf408c..67fde236 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,15 +19,16 @@ jobs: build_and_test: name: Build and test [dotnet ${{matrix.dotnet-version}}] runs-on: ubuntu-latest - strategy: - matrix: - dotnet-version: ['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 From 56bc9ed9a64e510b7ae0db4be773a4ce3b1753c1 Mon Sep 17 00:00:00 2001 From: Avi Avni Date: Sun, 25 Dec 2022 14:47:27 +0200 Subject: [PATCH 08/10] Update nuget-release.yml --- .github/workflows/nuget-release.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml index 7c7cdaa4..30afc000 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 + - name: Set up .NET Core 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: ['6.0.x', '7.0.x'] + dotnet-version: '6.0.x' + - name: Set up .NET Core 7 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '7.0.x' - name: Build run: dotnet pack -c Release --output . From cc960587bdcc6cbd85090ec7f480b5acbea436c1 Mon Sep 17 00:00:00 2001 From: Shachar Pashchur Date: Sun, 25 Dec 2022 16:08:04 +0200 Subject: [PATCH 09/10] fix name line --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 67fde236..ec7a3ce0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -17,7 +17,7 @@ env: jobs: build_and_test: - name: Build and test [dotnet ${{matrix.dotnet-version}}] + name: Build and test runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 209e64fc4fb01c6607d675b7c512394cfb15b3ac Mon Sep 17 00:00:00 2001 From: Shachar Pashchur Date: Sun, 25 Dec 2022 16:28:54 +0200 Subject: [PATCH 10/10] change to v2 --- .github/workflows/nuget-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml index 30afc000..ff128062 100644 --- a/.github/workflows/nuget-release.yml +++ b/.github/workflows/nuget-release.yml @@ -10,11 +10,11 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up .NET Core 6 - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: dotnet-version: '6.0.x' - name: Set up .NET Core 7 - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: dotnet-version: '7.0.x' - name: Build