OSOE-925: Upgrade OC preview (⚠️ breaking changes)

.github/workflows/publish-cloudsmith.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   publish-nuget:
     name: Publish to Cloudsmith
-    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-925
     with:
       source: https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json
     secrets:

.github/workflows/publish-nuget.yml

@@ -9,6 +9,6 @@ jobs:
   publish-nuget:
     name: Publish to NuGet
     if: ${{ !contains(github.ref_name, '-preview.') }}
-    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-925
     secrets:
       API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}

.github/workflows/validate-nuget-publish.yml

@@ -9,4 +9,4 @@ on:
 jobs:
   validate-nuget-publish:
     name: Validate NuGet Publish
-    uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@issue/OSOE-925

Lombiq.Tests.UI.AdminTheme/Constants/FeatureIds.cs

@@ -0,0 +1,6 @@
+namespace Lombiq.Tests.UI.AdminTheme.Constants;
+
+public static class FeatureIds
+{
+    public const string Area = "Lombiq.Tests.UI.AdminTheme";
+}

Lombiq.Tests.UI.AdminTheme/Constants/ResourceNames.cs

@@ -0,0 +1,8 @@
+namespace Lombiq.Tests.UI.AdminTheme.Constants;
+
+public static class ResourceNames
+{
+    private const string Prefix = FeatureIds.Area + ".";
+
+    public const string General = Prefix + nameof(General);
+}

Lombiq.Tests.UI.AdminTheme/Lombiq.Tests.UI.AdminTheme.csproj

@@ -0,0 +1,21 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Theme.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Theme.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
+
+  <PropertyGroup>
+    <Title>Lombiq UI Testing Toolbox - Admin Theme</Title>
+    <CopyrightYear>2020</CopyrightYear>
+    <DescriptionBody>Adjustments for the stock Orchard Core admin theme to make it more automation-friendly.</DescriptionBody>
+    <PackageTags>OrchardCore;Lombiq;AspNetCore;Selenium;Atata;Shouldly;xUnit;Axe;AccessibilityTesting;UITesting;Testing;Automation</PackageTags>
+    <RepositoryUrl>https://github.com/Lombiq/UI-Testing-Toolbox</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Lombiq/UI-Testing-Toolbox/tree/dev/Lombiq.Tests.UI.AdminTheme</PackageProjectUrl>
+  </PropertyGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Theme.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Theme.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
+</Project>

Lombiq.Tests.UI.AdminTheme/Manifest.cs

@@ -0,0 +1,12 @@
+using OrchardCore.DisplayManagement.Manifest;
+using OrchardCore.Modules.Manifest;
+
+[assembly: Theme(
+    Name = "Lombiq UI Testing Toolbox - Admin Theme",
+    Author = "Lombiq Technologies",
+    Website = "https://github.com/Lombiq/UI-Testing-Toolbox",
+    Version = "0.0.1",
+    Description = "Adjustments for the stock Orchard Core admin theme to make it more automation-friendly.",
+    BaseTheme = "TheAdmin",
+    Dependencies = ["OrchardCore.Themes", "TheAdmin"],
+    Tags = [ManifestConstants.AdminTag])]

Lombiq.Tests.UI.AdminTheme/ResourceManagementOptionsConfiguration.cs

@@ -0,0 +1,12 @@
+using Lombiq.HelpfulLibraries.OrchardCore.ResourceManagement;
+using Lombiq.Tests.UI.AdminTheme.Constants;
+
+namespace Lombiq.Tests.UI.AdminTheme;
+
+public class ResourceManagementOptionsConfiguration : ResourceManagementOptionsConfiguratorBase
+{
+    protected override string Area => FeatureIds.Area;
+
+    protected override void Configure(ResourceManagementContext context) =>
+        context.DefineStyle(ResourceNames.General, "general.css");
+}

Lombiq.Tests.UI.AdminTheme/Startup.cs

@@ -0,0 +1,18 @@
+using Lombiq.Tests.UI.AdminTheme.Constants;
+using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Modules;
+
+namespace Lombiq.Tests.UI.AdminTheme;
+
+public class Startup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddResourceManagementConfiguration<ResourceManagementOptionsConfiguration>();
+        services.AddResourceFilter(
+            builder => builder
+                .Always()
+                .RegisterStylesheet(ResourceNames.General),
+            FeatureIds.Area);
+    }
+}

Lombiq.Tests.UI.AdminTheme/wwwroot/css/general.css

@@ -0,0 +1,5 @@
+/* Forcefully remove all CSS animations from the page. This greatly improves screenshot and menu navigation reliability
+   without compromising the test's authenticity. */
+* {
+    transition: none !important; /* stylelint-disable-line declaration-no-important */
+}

Lombiq.Tests.UI.AppExtensions/CompatibilitySuppressions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>net8.0</Target>
+  </Suppression>
+</Suppressions>

Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj

@@ -1,44 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
-    <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.12.osoe-1208" />
+
   <PropertyGroup>
     <Title>Lombiq UI Testing Toolbox - App Extensions</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2020, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq UI Testing Toolbox - App Extensions: UI testing-related configuration extensions for the web app under test. See the project website for detailed documentation.</Description>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
+    <CopyrightYear>2020</CopyrightYear>
+    <DescriptionBody>UI testing-related configuration extensions for the web app under test.</DescriptionBody>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Selenium;Atata;Shouldly;xUnit;Axe;AccessibilityTesting;UITesting;Testing;Automation</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/UI-Testing-Toolbox</RepositoryUrl>
-    <PackageProjectUrl></PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="2.1.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="2.1.0" />
-    <PackageReference Include="OrchardCore.Liquid" Version="2.1.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
     <ProjectReference Include="..\..\..\src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
   </ItemGroup>
 
-
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.5.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.6.1-alpha.7.osoe-925" />
   </ItemGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.12.osoe-1208" />
 </Project>

Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj

@@ -1,11 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Tests.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
+
   <ItemGroup>
     <None Remove=".htmlvalidate.json" />
     <None Remove="Tests\CustomZapAutomationFrameworkPlan.yml" />
@@ -14,34 +15,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include=".htmlvalidate.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Recipes\Lombiq.OSOCE.Tests.Elasticsearch.recipe.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="Tests\CustomZapAutomationFrameworkPlan.yml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
-    <PackageReference Include="xunit.v3" Version="3.2.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <Content Include=".htmlvalidate.json" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="Recipes\Lombiq.OSOCE.Tests.Elasticsearch.recipe.json" CopyToOutputDirectory="PreserveNewest" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" />
+    <Content Include="Tests\CustomZapAutomationFrameworkPlan.yml" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Lombiq.OSOCE.Web\Lombiq.OSOCE.Web.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
   </ItemGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../src/Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Tests.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
 </Project>

Lombiq.Tests.UI.Samples/Recipes/Lombiq.OSOCE.Tests.Elasticsearch.recipe.json

@@ -20,7 +20,7 @@
       "name": "feature",
       "disable": [],
       "enable": [
-        "OrchardCore.Search.Elasticsearch",
+        "OrchardCore.Elasticsearch",
         "OrchardCore.Search"
       ]
     },
@@ -29,25 +29,119 @@
       "Indices": [
         {
           "elasticsearchshouldwork": {
-            "AnalyzerName": "standard",
-            "IndexLatest": false,
-            "IndexedContentTypes": [
-              "BlogPost"
-            ],
-            "Culture": "any",
-            "StoreSourceData": true
+            "Id": "elasticsearchshouldwork000",
+            "ProviderName": "Elasticsearch",
+            "Type": "Content",
+            "CreatedUtc": "2026-01-17T19:21:17Z",
+            "Properties": {
+              "ContentIndexMetadata": {
+                "IndexLatest": false,
+                "IndexedContentTypes": [
+                  "BlogPost"
+                ],
+                "Culture": "any"
+              },
+              "ElasticsearchIndexMetadata": {
+                "StoreSourceData": true,
+                "AnalyzerName": "standard",
+                "IndexMappings": {
+                  "KeyFieldName": "ContentItemId",
+                  "Mapping": {
+                    "dynamic_templates": [
+                      {
+                        "*.Inherited": {
+                          "mapping": {
+                            "type": "keyword"
+                          },
+                          "match_mapping_type": "string",
+                          "path_match": "*.Inherited"
+                        }
+                      },
+                      {
+                        "*.Ids": {
+                          "mapping": {
+                            "type": "keyword"
+                          },
+                          "match_mapping_type": "string",
+                          "path_match": "*.Ids"
+                        }
+                      },
+                      {
+                        "*.Location": {
+                          "mapping": {
+                            "type": "geo_point"
+                          },
+                          "match_mapping_type": "object",
+                          "path_match": "*.Location"
+                        }
+                      }
+                    ],
+                    "properties": {
+                      "ContentItemId": {
+                        "type": "keyword"
+                      },
+                      "ContentItemVersionId": {
+                        "type": "keyword"
+                      },
+                      "Content.ContentItem.Owner": {
+                        "type": "keyword"
+                      },
+                      "Content.ContentItem.FullText": {
+                        "type": "text"
+                      },
+                      "Content.ContentItem.ContainedPart": {
+                        "properties": {
+                          "Ids": {
+                            "type": "keyword"
+                          },
+                          "Order": {
+                            "type": "float"
+                          }
+                        },
+                        "type": "object"
+                      },
+                      "Content.ContentItem.DisplayText": {
+                        "properties": {
+                          "Analyzed": {
+                            "type": "text"
+                          },
+                          "Normalized": {
+                            "type": "keyword"
+                          },
+                          "Keyword": {
+                            "type": "keyword"
+                          }
+                        },
+                        "type": "object"
+                      },
+                      "Content.ContentItem.ContentType": {
+                        "type": "keyword"
+                      }
+                    },
+                    "_source": {
+                      "enabled": true,
+                      "excludes": [
+                        "Content.ContentItem.DisplayText.Analyzed"
+                      ]
+                    }
+                  }
+                }
+              },
+              "ElasticsearchDefaultQueryMetadata": {
+                "QueryAnalyzerName": "standard",
+                "DefaultSearchFields": [
+                  "Content.ContentItem.FullText"
+                ]
+              }
+            }
           }
         }
       ]
     },
     {
       "name": "Settings",
-      "ElasticSettings": {
-        "SearchIndex": "elasticsearchshouldwork",
-        "DefaultSearchFields": [
-          "Content.ContentItem.FullText"
-        ],
-        "AllowElasticQueryStringQueryInSearch": false
+      "SearchSettings": {
+        "DefaultIndexProfileName": "elasticsearchshouldwork"
       }
     },
     {

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

@@ -35,8 +35,7 @@ public Task TogglingFeaturesShouldWorkWithAzureBlobStorage() =>
             {
                 configuration.UseAzureBlobStorage = true;
 
-                configuration.ResponseLogFilter = e =>
-                    e.IsNonSuccessResponseAndNotExpectedNotFoundResponse(ShortcutsUITestContextExtensions.FeatureToggleTestBenchUrl);
+                configuration.WithIgnoreExpectedNotFoundResponseFilter(ShortcutsUITestContextExtensions.FeatureToggleTestBenchUrl);
             });
 }
 

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

@@ -77,8 +77,7 @@ public Task TogglingFeaturesShouldWork() =>
                 // Note that similarly, you can filter out log entries from the browser log with BrowserLogFilter. You
                 // can also adjust the assertion logic with AssertResponseLog and AssertBrowserLog, but it's best to
                 // filter out entries in the first place.
-                configuration.ResponseLogFilter = e =>
-                    e.IsNonSuccessResponseAndNotExpectedNotFoundResponse(ShortcutsUITestContextExtensions.FeatureToggleTestBenchUrl));
+                configuration.WithIgnoreExpectedNotFoundResponseFilter(ShortcutsUITestContextExtensions.FeatureToggleTestBenchUrl));
 
     // Let's see a couple more useful shortcuts in action.
     [Fact]