OSOE-751: Upgrade to Orchard Core 1.8

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>

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}");

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. -->

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;
 
@@ -12,7 +11,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);

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'">

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,19 +37,19 @@
     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(
     Id = Workflows,
     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",
-    }
+    ]
 )]

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>

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);
     }

Lombiq.Tests.UI/Extensions/ExtendedLoggingExtensions.cs

@@ -129,7 +129,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 () =>

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;
     }

Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs

@@ -9,6 +9,7 @@
 using OrchardCore.ContentFields.ViewModels;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -37,7 +38,9 @@ public static Task GoToAdminRelativeUrlAsync(
     public static Task GoToAbsoluteUrlAsync(this UITestContext context, Uri absoluteUri, bool onlyIfNotAlreadyThere = true) =>
         context.ExecuteLoggedAsync(
             nameof(GoToAbsoluteUrlAsync),
-            $"{absoluteUri} ({(onlyIfNotAlreadyThere ? "navigating also" : "not navigating")} if already there)",
+            string.Create(
+                CultureInfo.InvariantCulture,
+                $"{absoluteUri} ({(onlyIfNotAlreadyThere ? "navigating also" : "not navigating")} if already there)"),
             async () =>
             {
                 if (onlyIfNotAlreadyThere && context.GetCurrentUri() == absoluteUri) return;

Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs

@@ -343,9 +343,7 @@ public static Task<ApplicationInfo> GetApplicationInfoAsync(this UITestContext c
         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.

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)

Lombiq.Tests.UI/Extensions/TypedRouteUITestContextExtensions.cs

@@ -43,11 +43,19 @@ 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
+    {
+#pragma warning disable CA2000 // Dispose objects before losing scope
+        // We can't dispose the scope here because it would lead to exceptions in the consumers.
+        var serviceProvider = CreateServiceProvider(context);
+#pragma warning restore CA2000 // Dispose objects before losing scope
+        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 +65,20 @@ 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
+    {
+#pragma warning disable CA2000 // Dispose objects before losing scope
+        // We can't dispose the scope here because it would lead to exceptions in the consumers.
+        var serviceProvider = CreateServiceProvider(context);
+#pragma warning restore CA2000 // Dispose objects before losing scope
+
+        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 +101,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();
 

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.

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));
             }

Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs

@@ -5,6 +5,8 @@ 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>
@@ -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");

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
@@ -72,10 +72,10 @@
     <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" />

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();
     }

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, nameof(FailureDumpItemGeneric<TContent>));
 
         if (_content is Stream stream && _getStream == null)
         {

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;
 

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.