Skip to content

Commit 551f744

Browse files
committed
(code-rot) Update package dependencies (#2906)
* initial cleanup from migration to Rider * update lib-refs; only non-test one is logging-abstractions, where we'll eat the 8.0 upgrade from 8.0 onwards * net9 on CI * release notes
1 parent cc78018 commit 551f744

21 files changed

+149
-125
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
dotnet-version: |
3131
6.0.x
3232
8.0.x
33+
9.0.x
3334
- name: .NET Build
3435
run: dotnet build Build.csproj -c Release /p:CI=true
3536
- name: StackExchange.Redis.Tests

Directory.Packages.props

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,24 @@
88
<PackageVersion Include="System.Threading.Channels" Version="5.0.0" />
99
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
1010
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
11-
1211
<!-- Packages only used in the solution, upgrade at will -->
13-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
12+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
1413
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
1615
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1817
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
19-
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.146" />
18+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
2019
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2120
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2221
<PackageVersion Include="StackExchange.Redis" Version="2.6.96" />
2322
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
2423
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
25-
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
24+
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
2625
<!-- For binding redirect testing, main package gets this transitively -->
2726
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
2827
<PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
29-
<PackageVersion Include="xunit" Version="2.9.2" />
30-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
28+
<PackageVersion Include="xunit" Version="2.9.3" />
29+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
3130
</ItemGroup>
3231
</Project>

StackExchange.Redis.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ EndProject
9393
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{73A5C363-CA1F-44C4-9A9B-EF791A76BA6A}"
9494
ProjectSection(SolutionItems) = preProject
9595
tests\.editorconfig = tests\.editorconfig
96-
tests\Directory.Build.props = tests\Directory.Build.props
9796
tests\Directory.Build.targets = tests\Directory.Build.targets
9897
EndProjectSection
9998
EndProject

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ install:
99
choco install dotnet-6.0-sdk
1010
1111
choco install dotnet-7.0-sdk
12+
13+
choco install dotnet-9.0-sdk
1214
1315
cd tests\RedisConfigs\3.0.503
1416

docs/ReleaseNotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Current package versions:
88

99
## Unreleased
1010

11-
No pending unreleased changes
11+
- Package updates ([#2906 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2906))
1212

1313
## 2.8.41
1414

src/StackExchange.Redis/Interfaces/IServer.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public partial interface IServer : IRedis
8989
/// <remarks><seealso href="https://redis.io/commands/client-kill"/></remarks>
9090
void ClientKill(EndPoint endpoint, CommandFlags flags = CommandFlags.None);
9191

92-
/// <inheritdoc cref="ClientKill(EndPoint, CommandFlags)"/>
92+
/// <inheritdoc cref="ClientKill(System.Net.EndPoint, CommandFlags)"/>
9393
Task ClientKillAsync(EndPoint endpoint, CommandFlags flags = CommandFlags.None);
9494

9595
/// <summary>
@@ -104,7 +104,7 @@ public partial interface IServer : IRedis
104104
/// <remarks><seealso href="https://redis.io/commands/client-kill"/></remarks>
105105
long ClientKill(long? id = null, ClientType? clientType = null, EndPoint? endpoint = null, bool skipMe = true, CommandFlags flags = CommandFlags.None);
106106

107-
/// <inheritdoc cref="ClientKill(long?, ClientType?, EndPoint?, bool, CommandFlags)"/>
107+
/// <inheritdoc cref="ClientKill(long?, ClientType?, System.Net.EndPoint?, bool, CommandFlags)"/>
108108
Task<long> ClientKillAsync(long? id = null, ClientType? clientType = null, EndPoint? endpoint = null, bool skipMe = true, CommandFlags flags = CommandFlags.None);
109109

110110
/// <summary>
@@ -475,17 +475,17 @@ public partial interface IServer : IRedis
475475
/// <remarks><seealso href="https://redis.io/commands/shutdown"/></remarks>
476476
void Shutdown(ShutdownMode shutdownMode = ShutdownMode.Default, CommandFlags flags = CommandFlags.None);
477477

478-
/// <inheritdoc cref="ReplicaOfAsync(EndPoint, CommandFlags)"/>
478+
/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
479479
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 3.0.")]
480480
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
481481
void SlaveOf(EndPoint master, CommandFlags flags = CommandFlags.None);
482482

483-
/// <inheritdoc cref="ReplicaOfAsync(EndPoint, CommandFlags)"/>
483+
/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
484484
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 3.0.")]
485485
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
486486
Task SlaveOfAsync(EndPoint master, CommandFlags flags = CommandFlags.None);
487487

488-
/// <inheritdoc cref="ReplicaOfAsync(EndPoint, CommandFlags)"/>
488+
/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
489489
[Obsolete("Please use " + nameof(ReplicaOfAsync) + ", this will be removed in 3.0.")]
490490
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
491491
void ReplicaOf(EndPoint master, CommandFlags flags = CommandFlags.None);

src/StackExchange.Redis/KeyspaceIsolation/KeyPrefixed.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public Task<RedisResult> ScriptEvaluateAsync(byte[] hash, RedisKey[]? keys = nul
351351

352352
public Task<RedisResult> ScriptEvaluateAsync(string script, RedisKey[]? keys = null, RedisValue[]? values = null, CommandFlags flags = CommandFlags.None) =>
353353
// TODO: The return value could contain prefixed keys. It might make sense to 'unprefix' those?
354-
Inner.ScriptEvaluateAsync(script, ToInner(keys), values, flags);
354+
Inner.ScriptEvaluateAsync(script: script, keys: ToInner(keys), values: values, flags: flags);
355355

356356
public Task<RedisResult> ScriptEvaluateAsync(LuaScript script, object? parameters = null, CommandFlags flags = CommandFlags.None) =>
357357
// TODO: The return value could contain prefixed keys. It might make sense to 'unprefix' those?
@@ -367,7 +367,7 @@ public Task<RedisResult> ScriptEvaluateReadOnlyAsync(byte[] hash, RedisKey[]? ke
367367

368368
public Task<RedisResult> ScriptEvaluateReadOnlyAsync(string script, RedisKey[]? keys = null, RedisValue[]? values = null, CommandFlags flags = CommandFlags.None) =>
369369
// TODO: The return value could contain prefixed keys. It might make sense to 'unprefix' those?
370-
Inner.ScriptEvaluateAsync(script, ToInner(keys), values, flags);
370+
Inner.ScriptEvaluateAsync(script: script, keys: ToInner(keys), values: values, flags: flags);
371371

372372
public Task<long> SetAddAsync(RedisKey key, RedisValue[] values, CommandFlags flags = CommandFlags.None) =>
373373
Inner.SetAddAsync(ToInner(key), values, flags);

src/StackExchange.Redis/KeyspaceIsolation/KeyPrefixedDatabase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public RedisResult ScriptEvaluate(byte[] hash, RedisKey[]? keys = null, RedisVal
338338

339339
public RedisResult ScriptEvaluate(string script, RedisKey[]? keys = null, RedisValue[]? values = null, CommandFlags flags = CommandFlags.None) =>
340340
// TODO: The return value could contain prefixed keys. It might make sense to 'unprefix' those?
341-
Inner.ScriptEvaluate(script, ToInner(keys), values, flags);
341+
Inner.ScriptEvaluate(script: script, keys: ToInner(keys), values: values, flags: flags);
342342

343343
public RedisResult ScriptEvaluate(LuaScript script, object? parameters = null, CommandFlags flags = CommandFlags.None) =>
344344
// TODO: The return value could contain prefixed keys. It might make sense to 'unprefix' those?

src/StackExchange.Redis/LuaScript.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ internal void ExtractParameters(object? ps, RedisKey? keyPrefix, out RedisKey[]?
148148
public RedisResult Evaluate(IDatabase db, object? ps = null, RedisKey? withKeyPrefix = null, CommandFlags flags = CommandFlags.None)
149149
{
150150
ExtractParameters(ps, withKeyPrefix, out RedisKey[]? keys, out RedisValue[]? args);
151-
return db.ScriptEvaluate(ExecutableScript, keys, args, flags);
151+
return db.ScriptEvaluate(script: ExecutableScript, keys: keys, values: args, flags: flags);
152152
}
153153

154154
/// <summary>
@@ -161,7 +161,7 @@ public RedisResult Evaluate(IDatabase db, object? ps = null, RedisKey? withKeyPr
161161
public Task<RedisResult> EvaluateAsync(IDatabaseAsync db, object? ps = null, RedisKey? withKeyPrefix = null, CommandFlags flags = CommandFlags.None)
162162
{
163163
ExtractParameters(ps, withKeyPrefix, out RedisKey[]? keys, out RedisValue[]? args);
164-
return db.ScriptEvaluateAsync(ExecutableScript, keys, args, flags);
164+
return db.ScriptEvaluateAsync(script: ExecutableScript, keys: keys, values: args, flags: flags);
165165
}
166166

167167
/// <summary>
@@ -269,7 +269,7 @@ public RedisResult Evaluate(IDatabase db, object? ps = null, RedisKey? withKeyPr
269269
{
270270
Original.ExtractParameters(ps, withKeyPrefix, out RedisKey[]? keys, out RedisValue[]? args);
271271

272-
return db.ScriptEvaluate(ExecutableScript, keys, args, flags);
272+
return db.ScriptEvaluate(script: ExecutableScript, keys: keys, values: args, flags: flags);
273273
}
274274

275275
/// <summary>
@@ -287,7 +287,7 @@ public Task<RedisResult> EvaluateAsync(IDatabaseAsync db, object? ps = null, Red
287287
{
288288
Original.ExtractParameters(ps, withKeyPrefix, out RedisKey[]? keys, out RedisValue[]? args);
289289

290-
return db.ScriptEvaluateAsync(ExecutableScript, keys, args, flags);
290+
return db.ScriptEvaluateAsync(script: ExecutableScript, keys: keys, values: args, flags: flags);
291291
}
292292
}
293293
}

src/StackExchange.Redis/PhysicalConnection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,8 +1598,8 @@ internal async ValueTask<bool> ConnectedAsync(Socket? socket, ILogger? log, Sock
15981598
catch (Exception ex)
15991599
{
16001600
Debug.WriteLine(ex.Message);
1601-
bridge.Multiplexer?.SetAuthSuspect(ex);
1602-
bridge.Multiplexer?.Logger?.LogError(ex, ex.Message);
1601+
bridge.Multiplexer.SetAuthSuspect(ex);
1602+
bridge.Multiplexer.Logger?.LogError(ex, ex.Message);
16031603
throw;
16041604
}
16051605
log?.LogInformation($"TLS connection established successfully using protocol: {ssl.SslProtocol}");

0 commit comments

Comments
 (0)