Bump NSubstitute from 5.3.0 to 6.0.0 (#49)

dependabot[bot] · HandyS11 · claude · web-flow · commit 2d11ac1162e0 · 2026-07-16T11:57:39.000+02:00
* Bump NSubstitute from 5.3.0 to 6.0.0

---
updated-dependencies:
- dependency-name: NSubstitute
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;

* Fix nullable errors from NSubstitute 6 in test matchers

NSubstitute 6 annotates Arg.Is&lt;T&gt; predicate parameters and CallInfo's
indexer as nullable, so existing matcher lambdas tripped CS8602/CS8605
(treated as errors). Add null-forgiving operators at the first
dereference in each affected matcher.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;

---------

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
Co-authored-by: = &lt;valentin-clergue@orange.fr&gt;
Co-authored-by: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -37,7 +37,7 @@
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="NSubstitute" Version="6.0.0" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs
@@ -373,9 +373,9 @@ await h.Relay.HandleConnectionStatusAsync(
             CancellationToken.None);
 
         await h.Refresher.Received(1).RefreshAsync(
-            Arg.Is<SmartAlarm>(a => a.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());
+            Arg.Is<SmartAlarm>(a => a!.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());
         await h.Refresher.Received(1).RefreshAsync(
-            Arg.Is<SmartAlarm>(a => a.EntityId == 43UL), unreachable: true, Arg.Any<CancellationToken>());
+            Arg.Is<SmartAlarm>(a => a!.EntityId == 43UL), unreachable: true, Arg.Any<CancellationToken>());
     }
 
     /// <summary>Connected server → no-op (supervisor's prime path handles it).</summary>
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs
@@ -198,7 +198,7 @@ await h.Bus.PublishAsync(
         }
 
         await h.Refresher.Received().RefreshAsync(
-            Arg.Is<SmartAlarm>(a => a.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());
+            Arg.Is<SmartAlarm>(a => a!.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());
 
         await h.Service.StopAsync(default);
     }
diff --git a/tests/RustPlusBot.Features.Events.Tests/Hosting/EventsHostedServiceTickTests.cs b/tests/RustPlusBot.Features.Events.Tests/Hosting/EventsHostedServiceTickTests.cs
@@ -28,7 +28,7 @@ public async Task TickOnce_publishes_a_crate_lootable_event_when_active_window_e
         await service.TickOnceAsync(CancellationToken.None);
 
         await bus.Received(1).PublishAsync(
-            Arg.Is<RigStateChangedEvent>(e => e.Kind == RigEventKind.CrateLootable && e.Rig == RigKind.Small),
+            Arg.Is<RigStateChangedEvent>(e => e!.Kind == RigEventKind.CrateLootable && e.Rig == RigKind.Small),
             Arg.Any<CancellationToken>());
     }
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/RustMaps/RustMapsGenerationDriverTests.cs b/tests/RustPlusBot.Features.Map.Tests/RustMaps/RustMapsGenerationDriverTests.cs
@@ -87,7 +87,7 @@ public async Task NotFound_with_budget_generates_exactly_once_across_ticks()
 
         Assert.Equal(RustMapsGenerationState.Generating, coord.Snapshot(Key).State);
         await client.Received(1).CreateMapAsync(
-            Arg.Is<MapGenerationRequest>(r => r.Size == 4000 && r.Seed == 12345 && !r.Staging),
+            Arg.Is<MapGenerationRequest>(r => r!.Size == 4000 && r.Seed == 12345 && !r.Staging),
             Arg.Any<CancellationToken>());
     }
 
diff --git a/tests/RustPlusBot.Features.Pairing.Tests/AccountDisconnectServiceTests.cs b/tests/RustPlusBot.Features.Pairing.Tests/AccountDisconnectServiceTests.cs
@@ -49,10 +49,10 @@ public async Task Disconnect_StopsListener_DisablesRegistration_RemovesCreds_Pub
         await sup.Received(1).StopListenerAsync(10UL, 99UL);
         await regs.Received(1).SetStatusAsync(regId, FcmRegistrationStatus.Disabled, Arg.Any<CancellationToken>());
         await bus.Received(1).PublishAsync(
-            Arg.Is<ServerCredentialsChangedEvent>(e => e.GuildId == 10UL && e.ServerId == s1),
+            Arg.Is<ServerCredentialsChangedEvent>(e => e!.GuildId == 10UL && e.ServerId == s1),
             Arg.Any<CancellationToken>());
         await bus.Received(1).PublishAsync(
-            Arg.Is<ServerCredentialsChangedEvent>(e => e.ServerId == s2), Arg.Any<CancellationToken>());
+            Arg.Is<ServerCredentialsChangedEvent>(e => e!.ServerId == s2), Arg.Any<CancellationToken>());
     }
 
     [Fact]
diff --git a/tests/RustPlusBot.Features.Pairing.Tests/DiscordOwnerNotifierTests.cs b/tests/RustPlusBot.Features.Pairing.Tests/DiscordOwnerNotifierTests.cs
@@ -16,7 +16,7 @@ public async Task NotifyCredentialsExpired_DmsTheOwner()
 
         await dm.Received(1).SendAsync(
             99UL,
-            Arg.Is<string>(m => m.Contains("Reconnect", StringComparison.Ordinal)),
+            Arg.Is<string>(m => m!.Contains("Reconnect", StringComparison.Ordinal)),
             Arg.Any<CancellationToken>());
     }
 
@@ -29,6 +29,6 @@ public async Task NotifySetupChannelMissing_dms_owner_with_setup_instructions()
         await notifier.NotifySetupChannelMissingAsync(10UL, 99UL, CancellationToken.None);
 
         await dm.Received(1).SendAsync(99UL,
-            Arg.Is<string>(m => m.Contains("/setup", StringComparison.Ordinal)), Arg.Any<CancellationToken>());
+            Arg.Is<string>(m => m!.Contains("/setup", StringComparison.Ordinal)), Arg.Any<CancellationToken>());
     }
 }
diff --git a/tests/RustPlusBot.Features.Pairing.Tests/PairingHandlerTests.cs b/tests/RustPlusBot.Features.Pairing.Tests/PairingHandlerTests.cs
@@ -73,7 +73,7 @@ public async Task NewServerPairing_RoutesToCoordinator_PersistsNothing()
         await handler.HandleAsync(10UL, 99UL, ServerPairing(), CancellationToken.None);
 
         await coordinator.Received(1).HandleDetectedAsync(10UL, 99UL,
-            Arg.Is<PairingNotification>(n => n.Ip == "1.2.3.4" && n.Port == 28015), Arg.Any<CancellationToken>());
+            Arg.Is<PairingNotification>(n => n!.Ip == "1.2.3.4" && n.Port == 28015), Arg.Any<CancellationToken>());
         Assert.Empty(await context.RustServers.ToListAsync());
         Assert.Empty(await context.PlayerCredentials.ToListAsync());
         await bus.DidNotReceive().PublishAsync(Arg.Any<ServerRegisteredEvent>(), Arg.Any<CancellationToken>());
@@ -128,7 +128,7 @@ public async Task EntityPairing_KnownServer_PublishesSwitchPairedEvent()
         await handler.HandleAsync(10UL, 1UL, EntityPairing(FpServer, entityId: 42UL), CancellationToken.None);
 
         await bus.Received(1).PublishAsync(
-            Arg.Is<SwitchPairedEvent>(e => e.GuildId == 10UL && e.ServerId == server.Id && e.EntityId == 42UL),
+            Arg.Is<SwitchPairedEvent>(e => e!.GuildId == 10UL && e.ServerId == server.Id && e.EntityId == 42UL),
             Arg.Any<CancellationToken>());
     }
 
@@ -160,7 +160,8 @@ public async Task EntityPairing_Alarm_PublishesAlarmPairedEvent_NotSwitch()
         await handler.HandleAsync(10UL, 1UL, AlarmPairing(FpServer, 55UL), CancellationToken.None);
 
         await bus.Received(1).PublishAsync(
-            Arg.Is<AlarmPairedEvent>(e => e.ServerId == server.Id && e.EntityId == 55UL), Arg.Any<CancellationToken>());
+            Arg.Is<AlarmPairedEvent>(e => e!.ServerId == server.Id && e.EntityId == 55UL),
+            Arg.Any<CancellationToken>());
         await bus.DidNotReceive().PublishAsync(Arg.Any<SwitchPairedEvent>(), Arg.Any<CancellationToken>());
     }
 
@@ -177,7 +178,7 @@ public async Task EntityPairing_StorageMonitor_PublishesStorageMonitorPairedEven
         await handler.HandleAsync(10UL, 1UL, StorageMonitorPairing(FpServer, 77UL), CancellationToken.None);
 
         await bus.Received(1).PublishAsync(
-            Arg.Is<StorageMonitorPairedEvent>(e => e.ServerId == server.Id && e.EntityId == 77UL),
+            Arg.Is<StorageMonitorPairedEvent>(e => e!.ServerId == server.Id && e.EntityId == 77UL),
             Arg.Any<CancellationToken>());
         await bus.DidNotReceive().PublishAsync(Arg.Any<SwitchPairedEvent>(), Arg.Any<CancellationToken>());
     }
diff --git a/tests/RustPlusBot.Features.Pairing.Tests/ServerPairingCoordinatorTests.cs b/tests/RustPlusBot.Features.Pairing.Tests/ServerPairingCoordinatorTests.cs
@@ -167,7 +167,7 @@ public async Task Accept_persists_publishes_event_once_and_edits_prompt()
         Assert.Equal(server.Id, credential.RustServerId);
         Assert.Equal(CredentialStatus.Active, credential.Status);
         await h.Bus.Received(1).PublishAsync(
-            Arg.Is<ServerRegisteredEvent>(e => e.GuildId == 10UL && e.ServerId == server.Id),
+            Arg.Is<ServerRegisteredEvent>(e => e!.GuildId == 10UL && e.ServerId == server.Id),
             Arg.Any<CancellationToken>());
         await h.Poster.Received(1).EnsureAsync(777UL, 900UL, Arg.Any<global::Discord.Embed>(),
             Arg.Any<global::Discord.MessageComponent>(), Arg.Any<CancellationToken>());
@@ -279,7 +279,7 @@ public async Task Accept_without_setup_channel_still_persists_and_skips_edit()
         Assert.Equal(server.Id, credential.RustServerId);
         Assert.Equal(CredentialStatus.Active, credential.Status);
         await h.Bus.Received(1).PublishAsync(
-            Arg.Is<ServerRegisteredEvent>(e => e.GuildId == 10UL && e.ServerId == server.Id),
+            Arg.Is<ServerRegisteredEvent>(e => e!.GuildId == 10UL && e.ServerId == server.Id),
             Arg.Any<CancellationToken>());
         await h.Poster.Received(1).EnsureAsync(Arg.Any<ulong>(), Arg.Any<ulong?>(),
             Arg.Any<global::Discord.Embed>(), Arg.Any<global::Discord.MessageComponent>(),
diff --git a/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs b/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs
@@ -72,7 +72,7 @@ await h.Bus.PublishAsync(new PlayerStateChangedEvent(
         }
 
         await h.Sender.Received().SendAsync(
-            10UL, serverId, Arg.Is<string>(s => s.Contains("Alice")), Arg.Any<CancellationToken>());
+            10UL, serverId, Arg.Is<string>(s => s!.Contains("Alice")), Arg.Any<CancellationToken>());
 
         await h.Service.StopAsync(default);
     }
@@ -114,7 +114,7 @@ await h.Bus.PublishAsync(new PlayerStateChangedEvent(
         // The relay threw, causing the loop to fault and complete (LogRelayLoopFaulted). StopAsync joins the
         // faulted task cleanly — no rethrow. This is crash-isolation, not per-event resilience.
         await h.Sender.Received().SendAsync(
-            10UL, Arg.Any<Guid>(), Arg.Is<string>(s => s.Contains("Bob")), Arg.Any<CancellationToken>());
+            10UL, Arg.Any<Guid>(), Arg.Is<string>(s => s!.Contains("Bob")), Arg.Any<CancellationToken>());
         await h.Service.StopAsync(default);
     }
 
diff --git a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs
@@ -54,7 +54,7 @@ await relay.RelayAsync(
             Evt(new PlayerTransition(PlayerTransitionKind.Connect, 1, "Bob", null)), CancellationToken.None);
 
         await _sender.Received(1).SendAsync(
-            Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Is<string>(s => s.Contains("Bob")), Arg.Any<CancellationToken>());
+            Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Is<string>(s => s!.Contains("Bob")), Arg.Any<CancellationToken>());
     }
 
     [Fact]
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/Hosting/StorageMonitorsHostedServiceTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/Hosting/StorageMonitorsHostedServiceTests.cs
@@ -41,7 +41,7 @@ private static Harness Create()
         relayPoster.EnsureAsync(Arg.Any<ulong>(), Arg.Any<ulong?>(), Arg.Any<global::Discord.Embed>(),
             Arg.Any<global::Discord.MessageComponent>(), Arg.Any<CancellationToken>()).Returns((ulong?)900UL);
         var names = Substitute.For<IItemNameResolver>();
-        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]);
+        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]!);
         var renderer = new StorageMonitorEmbedRenderer(new ResxLocalizer(), names);
         var relay = new StorageMonitorStateRelay(scopeFactory, relayLocator, relayPoster, renderer,
             Substitute.For<IRustServerQuery>());
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorEmbedRendererTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorEmbedRendererTests.cs
@@ -14,7 +14,7 @@ private static StorageMonitorEmbedRenderer Create(out IItemNameResolver names)
     {
         var loc = new ResxLocalizer();
         names = Substitute.For<IItemNameResolver>();
-        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]);
+        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]!);
         return new StorageMonitorEmbedRenderer(loc, names);
     }
 
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorPairingCoordinatorTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorPairingCoordinatorTests.cs
@@ -37,7 +37,7 @@ private static Harness Create()
             .Returns(900UL);
 
         var names = Substitute.For<IItemNameResolver>();
-        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]);
+        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]!);
         var renderer = new StorageMonitorEmbedRenderer(new ResxLocalizer(), names);
         var coordinator = new StorageMonitorPairingCoordinator(scopeFactory, locator, poster, renderer);
         return new Harness(coordinator, store, poster, locator);
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorStateRelayTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorStateRelayTests.cs
@@ -38,7 +38,7 @@ private static Harness Create()
             Arg.Any<global::Discord.MessageComponent>(), Arg.Any<CancellationToken>()).Returns((ulong?)900UL);
 
         var names = Substitute.For<IItemNameResolver>();
-        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]);
+        names.Resolve(Arg.Any<int>()).Returns(ci => "Item" + (int)ci[0]!);
         var renderer = new StorageMonitorEmbedRenderer(new ResxLocalizer(), names);
 
         var query = Substitute.For<IRustServerQuery>();
@@ -222,7 +222,7 @@ await h.Relay.HandleReachabilityChangedAsync(
         // A device that became reachable must show its live contents, not the unreachable banner
         // (a null-contents render here would also disable the Refresh/Rename buttons).
         await h.Poster.Received(1).EnsureAsync(555UL, 900UL,
-            Arg.Is<global::Discord.Embed>(e => e.Description.Contains("Item100")),
+            Arg.Is<global::Discord.Embed>(e => e!.Description.Contains("Item100")),
             Arg.Any<global::Discord.MessageComponent>(), Arg.Any<CancellationToken>());
     }
 
diff --git a/tests/RustPlusBot.Features.Wipes.Tests/WipeAnnouncerTests.cs b/tests/RustPlusBot.Features.Wipes.Tests/WipeAnnouncerTests.cs
@@ -65,7 +65,7 @@ public async Task Posts_embed_without_ping_by_default()
         await h.Poster.Received(1).PostAsync(
             777UL,
             null,
-            Arg.Is<Embed>(e => e.Title == "🧹 Server wiped"),
+            Arg.Is<Embed>(e => e!.Title == "🧹 Server wiped"),
             Arg.Any<CancellationToken>());
     }
 
@@ -93,7 +93,7 @@ public async Task Renders_with_guild_culture()
         await h.Poster.Received(1).PostAsync(
             777UL,
             null,
-            Arg.Is<Embed>(e => e.Title == "🧹 Serveur wipé"),
+            Arg.Is<Embed>(e => e!.Title == "🧹 Serveur wipé"),
             Arg.Any<CancellationToken>());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ await h.Bus.PublishAsync(`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`await h.Refresher.Received().RefreshAsync(`
`201`		`- Arg.Is<SmartAlarm>(a => a.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());`
	`201`	`+ Arg.Is<SmartAlarm>(a => a!.EntityId == 42UL), unreachable: true, Arg.Any<CancellationToken>());`
`202`	`202`
`203`	`203`	`await h.Service.StopAsync(default);`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task TickOnce_publishes_a_crate_lootable_event_when_active_window_e`
`28`	`28`	`await service.TickOnceAsync(CancellationToken.None);`
`29`	`29`
`30`	`30`	`await bus.Received(1).PublishAsync(`
`31`		`- Arg.Is<RigStateChangedEvent>(e => e.Kind == RigEventKind.CrateLootable && e.Rig == RigKind.Small),`
	`31`	`+ Arg.Is<RigStateChangedEvent>(e => e!.Kind == RigEventKind.CrateLootable && e.Rig == RigKind.Small),`
`32`	`32`	`Arg.Any<CancellationToken>());`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public async Task NotFound_with_budget_generates_exactly_once_across_ticks()`
`87`	`87`
`88`	`88`	`Assert.Equal(RustMapsGenerationState.Generating, coord.Snapshot(Key).State);`
`89`	`89`	`await client.Received(1).CreateMapAsync(`
`90`		`- Arg.Is<MapGenerationRequest>(r => r.Size == 4000 && r.Seed == 12345 && !r.Staging),`
	`90`	`+ Arg.Is<MapGenerationRequest>(r => r!.Size == 4000 && r.Seed == 12345 && !r.Staging),`
`91`	`91`	`Arg.Any<CancellationToken>());`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public async Task NotifyCredentialsExpired_DmsTheOwner()`
`16`	`16`
`17`	`17`	`await dm.Received(1).SendAsync(`
`18`	`18`	`99UL,`
`19`		`- Arg.Is<string>(m => m.Contains("Reconnect", StringComparison.Ordinal)),`
	`19`	`+ Arg.Is<string>(m => m!.Contains("Reconnect", StringComparison.Ordinal)),`
`20`	`20`	`Arg.Any<CancellationToken>());`
`21`	`21`	`}`
`22`	`22`
`@@ -29,6 +29,6 @@ public async Task NotifySetupChannelMissing_dms_owner_with_setup_instructions()`
`29`	`29`	`await notifier.NotifySetupChannelMissingAsync(10UL, 99UL, CancellationToken.None);`
`30`	`30`
`31`	`31`	`await dm.Received(1).SendAsync(99UL,`
`32`		`- Arg.Is<string>(m => m.Contains("/setup", StringComparison.Ordinal)), Arg.Any<CancellationToken>());`
	`32`	`+ Arg.Is<string>(m => m!.Contains("/setup", StringComparison.Ordinal)), Arg.Any<CancellationToken>());`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ await h.Bus.PublishAsync(new PlayerStateChangedEvent(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`await h.Sender.Received().SendAsync(`
`75`		`- 10UL, serverId, Arg.Is<string>(s => s.Contains("Alice")), Arg.Any<CancellationToken>());`
	`75`	`+ 10UL, serverId, Arg.Is<string>(s => s!.Contains("Alice")), Arg.Any<CancellationToken>());`
`76`	`76`
`77`	`77`	`await h.Service.StopAsync(default);`
`78`	`78`	`}`
`@@ -114,7 +114,7 @@ await h.Bus.PublishAsync(new PlayerStateChangedEvent(`
`114`	`114`	`// The relay threw, causing the loop to fault and complete (LogRelayLoopFaulted). StopAsync joins the`
`115`	`115`	`// faulted task cleanly — no rethrow. This is crash-isolation, not per-event resilience.`
`116`	`116`	`await h.Sender.Received().SendAsync(`
`117`		`- 10UL, Arg.Any<Guid>(), Arg.Is<string>(s => s.Contains("Bob")), Arg.Any<CancellationToken>());`
	`117`	`+ 10UL, Arg.Any<Guid>(), Arg.Is<string>(s => s!.Contains("Bob")), Arg.Any<CancellationToken>());`
`118`	`118`	`await h.Service.StopAsync(default);`
`119`	`119`	`}`
`120`	`120`