Bump SonarAnalyzer.CSharp from 10.29.0.143774 to 10.30.0.144632 (#71)

* Bump SonarAnalyzer.CSharp from 10.29.0.143774 to 10.30.0.144632

---
updated-dependencies:
- dependency-name: SonarAnalyzer.CSharp
  dependency-version: 10.30.0.144632
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: satisfy new SonarAnalyzer 10.30 rules S8969 and S8949

SonarAnalyzer 10.30 adds S8969 (redundant null-forgiving operator) and
S8949 (missing cancellation token). With TreatWarningsAsErrors both break
the build.

- Drop null-forgiving operators the compiler already knows are redundant,
  mostly after Assert.NotNull.
- Swap `.Where(t => t is not null)` for `.OfType<Task>()` in the hosted
  services' StopAsync so the loop task is non-null by type instead of by
  assertion.
- Thread the service token through the workspace heal paths and the
  pairing expiry write, and swallow the resulting cancellation on
  shutdown.
- Pass CancellationToken.None explicitly to ConnectionSupervisor's gate
  waits: those run during teardown, after _shutdown is already cancelled.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: = <valentin-clergue@orange.fr>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

Author: 3 people

Directory.Packages.props

@@ -46,6 +46,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="18.7.23" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
     <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.29.0.143774" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.30.0.144632" />
   </ItemGroup>
 </Project>

src/RustPlusBot.Features.Alarms/Hosting/AlarmsHostedService.cs

@@ -49,12 +49,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _pairedLoop, _triggeredLoop, _statusLoop, _reachabilityLoop, _observedLoop, _wipedLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Connections/Supervisor/ConnectionSupervisor.cs

@@ -173,7 +173,9 @@ public async Task EnsureConnectionAsync(ulong guildId, Guid serverId, Cancellati
     /// <inheritdoc />
     public async Task StopAsync(ulong guildId, Guid serverId)
     {
-        await _gate.WaitAsync().ConfigureAwait(false);
+        // CancellationToken.None, not _shutdown.Token: teardown must still acquire the gate after
+        // StopAllAsync has already cancelled _shutdown, otherwise the connection is never stopped.
+        await _gate.WaitAsync(CancellationToken.None).ConfigureAwait(false);
         try
         {
             await StopConnectionAsync((guildId, serverId)).ConfigureAwait(false);
@@ -188,7 +190,8 @@ public async Task StopAsync(ulong guildId, Guid serverId)
     public async Task StopAllAsync()
     {
         await _shutdown.CancelAsync().ConfigureAwait(false);
-        await _gate.WaitAsync().ConfigureAwait(false);
+        // CancellationToken.None: _shutdown was just cancelled, so waiting on it would abandon shutdown.
+        await _gate.WaitAsync(CancellationToken.None).ConfigureAwait(false);
         try
         {
             foreach (var key in _connections.Keys.ToList())

src/RustPlusBot.Features.Events/Hosting/EventsHostedService.cs

@@ -60,12 +60,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _relayLoop, _rigLoop, _tickLoop, _disconnectLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Map/Hosting/InfoMapHostedService.cs

@@ -58,12 +58,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _statusLoop, _tickLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Map/Hosting/MapHostedService.cs

@@ -79,12 +79,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _markerLoop, _settingsLoop, _statusLoop, _tickLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Pairing/Supervisor/PairingSupervisor.cs

@@ -249,10 +249,11 @@ private async Task MarkExpiredAsync((ulong Guild, ulong Owner) key, Guid registr
         await using (expireScope.ConfigureAwait(false))
         {
             var store = expireScope.ServiceProvider.GetRequiredService<IFcmRegistrationStore>();
-            await store.SetStatusAsync(registrationId, FcmRegistrationStatus.Expired).ConfigureAwait(false);
+            await store.SetStatusAsync(registrationId, FcmRegistrationStatus.Expired, _shutdown.Token)
+                .ConfigureAwait(false);
         }
 
-        await notifier.NotifyCredentialsExpiredAsync(key.Guild, key.Owner).ConfigureAwait(false);
+        await notifier.NotifyCredentialsExpiredAsync(key.Guild, key.Owner, _shutdown.Token).ConfigureAwait(false);
     }
 
     private sealed class Handle : IAsyncDisposable

src/RustPlusBot.Features.StorageMonitors/Hosting/StorageMonitorsHostedService.cs

@@ -47,12 +47,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _pairedLoop, _triggeredLoop, _statusLoop, _reachabilityLoop, _wipedLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Switches/Hosting/SwitchesHostedService.cs

@@ -49,12 +49,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _pairedLoop, _stateLoop, _statusLoop, _deviceLoop, _reachabilityLoop, _wipedLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)

src/RustPlusBot.Features.Wipes/Hosting/WipesHostedService.cs

@@ -39,12 +39,12 @@ public async Task StopAsync(CancellationToken cancellationToken)
         foreach (var loop in new[]
                  {
                      _statusLoop, _wipedLoop
-                 }.Where(t => t is not null))
+                 }.OfType<Task>())
         {
             try
             {
 #pragma warning disable VSTHRD003 // Our own loop tasks, joined on stop.
-                await loop!.ConfigureAwait(false);
+                await loop.ConfigureAwait(false);
 #pragma warning restore VSTHRD003
             }
             catch (OperationCanceledException)