OSOE-751: Upgrade to Orchard Core 1.8

.github/workflows/build-and-test-windows.yml

@@ -33,7 +33,7 @@ jobs:
     if: github.ref_name != github.event.repository.default_branch &&
         (github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build')
     name: Build and Test Windows - root solution (larger runners)
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: "root-solution-larger-runners"
       machine-types: "['windows-2022-8core']"
@@ -51,7 +51,7 @@ jobs:
     # Since dev builds are not awaited by anyone, they can run on the slower free runners.
     if: github.ref_name == github.event.repository.default_branch
     name: Build and Test Windows - root solution (standard runners)
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: "root-solution-standard-runners"
       machine-types: "['windows-2022']"
@@ -69,7 +69,7 @@ jobs:
         github.event_name == 'workflow_dispatch' ||
         github.event.label.name == 'run-windows-build'
     name: Build and Test Windows - NuGetTest solution
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: "nuget-solution"
       machine-types: "['windows-2022']"

.github/workflows/build-and-test.yml

@@ -11,7 +11,7 @@ jobs:
   build-and-test-larger-runners:
     if: github.ref_name != github.event.repository.default_branch
     name: Build and Test - root solution (larger runners)
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: "root-solution-larger-runners"
       machine-types: "['buildjet-4vcpu-ubuntu-2204']"
@@ -28,7 +28,7 @@ jobs:
     # Since dev builds are not awaited by anyone, they can run on the slower free runners.
     if: github.ref_name == github.event.repository.default_branch
     name: Build and Test - root solution (standard runners)
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: "root-solution-standard-runners"
       timeout-minutes: 50
@@ -39,7 +39,7 @@ jobs:
 
   build-and-test-nuget-test:
     name: Build and Test - NuGetTest solution
-    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
     with:
       parent-job-name: nuget-solution
       build-directory: NuGetTest

NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
     <!-- Test value for Lombiq.Hosting.BuildVersionDisplay. Intentionally different than the value in its props file. -->
@@ -19,48 +19,48 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="5.0.0" />
-    <PackageReference Include="Lombiq.BaseTheme" Version="5.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.BaseTheme.Samples" Version="5.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.ChartJs" Version="6.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.ChartJs.Samples" Version="6.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.ContentEditors" Version="2.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.ContentEditors.Samples" Version="2.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.DataTables" Version="7.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.DataTables.Samples" Version="7.0.2-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.2" />
-    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="7.0.2-alpha.1.osoe-733" />
-    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="4.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.1.osoe-775" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.1.osoe-775" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.0-alpha.2.lmbq-249" />
-    <PackageReference Include="Lombiq.JsonEditor" Version="6.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.LoginAsAnybody" Version="1.0.0" />
-    <PackageReference Include="Lombiq.Privacy" Version="7.0.2-alpha.2.osoe-638" />
-    <PackageReference Include="Lombiq.Privacy.Samples" Version="7.0.2-alpha.2.osoe-638" />
-    <PackageReference Include="Lombiq.SetupExtensions" Version="5.0.0" />
-    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="8.2.1-alpha.16.osoe-771" />
-    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.16.osoe-771" />
-    <PackageReference Include="Lombiq.UIKit" Version="6.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.VueJs" Version="3.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.VueJs.Samples" Version="3.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.4.osoe-771" />
+    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="5.0.1-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.BaseTheme" Version="5.0.3-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.BaseTheme.Samples" Version="5.0.3-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.ChartJs" Version="6.0.3-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.ChartJs.Samples" Version="6.0.3-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.ContentEditors" Version="2.0.2-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.ContentEditors.Samples" Version="2.0.2-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.DataTables" Version="7.0.3-alpha.4.osoe-751" />
+    <PackageReference Include="Lombiq.DataTables.Samples" Version="7.0.3-alpha.4.osoe-751" />
+    <PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.3-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="7.0.2-alpha.5.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="4.0.2-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.2-alpha.2.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.2-alpha.2.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.2-alpha.2.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.1-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.JsonEditor" Version="6.0.2-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.2-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.LoginAsAnybody" Version="1.0.1-alpha.2.osoe-751" />
+    <PackageReference Include="Lombiq.Privacy" Version="7.0.3-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.Privacy.Samples" Version="7.0.3-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.SetupExtensions" Version="5.0.1-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="8.2.1-alpha.20.osoe-751" />
+    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.20.osoe-751" />
+    <PackageReference Include="Lombiq.UIKit" Version="6.0.2-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.VueJs" Version="3.0.2-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.VueJs.Samples" Version="3.0.2-alpha.3.osoe-751" />
+    <PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.8.osoe-751" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -69,4 +69,8 @@
     <ProjectReference Include="..\Themes\Lombiq.OSOCE.NuGet.TestTheme\Lombiq.OSOCE.NuGet.TestTheme.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Lombiq.Analyzers.OrchardCore" Version="4.0.1-alpha.0.osoe-751" />
+  </ItemGroup>
+
 </Project>

NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs

@@ -18,7 +18,7 @@
         .ConfigureFeaturesGuard(
             new Dictionary<string, IEnumerable<string>>
             {
-                ["OrchardCore.Twitter"] = new[] { "Lombiq.UIKit", "Lombiq.ChartJs" },
+                ["OrchardCore.Twitter"] = ["Lombiq.UIKit", "Lombiq.ChartJs"],
             })
         .EnableAutoSetupIfNotUITesting(configuration));
 

NuGetTest/src/Modules/Lombiq.OSOCE.NuGet.TestModule/Lombiq.OSOCE.NuGet.TestModule.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -16,11 +16,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.1-alpha.7.osoe-751" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Lombiq.Analyzers.OrchardCore" Version="4.0.1-alpha.0.osoe-751" />
   </ItemGroup>
 
 </Project>

NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/Lombiq.OSOCE.NuGet.TestTheme.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -21,10 +21,14 @@
 
   <ItemGroup>
     <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Lombiq.Analyzers.OrchardCore" Version="4.0.1-alpha.0.osoe-751" />
   </ItemGroup>
 
 </Project>

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Helpers/AssertBrowserLogHelpers.cs

@@ -0,0 +1,24 @@
+using Atata.HtmlValidation;
+using Lombiq.Tests.UI.Extensions;
+using OpenQA.Selenium;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Lombiq.OSOCE.NuGet.Tests.UI.Helpers;
+public static class AssertHtmlAndBrowserErrorsHelper
+{
+    public static readonly Action<IEnumerable<LogEntry>> AssertBrowserLogIsEmpty =
+        logEntries => logEntries.Where(
+            logEntry => !logEntry.Message.ContainsOrdinalIgnoreCase("Prefer to use the native <button> element"));
+
+    public static readonly Func<HtmlValidationResult, Task> AssertHtmlErrorsAreEmpty = async errors =>
+    {
+        var errorResult = (await errors.GetErrorsAsync())
+        .Where(error => !error.ContainsOrdinalIgnoreCase("Prefer to use the native <button> element"));
+
+        errorResult.ShouldBeEmpty();
+    };
+}