updating StackExchange.Redis Version to remove System.Drawing depende…

…ncy (#436) * updating StackExchange.Redis Version to remove System.Drawing dependency.
redis · Apr 12, 2024 · fd31129 · fd31129
1 parent d43d4b2
commit fd31129
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/Redis.OM.POC/Redis.OM.POC.csproj b/src/Redis.OM.POC/Redis.OM.POC.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.10.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
     <PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>

diff --git a/src/Redis.OM/Redis.OM.csproj b/src/Redis.OM/Redis.OM.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="Ulid" Version="1.2.6" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />

diff --git a/src/Redis.OM/RedisReply.cs b/src/Redis.OM/RedisReply.cs
@@ -25,23 +25,23 @@ public class RedisReply : IConvertible
         /// <param name="result">the redisResult.</param>
         public RedisReply(RedisResult result)
         {
-            switch (result.Type)
+            switch (result.Resp2Type)
             {
                 case ResultType.None:
                     break;
                 case ResultType.SimpleString:
                 case ResultType.BulkString:
-                    _raw = (byte[])result;
+                    _raw = (byte[])result!;
                     break;
                 case ResultType.Error:
                     Error = true;
-                    _raw = (byte[])result;
+                    _raw = (byte[])result!;
                     break;
                 case ResultType.Integer:
                     _internalLong = (long)result;
                     break;
-                case ResultType.MultiBulk:
-                    _values = ((RedisResult[])result).Select(x => new RedisReply(x)).ToArray();
+                case ResultType.Array:
+                    _values = ((RedisResult[])result!).Select(x => new RedisReply(x)).ToArray();
                     break;
             }
         }

diff --git a/test/Redis.OM.Unit.Tests/CoreTests.cs b/test/Redis.OM.Unit.Tests/CoreTests.cs
@@ -476,8 +476,8 @@ public async Task SearchTimeoutTest()
 
             await Task.WhenAll(tasks);
 
-            var ex = await Assert.ThrowsAsync<TimeoutException>(async () => await collection.Take(10000).ToListAsync());
-            Assert.Equal("Encountered timeout when searching - check the duration of your query.", ex.Message);
+            var ex = await Assert.ThrowsAsync<Exception>(async () => await collection.Take(10000).ToListAsync());
+            Assert.True(ex.Message.Equals("Encountered timeout when searching - check the duration of your query.") || ex.Message.Contains("Timeout limit was reached"));
         }
     }
 }