OSOE-818: Upgrade to Orchard Core 2.0

.github/actions/spelling/allow.txt

@@ -3,6 +3,7 @@ autorun
 barcode
 chainable
 clickable
+cloudflare
 entra
 flyout
 hackish

.gitignore

@@ -199,3 +199,4 @@ src/*.Web/Localization
 /test.out
 .ps1-analyzer-stamp
 /NDependOut/
+/build.binlog

NuGet.config

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <!-- Here, so the Visual Studio package manager won't default to the next feed below. -->
+    <!-- Ignore global configuration -->
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+      <!-- OrchardCore.Translations.All is on a separate repo and doesn't have a preview -->
+      <package pattern="OrchardCore.Translations.*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>

NuGetTest/NuGet.config

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <!-- Here so the Visual Studio package manager won't default to the next feed below. -->
+    <!-- Ignore global configuration -->
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
-    <!-- Use this to test packages that you published to a local folder. Restart Visual Studio if you change it. -->
-    <!--<add key="Test Source" value="c:\packages" />-->
   </packageSources>
 </configuration>

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

@@ -19,48 +19,49 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="6.0.1" />
-    <PackageReference Include="Lombiq.BaseTheme" Version="7.0.0" />
-    <PackageReference Include="Lombiq.BaseTheme.Samples" Version="7.0.0" />
-    <PackageReference Include="Lombiq.ChartJs" Version="7.0.1" />
-    <PackageReference Include="Lombiq.ChartJs.Samples" Version="7.0.1" />
-    <PackageReference Include="Lombiq.ContentEditors" Version="3.0.1" />
-    <PackageReference Include="Lombiq.ContentEditors.Samples" Version="3.0.1" />
-    <PackageReference Include="Lombiq.DataTables" Version="8.0.1" />
-    <PackageReference Include="Lombiq.DataTables.Samples" Version="8.0.1" />
-    <PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.1" />
-    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="8.1.0" />
-    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="5.0.1" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.JsonEditor" Version="7.0.2" />
-    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="7.0.2" />
-    <PackageReference Include="Lombiq.LoginAsAnybody" Version="3.0.1-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Privacy" Version="8.0.1" />
-    <PackageReference Include="Lombiq.Privacy.Samples" Version="8.0.1" />
-    <PackageReference Include="Lombiq.SetupExtensions" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="10.0.2-alpha.4.osoe-861" />
-    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="10.0.2-alpha.4.osoe-861" />
-    <PackageReference Include="Lombiq.UIKit" Version="7.0.1" />
-    <PackageReference Include="Lombiq.VueJs" Version="6.0.0" />
-    <PackageReference Include="Lombiq.VueJs.Samples" Version="6.0.0" />
-    <PackageReference Include="Lombiq.Walkthroughs" Version="1.0.2-alpha.4.osoe-861" />
+    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="7.0.0" />
+    <PackageReference Include="Lombiq.BaseTheme" Version="8.0.0" />
+    <PackageReference Include="Lombiq.BaseTheme.Samples" Version="8.0.0" />
+    <PackageReference Include="Lombiq.ChartJs" Version="8.0.0" />
+    <PackageReference Include="Lombiq.ChartJs.Samples" Version="8.0.0" />
+    <PackageReference Include="Lombiq.ContentEditors" Version="4.0.0" />
+    <PackageReference Include="Lombiq.ContentEditors.Samples" Version="4.0.0" />
+    <PackageReference Include="Lombiq.DataTables" Version="9.0.0" />
+    <PackageReference Include="Lombiq.DataTables.Samples" Version="9.0.0" />
+    <PackageReference Include="Lombiq.HelpfulExtensions" Version="9.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="11.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="9.0.0" />
+    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="6.0.0" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="8.0.0" />
+    <PackageReference Include="Lombiq.JsonEditor" Version="8.0.0" />
+    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.LoginAsAnybody" Version="4.0.0" />
+    <PackageReference Include="Lombiq.Privacy" Version="9.0.0" />
+    <PackageReference Include="Lombiq.Privacy.Samples" Version="9.0.0" />
+    <PackageReference Include="Lombiq.SetupExtensions" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="11.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="11.0.0" />
+    <PackageReference Include="Lombiq.UIKit" Version="8.0.0" />
+    <PackageReference Include="Lombiq.VueJs" Version="7.0.0" />
+    <PackageReference Include="Lombiq.VueJs.Samples" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Walkthroughs" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.1" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Recipes/Lombiq.OSOCE.NuGet.Tests.recipe.json

@@ -17,6 +17,7 @@
       "name": "feature",
       "disable": [],
       "enable": [
+        "OrchardCore.Email.Smtp",
         "OrchardCore.Localization",
         "Lombiq.AuditTrailExtensions",
         "Lombiq.ChartJs",

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

@@ -16,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="10.0.0" />
-    <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" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="11.0.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
   </ItemGroup>
 
 </Project>

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

@@ -21,10 +21,10 @@
 
   <ItemGroup>
     <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.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" />
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0" />
   </ItemGroup>
 
 </Project>

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj

@@ -13,36 +13,38 @@
     <Content Include=".htmlvalidate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="BehaviorWalkthroughsTests.htmlvalidate.json">
+    <Content Include="*.htmlvalidate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="7.0.0" />
-    <PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="7.0.1" />
-    <PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="3.0.1" />
-    <PackageReference Include="Lombiq.DataTables.Tests.UI" Version="8.0.1" />
-    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="8.1.0" />
-    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="5.0.1" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="6.0.1" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="7.0.2-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="7.0.2" />
-    <PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="3.0.1-alpha.1.nest-501" />
-    <PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="5.0.1-alpha.2.osoe-617" />
-    <PackageReference Include="Lombiq.Privacy.Tests.UI" Version="8.0.1" />
-    <PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="8.0.1" />
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.4.osoe-861" />
-    <PackageReference Include="Lombiq.VueJs.Tests.UI" Version="6.0.0" />
-    <PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="1.0.2-alpha.4.osoe-861" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="11.0.0" />
+    <PackageReference Include="Lombiq.HelpfulExtensions" Version="9.0.0" />
+    <PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="4.0.0" />
+    <PackageReference Include="Lombiq.DataTables.Tests.UI" Version="9.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="9.0.0" />
+    <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="6.0.0" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="4.0.0" />
+    <PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="6.0.0" />
+    <PackageReference Include="Lombiq.Privacy.Tests.UI" Version="9.0.0" />
+    <PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="9.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="11.0.0" />
+    <PackageReference Include="Lombiq.VueJs.Tests.UI" Version="7.0.0" />
+    <PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/NoUniqueLandmark.htmlvalidate.json

@@ -0,0 +1,11 @@
+{
+  "extends": [
+    "./default.htmlvalidate.json"
+  ],
+
+  "rules": {
+    "unique-landmark": "off"
+  },
+
+  "root": true
+}

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs

@@ -1,4 +1,5 @@
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.Extensions;
+using Lombiq.Tests.UI.Extensions;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -21,8 +22,14 @@ public Task EmailQuotaShouldBlockEmailsOverLimitAndWarn() =>
     [Fact]
     public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFromConfig() =>
         ExecuteTestAfterSetupAsync(
-            context => context.TestEmailQuotaManagementBehaviorAsync(1, moduleShouldInterfere: false),
-            // The default SMTP host is localhost during UI tests, we set it to 127.0.0.1 to be able to send emails,
-            // but the Email Quota module shouldn't interfere.
-            configuration => configuration.SetEmailQuotaManagementOptionsForUITest(1, "127.0.0.1"));
+            async context =>
+            {
+                // The default SMTP host is localhost during UI tests. We set it to 127.0.0.1 to still be able to send
+                // emails (since localhost and 127.0.0.1 is the same), but the Email Quota module shouldn't interfere,
+                // thinking it's a non-default host.
+                await context.SignInDirectlyAndGoToDashboardAsync();
+                await context.ConfigureSmtpSettingsAsync("sender@example.com", "127.0.0.1");
+                await context.TestEmailQuotaManagementBehaviorAsync(1, moduleShouldInterfere: false);
+            },
+            configuration => configuration.SetEmailQuotaManagementOptionsForUITest(1));
 }

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorWalkthroughsTests.cs

@@ -1,10 +1,4 @@
-using Lombiq.Tests.UI.Extensions;
-using Lombiq.Tests.UI.Services;
 using Lombiq.Walkthroughs.Tests.UI.Extensions;
-using OpenQA.Selenium;
-using Shouldly;
-using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -22,23 +16,7 @@ public BehaviorWalkthroughsTests(ITestOutputHelper testOutputHelper)
     public Task WalkthroughsShouldWorkCorrectly() =>
         ExecuteTestAsync(
             context => context.RunSetupAndTestWalkthroughsBehaviorAsync(),
-            // Could be removed if https://github.com/shepherd-pro/shepherd/issues/2555 is fixed.
-            changeConfiguration: configuration =>
-            {
-                configuration.HtmlValidationConfiguration
-                    .WithRelativeConfigPath("BehaviorWalkthroughsTests.htmlvalidate.json");
-
-                configuration.AssertBrowserLog = logEntries => logEntries.ShouldNotContain(
-                    logEntry => IsValidLogEntry(logEntry),
-                    logEntries.Where(IsValidLogEntry).ToFormattedString());
-            });
-
-    private static bool IsValidLogEntry(LogEntry logEntry) =>
-        OrchardCoreUITestExecutorConfiguration.IsValidBrowserLogEntry(logEntry) &&
-        // See https://github.com/OrchardCMS/OrchardCore/issues/15301.
-        !(logEntry.Message.ContainsOrdinalIgnoreCase("/OrchardCore.Resources/Scripts/jquery.js?v=") &&
-            logEntry.Message.ContainsOrdinalIgnoreCase("Uncaught")) &&
-        // See https://github.com/OrchardCMS/OrchardCore/issues/14598. This error has multiple variations, so targeting
-        // the lowest common denominator with the file name.
-        !logEntry.Message.ContainsOrdinalIgnoreCase("/monaco/IStandaloneEditorConstructionOptions.json");
+            changeConfiguration: configuration => configuration
+                .HtmlValidationConfiguration
+                .WithRelativeConfigPath("NoUniqueLandmark.htmlvalidate.json"));
 }

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests/Lombiq.OSOCE.NuGet.Tests.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="10.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="11.0.0" />
     <PackageReference Include="Lombiq.Tests" Version="3.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">