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.Samples/Tests/AccessibilityTest.cs

@@ -9,13 +9,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // Here we'll see how to check some web accessibility rules. Keeping our app accessible helps people with disabilities
 // consume the content of our website more easily. Do note though that only checking rules that can be automatically
 // checked is not enough for full compliance.
-public class AccessibilityTest : UITestBase
+public class AccessibilityTest(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public AccessibilityTest(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     [Fact]
     public Task FrontendPagesShouldBeAccessible() =>
         ExecuteTestAfterSetupAsync(

Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs

@@ -10,13 +10,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Up until now the Orchard app always used the default local Media storage for managing Media files. However, you may
 // use Azure Blob Storage in production. You can also test your app with it!
-public class AzureBlobStorageTests : UITestBase
+public class AzureBlobStorageTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public AzureBlobStorageTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Here we have basically two of the same tests as in BasicTests but now we're using Azure Blob Storage as the
     // site's Media storage. If they still work and there are no errors in the log then the app works with Azure Blob
     // Storage too.

Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs

@@ -10,13 +10,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // writing tests for your app is not really about testing Orchard itself but nevertheless it's useful to check if all
 // the important features like login work - keep in mind that you can break these from your own code. So, here we run
 // the whole test suite.
-public class BasicOrchardFeaturesTests : UITestBase
+public class BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // We could reuse the previously specified SetupHelpers.RecipeId const here but it's actually a different recipe for
     // this test.
     [Fact]

Lombiq.Tests.UI.Samples/Tests/BasicTests.cs

@@ -11,13 +11,8 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // We'll see some simpler tests as a start. Each of them will teach us important concepts.
-public class BasicTests : UITestBase
+public class BasicTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public BasicTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Checking that everything is OK with the homepage as an anonymous user. Note the [Fact] attribute: it's necessary
     // for xUnit.
     // Note that by default, tests are run via Chrome. Check out MultiBrowserTests for samples on using other browsers.

Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs

@@ -10,13 +10,8 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this basic test we will check visually the rendered content.
-public class BasicVisualVerificationTests : UITestBase
+public class BasicVisualVerificationTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public BasicVisualVerificationTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // This is a very basic sample to check that the header image is what we expect and looks as we expect. For this
     // magic we are using the ImageSharp.Compare package. You can find more info about it here:
     // https://github.com/Codeuctivity/ImageSharp.Compare. This looks really simple, but there is some trap to comparing

Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs

@@ -11,13 +11,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // and use that, because we don't have a pre-beaked database. Normally this feature is used to run tests when there is
 // an already existing database, so you don't need to take a snapshot before using the
 // "ExecuteTestFromExistingDBAsync()" method.
-public class DatabaseSnapshotTests : UITestBase
+public class DatabaseSnapshotTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public DatabaseSnapshotTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Here, we set up the application, then we take a snapshot of it, then we use the
     // "ExecuteTestFromExistingDBAsync()" to run the test on that. Finally, we test the basic Orchard features to check
     // that the application was set up correctly.

Lombiq.Tests.UI.Samples/Tests/EmailTests.cs

@@ -10,13 +10,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this test class we'll work with (wait for it!) e-mails. The UI Testing Toolbox provides services to run an SMTP
 // server locally that the app can use to send out e-mails, which we can then immediately check.
-public class EmailTests : UITestBase
+public class EmailTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public EmailTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     [Fact]
     public Task SendingTestEmailShouldWork() =>
         ExecuteTestAfterSetupAsync(

Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs

@@ -12,13 +12,8 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Sometimes errors are expected. Let's check out what can be done with them!
-public class ErrorHandlingTests : UITestBase
+public class ErrorHandlingTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public ErrorHandlingTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // It's easier to diagnose a test failure if you know whether an element is missing because there something is
     // actually missing or there was a server-side error. The below test visits a page where the action method throws an
     // exception.

Lombiq.Tests.UI.Samples/Tests/InteractiveModeTests.cs

@@ -14,13 +14,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // causes the test thread to wait until you've clicked on the "Continue Test" button in this tab. During that time you
 // can interact with OC as if it was a normal execution.
 // Note: this extension depends on Lombiq.Tests.UI.Shortcuts being enabled in your OC app.
-public class InteractiveModeTests : UITestBase
+public class InteractiveModeTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public InteractiveModeTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // If you want to try it out yourself, just remove the "Skip" parameter and run this test.
     [Fact(Skip = "Use this to test to try out the interactive mode. This is not a real test you can run in CI.")]
     [SuppressMessage("Usage", "xUnit1004:Test methods should not be skipped", Justification = "Only a demo.")]

Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs

@@ -17,13 +17,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // It's possible to execute monkey tests that walk through site pages and do random interactions with pages, like click,
 // scrolling, form filling, etc. Such random actions can uncover bugs that are otherwise difficult to find. Use such
 // tests plug holes in your test suite which are not covered by explicit tests.
-public class MonkeyTests : UITestBase
+public class MonkeyTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public MonkeyTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // The basic idea is that you unleash monkey testing on specific pages or sections of the site, like a contact form
     // or the content management UI. First, we test a single page.
     [Fact]

Lombiq.Tests.UI.Samples/Tests/MultiBrowserTests.cs

@@ -11,13 +11,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Up until now, all of our tests were run via Chrome. However, it's important that you can run tests with any of the
 // other supported browsers too, even running a test with all of them at once! This class shows you how.
-public class MultiBrowserTests : UITestBase
+public class MultiBrowserTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public MultiBrowserTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Remember that back in BasicTests we had AnonymousHomePageShouldExist()? We have similar super-simple tests here,
     // just demonstrating how to drive different browsers.
 

Lombiq.Tests.UI.Samples/Tests/SecurityScanningTests.cs

@@ -26,13 +26,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Note that security scanning has cross-platform support, but due to the limitations of virtualization under Windows in
 // GitHub Actions, these tests won't work there. They'll work on a Windows desktop though.
-public class SecurityScanningTests : UITestBase
+public class SecurityScanningTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public SecurityScanningTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Let's see simple use case first: Running a built-in ZAP scan.
 
     // We're running one of ZAP's built-in scans, the Baseline scan. This, as the name suggests, provides some

Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs

@@ -13,13 +13,8 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // with it, should there be any incompatibilities). Note that for this, you need an SQL Server instance running; by
 // default, this will be attempted under the default localhost server name. If you're using anything else, check out the
 // settings in SqlServerConfiguration and Docs/Configuration.md, especially if you use Docker.
-public class SqlServerTests : UITestBase
+public class SqlServerTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
-    public SqlServerTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     // Here we have basically two of the same tests as in BasicTests but now we're using SQL Server as the site's
     // database. If they still work and there are no errors in the log then the app works with SQL Server too.
     [Fact]

Lombiq.Tests.UI.Samples/Tests/TenantTests.cs

@@ -11,17 +11,12 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // You can also test multi-tenant web apps. Creating tenants on the fly is supported as well with a shortcut. If you'd
 // like to test the tenant creation-setup process itself, then look into using CreateNewTenantManuallyAsync() instead.
-public class TenantTests : UITestBase
+public class TenantTests(ITestOutputHelper testOutputHelper) : UITestBase(testOutputHelper)
 {
     private const string TestTenantName = "Test";
     private const string TestTenantUrlPrefix = "test";
     private const string TestTenantDisplayName = "Lombiq's OSOCE - Test Tenant";
 
-    public TenantTests(ITestOutputHelper testOutputHelper)
-        : base(testOutputHelper)
-    {
-    }
-
     [Fact]
     public Task CreatingTenantShouldWork() =>
         ExecuteTestAfterSetupAsync(

Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs

@@ -8,31 +8,22 @@
 namespace Lombiq.Tests.UI.Shortcuts.Controllers;
 
 [DevelopmentAndLocalhostOnly]
-public class AccountController : Controller
+public class AccountController(UserManager<IUser> userManager, SignInManager<IUser> userSignInManager) : Controller
 {
-    private readonly UserManager<IUser> _userManager;
-    private readonly SignInManager<IUser> _userSignInManager;
-
-    public AccountController(UserManager<IUser> userManager, SignInManager<IUser> userSignInManager)
-    {
-        _userManager = userManager;
-        _userSignInManager = userSignInManager;
-    }
-
     [AllowAnonymous]
     public async Task<IActionResult> SignInDirectly(string userName)
     {
         if (string.IsNullOrWhiteSpace(userName)) userName = "admin";
-        if (await _userManager.FindByNameAsync(userName) is not { } user) return NotFound();
+        if (await userManager.FindByNameAsync(userName) is not { } user) return NotFound();
 
-        await _userSignInManager.SignInAsync(user, isPersistent: false);
+        await userSignInManager.SignInAsync(user, isPersistent: false);
 
         return Ok();
     }
 
     public async Task<IActionResult> SignOutDirectly()
     {
-        await _userSignInManager.SignOutAsync();
+        await userSignInManager.SignOutAsync();
 
         return Ok();
     }

Lombiq.Tests.UI.Shortcuts/Controllers/ApplicationInfoController.cs

@@ -7,12 +7,8 @@ namespace Lombiq.Tests.UI.Shortcuts.Controllers;
 [ApiController]
 [Route("api/ApplicationInfo")]
 [DevelopmentAndLocalhostOnly]
-public class ApplicationInfoController : Controller
+public class ApplicationInfoController(IApplicationContext applicationContext) : Controller
 {
-    private readonly IApplicationContext _applicationContext;
-
-    public ApplicationInfoController(IApplicationContext applicationContext) => _applicationContext = applicationContext;
-
     [HttpGet]
-    public IActionResult Get() => Ok(_applicationContext.GetApplicationInfo());
+    public IActionResult Get() => Ok(applicationContext.GetApplicationInfo());
 }

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/Controllers/InteractiveModeController.cs

@@ -7,12 +7,9 @@ namespace Lombiq.Tests.UI.Shortcuts.Controllers;
 
 [AllowAnonymous]
 [DevelopmentAndLocalhostOnly]
-public class InteractiveModeController : Controller
+public class InteractiveModeController(IInteractiveModeStatusAccessor interactiveModeStatusAccessor) : Controller
 {
-    private readonly IInteractiveModeStatusAccessor _interactiveModeStatusAccessor;
-
-    public InteractiveModeController(IInteractiveModeStatusAccessor interactiveModeStatusAccessor) =>
-        _interactiveModeStatusAccessor = interactiveModeStatusAccessor;
+    private readonly IInteractiveModeStatusAccessor _interactiveModeStatusAccessor = interactiveModeStatusAccessor;
 
     public IActionResult Index()
     {

Lombiq.Tests.UI.Shortcuts/Controllers/MediaCachePurgeController.cs

@@ -6,16 +6,11 @@
 namespace Lombiq.Tests.UI.Shortcuts.Controllers;
 
 [Feature(ShortcutsFeatureIds.MediaCachePurge)]
-public class MediaCachePurgeController : Controller
+public class MediaCachePurgeController(IMediaFileStoreCache mediaFileStoreCache) : Controller
 {
-    private readonly IMediaFileStoreCache _mediaFileStoreCache;
-
-    public MediaCachePurgeController(IMediaFileStoreCache mediaFileStoreCache)
-        => _mediaFileStoreCache = mediaFileStoreCache;
-
     public async Task<IActionResult> PurgeMediaCacheDirectly()
     {
-        var hasErrors = await _mediaFileStoreCache.PurgeAsync();
+        var hasErrors = await mediaFileStoreCache.PurgeAsync();
 
         return hasErrors ? StatusCode(500) : Ok();
     }

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