Merge branch 'master' into DOC-4733-geo-index-examples

Author: andy-stark-redis

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

@@ -24,11 +24,13 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v4
-
-    - name: Install .NET Core 
+    
+    - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{inputs.dotnet-version}}
+        dotnet-version: |
+          9.0.x
+          ${{inputs.dotnet-version}}
         dotnet-quality: 'ga'
 
     - name: Setup Environment variables and run Redis
@@ -51,8 +53,8 @@ runs:
         
           # Mapping of redis version to stack version  
           declare -A redis_stack_version_mapping=(
-            ["7.4.1"]="rs-7.4.0-v1"
-            ["7.2.6"]="rs-7.2.0-v13"
+            ["7.4.1"]="rs-7.4.0-v5"
+            ["7.2.6"]="rs-7.2.0-v17"
             ["6.2.16"]="rs-6.2.6-v17"
           )
                   

.github/workflows/integration.yml

@@ -17,7 +17,7 @@ concurrency:
 
 env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  CURRENT_REDIS_VERSION: '7.4.1'
+  CURRENT_REDIS_VERSION: '8.0.2'
 
 jobs:
     redis_version:
@@ -37,8 +37,8 @@ jobs:
         max-parallel: 15
         fail-fast: false
         matrix:
-          redis-version: [ '8.0-M04-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16']
-          dotnet-version: ['6.0', '7.0', '8.0']
+          redis-version: [ '8.2.1', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.1', '7.2.6', '6.2.16']
+          dotnet-version: ['8.0', '9.0']
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       name: Redis ${{ matrix.redis-version }}; .NET ${{ matrix.dotnet-version }};
@@ -59,7 +59,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          redis-stack-version: ['6.2.6-v18', '7.2.0-v14', '7.4.0-v2']
+          redis-stack-version: ['6.2.6-v18', '7.2.0-v17', '7.4.0-v6']
       env:
         redis_stack_version: ${{matrix.redis-stack-version}}
         USER_NAME: ${{ secrets.USER_NAME }}

.github/workflows/nuget-release.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up .NET Core 8
+      - name: Set up .NET 9
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8
+          dotnet-version: 9
       - name: Check .NET version
         run: dotnet --version
       - name: Check .NET SDKs

.gitignore

@@ -410,3 +410,8 @@ tests/NRedisStack.Tests/redis_credentials/redis_user.crt
 # global.json
 global.json
 tests/NRedisStack.Tests/lcov.net8.0.info
+
+# docker containers
+tests/dockers/cluster/
+tests/dockers/standalone/
+tests/dockers/all/

Directory.Build.props

@@ -0,0 +1,45 @@
+<Project>
+    <PropertyGroup>
+        <Copyright>2022- Redis, inc.</Copyright>
+        <Nullable>enable</Nullable>
+        <LangVersion>13</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Authors>Redis Open Source</Authors>
+        <Owners>Redis OSS</Owners>
+        <Description>.Net Client for Redis Stack</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/redis/nRedisStack/</RepositoryUrl>
+        <PackageReleaseNotes>https://github.com/redis/NRedisStack/releases</PackageReleaseNotes>
+        <PackageProjectUrl>https://redis.io/docs/latest/develop/clients/dotnet/</PackageProjectUrl>
+        <Deterministic>false</Deterministic>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>embedded</DebugType>
+        <DefaultLanguage>en-US</DefaultLanguage>
+        <IncludeSymbols>false</IncludeSymbols>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SuppressTfmSupportBuildErrors>true</SuppressTfmSupportBuildErrors>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <NoWarn>$(NoWarn);CS1591</NoWarn>
+        <IsWindows>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Windows())))</IsWindows>
+    </PropertyGroup>
+
+    <!-- release builds should be deterministic for packaging  -->
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+        <Deterministic>true</Deterministic>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)'==''">
+        <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
+        <!--<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all"/>-->
+    </ItemGroup>
+</Project>

Directory.Packages.props

@@ -0,0 +1,33 @@
+<Project>
+  <ItemGroup>
+    <!-- core build -->
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageVersion>
+    <!-- primary library -->
+    <PackageVersion Include="NetTopologySuite" Version="2.6.0" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
+    <PackageVersion Include="StackExchange.Redis" Version="2.9.17" />
+    <!-- tests, etc -->
+    <PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
+    <PackageVersion Include="dotenv.net" Version="4.0.0" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="Microsoft.Azure.StackExchangeRedis" Version="3.2.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Validation" Version="2.6.68" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.assert" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
+  </ItemGroup>
+</Project>

NRedisStack.sln

@@ -9,6 +9,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack.Tests", "tests\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Doc", "tests\Doc\Doc.csproj", "{F14F6342-14A0-4DDD-AB05-C425B1AD8001}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{84D6210F-9A65-427A-965F-57E7B76424AB}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
+		version.json = version.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

NRedisStack.sln.DotSettings

@@ -0,0 +1,7 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=geoshape/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hnsw/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=indexempty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=indexmissing/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ismissing/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=vamana/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

README.md

@@ -14,17 +14,15 @@ This project builds on [StackExchange.Redis](https://github.com/StackExchange/St
 
 ## How do I Redis?
 
-[Learn for free at Redis University](https://university.redis.com/)
+[Learn for free at Redis University](https://university.redis.io/academy/)
 
-[Build faster with the Redis Launchpad](https://launchpad.redis.com/)
+[Try the Redis Cloud](https://redis.io/try-free/)
 
-[Try the Redis Cloud](https://redis.com/try-free/)
+[Dive in developer tutorials](https://redis.io/learn/)
 
-[Dive in developer tutorials](https://developer.redis.com/)
+[Join the Redis community](https://redis.io/community/)
 
-[Join the Redis community](https://redis.com/community/)
-
-[Work at Redis](https://redis.com/company/careers/jobs/)
+[Work at Redis](https://redis.io/careers/jobs/)
 
 ## API
 
@@ -40,8 +38,9 @@ Each module has a command class with its own commands.
 
 The supported modules are [Search](https://redis.io/commands/?group=search), [JSON](https://redis.io/commands/?group=json), [TimeSeries](https://redis.io/commands/?group=timeseries), [Bloom Filter](https://redis.io/commands/?group=bf), [Cuckoo Filter](https://redis.io/commands/?group=cf), [T-Digest](https://redis.io/commands/?group=tdigest), [Count-min Sketch](https://redis.io/commands/?group=cms), and [Top-K](https://redis.io/commands/?group=topk).
 
-**Note:** RedisGraph support has been deprecated starting from Redis Stack version 7.2. For more information, please refer to [this blog post](https://redis.com/blog/redisgraph-eol/).
-**IMPORTANT:** NRedisStack will end the support for Graph functionalities with version 0.13.x  
+**Note:** RedisGraph support has been deprecated starting from Redis Stack version 7.2. For more information, please refer to [this blog post](https://redis.com/blog/redisgraph-eol/).<br>
+**IMPORTANT:** NRedisStack will end the support for Graph functionalities with version 0.13.x<br>
+**IMPORTANT:** Starting from version **1.0.0-beta1**, by default, the client now overrides the [server-side dialect](https://redis.io/docs/latest/develop/interact/search-and-query/advanced-concepts/dialects/) with version 2, automatically appending `DIALECT 2` to commands like **FT.AGGREGATE** and **FT.SEARCH**. Be aware that the query dialect may impact the results returned. If needed, you can revert to a different dialect version by configuring the client accordingly. Please see [release notes](https://github.com/redis/NRedisStack/releases/tag/v1.0.0-beta1).
 
 # Usage
 
@@ -57,18 +56,20 @@ dotnet add package NRedisStack
 
 ### Supported Redis versions
 
-The most recent version of this library supports Redis version [6.2](https://github.com/redis/redis/blob/6.2/00-RELEASENOTES), [7.2](https://github.com/redis/redis/blob/7.2/00-RELEASENOTES).
+The most recent version of this library supports Redis version 
+[7.2](https://github.com/redis/redis/blob/7.2/00-RELEASENOTES),
+[7.4](https://github.com/redis/redis/blob/7.4/00-RELEASENOTES),
+[8.0](https://github.com/redis/redis/blob/8.0/00-RELEASENOTES) and
+[8.2](https://github.com/redis/redis/blob/8.2/00-RELEASENOTES).
 
 ### Starting Redis
 
 Before writing any code, you'll need a Redis instance with the appropriate Redis modules. The quickest way to get this is with Docker:
 
 ```sh
-docker run -p 6379:6379 --name redis-stack redis/redis-stack:latest
+docker run -p 6379:6379 --name redis redis:latest
 ```
 
-This launches [Redis Stack](https://redis.io/docs/stack/), an extension of Redis that adds modern data structures to Redis.
-
 Now, you need to connect to Redis, exactly the same way you do it in [StackExchange.Redis](https://github.com/StackExchange/StackExchange.Redis):
 ```csharp
 using NRedisStack;
@@ -88,7 +89,6 @@ TdigestCommands tdigest = db.TDIGEST();
 SearchCommands ft = db.FT();
 JsonCommands json = db.JSON();
 TimeSeriesCommands ts = db.TS();
-GraphCommands graph = db.GRAPH(); // If Redis version is less than 7.2 and NRedisStack version is less than 0.13.x
 ```
 Then, that variable will allow you to call all the commands of that module.