Target .NET Standard 2.0

.github/workflows/integration.yml

@@ -12,11 +12,10 @@ on:
     - cron: "0 1 * * *"
 
 env:
-  redis_stack_version: 6.2.2-v5
+  redis_stack_version: 6.2.6-v6
 
 jobs:
-
-  build_and_test:
+  build_and_Test:
     name: Build and test
     runs-on: ubuntu-latest
     steps:
@@ -36,12 +35,37 @@ jobs:
       - name: Build
         run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
       - name: Test
-        run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+        run: dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+      - name: Test
+        run: dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
       - name: Codecov
         uses: codecov/codecov-action@v3
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           verbose: true
-
       - name: Build
         run: dotnet pack -c Release
+  build_and_test_windows:
+    name: Build and Test on Windows
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Vampire/setup-wsl@v2
+        with:
+          distribution: Ubuntu-22.04
+      - name: Install Redis
+        shell: wsl-bash {0}
+        run: |
+          sudo apt-get update
+          sudo apt-get install curl -y && sudo apt-get install gpg -y && apt-get install lsb-release -y && apt-get install libgomp1 -y
+          curl https://packages.redis.io/redis-stack/redis-stack-server-6.2.6-v6.jammy.x86_64.tar.gz -o redis-stack.tar.gz
+          tar xf redis-stack.tar.gz      
+      - name: Restore dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
+      - name: Test
+        shell: cmd
+        run: |
+          START wsl ./redis-stack-server-6.2.6-v6/bin/redis-stack-server &
+          dotnet test -f net481 --no-build --verbosity normal

src/NRedisStack/Graph/Header.cs

@@ -34,7 +34,7 @@ internal Header(RedisResult result)
             SchemaTypes = new List<ResultSetColumnTypes>();
             SchemaNames = new List<string>();
 
-            foreach(RedisResult[] tuple in (RedisResult[])result)
+            foreach (RedisResult[] tuple in (RedisResult[])result)
             {
                 SchemaTypes.Add((ResultSetColumnTypes)(int)tuple[0]);
                 SchemaNames.Add((string)tuple[1]);
@@ -63,9 +63,17 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(SchemaTypes, SchemaNames);
+            unchecked
+            {
+                int hash = 17;
+                hash = hash * 23 + SchemaTypes.GetHashCode();
+                hash = hash * 23 + SchemaNames.GetHashCode();
+                return hash;
+            }
         }
 
+
+
         public override string ToString() =>
             $"Header{{schemaTypes=[{string.Join(", ", SchemaTypes)}], schemaNames=[{string.Join(", ", SchemaNames)}]}}";
     }

src/NRedisStack/Json/JsonCommands.cs

@@ -42,12 +42,12 @@ public bool Set(RedisKey key, RedisValue path, RedisValue json, When when = When
     /// <inheritdoc/>
     public bool SetFromFile(RedisKey key, RedisValue path, string filePath, When when = When.Always)
     {
-        if(!File.Exists(filePath))
+        if (!File.Exists(filePath))
         {
             throw new FileNotFoundException($"File {filePath} not found.");
         }
 
-        string fileContent  = File.ReadAllText(filePath);
+        string fileContent = File.ReadAllText(filePath);
         return Set(key, path, fileContent, when);
     }
 
@@ -60,7 +60,7 @@ public int SetFromDirectory(RedisValue path, string filesPath, When when = When.
         foreach (var filePath in files)
         {
             key = filePath.Substring(0, filePath.IndexOf("."));
-            if(SetFromFile(key, path, filePath, when))
+            if (SetFromFile(key, path, filePath, when))
             {
                 inserted++;
             }
@@ -111,12 +111,12 @@ public JsonType[] Type(RedisKey key, string? path = null)
 
         if (result.Type == ResultType.MultiBulk)
         {
-            return ((RedisResult[])result!).Select(x => Enum.Parse<JsonType>(x.ToString()!.ToUpper())).ToArray();
+            return ((RedisResult[])result!).Select(x => (JsonType)Enum.Parse(typeof(JsonType), x.ToString()!.ToUpper())).ToArray();
         }
 
         if (result.Type == ResultType.BulkString)
         {
-            return new[] { Enum.Parse<JsonType>(result.ToString()!.ToUpper()) };
+            return new[] { (JsonType)Enum.Parse(typeof(JsonType), result.ToString()!.ToUpper()) };
         }
 
         return Array.Empty<JsonType>();

src/NRedisStack/Json/JsonCommandsAsync.cs

@@ -209,12 +209,12 @@ public async Task<JsonType[]> TypeAsync(RedisKey key, string? path = null)
 
         if (result.Type == ResultType.MultiBulk)
         {
-            return ((RedisResult[])result!).Select(x => Enum.Parse<JsonType>(x.ToString()!.ToUpper())).ToArray();
+            return ((RedisResult[])result!).Select(x => (JsonType)Enum.Parse(typeof(JsonType), x.ToString()!.ToUpper())).ToArray();
         }
 
         if (result.Type == ResultType.BulkString)
         {
-            return new[] { Enum.Parse<JsonType>(result.ToString()!.ToUpper()) };
+            return new[] { (JsonType)Enum.Parse(typeof(JsonType), result.ToString()!.ToUpper()) };
         }
 
         return Array.Empty<JsonType>();

src/NRedisStack/NRedisStack.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-	<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
+	<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+	<LangVersion>latest</LangVersion>
+	<ImplicitUsings>enable</ImplicitUsings>
 	<Authors>Redis Open Source</Authors>
 	<Owners>Redis OSS</Owners>
 	<Description>.Net Client for Redis Stack</Description>
@@ -14,6 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+	<PackageReference Include="System.Text.Json" Version="7.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 	<PackageReference Include="StackExchange.Redis" Version="2.6.90" />
 	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>

src/NRedisStack/ResponseParser.cs

@@ -47,6 +47,8 @@ public static long ToLong(this RedisResult result)
 
         public static double ToDouble(this RedisResult result)
         {
+            if (result.ToString() == "nan")
+                return double.NaN;
             if ((double?)result == null)
                 throw new ArgumentNullException(nameof(result));
             return (double)result;
@@ -591,7 +593,7 @@ public static IEnumerable<HashSet<string>> ToHashSets(this RedisResult result)
             if (res.All(x => x.Type != ResultType.MultiBulk))
             {
                 var keys = res.Select(x => x.ToString()!);
-                sets.Add(keys.ToHashSet());
+                sets.Add(new HashSet<string>(keys));
                 return sets;
             }
 

src/NRedisStack/Tdigest/TdigestCommands.cs

@@ -44,7 +44,9 @@ public double Max(RedisKey key)
         /// <inheritdoc/>
         public double Min(RedisKey key)
         {
-            return _db.Execute(TdigestCommandBuilder.Min(key)).ToDouble();
+            var cmd = TdigestCommandBuilder.Min(key);
+            var res =_db.Execute(cmd);
+            return res.ToDouble();
         }
 
         /// <inheritdoc/>

tests/NRedisStack.Tests/NRedisStack.Tests.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net481</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

tests/NRedisStack.Tests/Tdigest/TdigestTests.cs

@@ -666,7 +666,7 @@ static Tuple<double, long> RandomValueWeight()
     {
         Random random = new Random();
 
-        return new Tuple<double, long>(random.NextDouble() * 10000, random.NextInt64() + 1);
+        return new Tuple<double, long>(random.NextDouble() * 10000, random.Next() + 1);
     }
 
     static Tuple<double, long>[] RandomValueWeightArray(int count)
@@ -687,7 +687,11 @@ static Tuple<double, long> DefinedValueWeight(double value, long weight)
     private static double[] WeightedValue(double value, int weight)
     {
         double[] values = new double[weight];
-        Array.Fill(values, value);
+        for (var i = 0; i < values.Length; i++)
+        {
+            values[i] = value;
+        }
+
         return values;
     }
 }

tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs

@@ -1,4 +1,5 @@
 using NRedisStack.DataTypes;
+using NRedisStack.Literals.Enums;
 using NRedisStack.RedisStackCommands;
 using StackExchange.Redis;
 using Xunit;
@@ -88,7 +89,7 @@ public void TestOverrideMADD()
 
             foreach (string key in keys)
             {
-                ts.Create(key);
+                ts.Create(key, duplicatePolicy: TsDuplicatePolicy.MAX);
             }
 
             List<DateTime> oldTimeStamps = new List<DateTime>();

tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs

@@ -1,4 +1,5 @@
 using NRedisStack.DataTypes;
+using NRedisStack.Literals.Enums;
 using NRedisStack.RedisStackCommands;
 using StackExchange.Redis;
 using Xunit;
@@ -82,7 +83,7 @@ public async Task TestOverrideMAdd()
 
             foreach (var key in keys)
             {
-                await ts.CreateAsync(key);
+                await ts.CreateAsync(key, duplicatePolicy: TsDuplicatePolicy.MAX);
             }
 
             var oldTimeStamps = new List<DateTime>();