Merge branch 'master' into dependabot/nuget/coverlet.msbuild-6.0.4

Author: atakavci

.github/actions/run-tests/action.yml

@@ -109,6 +109,8 @@ runs:
         echo "${{inputs.REDIS_CA_PEM}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_ca.pem
         echo "${{inputs.REDIS_USER_CRT}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_user.crt
         echo "${{inputs.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_user_private.key
+        REDIS_VERSION=$(echo "$REDIS_VERSION" | cut -d'-' -f1)
+        echo $REDIS_VERSION
         dotnet test -f ${CLR_VERSION} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover -p:BuildInParallel=false tests/Test.proj --logger GitHubActions
         echo "::endgroup::"
     - name: Codecov

.github/workflows/integration.yml

@@ -106,5 +106,8 @@ jobs:
           shell: cmd
           env:
             REDIS_VERSION: ${{env.redis_stack_version}}
-          run: |                      
+          run: |
+            rem Extract part of the version before the '-' character
+            for /f "tokens=1 delims=-" %%a in ("%REDIS_VERSION%") do set REDIS_VERSION=%%a
+            echo %REDIS_VERSION%
             dotnet test -f net481 --no-build --verbosity detailed -p:BuildInParallel=false tests/Test.proj --logger GitHubActions

src/NRedisStack/Search/SearchCommands.cs

@@ -134,6 +134,7 @@ public InfoResult Info(RedisValue index) =>
         [Obsolete("Consider using ProfileOnSearch with Redis CE 8.0 and later")]
         public Tuple<SearchResult, Dictionary<string, RedisResult>> ProfileSearch(string indexName, Query q, bool limited = false)
         {
+            setDefaultDialectIfUnset(q);
             return _db.Execute(SearchCommandBuilder.ProfileSearch(indexName, q, limited))
                     .ToProfileSearchResult(q);
         }

src/NRedisStack/Search/SearchCommandsAsync.cs

@@ -165,6 +165,7 @@ public async Task<InfoResult> InfoAsync(RedisValue index) =>
         [Obsolete("Consider using ProfileOnSearchAsync with Redis CE 8.0 and later")]
         public async Task<Tuple<SearchResult, Dictionary<string, RedisResult>>> ProfileSearchAsync(string indexName, Query q, bool limited = false)
         {
+            setDefaultDialectIfUnset(q);
             return (await _db.ExecuteAsync(SearchCommandBuilder.ProfileSearch(indexName, q, limited)))
                             .ToProfileSearchResult(q);
         }
@@ -179,6 +180,7 @@ public async Task<Tuple<SearchResult, ProfilingInformation>> ProfileOnSearchAsyn
         [Obsolete("Consider using ProfileOnSearchAsync with Redis CE 8.0 and later")]
         public async Task<Tuple<AggregationResult, Dictionary<string, RedisResult>>> ProfileAggregateAsync(string indexName, AggregationRequest query, bool limited = false)
         {
+            setDefaultDialectIfUnset(query);
             return (await _db.ExecuteAsync(SearchCommandBuilder.ProfileAggregate(indexName, query, limited)))
                             .ToProfileAggregateResult(query);
         }

tests/NRedisStack.Tests/Search/SearchTests.cs

@@ -751,7 +751,6 @@ public void AlterAdd(string endpointId)
         Assert.True(info.OffsetsPerTermAvg > 0.8);
         Assert.Equal(8, info.OffsetBitsPerRecordAvg);
         Assert.Equal(0, info.HashIndexingFailures);
-        Assert.True(info.TotalIndexingTime > 0);
         Assert.Equal(0, info.Indexing);
         Assert.Equal(1, info.PercentIndexed);
         Assert.Equal(4, info.NumberOfUses);
@@ -813,7 +812,6 @@ public async Task AlterAddAsync(string endpointId)
         Assert.True(info.OffsetsPerTermAvg > 0.8);
         Assert.Equal(8, info.OffsetBitsPerRecordAvg);
         Assert.Equal(0, info.HashIndexingFailures);
-        Assert.True(info.TotalIndexingTime > 0);
         Assert.Equal(0, info.Indexing);
         Assert.Equal(1, info.PercentIndexed);
         Assert.Equal(4, info.NumberOfUses);
@@ -877,7 +875,6 @@ public void AlterAddSortable(string endpointId)
         Assert.True(info.OffsetsPerTermAvg > 0.8);
         Assert.Equal(8, info.OffsetBitsPerRecordAvg);
         Assert.Equal(0, info.HashIndexingFailures);
-        Assert.True(info.TotalIndexingTime > 0);
         Assert.Equal(0, info.Indexing);
         Assert.Equal(1, info.PercentIndexed);
         Assert.Equal(4, info.NumberOfUses);
@@ -974,7 +971,6 @@ public async Task AlterAddSortableAsync(string endpointId)
         Assert.True(info.OffsetsPerTermAvg > 0.8);
         Assert.Equal(8, info.OffsetBitsPerRecordAvg);
         Assert.Equal(0, info.HashIndexingFailures);
-        Assert.True(info.TotalIndexingTime > 0);
         Assert.Equal(0, info.Indexing);
         Assert.Equal(1, info.PercentIndexed);
         Assert.Equal(4, info.NumberOfUses);

tests/NRedisStack.Tests/SkippableTheoryDiscoverer.cs

@@ -42,7 +42,7 @@ public SkippableTheoryDiscoverer(IMessageSink diagnosticMessageSink)
     public virtual IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
     {
         Requires.NotNull(factAttribute, nameof(factAttribute));
-        string[] skippingExceptionNames = new[] { "Xunit.SkippableFact.SkipException" };
+        string[] skippingExceptionNames = new[] { "Xunit.SkippableFact.SkipException", "Xunit.SkipException" };
         TestMethodDisplay defaultMethodDisplay = discoveryOptions.MethodDisplayOrDefault();
 
         IEnumerable<IXunitTestCase>? basis = this.theoryDiscoverer.Discover(discoveryOptions, testMethod, factAttribute);