Refactor: remove unused using directives across multiple files

HandyS11 · HandyS11 · commit c049fb22dde6 · 2026-07-06T17:08:38.000+02:00
diff --git a/RustPlusBot.slnx.DotSettings b/RustPlusBot.slnx.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=ReformatAndReorder/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="ReformatAndReorder"&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;/Profile&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=ReformatAndReorder/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="ReformatAndReorder"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;/Profile&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs b/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs
@@ -3,7 +3,6 @@
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Features.Alarms.Posting;
-using RustPlusBot.Features.Alarms.Rendering;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
diff --git a/src/RustPlusBot.Features.Commands/Modules/LeaderComponentModule.cs b/src/RustPlusBot.Features.Commands/Modules/LeaderComponentModule.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using RustPlusBot.Features.Commands.Leader;
 using RustPlusBot.Localization;
-using RustPlusBot.Persistence.Servers;
 using RustPlusBot.Persistence.Workspace;
 
 namespace RustPlusBot.Features.Commands.Modules;
diff --git a/src/RustPlusBot.Features.Connections/Listening/RustPlusSocketSource.cs b/src/RustPlusBot.Features.Connections/Listening/RustPlusSocketSource.cs
@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Linq;
 using Microsoft.Extensions.Logging;
 using RustPlusApi;
 using RustPlusBot.Abstractions.Connections;
diff --git a/src/RustPlusBot.Features.StorageMonitors/StorageMonitorServiceCollectionExtensions.cs b/src/RustPlusBot.Features.StorageMonitors/StorageMonitorServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using RustPlusBot.Discord;
-using RustPlusBot.Features.StorageMonitors.Hosting;
 using RustPlusBot.Features.ItemData;
+using RustPlusBot.Features.StorageMonitors.Hosting;
 using RustPlusBot.Features.StorageMonitors.Pairing;
 using RustPlusBot.Features.StorageMonitors.Posting;
 using RustPlusBot.Features.StorageMonitors.Relaying;
diff --git a/src/RustPlusBot.Host/Program.cs b/src/RustPlusBot.Host/Program.cs
@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using RustPlusBot.Abstractions.Credentials;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmEmbedRendererTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmEmbedRendererTests.cs
@@ -1,7 +1,5 @@
 using Discord;
-using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
-using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Domain.Alarms;
 using RustPlusBot.Features.Alarms.Rendering;
 using RustPlusBot.Localization;
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs
@@ -1,15 +1,14 @@
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using NSubstitute;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
+using RustPlusBot.Discord.Posting;
 using RustPlusBot.Features.Alarms.Pairing;
 using RustPlusBot.Features.Alarms.Posting;
 using RustPlusBot.Features.Alarms.Relaying;
 using RustPlusBot.Features.Alarms.Rendering;
-using RustPlusBot.Discord.Posting;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs
@@ -8,7 +8,6 @@
 using RustPlusBot.Domain.Alarms;
 using RustPlusBot.Features.Alarms.Posting;
 using RustPlusBot.Features.Alarms.Relaying;
-using RustPlusBot.Features.Alarms.Rendering;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
diff --git a/tests/RustPlusBot.Features.Commands.Tests/CommandOptionsTests.cs b/tests/RustPlusBot.Features.Commands.Tests/CommandOptionsTests.cs
@@ -1,5 +1,3 @@
-using RustPlusBot.Features.Commands;
-
 namespace RustPlusBot.Features.Commands.Tests;
 
 public sealed class CommandOptionsTests
diff --git a/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandCooldownTests.cs b/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandCooldownTests.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Options;
 using RustPlusBot.Abstractions.Time;
-using RustPlusBot.Features.Commands;
 using RustPlusBot.Features.Commands.Dispatching;
 
 namespace RustPlusBot.Features.Commands.Tests.Dispatching;
diff --git a/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs b/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs
@@ -2,7 +2,6 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
-using RustPlusBot.Features.Commands;
 using RustPlusBot.Features.Commands.Dispatching;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Persistence.Commands;
diff --git a/tests/RustPlusBot.Features.Connections.Tests/ConnectionOptionsTests.cs b/tests/RustPlusBot.Features.Connections.Tests/ConnectionOptionsTests.cs
@@ -1,5 +1,3 @@
-using RustPlusBot.Features.Connections;
-
 namespace RustPlusBot.Features.Connections.Tests;
 
 /// <summary>Unit tests for <see cref="ConnectionOptions"/> default values.</summary>
diff --git a/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs b/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs
@@ -5,7 +5,6 @@
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Discord.Notifications;
-using RustPlusBot.Features.Connections;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Connections.Removal;
 using RustPlusBot.Features.Connections.Supervisor;
diff --git a/tests/RustPlusBot.Features.ItemData.Tests/CctvBundleTests.cs b/tests/RustPlusBot.Features.ItemData.Tests/CctvBundleTests.cs
@@ -1,5 +1,3 @@
-using RustPlusBot.Features.ItemData;
-
 namespace RustPlusBot.Features.ItemData.Tests;
 
 public sealed class CctvBundleTests
diff --git a/tests/RustPlusBot.Features.ItemData.Tests/EmbeddedItemDatabaseTests.cs b/tests/RustPlusBot.Features.ItemData.Tests/EmbeddedItemDatabaseTests.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using RustPlusBot.Features.ItemData;
 using RustPlusBot.Features.ItemData.Data;
 using RustPlusBot.Features.ItemData.Lookup;
 
diff --git a/tests/RustPlusBot.Features.ItemData.Tests/ItemDatabaseNameResolverTests.cs b/tests/RustPlusBot.Features.ItemData.Tests/ItemDatabaseNameResolverTests.cs
@@ -1,4 +1,3 @@
-using RustPlusBot.Features.ItemData;
 using RustPlusBot.Features.ItemData.Naming;
 
 namespace RustPlusBot.Features.ItemData.Tests;
diff --git a/tests/RustPlusBot.Features.Map.Tests/BaseMapCacheTests.cs b/tests/RustPlusBot.Features.Map.Tests/BaseMapCacheTests.cs
@@ -1,7 +1,6 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Features.Map.Composing;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs
@@ -8,7 +8,6 @@
 using RustPlusBot.Persistence.Map;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapIconsTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapIconsTests.cs
@@ -1,7 +1,6 @@
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Features.Map.Assets;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapLayerSetTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapLayerSetTests.cs
@@ -1,5 +1,4 @@
 using RustPlusBot.Features.Map.Rendering;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapRefreshThrottleTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapRefreshThrottleTests.cs
@@ -1,6 +1,5 @@
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Features.Map.Hosting;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/WorldToPixelTests.cs b/tests/RustPlusBot.Features.Map.Tests/WorldToPixelTests.cs
@@ -1,6 +1,5 @@
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Features.Map.Rendering;
-using Xunit;
 
 namespace RustPlusBot.Features.Map.Tests;
 
diff --git a/tests/RustPlusBot.Features.Pairing.Tests/PairingRegistrationTests.cs b/tests/RustPlusBot.Features.Pairing.Tests/PairingRegistrationTests.cs
@@ -5,7 +5,6 @@
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Discord.Notifications;
-using RustPlusBot.Features.Pairing;
 using RustPlusBot.Features.Pairing.Accounts;
 using RustPlusBot.Features.Pairing.Pairing;
 using RustPlusBot.Features.Pairing.Supervisor;
diff --git a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs
@@ -5,7 +5,6 @@
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Discord.Posting;
 using RustPlusBot.Features.Connections.Listening;
-using RustPlusBot.Features.Players;
 using RustPlusBot.Features.Players.Hosting;
 using RustPlusBot.Features.Players.Relaying;
 using RustPlusBot.Features.Workspace.Locating;
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorRegistrationTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorRegistrationTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using RustPlusBot.Features.StorageMonitors;
 using RustPlusBot.Features.ItemData.Naming;
 using RustPlusBot.Features.StorageMonitors.Pairing;
 using RustPlusBot.Features.StorageMonitors.Relaying;
diff --git a/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorStateRelayTests.cs b/tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorStateRelayTests.cs
@@ -9,7 +9,6 @@
 using RustPlusBot.Features.StorageMonitors.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.StorageMonitors;
 using RustPlusBot.Persistence.Workspace;
 
diff --git a/tests/RustPlusBot.Features.Switches.Tests/SwitchRegistrationTests.cs b/tests/RustPlusBot.Features.Switches.Tests/SwitchRegistrationTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using RustPlusBot.Features.Switches;
 using RustPlusBot.Features.Switches.Pairing;
 using RustPlusBot.Features.Switches.Relaying;
 using RustPlusBot.Features.Switches.Rendering;
diff --git a/tests/RustPlusBot.Features.Workspace.Tests/Fakes/FakeWorkspaceGatewayTests.cs b/tests/RustPlusBot.Features.Workspace.Tests/Fakes/FakeWorkspaceGatewayTests.cs
@@ -1,5 +1,4 @@
 using RustPlusBot.Features.Workspace.Registry;
-using RustPlusBot.Features.Workspace.Tests.Fakes;
 
 namespace RustPlusBot.Features.Workspace.Tests.Fakes;
 
diff --git a/tests/RustPlusBot.Features.Workspace.Tests/Reconciler/ReconcilerHarness.cs b/tests/RustPlusBot.Features.Workspace.Tests/Reconciler/ReconcilerHarness.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
-using RustPlusBot.Domain.Servers;
 using RustPlusBot.Features.Workspace.Gateway;
 using RustPlusBot.Features.Workspace.Reconciler;
 using RustPlusBot.Features.Workspace.Registry;
diff --git a/tests/RustPlusBot.Features.Workspace.Tests/Specs/ServerWorkspaceSpecProviderTests.cs b/tests/RustPlusBot.Features.Workspace.Tests/Specs/ServerWorkspaceSpecProviderTests.cs
@@ -1,4 +1,3 @@
-using RustPlusBot.Features.Workspace;
 using RustPlusBot.Features.Workspace.Registry;
 using RustPlusBot.Features.Workspace.Specs;
 
diff --git a/tests/RustPlusBot.Features.Workspace.Tests/WorkspaceRegistrationTests.cs b/tests/RustPlusBot.Features.Workspace.Tests/WorkspaceRegistrationTests.cs
@@ -4,7 +4,6 @@
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
-using RustPlusBot.Features.Workspace;
 using RustPlusBot.Features.Workspace.Reconciler;
 using RustPlusBot.Features.Workspace.Teardown;
 using RustPlusBot.Persistence;
diff --git a/tests/RustPlusBot.ItemData.Generator.Tests/OfflineSmeltingSourceTests.cs b/tests/RustPlusBot.ItemData.Generator.Tests/OfflineSmeltingSourceTests.cs
@@ -1,4 +1,3 @@
-using RustPlusBot.Features.ItemData.Data;
 using RustPlusBot.ItemData.Generator.Sources;
 
 namespace RustPlusBot.ItemData.Generator.Tests;
diff --git a/tests/RustPlusBot.Localization.Tests/ResxLocalizerTests.cs b/tests/RustPlusBot.Localization.Tests/ResxLocalizerTests.cs
@@ -1,5 +1,3 @@
-using RustPlusBot.Localization;
-
 namespace RustPlusBot.Localization.Tests;
 
 public sealed class ResxLocalizerTests
diff --git a/tests/RustPlusBot.Localization.Tests/StringsResourceParityTests.cs b/tests/RustPlusBot.Localization.Tests/StringsResourceParityTests.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Globalization;
 using System.Resources;
-using RustPlusBot.Localization;
 
 namespace RustPlusBot.Localization.Tests;
 
diff --git a/tests/RustPlusBot.Persistence.Tests/Connections/ConnectionStoreTests.cs b/tests/RustPlusBot.Persistence.Tests/Connections/ConnectionStoreTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
 using NSubstitute;
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Domain.Connections;
diff --git a/tests/RustPlusBot.Persistence.Tests/PersistenceRegistrationTests.cs b/tests/RustPlusBot.Persistence.Tests/PersistenceRegistrationTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using RustPlusBot.Abstractions.Credentials;
-using RustPlusBot.Persistence;
 using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.Credentials;
 using RustPlusBot.Persistence.Servers;
diff --git a/tests/RustPlusBot.Persistence.Tests/SqliteContextFixture.cs b/tests/RustPlusBot.Persistence.Tests/SqliteContextFixture.cs
@@ -1,6 +1,5 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using RustPlusBot.Persistence;
 
 namespace RustPlusBot.Persistence.Tests;
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
`2`		`- <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=ReformatAndReorder/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="ReformatAndReorder"><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers></Profile></s:String></wpf:ResourceDictionary>`
	`2`	`+ <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=ReformatAndReorder/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="ReformatAndReorder"><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers></Profile></s:String></wpf:ResourceDictionary>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Globalization;`
`2`		`-using System.Linq;`
`3`	`2`	`using Microsoft.Extensions.Logging;`
`4`	`3`	`using RustPlusApi;`
`5`	`4`	`using RustPlusBot.Abstractions.Connections;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using RustPlusBot.Features.Commands;`
`2`		`-`
`3`	`1`	`namespace RustPlusBot.Features.Commands.Tests;`
`4`	`2`
`5`	`3`	`public sealed class CommandOptionsTests`