OSOE-925: Upgrade OC preview

.github/workflows/publish-nuget.yml

@@ -8,6 +8,6 @@ on:
 jobs:
   publish-nuget:
     name: Publish to NuGet
-    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.HelpfulExtensions.Tests.UI/Constants/GeneratedMigrationCodes.cs

@@ -12,7 +12,7 @@ internal static class GeneratedMigrationCodes
     private const string Page =
         """
         await _contentDefinitionManager.AlterTypeDefinitionAsync("Page", type => type
-            .DisplayedAs("Page")
+            .WithDisplayName("Page")
             .Creatable()
             .Listable()
             .Draftable()

Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj

@@ -1,33 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
+
   <PropertyGroup>
     <Title>Lombiq Helpful Extensions for Orchard Core - UI Test Extensions</Title>
     <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2013, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq Helpful Extensions for Orchard Core - UI Test Extensions: Extension methods that test various features in Lombiq Helpful Extensions for Orchard Core. See the project website for detailed documentation.</Description>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
+    <CopyrightYear>2013</CopyrightYear>
+    <DescriptionBody>Extension methods that test various features in Lombiq Helpful Extensions for Orchard Core.</DescriptionBody>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Helpful-Extensions</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Helpful-Extensions/tree/dev/Lombiq.HelpfulExtensions.Tests.UI</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
     <Content Include="Recipes\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="2.1.0">
+    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="3.0.0-preview-18975">
       <Aliases>OCCMA</Aliases>
     </PackageReference>
   </ItemGroup>
@@ -36,12 +33,6 @@
     <ProjectReference Include="..\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
-    <ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="14.2.0" />
-  </ItemGroup>
-
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.10.osoe-1208" />
 </Project>

Lombiq.HelpfulExtensions.slnx

@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj" />
+  <Project Path="Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj" />
+</Solution>

Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs

@@ -23,7 +23,7 @@ public async Task<IActionResult> Create(string fromContentItemId, string fromPar
         if (!ModelState.IsValid) return BadRequest(ModelState);
 
         return await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
-            ? Redirect(_orchardHelper.GetItemEditUrl(content))
+            ? Redirect(await _orchardHelper.GetItemEditUrlAsync(content))
             : NotFound();
     }
 }

Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs

@@ -40,7 +40,7 @@ public override IDisplayResult Edit(ContentTypeDefinition model, BuildEditorCont
                 codeBuilder.AppendLine(
                     CultureInfo.InvariantCulture,
                     $"await _contentDefinitionManager.AlterTypeDefinitionAsync(\"{name}\", type => type");
-                codeBuilder.AppendLine(CultureInfo.InvariantCulture, $"    .DisplayedAs(\"{model.DisplayName}\")");
+                codeBuilder.AppendLine(CultureInfo.InvariantCulture, $"    .WithDisplayName(\"{model.DisplayName}\")");
 
                 GenerateCodeForSettings(codeBuilder, model.GetSettings<ContentTypeSettings>());
                 AddSettingsWithout<ContentTypeSettings>(codeBuilder, model.Settings);

Lombiq.HelpfulExtensions/Extensions/Emails/Extensions/EmailSenderShellScopeExtensions.cs

@@ -27,8 +27,7 @@ public static void SendEmailDeferred(this ShellScope shellScope, EmailParameters
                 Bcc = parameters.Bcc?.Join(","),
                 Subject = parameters.Subject,
                 ReplyTo = parameters.ReplyTo,
-                Body = parameters.Body,
-                IsHtmlBody = true,
+                HtmlBody = parameters.Body,
             });
 
             if (!result.Succeeded)

Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs

@@ -17,12 +17,7 @@ public override IDisplayResult Edit(ContentItem model, BuildEditorContext contex
 
     public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
     {
-        var additionalStylingPart = model.As<AdditionalStylingPart>();
-
-        if (additionalStylingPart == null)
-        {
-            return null;
-        }
+        if (!model.Has<AdditionalStylingPart>()) return null;
 
         await model.AlterAsync<AdditionalStylingPart>(model => context.Updater.TryUpdateModelAsync(model, Prefix));
 
@@ -31,12 +26,8 @@ public override async Task<IDisplayResult> UpdateAsync(ContentItem model, Update
 
     private static void PopulateViewModel(ContentItem model, AdditionalStylingPart viewModel)
     {
-        var additionalStylingPart = model.As<AdditionalStylingPart>();
-
-        if (additionalStylingPart != null)
-        {
-            viewModel.CustomClasses = additionalStylingPart.CustomClasses;
-            viewModel.RemoveGridExtensionClasses = additionalStylingPart.RemoveGridExtensionClasses;
-        }
+        if (!model.TryGet<AdditionalStylingPart>(out var additionalStylingPart)) return;
+        viewModel.CustomClasses = additionalStylingPart.CustomClasses;
+        viewModel.RemoveGridExtensionClasses = additionalStylingPart.RemoveGridExtensionClasses;
     }
 }

Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs

@@ -23,8 +23,8 @@ public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder)
     {
         if (!name.EqualsOrdinalIgnoreCase("admin")) return ValueTask.CompletedTask;
 
-        builder.Add(T["Configuration"], configuration => configuration
-            .Add(T["Import/Export"], importExport => importExport
+        builder.Add(T["Tools"], tools => tools
+            .Add(T["Deployments"], deployments => deployments
                 .Add(T["Orchard 1 Recipe Migration"], T["Orchard 1 Recipe Migration"], migration => migration
                     .Action<OrchardRecipeMigrationAdminController>(_hca.HttpContext, controller => controller.Index())
                     .LocalNav()

Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs

@@ -18,18 +18,19 @@ public class ListPartOrchardExportConverter : IOrchardExportConverter
     public Task UpdateContentItemsAsync(XDocument document, IList<ContentItem> contentItems)
     {
         var itemsById = contentItems
-            .Where(item => !string.IsNullOrEmpty(item.As<OrchardIds>()?.ExportId))
-            .ToDictionary(item => item.As<OrchardIds>().ExportId);
+            .SelectWhere(
+                item => (Item: item, Ids: item.GetOrCreate<OrchardIds>()),
+                pair => !string.IsNullOrEmpty(pair.Ids.ExportId) && !string.IsNullOrEmpty(pair.Ids.Parent))
+            .ToDictionary(item => item.Ids.ExportId);
 
-        foreach (var item in itemsById.Values.Where(item => !string.IsNullOrEmpty(item.As<OrchardIds>().Parent)))
+        foreach (var (item, ids) in itemsById.Values)
         {
-            var parentId = item.As<OrchardIds>().Parent;
-            if (!itemsById.TryGetValue(parentId, out var parent) || !parent.Has<ListPart>()) continue;
+            if (!itemsById.TryGetValue(ids.Parent, out var parentPair) || !parentPair.Item.Has<ListPart>()) continue;
 
             item.Alter<ContainedPart>(part =>
             {
-                part.ListContentItemId = parent.ContentItemId;
-                part.ListContentType = parent.ContentType;
+                part.ListContentItemId = parentPair.Item.ContentItemId;
+                part.ListContentType = parentPair.Item.ContentType;
             });
         }
 

Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs

@@ -1,8 +1,7 @@
 using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Controllers;
 using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Models;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Routing;
+using OrchardCore;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Entities;
@@ -21,30 +20,27 @@ public class OrchardExportToRecipeConverter : IOrchardExportToRecipeConverter
 {
     private readonly int batchSize = 50;
 
-    private readonly IActionContextAccessor _actionContextAccessor;
     private readonly IContentManager _contentManager;
     private readonly IIdGenerator _idGenerator;
     private readonly IEnumerable<IOrchardContentConverter> _contentConverters;
+    private readonly IOrchardHelper _orchardHelper;
     private readonly IEnumerable<IOrchardUserConverter> _userConverters;
     private readonly IContentDefinitionManager _contentDefinitionManager;
-    private readonly IUrlHelperFactory _urlHelperFactory;
 
     public OrchardExportToRecipeConverter(
-        IActionContextAccessor actionContextAccessor,
         IContentDefinitionManager contentDefinitionManager,
         IContentManager contentManager,
         IIdGenerator idGenerator,
         IEnumerable<IOrchardContentConverter> contentConverters,
-        IEnumerable<IOrchardUserConverter> userConverters,
-        IUrlHelperFactory urlHelperFactory)
+        IOrchardHelper orchardHelper,
+        IEnumerable<IOrchardUserConverter> userConverters)
     {
-        _actionContextAccessor = actionContextAccessor;
         _contentManager = contentManager;
         _idGenerator = idGenerator;
         _contentConverters = contentConverters;
+        _orchardHelper = orchardHelper;
         _userConverters = userConverters;
         _contentDefinitionManager = contentDefinitionManager;
-        _urlHelperFactory = urlHelperFactory;
     }
 
     public async Task<ConversionBatchResult> ConvertAsync(XDocument export, int page)
@@ -83,7 +79,7 @@ await _contentConverters
             }
         }
 
-        var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext!);
+        var urlHelper = await _orchardHelper.GetUrlHelperAsync();
 
         var hasNextPage = page < totalPages;
         var nextUrl = hasNextPage ? urlHelper.Action(

Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs

@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.DisplayManagement.Shapes;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ShapeTracing;
@@ -53,12 +52,6 @@ void AddIfNotNullOrEmpty(string name, string value)
             builderShapeInfo.AppendHtmlLine(string.Join(", ", shapeMetadata.Alternates));
         }
 
-        if (shapeMetadata.BindingSources.Any())
-        {
-            builderShapeInfo.AppendHtml("Binding sources: ");
-            builderShapeInfo.AppendHtmlLine(string.Join(", ", shapeMetadata.BindingSources));
-        }
-
         if (shapeMetadata.Wrappers.Count != 0)
         {
             builderShapeInfo.AppendHtml("Wrappers: ");

Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs

@@ -25,10 +25,10 @@ public override async Task<HtmlString> RenderHtmlByIdAsync(string contentItemId)
         var part = await GetSiteTextMarkdownBodyPartByIdAsync(contentItemId);
         var culture = CultureInfo.CurrentCulture.Name;
 
-        if (part.As<LocalizationPart>() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } &&
+        if (part.GetMaybe<LocalizationPart>() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } &&
             partCulture != culture &&
             await _contentLocalizationManager.GetContentItemAsync(localizationSet, culture) is { } contentItem &&
-            contentItem.As<MarkdownBodyPart>() is { } localizedPart)
+            contentItem.TryGet<MarkdownBodyPart>(out var localizedPart))
         {
             part = localizedPart;
         }

Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs

@@ -51,7 +51,7 @@ private async Task<MarkdownBodyPart> GetSiteTextMarkdownBodyPartByIdInnerAsync(s
             throw new InvalidOperationException($"A content with the ID \"{contentItemId}\" does not exist.");
         }
 
-        if (contentItem.As<MarkdownBodyPart>() is not { } part)
+        if (!contentItem.TryGet<MarkdownBodyPart>(out var part))
         {
             throw new InvalidOperationException(
                 $"A content with the ID \"{contentItemId}\" does not have a {nameof(MarkdownBodyPart)}.");

Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs

@@ -3,9 +3,8 @@
 using Lombiq.HelpfulExtensions.Extensions.Widgets.ViewModels;
 using Lombiq.HelpfulLibraries.OrchardCore.Liquid;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.Extensions.Localization;
+using OrchardCore;
 using OrchardCore.Liquid;
 using OrchardCore.Navigation;
 using System;
@@ -21,24 +20,21 @@ namespace Lombiq.HelpfulExtensions.Extensions.Widgets.Liquid;
 public class MenuWidgetLiquidFilter : ILiquidFilter
 {
     private readonly ILiquidContentDisplayService _liquidContentDisplayService;
-    private readonly Lazy<IUrlHelper> _urlHelperLazy;
+    private readonly IOrchardHelper _orchardHelper;
     private readonly IStringLocalizer<MenuWidgetLiquidFilter> T;
 
     public MenuWidgetLiquidFilter(
-        IActionContextAccessor actionContextAccessor,
         ILiquidContentDisplayService liquidContentDisplayService,
-        IStringLocalizer<MenuWidgetLiquidFilter> stringLocalizer,
-        IUrlHelperFactory urlHelperFactory)
+        IOrchardHelper orchardHelper,
+        IStringLocalizer<MenuWidgetLiquidFilter> stringLocalizer)
     {
         _liquidContentDisplayService = liquidContentDisplayService;
-
-        _urlHelperLazy = new Lazy<IUrlHelper>(() =>
-            urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext!));
+        _orchardHelper = orchardHelper;
 
         T = stringLocalizer;
     }
 
-    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
     {
         bool noWrapper, localNav;
         string classes;
@@ -63,9 +59,10 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             _ => null,
         };
 
-        UpdateMenuItems(menuItems, localNav);
+        var urlHelper = await _orchardHelper.GetUrlHelperAsync();
+        UpdateMenuItems(menuItems, localNav, urlHelper);
 
-        return _liquidContentDisplayService.DisplayNewAsync<MenuWidgetViewModel>(
+        return await _liquidContentDisplayService.DisplayNewAsync<MenuWidgetViewModel>(
             WidgetTypes.MenuWidget,
             model =>
             {
@@ -75,22 +72,22 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             });
     }
 
-    private void UpdateMenuItems(IEnumerable<MenuItem> menuItems, bool localNav)
+    private static void UpdateMenuItems(IEnumerable<MenuItem> menuItems, bool localNav, IUrlHelper urlHelper)
     {
         if (menuItems == null) return;
 
         foreach (var item in menuItems)
         {
             if (!string.IsNullOrEmpty(item.Url))
             {
-                var finalUrl = _urlHelperLazy.Value.Content(item.Url);
+                var finalUrl = urlHelper.Content(item.Url);
                 item.Url = finalUrl;
                 item.Href = finalUrl;
             }
 
             item.LocalNav = localNav || item.LocalNav;
 
-            UpdateMenuItems(item.Items, localNav);
+            UpdateMenuItems(item.Items, localNav, urlHelper);
         }
     }