diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index d9acc64b..609071bd 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -29,7 +29,7 @@ runs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 9.0.x + 10.0.x ${{inputs.dotnet-version}} dotnet-quality: 'ga' diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1b932003..9da953c0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: redis-version: [ '8.6', '8.4', '8.2', '7.4', '7.2', '6.2'] - dotnet-version: ['8.0', '9.0'] + dotnet-version: ['8.0', '9.0', '10.0'] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true name: Redis ${{ matrix.redis-version }}; .NET ${{ matrix.dotnet-version }}; diff --git a/Directory.Build.props b/Directory.Build.props index b446cc4f..e6dab0f8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ 2022- Redis, inc. enable - 13 + 14 enable Redis Open Source Redis OSS diff --git a/NRedisStack.sln b/NRedisStack.sln index a03db832..339bd17f 100644 --- a/NRedisStack.sln +++ b/NRedisStack.sln @@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{84D6210F global.json = global.json version.json = version.json tests\dockers\docker-compose.yml = tests\dockers\docker-compose.yml + .github\actions\run-tests\action.yml = .github\actions\run-tests\action.yml + .github\workflows\integration.yml = .github\workflows\integration.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs", "docs\docs.csproj", "{4A35FC3C-69BC-4BDB-A4B2-6BFD0DF215AD}" diff --git a/src/NRedisStack/NRedisStack.csproj b/src/NRedisStack/NRedisStack.csproj index 4cab0a8f..ac8f1577 100644 --- a/src/NRedisStack/NRedisStack.csproj +++ b/src/NRedisStack/NRedisStack.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;netstandard2.0;net481 + net6.0;net8.0;net10.0;netstandard2.0;net481 true README.md Redis.png diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj index 83bd48e5..66d5064c 100644 --- a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj +++ b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0;net9.0;net481 + net6.0;net8.0;net9.0;net10.0;net481 false true diff --git a/tests/NRedisStack.Tests/TopK/TopKTests.cs b/tests/NRedisStack.Tests/TopK/TopKTests.cs index 027b6a66..b0b65c86 100644 --- a/tests/NRedisStack.Tests/TopK/TopKTests.cs +++ b/tests/NRedisStack.Tests/TopK/TopKTests.cs @@ -25,10 +25,11 @@ public void CreateTopKFilter(string endpointId) var res = topk.Add(key, "bb", "cc"); Assert.True(res![0].IsNull && res[1].IsNull); + // ReSharper disable once UseCollectionExpression - need to avoid span overload due to TFMs Assert.Equal(topk.Query(key, "bb", "gg", "cc"), new[] { true, false, true }); Assert.False(topk.Query(key, "notExists")); - - Assert.Equal(topk.Count(key, "bb", "gg", "cc"), [1, 0, 1]); + // ReSharper disable once UseCollectionExpression - need to avoid span overload due to TFMs + Assert.Equal(topk.Count(key, "bb", "gg", "cc"), new[] { 1L, 0L, 1L }); var res2 = topk.List(key); Assert.Equal("bb", res2[0].ToString()); @@ -62,10 +63,11 @@ public async Task CreateTopKFilterAsync(string endpointId) var res = await topk.AddAsync(key, "bb", "cc"); Assert.True(res![0].IsNull && res[1].IsNull); + // ReSharper disable once UseCollectionExpression - need to avoid span overload due to TFMs Assert.Equal(await topk.QueryAsync(key, "bb", "gg", "cc"), new[] { true, false, true }); Assert.False(await topk.QueryAsync(key, "notExists")); - - Assert.Equal(await topk.CountAsync(key, "bb", "gg", "cc"), [1, 0, 1]); + // ReSharper disable once UseCollectionExpression - need to avoid span overload due to TFMs + Assert.Equal(await topk.CountAsync(key, "bb", "gg", "cc"), new[] { 1L, 0L, 1L }); var res2 = await topk.ListAsync(key); Assert.Equal("bb", res2[0].ToString());