diff --git a/Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj b/Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj
index b96e86238..8cf7b1060 100644
--- a/Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj
+++ b/Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -33,8 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.Tests.UI.Samples/Helpers/SetupHelpers.cs b/Lombiq.Tests.UI.Samples/Helpers/SetupHelpers.cs
index 7c8e73cc7..fe4ff9f32 100644
--- a/Lombiq.Tests.UI.Samples/Helpers/SetupHelpers.cs
+++ b/Lombiq.Tests.UI.Samples/Helpers/SetupHelpers.cs
@@ -78,7 +78,7 @@ private static void AssertSetupSuccessful(UITestContext context)
         {
             var validationErrors = context.GetAll(By.ClassName("field-validation-error"));
 
-            if (!validationErrors.Any()) throw;
+            if (validationErrors.Count == 0) throw;
 
             var errors = "\n- " + validationErrors.Select(element => element.Text.Trim()).Join("\n- ");
             throw new AssertionException($"Setup has failed with the following validation errors:{errors}");
diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index 2f30ec9a8..83a572ce6 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <!-- Eliminates problem with dotnet publish caused by duplicate .htmlvalidate.json file. See
          https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/6.0/duplicate-files-in-output. -->
diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/ErrorController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/ErrorController.cs
index 3f9728bcc..7935cd317 100644
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/ErrorController.cs
+++ b/Lombiq.Tests.UI.Shortcuts/Controllers/ErrorController.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Lombiq.Tests.UI.Shortcuts.Controllers;
 
@@ -11,8 +10,6 @@ public class ErrorController : Controller
 {
     public const string ExceptionMessage = "This action intentionally causes an exception!";
 
-    // This only happens in the CI for some reason.
-    [SuppressMessage("Usage", "CA1822:Mark members as static", Justification = "It's a controller action.")]
     [AllowAnonymous]
     public IActionResult Index() =>
         throw new InvalidOperationException(ExceptionMessage);
diff --git a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
index d077d6b04..44f05f170 100644
--- a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
+++ b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
@@ -34,15 +34,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Themes" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Users" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Recipes.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Workflows" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Themes" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Users" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Recipes.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ResourceManagement.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Workflows" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.5.tdeal-16" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.7.osoe-751" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.Tests.UI.Shortcuts/Manifest.cs b/Lombiq.Tests.UI.Shortcuts/Manifest.cs
index 012139940..a281e0653 100644
--- a/Lombiq.Tests.UI.Shortcuts/Manifest.cs
+++ b/Lombiq.Tests.UI.Shortcuts/Manifest.cs
@@ -14,15 +14,15 @@
     Category = "Development",
     Description = "WARNING: Only enable this feature in the UI testing environment. Provides shortcuts for common " +
         "operations that UI tests might want to do or check.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.ContentManagement",
         "OrchardCore.ContentTypes",
         "OrchardCore.DisplayManagement",
         "OrchardCore.Roles",
         "OrchardCore.Tenants",
         "OrchardCore.Users",
-    }
+    ]
 )]
 
 [assembly: Feature(
@@ -37,10 +37,10 @@
     Name = "Media Cache Purge - Shortcuts - Lombiq UI Testing Toolbox",
     Category = "Development",
     Description = "WARNING: Only enable this feature in the UI testing environment. Provides shortcut for Media Cache Purge.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.Media.Cache",
-    }
+    ]
 )]
 
 [assembly: Feature(
@@ -48,8 +48,8 @@
     Name = "Workflows - Shortcuts - Lombiq UI Testing Toolbox",
     Category = "Development",
     Description = "WARNING: Only enable this feature in the UI testing environment. Provides shortcut for Workflows.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.Workflows.Http",
-    }
+    ]
 )]
diff --git a/Lombiq.Tests.UI.Tests.UI/Lombiq.Tests.UI.Tests.UI.csproj b/Lombiq.Tests.UI.Tests.UI/Lombiq.Tests.UI.Tests.UI.csproj
index b5305d04e..36cbc2eed 100644
--- a/Lombiq.Tests.UI.Tests.UI/Lombiq.Tests.UI.Tests.UI.csproj
+++ b/Lombiq.Tests.UI.Tests.UI/Lombiq.Tests.UI.Tests.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Lombiq.Tests.UI/Extensions/BasicOrchardFeaturesTestingUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/BasicOrchardFeaturesTestingUITestContextExtensions.cs
index 2c6582c45..d601038be 100644
--- a/Lombiq.Tests.UI/Extensions/BasicOrchardFeaturesTestingUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/BasicOrchardFeaturesTestingUITestContextExtensions.cs
@@ -659,9 +659,9 @@ await context
     public static Task ExecuteTestAsync(
         this UITestContext context, string testName, Func<Task> testFunctionAsync)
     {
-        if (context is null) throw new ArgumentNullException(nameof(context));
-        if (testName is null) throw new ArgumentNullException(nameof(testName));
-        if (testFunctionAsync is null) throw new ArgumentNullException(nameof(testFunctionAsync));
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(testName);
+        ArgumentNullException.ThrowIfNull(testFunctionAsync);
 
         return ExecuteTestInnerAsync(context, testName, testFunctionAsync);
     }
diff --git a/Lombiq.Tests.UI/Extensions/ExtendedLoggingExtensions.cs b/Lombiq.Tests.UI/Extensions/ExtendedLoggingExtensions.cs
index 32bfe12f2..cb1a29ef5 100644
--- a/Lombiq.Tests.UI/Extensions/ExtendedLoggingExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ExtendedLoggingExtensions.cs
@@ -131,7 +131,7 @@ private static TResult ExecuteSection<TResult>(this UITestContext context, LogSe
             throw new InvalidOperationException("Impossible to reach.");
         });
 
-    private static Task ExecuteSectionAsync(this UITestContext context, LogSection section, Func<Task> functionAsync) =>
+    private static Task<bool> ExecuteSectionAsync(this UITestContext context, LogSection section, Func<Task> functionAsync) =>
         context.ExecuteSectionAsync(
             section,
             async () =>
diff --git a/Lombiq.Tests.UI/Extensions/FormUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/FormUITestContextExtensions.cs
index 926905923..11e4bf1c7 100644
--- a/Lombiq.Tests.UI/Extensions/FormUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/FormUITestContextExtensions.cs
@@ -110,8 +110,7 @@ public static void FillInMonacoEditor(
     {
         var script = $@"
             monaco.editor.getEditors().find((element) =>
-                element.getContainerDomNode().id == {JsonConvert.SerializeObject(editorId)})
-            .getModel().setValue({JsonConvert.SerializeObject(text)});";
+                element.getContainerDomNode().id == {JsonConvert.SerializeObject(editorId)}).setValue({JsonConvert.SerializeObject(text)});";
 
         context.ExecuteScript(script);
     }
@@ -125,8 +124,7 @@ public static string GetMonacoEditorText(
     {
         var script = $@"
             return monaco.editor.getEditors().find((element) =>
-                element.getContainerDomNode().id == {JsonConvert.SerializeObject(editorId)})
-            .getModel().getValue();";
+                element.getContainerDomNode().id == {JsonConvert.SerializeObject(editorId)}).getValue();";
 
         return context.ExecuteScript(script) as string;
     }
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index c2a824207..0119802e3 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -342,10 +342,7 @@ public static async Task PurgeMediaCacheDirectlyAsync(this UITestContext context
     public static Task<ApplicationInfo> GetApplicationInfoAsync(this UITestContext context) =>
         context.GetApi().GetApplicationInfoFromApiAsync();
 
-    // This is required to instantiate ILogger<>.
-#pragma warning disable S2094 // Classes should not be empty
     private sealed class ExecuteRecipeShortcut { }
-#pragma warning restore S2094 // Classes should not be empty
 
     /// <summary>
     /// Executes a recipe identified by its name directly.
@@ -646,7 +643,7 @@ internal static async Task WaitInteractiveModeAsync(this UITestContext context)
     }
 
     private static bool IsAdminTheme(IManifestInfo manifest) =>
-        manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(ManifestConstants.AdminTag));
+        manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(value: ManifestConstants.AdminTag));
 
     private static async Task<bool> PermissionExistsAsync(
         IEnumerable<IPermissionProvider> permissionProviders, string permissionName) =>
diff --git a/Lombiq.Tests.UI/Extensions/ShouldlyExtensions.cs b/Lombiq.Tests.UI/Extensions/ShouldlyExtensions.cs
index e0b161f38..1d200966c 100644
--- a/Lombiq.Tests.UI/Extensions/ShouldlyExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShouldlyExtensions.cs
@@ -51,7 +51,7 @@ public static void ShouldBeEmptyWhen<TItem, TMessage>(
         JsonSerializerOptions jsonSerializerOptions = null)
     {
         var results = enumerable.Where(condition).ToList();
-        if (!results.Any()) return;
+        if (results.Count == 0) return;
 
         var message = messageTransform == null
             ? JsonSerializer.Serialize(results, jsonSerializerOptions)
diff --git a/Lombiq.Tests.UI/Extensions/TypedRouteUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/TypedRouteUITestContextExtensions.cs
index f3a2535c1..ddd059010 100644
--- a/Lombiq.Tests.UI/Extensions/TypedRouteUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/TypedRouteUITestContextExtensions.cs
@@ -43,11 +43,16 @@ public static string GetRelativeUrlOfAction<TController>(
         this UITestContext context,
         Expression<Action<TController>> actionExpression,
         params (string Key, object Value)[] additionalArguments)
-        where TController : ControllerBase =>
-        TypedRoute
-            .CreateFromExpression(actionExpression, additionalArguments, CreateServiceProvider(context))
+        where TController : ControllerBase
+    {
+        using var serviceProvider = CreateServiceProvider(context);
+        var route = TypedRoute
+            .CreateFromExpression(actionExpression, additionalArguments, serviceProvider)
             .ToString();
 
+        return route;
+    }
+
     /// <summary>
     /// Gets the relative URL generated by <see cref="TypedRoute"/> for the <paramref name="actionExpressionAsync"/> in
     /// the <typeparamref name="TController"/>.
@@ -57,11 +62,17 @@ public static string GetRelativeUrlOfAction<TController>(
         this UITestContext context,
         Expression<Func<TController, Task>> actionExpressionAsync,
         params (string Key, object Value)[] additionalArguments)
-        where TController : ControllerBase =>
-        TypedRoute
-            .CreateFromExpression(actionExpressionAsync.StripResult(), additionalArguments, CreateServiceProvider(context))
+        where TController : ControllerBase
+    {
+        using var serviceProvider = CreateServiceProvider(context);
+
+        var route = TypedRoute
+            .CreateFromExpression(actionExpressionAsync.StripResult(), additionalArguments, serviceProvider)
             .ToString();
 
+        return route;
+    }
+
     /// <summary>
     /// Gets the absolute URL generated by <see cref="TypedRoute"/> for the <paramref name="actionExpression"/> in the
     /// <typeparamref name="TController"/>.
@@ -84,7 +95,7 @@ public static Uri GetAbsoluteUrlOfAction<TController>(
         where TController : ControllerBase =>
         context.GetAbsoluteUri(context.GetRelativeUrlOfAction(actionExpressionAsync, additionalArguments));
 
-    private static IServiceProvider CreateServiceProvider(UITestContext context)
+    private static ServiceProvider CreateServiceProvider(UITestContext context)
     {
         var services = new ServiceCollection();
 
diff --git a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
index d94b6d2bc..bd4852947 100644
--- a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
@@ -82,7 +82,7 @@ public static void AssertVisualVerificationOnAllResolutions(
 
         if (exceptions.Count == 1) throw exceptions.Single();
 
-        if (exceptions.Any())
+        if (exceptions.Count != 0)
         {
             // The UITestExecutionSession doesn't support AggregateException with multiple inner exceptions, so we just
             // concatenate the exceptions if there are multiple.
diff --git a/Lombiq.Tests.UI/Extensions/WebApplicationInstanceExtensions.cs b/Lombiq.Tests.UI/Extensions/WebApplicationInstanceExtensions.cs
index 073beb887..ee517817c 100644
--- a/Lombiq.Tests.UI/Extensions/WebApplicationInstanceExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/WebApplicationInstanceExtensions.cs
@@ -37,7 +37,7 @@ public static async Task LogsShouldBeEmptyAsync(
                 .SplitByNewLines()
                 .Where(line => line.Contains("|ERROR|"));
 
-            if (permittedErrorLines.Any())
+            if (permittedErrorLines.Count != 0)
             {
                 errorLines = errorLines.Where(line => !permittedErrorLines.Any(line.ContainsOrdinalIgnoreCase));
             }
diff --git a/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs b/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs
index 0d25b8cb2..b48bb5601 100644
--- a/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs
+++ b/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs
@@ -5,15 +5,17 @@ namespace Lombiq.Tests.UI.Helpers;
 
 public static class WebAppConfigHelper
 {
+    private static readonly string[] Separator = ["src", "test"];
+
     /// <summary>
     /// Retrieves the absolute path to the assembly (DLL) of the application being tested.
     /// </summary>
     /// <param name="webAppName">The web app's project name.</param>
     /// <param name="frameworkFolderName">
-    /// The name of the folder that corresponds to the .NET version in the build output folder (e.g. "net6.0").
+    /// The name of the folder that corresponds to the .NET version in the build output folder (e.g. "net8.0").
     /// </param>
     /// <returns>The absolute path to the assembly (DLL) of the application being tested.</returns>
-    public static string GetAbsoluteApplicationAssemblyPath(string webAppName, string frameworkFolderName = "net6.0")
+    public static string GetAbsoluteApplicationAssemblyPath(string webAppName, string frameworkFolderName = "net8.0")
     {
         string baseDirectory;
 
@@ -24,7 +26,7 @@ public static string GetAbsoluteApplicationAssemblyPath(string webAppName, strin
         else
         {
             var outputFolderContainingPath = Path.Combine(
-                AppContext.BaseDirectory.Split(new[] { "src", "test" }, StringSplitOptions.RemoveEmptyEntries)[0],
+                AppContext.BaseDirectory.Split(Separator, StringSplitOptions.RemoveEmptyEntries)[0],
                 "src",
                 webAppName,
                 "bin");
diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index 6f086f898..4617f4e78 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
     <!-- With these the driver exe files will be copied to all projects referencing this project. Otherwise all child
@@ -67,15 +67,15 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="Codeuctivity.ImageSharpCompare" Version="3.0.183" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.SqlServer.DACFx" Version="162.0.52" />
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.18.0" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Recipes.Core" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Recipes.Core" Version="1.8.2" />
     <PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
     <PackageReference Include="Sarif.Sdk" Version="4.3.7" />
     <PackageReference Include="Selenium.Axe" Version="4.0.14" />
@@ -102,10 +102,10 @@
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\src\Utilities\Lombiq.Npm.Targets\Lombiq.Npm.Targets.targets" />
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests" Version="2.2.5" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="8.1.1-alpha.5.tdeal-16" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.5.tdeal-16" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Refit" Version="8.1.1-alpha.5.tdeal-16" />
+    <PackageReference Include="Lombiq.Tests" Version="2.2.6-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="8.1.1-alpha.7.osoe-751" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.7.osoe-751" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Refit" Version="8.1.1-alpha.7.osoe-751" />
     <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI/Models/FailureDumpItem.cs b/Lombiq.Tests.UI/Models/FailureDumpItem.cs
index 035dbe21e..0f788198f 100644
--- a/Lombiq.Tests.UI/Models/FailureDumpItem.cs
+++ b/Lombiq.Tests.UI/Models/FailureDumpItem.cs
@@ -20,10 +20,7 @@ public FailureDumpItem(
 
     public Task<Stream> GetStreamAsync()
     {
-        if (_disposed)
-        {
-            throw new ObjectDisposedException(nameof(FailureDumpItem));
-        }
+        ObjectDisposedException.ThrowIf(_disposed, this);
 
         return _getStream();
     }
diff --git a/Lombiq.Tests.UI/Models/FailureDumpItemGeneric.cs b/Lombiq.Tests.UI/Models/FailureDumpItemGeneric.cs
index f8afc5f4a..c72349763 100644
--- a/Lombiq.Tests.UI/Models/FailureDumpItemGeneric.cs
+++ b/Lombiq.Tests.UI/Models/FailureDumpItemGeneric.cs
@@ -28,10 +28,7 @@ public FailureDumpItemGeneric(
 
     public Task<Stream> GetStreamAsync()
     {
-        if (_disposed)
-        {
-            throw new ObjectDisposedException(nameof(FailureDumpItemGeneric<TContent>));
-        }
+        ObjectDisposedException.ThrowIf(_disposed, this);
 
         if (_content is Stream stream && _getStream == null)
         {
diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
index 6bce9d121..b818f6bea 100644
--- a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -5,7 +5,7 @@ namespace Lombiq.Tests.UI.Models;
 
 public class InstanceCommandLineArgumentsBuilder
 {
-    private readonly List<string> _arguments = new();
+    private readonly List<string> _arguments = [];
 
     public IEnumerable<string> Arguments => _arguments;
 
diff --git a/Lombiq.Tests.UI/Models/SafeWaitAsync.cs b/Lombiq.Tests.UI/Models/SafeWaitAsync.cs
index c865cbcdc..d31e6b862 100644
--- a/Lombiq.Tests.UI/Models/SafeWaitAsync.cs
+++ b/Lombiq.Tests.UI/Models/SafeWaitAsync.cs
@@ -19,7 +19,7 @@ public class SafeWaitAsync<T> : IWait<T>
 
     private readonly IClock _clock;
 
-    private readonly List<Type> _ignoredExceptions = new();
+    private readonly List<Type> _ignoredExceptions = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SafeWaitAsync{T}"/> class.
diff --git a/Lombiq.Tests.UI/Models/VisualVerificationMatchApprovedContext.cs b/Lombiq.Tests.UI/Models/VisualVerificationMatchApprovedContext.cs
index b5c2ad1c1..e08eb16bb 100644
--- a/Lombiq.Tests.UI/Models/VisualVerificationMatchApprovedContext.cs
+++ b/Lombiq.Tests.UI/Models/VisualVerificationMatchApprovedContext.cs
@@ -7,7 +7,7 @@
 
 namespace Lombiq.Tests.UI.Models;
 
-public class VisualVerificationMatchApprovedContext
+public partial class VisualVerificationMatchApprovedContext
 {
     public string ModuleName { get; }
     public string MethodName { get; }
@@ -55,7 +55,7 @@ private static string GetModuleName(EnhancedStackFrame frame)
         }
         while (currentMethod is not null);
 
-        var depthMark = new Regex("^(?<module>.*)`[0-9]+$", RegexOptions.ExplicitCapture);
+        var depthMark = DepthMark();
         if (depthMark.IsMatch(moduleName))
         {
             moduleName = depthMark.Match(moduleName).Groups["module"].Value;
@@ -69,7 +69,7 @@ private static string GetModuleName(EnhancedStackFrame frame)
     private static string GetMethodName(EnhancedStackFrame frame)
     {
         var methodName = frame.MethodInfo.Name!;
-        var inheritedMethod = new Regex("^<(?<method>.*)>.*$", RegexOptions.ExplicitCapture);
+        var inheritedMethod = InheritedMethod();
         if (inheritedMethod.IsMatch(methodName))
         {
             methodName = inheritedMethod.Match(methodName).Groups["method"].Value;
@@ -77,4 +77,10 @@ private static string GetMethodName(EnhancedStackFrame frame)
 
         return methodName;
     }
+
+    [GeneratedRegex("^(?<module>.*)`[0-9]+$", RegexOptions.ExplicitCapture)]
+    private static partial Regex DepthMark();
+
+    [GeneratedRegex("^<(?<method>.*)>.*$", RegexOptions.ExplicitCapture)]
+    private static partial Regex InheritedMethod();
 }
diff --git a/Lombiq.Tests.UI/MonkeyTesting/MonkeyTester.cs b/Lombiq.Tests.UI/MonkeyTesting/MonkeyTester.cs
index 633ab507b..55addfc47 100644
--- a/Lombiq.Tests.UI/MonkeyTesting/MonkeyTester.cs
+++ b/Lombiq.Tests.UI/MonkeyTesting/MonkeyTester.cs
@@ -15,7 +15,7 @@ internal sealed class MonkeyTester
     private readonly UITestContext _context;
     private readonly MonkeyTestingOptions _options;
     private readonly NonSecurityRandomizer _randomizer;
-    private readonly List<PageMonkeyTestInfo> _visitedPages = new();
+    private readonly List<PageMonkeyTestInfo> _visitedPages = [];
 
     private ILogManager Log => _context.Scope.AtataContext.Log;
 
@@ -200,8 +200,8 @@ private void WaitForGremlinsIndicatorsToDisappear() =>
     private string BuildGremlinsRunScript(TimeSpan testTime, int randomSeed) =>
         new GremlinsScripts.RunScriptBuilder
         {
-            Species = _options.GremlinsSpecies.ToArray(),
-            Mogwais = _options.GremlinsMogwais.ToArray(),
+            Species = [.. _options.GremlinsSpecies],
+            Mogwais = [.. _options.GremlinsMogwais],
             NumberOfAttacks = (int)(testTime.TotalMilliseconds / _options.GremlinsAttackDelay.TotalMilliseconds),
             AttackDelay = (int)_options.GremlinsAttackDelay.TotalMilliseconds,
             RandomSeed = randomSeed,
diff --git a/Lombiq.Tests.UI/MonkeyTesting/MonkeyTestingOptions.cs b/Lombiq.Tests.UI/MonkeyTesting/MonkeyTestingOptions.cs
index d75c95a05..49e378cb1 100644
--- a/Lombiq.Tests.UI/MonkeyTesting/MonkeyTestingOptions.cs
+++ b/Lombiq.Tests.UI/MonkeyTesting/MonkeyTestingOptions.cs
@@ -47,8 +47,8 @@ public sealed class MonkeyTestingOptions
     /// <item><description><c>"gremlins.species.typer()"</c></description></item>
     /// </list>
     /// </summary>
-    public List<string> GremlinsSpecies { get; } = new()
-    {
+    public List<string> GremlinsSpecies { get; } =
+    [
         @"gremlins.species.clicker({
             log: true,
             canClick: (element) => {
@@ -65,7 +65,7 @@ public sealed class MonkeyTestingOptions
         "gremlins.species.formFiller()",
         "gremlins.species.scroller()",
         "gremlins.species.typer()",
-    };
+    ];
 
     /// <summary>
     /// <para>Gets the gremlins' mogwais.</para>
@@ -75,11 +75,11 @@ public sealed class MonkeyTestingOptions
     /// <item><description><c>"gremlins.mogwais.gizmo()"</c></description></item>
     /// </list>
     /// </summary>
-    public List<string> GremlinsMogwais { get; } = new()
-    {
+    public List<string> GremlinsMogwais { get; } =
+    [
         "gremlins.mogwais.alert()",
         "gremlins.mogwais.gizmo()",
-    };
+    ];
 
     /// <summary>
     /// Gets or sets the gremlins' attack delay. The default value is 10 milliseconds. Set greater time value to make
@@ -100,13 +100,13 @@ public sealed class MonkeyTestingOptions
     /// </item>
     /// </list>
     /// </summary>
-    public List<IMonkeyTestingUrlSanitizer> UrlSanitizers { get; } = new()
-    {
+    public List<IMonkeyTestingUrlSanitizer> UrlSanitizers { get; } =
+    [
         new RemovesFragmentMonkeyTestingUrlSanitizer(),
         new RemovesBaseUrlMonkeyTestingUrlSanitizer(),
         new RemovesQueryParameterMonkeyTestingUrlSanitizer("admin"),
         new RemovesQueryParameterMonkeyTestingUrlSanitizer("returnUrl"),
-    };
+    ];
 
     /// <summary>
     /// <para>
@@ -118,10 +118,10 @@ public sealed class MonkeyTestingOptions
     /// <item><description><see cref="StartsWithBaseUrlMonkeyTestingUrlFilter"/> instance.</description></item>
     /// </list>
     /// </summary>
-    public List<IMonkeyTestingUrlFilter> UrlFilters { get; } = new()
-    {
+    public List<IMonkeyTestingUrlFilter> UrlFilters { get; } =
+    [
         new StartsWithBaseUrlMonkeyTestingUrlFilter(),
-    };
+    ];
 
     /// <summary>
     /// Adds the login page (/Login) to the URL filters (i.e. monkey testing will not happen on that page).
diff --git a/Lombiq.Tests.UI/Pages/OrchardCoreSetupPage.cs b/Lombiq.Tests.UI/Pages/OrchardCoreSetupPage.cs
index 76ba1acbd..9fda818ac 100644
--- a/Lombiq.Tests.UI/Pages/OrchardCoreSetupPage.cs
+++ b/Lombiq.Tests.UI/Pages/OrchardCoreSetupPage.cs
@@ -13,12 +13,12 @@ namespace Lombiq.Tests.UI.Pages;
 using _ = OrchardCoreSetupPage;
 #pragma warning restore IDE0065 // Misplaced using directive
 
-[VerifyTitle(values: new[] { DefaultPageTitle, OlderPageTitle }, Format = "{0}")]
-[VerifyH1(values: new[] { DefaultPageTitle, OlderPageTitle })]
+[VerifyTitle(values: [DefaultPageTitle, OlderPageTitle], Format = "{0}")]
+[VerifyH1(values: [DefaultPageTitle, OlderPageTitle])]
 [TermFindSettings(
     Case = TermCase.Pascal,
     TargetAllChildren = true,
-    TargetAttributeTypes = new[] { typeof(FindByIdAttribute), typeof(FindByNameAttribute) })]
+    TargetAttributeTypes = [typeof(FindByIdAttribute), typeof(FindByNameAttribute)])]
 public sealed class OrchardCoreSetupPage : Page<_>
 {
     public const string DefaultPageTitle = "Setup";
diff --git a/Lombiq.Tests.UI/SecurityScanning/SecurityScanConfiguration.cs b/Lombiq.Tests.UI/SecurityScanning/SecurityScanConfiguration.cs
index c486a3ce3..29caaf24b 100644
--- a/Lombiq.Tests.UI/SecurityScanning/SecurityScanConfiguration.cs
+++ b/Lombiq.Tests.UI/SecurityScanning/SecurityScanConfiguration.cs
@@ -21,14 +21,14 @@ namespace Lombiq.Tests.UI.SecurityScanning;
 /// </remarks>
 public class SecurityScanConfiguration
 {
-    private readonly List<Uri> _additionalUris = new();
-    private readonly List<string> _excludedUrlRegexPatterns = new();
-    private readonly List<ScanRule> _disabledActiveScanRules = new();
-    private readonly Dictionary<ScanRule, (ScanRuleThreshold Threshold, ScanRuleStrength Strength)> _configuredActiveScanRules = new();
-    private readonly List<ScanRule> _disabledPassiveScanRules = new();
-    private readonly List<(string Url, int Id, string RuleName)> _disabledRulesForUrls = new();
-    private readonly List<(string Url, int Id, string RuleName, string Justification)> _falsePositives = new();
-    private readonly List<Func<YamlDocument, Task>> _zapPlanModifiers = new();
+    private readonly List<Uri> _additionalUris = [];
+    private readonly List<string> _excludedUrlRegexPatterns = [];
+    private readonly List<ScanRule> _disabledActiveScanRules = [];
+    private readonly Dictionary<ScanRule, (ScanRuleThreshold Threshold, ScanRuleStrength Strength)> _configuredActiveScanRules = [];
+    private readonly List<ScanRule> _disabledPassiveScanRules = [];
+    private readonly List<(string Url, int Id, string RuleName)> _disabledRulesForUrls = [];
+    private readonly List<(string Url, int Id, string RuleName, string Justification)> _falsePositives = [];
+    private readonly List<Func<YamlDocument, Task>> _zapPlanModifiers = [];
 
     public Uri StartUri { get; private set; }
     public bool AjaxSpiderIsUsed { get; private set; }
@@ -275,7 +275,10 @@ internal async Task ApplyToPlanAsync(YamlDocument yamlDocument, UITestContext co
             //   pollPostData: ""
         }
 
-        yamlDocument.AddExcludePathsRegex(_excludedUrlRegexPatterns.ToArray());
+        // False positive: https://github.com/SonarSource/sonar-dotnet/issues/8510.
+#pragma warning disable S3878 // Arrays should not be created for params parameters
+        yamlDocument.AddExcludePathsRegex([.. _excludedUrlRegexPatterns]);
+#pragma warning restore S3878 // Arrays should not be created for params parameters
         foreach (var rule in _disabledActiveScanRules) yamlDocument.DisableActiveScanRule(rule.Id, rule.Name);
 
         foreach (var ruleConfiguration in _configuredActiveScanRules)
diff --git a/Lombiq.Tests.UI/SecurityScanning/ZapManager.cs b/Lombiq.Tests.UI/SecurityScanning/ZapManager.cs
index 218e72176..8124cbbb2 100644
--- a/Lombiq.Tests.UI/SecurityScanning/ZapManager.cs
+++ b/Lombiq.Tests.UI/SecurityScanning/ZapManager.cs
@@ -9,7 +9,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -112,7 +111,7 @@ public async Task<SecurityScanResult> RunSecurityScanAsync(
 
         var cliParameters = new List<object> { "run" };
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        if (OperatingSystem.IsLinux())
         {
             cliParameters.Add("--network");
             cliParameters.Add("host");
@@ -176,15 +175,13 @@ public async Task<SecurityScanResult> RunSecurityScanAsync(
         return new SecurityScanResult(reportsDirectoryPath, SarifLog.Load(jsonReports[0]));
     }
 
-    public ValueTask DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         if (_cancellationTokenSource != null && !_cancellationTokenSource.IsCancellationRequested)
         {
-            _cancellationTokenSource.Cancel();
+            await _cancellationTokenSource.CancelAsync();
             _cancellationTokenSource.Dispose();
         }
-
-        return ValueTask.CompletedTask;
     }
 
     private async Task EnsureInitializedAsync()
diff --git a/Lombiq.Tests.UI/Services/AtataFactory.cs b/Lombiq.Tests.UI/Services/AtataFactory.cs
index 2cf23f84b..641ea0be0 100644
--- a/Lombiq.Tests.UI/Services/AtataFactory.cs
+++ b/Lombiq.Tests.UI/Services/AtataFactory.cs
@@ -3,7 +3,6 @@
 using Lombiq.HelpfulLibraries.Common.Utilities;
 using OpenQA.Selenium;
 using System;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
@@ -69,7 +68,7 @@ Task<T> FromAsync<T>(Func<BrowserConfiguration, TimeSpan, Task<T>> factory)
         var currentTry = 1;
 
         // Force headless mode if we are in Linux without a working graphical environment.
-        if (!browserConfiguration.Headless && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        if (!browserConfiguration.Headless && OperatingSystem.IsLinux())
         {
             browserConfiguration.Headless = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("DISPLAY"));
         }
diff --git a/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs b/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
index 509f00c38..3d8a856c2 100644
--- a/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
+++ b/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
@@ -1,8 +1,8 @@
+using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Lombiq.HelpfulLibraries.Common.Utilities;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -42,10 +42,6 @@ public sealed class AzureBlobStorageManager : IAsyncDisposable
     private BlobContainerClient _blobContainer;
     private bool _isDisposed;
 
-    [SuppressMessage(
-        "Performance",
-        "CA1810:Initialize reference type static fields inline",
-        Justification = "No GetAgentIndexOrDefault() duplication this way.")]
     static AzureBlobStorageManager()
     {
         var agentIndexTimesHundred = TestConfigurationManager.GetAgentIndexOrDefault() * 100;
@@ -78,7 +74,7 @@ public Task TakeSnapshotAsync(string snapshotDirectoryPath)
                 var blobUrl = blobClient.Name[(blobClient.Name.IndexOf('/', StringComparison.OrdinalIgnoreCase) + 1)..];
 
                 var blobDirectoryPath = Path.GetDirectoryName(blobUrl);
-                var tenantDirectoryName = blobDirectoryPath.IndexOf(Path.DirectorySeparatorChar) != -1
+                var tenantDirectoryName = blobDirectoryPath.Contains(Path.DirectorySeparatorChar)
                     ? blobDirectoryPath[..blobDirectoryPath.IndexOf(Path.DirectorySeparatorChar)]
                     : blobDirectoryPath;
                 var tenantMediaDirectoryPath = Path.Combine(sitesDirectoryPath, tenantDirectoryName, "Media");
@@ -130,7 +126,8 @@ public async ValueTask DisposeAsync()
         await _portLeaseManager.StopLeaseAsync(_folderId);
     }
 
-    private Task CreateContainerIfNotExistsAsync() => _blobContainer.CreateIfNotExistsAsync(PublicAccessType.None);
+    private Task<Response<BlobContainerInfo>> CreateContainerIfNotExistsAsync() =>
+        _blobContainer.CreateIfNotExistsAsync(PublicAccessType.None);
 
     private Task DropFolderIfExistsAsync() =>
         IterateThroughBlobsAsync(blobClient => blobClient.DeleteIfExistsAsync(DeleteSnapshotsOption.IncludeSnapshots));
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
index a86067a61..894d6d2f3 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
@@ -9,7 +9,7 @@ namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
 public sealed class FakeStore : IStore
 {
-    private readonly ConcurrentBag<ISession> _createdSessions = new();
+    private readonly ConcurrentBag<ISession> _createdSessions = [];
     private readonly IStore _store;
 
     public FakeStore(IStore store) => _store = store;
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 60fee2ddf..5f90ad820 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -25,7 +25,7 @@ public sealed class OrchardApplicationFactory<TStartup> : WebApplicationFactory<
     private readonly Action<IConfigurationBuilder> _configureHost;
     private readonly Action<IWebHostBuilder> _configuration;
     private readonly Action<ConfigurationManager, OrchardCoreBuilder> _configureOrchard;
-    private readonly List<IStore> _createdStores = new();
+    private readonly List<IStore> _createdStores = [];
 
     public OrchardApplicationFactory(
         Action<IConfigurationBuilder> configureHost = null,
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index c3dc94670..e41493974 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -193,17 +193,11 @@ private async Task StopOrchardAppAsync()
         return;
     }
 
-    // Use cancellationToken in ReadToEndAsync() once it's available after a .NET upgrade, see:
-    // https://github.com/dotnet/runtime/pull/61898.
-#pragma warning disable S1172 // Unused method parameters should be removed
-#pragma warning disable IDE0060 // Remove unused parameter
     private static async Task<string> GetFileContentAsync(string filePath, CancellationToken cancellationToken)
-#pragma warning restore IDE0060 // Remove unused parameter
-#pragma warning restore S1172 // Unused method parameters should be removed
     {
         using var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
         using var streamReader = new StreamReader(fileStream);
-        return await streamReader.ReadToEndAsync();
+        return await streamReader.ReadToEndAsync(cancellationToken);
     }
 
     private async Task TakeSnapshotInnerAsync(string snapshotDirectoryPath)
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs b/Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs
index 29d5ae5f0..dc81be07c 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs
@@ -57,7 +57,7 @@ public class OrchardCoreUITestExecutorConfiguration
         "Design",
         "MA0016:Prefer return collection abstraction instead of implementation",
         Justification = "Deliberately modifiable by consumer code.")]
-    public Dictionary<string, object> CustomConfiguration { get; } = new();
+    public Dictionary<string, object> CustomConfiguration { get; } = [];
 
     public BrowserConfiguration BrowserConfiguration { get; set; } = new();
     public TimeoutConfiguration TimeoutConfiguration { get; set; } = TimeoutConfiguration.Default;
diff --git a/Lombiq.Tests.UI/Services/PortLeaseManager.cs b/Lombiq.Tests.UI/Services/PortLeaseManager.cs
index fd119faf0..db1ee1beb 100644
--- a/Lombiq.Tests.UI/Services/PortLeaseManager.cs
+++ b/Lombiq.Tests.UI/Services/PortLeaseManager.cs
@@ -22,7 +22,7 @@ namespace Lombiq.Tests.UI.Services;
 public class PortLeaseManager
 {
     private readonly IEnumerable<int> _availablePortsRange;
-    private readonly HashSet<int> _usedPorts = new();
+    private readonly HashSet<int> _usedPorts = [];
     private readonly SemaphoreSlim _portAcquisitionLock = new(1, 1);
 
     public PortLeaseManager(int lowerBound, int upperBound) =>
diff --git a/Lombiq.Tests.UI/Services/SmtpService.cs b/Lombiq.Tests.UI/Services/SmtpService.cs
index d198932c8..28b4d8a8a 100644
--- a/Lombiq.Tests.UI/Services/SmtpService.cs
+++ b/Lombiq.Tests.UI/Services/SmtpService.cs
@@ -2,17 +2,13 @@
 using Lombiq.HelpfulLibraries.Cli;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Services;
 
-// Here for future use.
-#pragma warning disable S2094 // Classes should not be empty
 public class SmtpServiceConfiguration
-#pragma warning restore S2094 // Classes should not be empty
 {
 }
 
@@ -43,10 +39,6 @@ public sealed class SmtpService : IAsyncDisposable
     private int _webUIPort;
     private CancellationTokenSource _cancellationTokenSource;
 
-    [SuppressMessage(
-        "Performance",
-        "CA1810:Initialize reference type static fields inline",
-        Justification = "No GetAgentIndexOrDefault() duplication this way.")]
     static SmtpService()
     {
         var agentIndexTimesHundred = TestConfigurationManager.GetAgentIndexOrDefault() * 100;
@@ -128,7 +120,7 @@ public async ValueTask DisposeAsync()
 
         if (_cancellationTokenSource != null && !_cancellationTokenSource.IsCancellationRequested)
         {
-            _cancellationTokenSource.Cancel();
+            await _cancellationTokenSource.CancelAsync();
             _cancellationTokenSource.Dispose();
         }
     }
diff --git a/Lombiq.Tests.UI/Services/SqlServerManager.cs b/Lombiq.Tests.UI/Services/SqlServerManager.cs
index cc0e13a0b..249e6885f 100644
--- a/Lombiq.Tests.UI/Services/SqlServerManager.cs
+++ b/Lombiq.Tests.UI/Services/SqlServerManager.cs
@@ -9,7 +9,6 @@
 using Microsoft.SqlServer.Management.Smo;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -55,10 +54,6 @@ public sealed class SqlServerManager : IAsyncDisposable
     private string _password;
     private bool _isDisposed;
 
-    [SuppressMessage(
-        "Performance",
-        "CA1810:Initialize reference type static fields inline",
-        Justification = "No GetAgentIndexOrDefault() duplication this way.")]
     static SqlServerManager()
     {
         var agentIndexTimesHundred = TestConfigurationManager.GetAgentIndexOrDefault() * 100;
@@ -272,7 +267,7 @@ private static object[] CreateArguments(string containerName, params object[] co
         var arguments = new List<object> { "exec", "-u", 0, containerName };
         arguments.AddRange(command);
 
-        return arguments.ToArray();
+        return [.. arguments];
     }
 
     public async ValueTask DisposeAsync()
diff --git a/Lombiq.Tests.UI/Services/UITestContext.cs b/Lombiq.Tests.UI/Services/UITestContext.cs
index a1da23400..29c9fd4e1 100644
--- a/Lombiq.Tests.UI/Services/UITestContext.cs
+++ b/Lombiq.Tests.UI/Services/UITestContext.cs
@@ -13,7 +13,7 @@ namespace Lombiq.Tests.UI.Services;
 
 public class UITestContext
 {
-    private readonly List<LogEntry> _historicBrowserLog = new();
+    private readonly List<LogEntry> _historicBrowserLog = [];
 
     /// <summary>
     /// Gets the globally unique ID of this context. You can use this ID to refer to the current text execution in
@@ -81,7 +81,7 @@ public class UITestContext
         "Design",
         "MA0016:Prefer return collection abstraction instead of implementation",
         Justification = "Deliberately modifiable by consumer code.")]
-    public Dictionary<string, object> CustomContext { get; } = new();
+    public Dictionary<string, object> CustomContext { get; } = [];
 
     /// <summary>
     /// Gets a dictionary storing some custom data for collecting in the failure dump.
diff --git a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
index a43208fce..2149641a7 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
@@ -17,7 +17,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -561,7 +560,7 @@ Task SqlServerManagerBeforeTakeSnapshotHandlerAsync(string contentRootPath, stri
                 // user without access to freshly created directories by the current user. Since this is a subdirectory
                 // that third parties can't list without prior knowledge and it only contains freshly created data this
                 // is not a security concern.
-                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (!OperatingSystem.IsWindows())
                 {
                     if (!Directory.Exists(snapshotDirectoryPath)) Directory.CreateDirectory(snapshotDirectoryPath);
                     var unixFileInfo = new UnixFileInfo(snapshotDirectoryPath);
diff --git a/Lombiq.Tests.UI/Services/UITestExecutorFailureDumpConfiguration.cs b/Lombiq.Tests.UI/Services/UITestExecutorFailureDumpConfiguration.cs
index dd349f118..1efcd1b6f 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutorFailureDumpConfiguration.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutorFailureDumpConfiguration.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System;
 
 namespace Lombiq.Tests.UI.Services;
 
@@ -9,7 +9,7 @@ public class UITestExecutorFailureDumpConfiguration
     /// containing the name of the test method, without the name of the test class and its namespace. This is to
     /// overcome the 260 character path length limitations on Windows. Defaults to <see langword="true"/> on Windows.
     /// </summary>
-    public bool UseShortNames { get; set; } = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+    public bool UseShortNames { get; set; } = OperatingSystem.IsWindows();
 
     public string DumpsDirectoryPath { get; set; } = "FailureDumps";
     public bool CreateFailureDump { get; set; } = true;
diff --git a/Lombiq.Tests.UI/Services/WebDriverFactory.cs b/Lombiq.Tests.UI/Services/WebDriverFactory.cs
index 0b30f475a..d27325bdc 100644
--- a/Lombiq.Tests.UI/Services/WebDriverFactory.cs
+++ b/Lombiq.Tests.UI/Services/WebDriverFactory.cs
@@ -10,7 +10,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Services;
@@ -73,7 +72,7 @@ public static Task<EdgeDriver> CreateEdgeDriverAsync(BrowserConfiguration config
             // While the Edge driver easily locates Edge on Windows, it struggles on Linux, where the different release
             // channels have different executable names. This setting looks up the "microsoft-edge-stable" command and
             // sets the full path as the browser's binary location.
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
+            if (!OperatingSystem.IsWindows() &&
                 (await CliWrapHelper.WhichAsync("microsoft-edge-stable"))?.FirstOrDefault() is { } binaryLocation)
             {
                 options.BinaryLocation = binaryLocation.FullName;
diff --git a/Lombiq.Tests.UI/UITestBase.cs b/Lombiq.Tests.UI/UITestBase.cs
index 9b15a64cd..c23e0aa66 100644
--- a/Lombiq.Tests.UI/UITestBase.cs
+++ b/Lombiq.Tests.UI/UITestBase.cs
@@ -38,10 +38,7 @@ protected async Task ExecuteOrchardCoreTestAsync(
         finally
         {
             _testOutputHelper = originalTestOutputHelper;
-            // This warning is a false positive as it is not considering the evaluation of the if statement above.
-#pragma warning disable S2583 // Conditionally executed code should be reachable
             afterTest?.Invoke();
-#pragma warning restore S2583 // Conditionally executed code should be reachable
         }
     }
 }