From 138579ecad0516f3fbbba09c89b9a0761a6bc471 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 22:58:13 +0000 Subject: [PATCH 1/3] Bump the nuget group with 15 updates Bumps dotnet-ef from 10.0.14 to 11.0.0 Bumps dotnet-stryker from 5.0.0 to 5.1.0 Bumps jetbrains.resharper.globaltools from 2026.2.4.1 to 2026.3.0 Bumps Microsoft.AspNetCore.DataProtection from 10.0.14 to 11.0.0 Bumps Microsoft.CodeAnalysis.NetAnalyzers from 10.0.403 to 11.0.100 Bumps Microsoft.EntityFrameworkCore.Design from 10.0.14 to 10.0.15 Bumps Microsoft.EntityFrameworkCore.Sqlite from 10.0.14 to 10.0.15 Bumps Microsoft.Extensions.DependencyInjection.Abstractions from 10.0.14 to 11.0.0 Bumps Microsoft.Extensions.Hosting from 10.0.14 to 11.0.0 Bumps Microsoft.Extensions.Hosting.Abstractions from 10.0.14 to 11.0.0 Bumps Microsoft.Extensions.Logging.Abstractions from 10.0.14 to 11.0.0 Bumps Microsoft.NET.Test.Sdk from 18.11.0 to 18.12.0 Bumps SkiaSharp from 4.155.0 to 4.156.1 Bumps SkiaSharp.NativeAssets.Linux.NoDependencies from 4.155.0 to 4.156.1 Bumps SonarAnalyzer.CSharp from 10.35.0.4138 to 10.36.0.15337 --- updated-dependencies: - dependency-name: dotnet-ef dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: dotnet-stryker dependency-version: 5.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget - dependency-name: jetbrains.resharper.globaltools dependency-version: 2026.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget - dependency-name: Microsoft.AspNetCore.DataProtection dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.CodeAnalysis.NetAnalyzers dependency-version: 11.0.100 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.EntityFrameworkCore.Design dependency-version: 10.0.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget - dependency-name: Microsoft.EntityFrameworkCore.Sqlite dependency-version: 10.0.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget - dependency-name: Microsoft.Extensions.DependencyInjection.Abstractions dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.Extensions.Hosting dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.Extensions.Hosting.Abstractions dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget - dependency-name: Microsoft.NET.Test.Sdk dependency-version: 18.12.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget - dependency-name: SkiaSharp dependency-version: 4.156.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget - dependency-name: SkiaSharp.NativeAssets.Linux.NoDependencies dependency-version: 4.156.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.36.0.15337 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget ... Signed-off-by: dependabot[bot] --- .config/dotnet-tools.json | 6 +++--- Directory.Packages.props | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aa081c5..b9c6ae2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,21 +3,21 @@ "isRoot": true, "tools": { "dotnet-stryker": { - "version": "5.0.0", + "version": "5.1.0", "commands": [ "dotnet-stryker" ], "rollForward": false }, "jetbrains.resharper.globaltools": { - "version": "2026.2.4.1", + "version": "2026.3.0", "commands": [ "jb" ], "rollForward": false }, "dotnet-ef": { - "version": "10.0.14", + "version": "11.0.0", "commands": [ "dotnet-ef" ], diff --git a/Directory.Packages.props b/Directory.Packages.props index d8177b5..8c6b77a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,13 +5,13 @@ - - - - - - - + + + + + + + @@ -22,8 +22,8 @@ - - + + @@ -32,7 +32,7 @@ - + @@ -43,10 +43,10 @@ - + - + From 72ee61ef484147f7b397c8ebcea08f0f5c0f84d1 Mon Sep 17 00:00:00 2001 From: Valentin Clergue Date: Mon, 16 Nov 2026 01:05:59 +0100 Subject: [PATCH 2/3] fix: use System.Threading.Lock for the team tracker gate SonarAnalyzer.CSharp 10.36 adds S9422, which flags object-typed lock fields; with TreatWarningsAsErrors it failed the build on both CI legs. The field is only used by lock statements, so the swap keeps semantics. Co-Authored-By: Claude Opus 5.5 --- .../Listening/TeamStateTracker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RustPlusBot.Features.Connections/Listening/TeamStateTracker.cs b/src/RustPlusBot.Features.Connections/Listening/TeamStateTracker.cs index 0907ba3..61c11f8 100644 --- a/src/RustPlusBot.Features.Connections/Listening/TeamStateTracker.cs +++ b/src/RustPlusBot.Features.Connections/Listening/TeamStateTracker.cs @@ -14,7 +14,7 @@ internal sealed record AfkPollContext(DateTimeOffset Clock, TimeSpan Threshold, internal sealed class TeamStateTracker { private readonly HashSet _afk = []; - private readonly object _gate = new(); + private readonly Lock _gate = new(); private readonly Dictionary _stillSince = []; private Dictionary? _baseline; From b9f36b9b2d864c9fe5658ba5c8eb5dee18c62b98 Mon Sep 17 00:00:00 2001 From: Valentin Clergue Date: Mon, 16 Nov 2026 01:17:20 +0100 Subject: [PATCH 3/3] fix: cancel the stop-window delay in the vending StopAsync test The ubuntu-26.04 runner image now ships SDK 11.0.100 and the repo has no global.json, so the Linux leg builds with SDK 11 and AnalysisLevel latest-all resolves to 11. NetAnalyzers 11 enables CA2027 at that level (it is off at level 10, which is why Windows and SDK 10 builds pass). Give the Task.Delay a token and cancel it once Task.WhenAny returns. Co-Authored-By: Claude Opus 5.5 --- .../Hosting/VendingHostedServiceTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/RustPlusBot.Features.Vending.Tests/Hosting/VendingHostedServiceTests.cs b/tests/RustPlusBot.Features.Vending.Tests/Hosting/VendingHostedServiceTests.cs index 5b09d61..1deb8fa 100644 --- a/tests/RustPlusBot.Features.Vending.Tests/Hosting/VendingHostedServiceTests.cs +++ b/tests/RustPlusBot.Features.Vending.Tests/Hosting/VendingHostedServiceTests.cs @@ -161,7 +161,9 @@ public async Task StopAsync_JoinsTheLoopsRatherThanReturningMidHandler() // Cancelling alone cannot end a loop that is mid-handler, so a StopAsync that joins its loop // tasks can never complete here however long we wait — which is what makes waiting sound rather // than a timing assumption. One that did not join would return as soon as the cancel landed. - await Task.WhenAny(stop, Task.Delay(TimeSpan.FromSeconds(2))); + using var window = new CancellationTokenSource(); + await Task.WhenAny(stop, Task.Delay(TimeSpan.FromSeconds(2), window.Token)); + await window.CancelAsync(); // Don't leave the timer running if StopAsync won the race. Assert.False(stop.IsCompleted, "StopAsync returned while a handler was still in flight"); release.SetResult();