Skip to content

Commit 92b552c

Browse files
authored
Merge branch 'master' into marc/fix-CI
2 parents 3caa1b6 + 10e7b26 commit 92b552c

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- primary library -->
1313
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
1414
<PackageVersion Include="System.Text.Json" Version="10.0.8" />
15-
<PackageVersion Include="StackExchange.Redis" Version="2.13.17" />
15+
<PackageVersion Include="StackExchange.Redis" Version="3.0.0" />
1616
<!-- tests, etc -->
1717
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
1818
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
@@ -28,4 +28,4 @@
2828
<PackageVersion Include="xunit.v3.runner.console" Version="3.0.0" />
2929
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
3030
</ItemGroup>
31-
</Project>
31+
</Project>

‎tests/NRedisStack.Tests/EndpointsFixture.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ public ConnectionMultiplexer GetConnectionById(ConfigurationOptions configuratio
128128
{
129129
var options = configurationOptions.Clone(); // isolate before we start applying the protocol
130130
options.Protocol = protocol.IsResp3() ? RedisProtocol.Resp3 : RedisProtocol.Resp2;
131+
options.AllowAdmin = true; // from 3.0, Execute[Async] does a better job of recognizing admin commands
131132
options.HighIntegrity = protocol.IsHighIntegrity();
132133
options.ConnectTimeout = 2000;
133134
if (shareConnection) options.AbortOnConnectFail = false;
@@ -170,4 +171,4 @@ public bool IsTargetConnectionExist(string id)
170171
{
171172
return redisEndpoints.ContainsKey(id);
172173
}
173-
}
174+
}

0 commit comments

Comments
 (0)