From 21e9006b45839e9ea2432d84a62f6adc50d21513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 7 Jan 2026 23:54:55 +0100 Subject: [PATCH 01/51] Update OC versions to preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 4 +-- .../Lombiq.HelpfulExtensions.csproj | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 7915119..b5034d3 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 $(DefaultItemExcludes);.git* @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 267b72f..55f88a9 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -4,7 +4,7 @@ Condition="'$(NuGetBuild)' != 'true'"/> - net8.0 + net10.0 true $(DefaultItemExcludes);.git* @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 6882b27b06c203d969ae2e23e4f4737b97268486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 9 Jan 2026 01:30:21 +0100 Subject: [PATCH 02/51] Fix various errors. --- .../EmailSenderShellScopeExtensions.cs | 3 +-- .../Services/OrchardExportToRecipeConverter.cs | 16 ++++++---------- .../ShapeTracing/ShapeTracingShapeEvents.cs | 6 ------ .../Widgets/Liquid/MenuWidgetLiquidFilter.cs | 9 ++++----- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/Emails/Extensions/EmailSenderShellScopeExtensions.cs b/Lombiq.HelpfulExtensions/Extensions/Emails/Extensions/EmailSenderShellScopeExtensions.cs index d6629e1..a97d37d 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Emails/Extensions/EmailSenderShellScopeExtensions.cs +++ b/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) diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs index 0bf8664..1c8d40b 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs +++ b/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 _contentConverters; + private readonly IOrchardHelper _orchardHelper; private readonly IEnumerable _userConverters; private readonly IContentDefinitionManager _contentDefinitionManager; - private readonly IUrlHelperFactory _urlHelperFactory; public OrchardExportToRecipeConverter( - IActionContextAccessor actionContextAccessor, IContentDefinitionManager contentDefinitionManager, IContentManager contentManager, IIdGenerator idGenerator, IEnumerable contentConverters, - IEnumerable userConverters, - IUrlHelperFactory urlHelperFactory) + IOrchardHelper orchardHelper, + IEnumerable userConverters) { - _actionContextAccessor = actionContextAccessor; _contentManager = contentManager; _idGenerator = idGenerator; _contentConverters = contentConverters; + _orchardHelper = orchardHelper; _userConverters = userConverters; _contentDefinitionManager = contentDefinitionManager; - _urlHelperFactory = urlHelperFactory; } public async Task ConvertAsync(XDocument export, int page) @@ -83,7 +79,7 @@ await _contentConverters } } - var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext!); + var urlHelper = _orchardHelper.GetUrlHelper(); var hasNextPage = page < totalPages; var nextUrl = hasNextPage ? urlHelper.Action( diff --git a/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs b/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs index 43d9873..68466be 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs @@ -53,12 +53,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: "); diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs index 5f2e7c5..dc16182 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.Extensions.Localization; +using OrchardCore; using OrchardCore.Liquid; using OrchardCore.Navigation; using System; @@ -25,15 +26,13 @@ public class MenuWidgetLiquidFilter : ILiquidFilter private readonly IStringLocalizer T; public MenuWidgetLiquidFilter( - IActionContextAccessor actionContextAccessor, ILiquidContentDisplayService liquidContentDisplayService, - IStringLocalizer stringLocalizer, - IUrlHelperFactory urlHelperFactory) + IOrchardHelper orchardHelper, + IStringLocalizer stringLocalizer) { _liquidContentDisplayService = liquidContentDisplayService; - _urlHelperLazy = new Lazy(() => - urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext!)); + _urlHelperLazy = new Lazy(orchardHelper.GetUrlHelper); T = stringLocalizer; } From 3873781df9d004f79b17df6cd585a1aba8272b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 9 Jan 2026 13:36:14 +0100 Subject: [PATCH 03/51] Fix obsolete IActionContextAccessor usage. --- .../Controllers/ContentSetController.cs | 2 +- .../OrchardExportToRecipeConverter.cs | 2 +- .../Widgets/Liquid/MenuWidgetLiquidFilter.cs | 20 +++++++++---------- .../Views/ContentSetContentPickerField.cshtml | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs index ab7a255..1f947ec 100644 --- a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs +++ b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs @@ -23,7 +23,7 @@ public async Task 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(); } } diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs index 1c8d40b..c35e94a 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs @@ -79,7 +79,7 @@ await _contentConverters } } - var urlHelper = _orchardHelper.GetUrlHelper(); + var urlHelper = await _orchardHelper.GetUrlHelperAsync(); var hasNextPage = page < totalPages; var nextUrl = hasNextPage ? urlHelper.Action( diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs index dc16182..2420b83 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs @@ -3,8 +3,6 @@ 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; @@ -22,7 +20,7 @@ namespace Lombiq.HelpfulExtensions.Extensions.Widgets.Liquid; public class MenuWidgetLiquidFilter : ILiquidFilter { private readonly ILiquidContentDisplayService _liquidContentDisplayService; - private readonly Lazy _urlHelperLazy; + private readonly IOrchardHelper _orchardHelper; private readonly IStringLocalizer T; public MenuWidgetLiquidFilter( @@ -31,13 +29,12 @@ public MenuWidgetLiquidFilter( IStringLocalizer stringLocalizer) { _liquidContentDisplayService = liquidContentDisplayService; - - _urlHelperLazy = new Lazy(orchardHelper.GetUrlHelper); + _orchardHelper = orchardHelper; T = stringLocalizer; } - public ValueTask ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context) + public async ValueTask ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context) { bool noWrapper, localNav; string classes; @@ -62,9 +59,10 @@ public ValueTask ProcessAsync(FluidValue input, FilterArguments argu _ => null, }; - UpdateMenuItems(menuItems, localNav); + var urlHelper = await _orchardHelper.GetUrlHelperAsync(); + UpdateMenuItems(menuItems, localNav, urlHelper); - return _liquidContentDisplayService.DisplayNewAsync( + return await _liquidContentDisplayService.DisplayNewAsync( WidgetTypes.MenuWidget, model => { @@ -74,7 +72,7 @@ public ValueTask ProcessAsync(FluidValue input, FilterArguments argu }); } - private void UpdateMenuItems(IEnumerable menuItems, bool localNav) + private void UpdateMenuItems(IEnumerable menuItems, bool localNav, IUrlHelper urlHelper) { if (menuItems == null) return; @@ -82,14 +80,14 @@ private void UpdateMenuItems(IEnumerable menuItems, bool localNav) { 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); } } diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml index 62ea50f..ed83e0a 100644 --- a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml +++ b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml @@ -25,7 +25,7 @@ @for (var i = 0; i < links.Count; i++) { var link = links[i]; - var url = Orchard.GetItemDisplayUrl(link.ContentItemId); + var url = await Orchard.GetItemDisplayUrlAsync(link.ContentItemId); var separator = i < (links.Count - 1) ? ", " : string.Empty; @link.DisplayText@separator } From e33a1d42b071d643a855127872172624a326490c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 9 Jan 2026 18:01:38 +0100 Subject: [PATCH 04/51] Fix remaining warnings. --- .../Extensions/ShapeTracing/ShapeTracingShapeEvents.cs | 1 - .../Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs b/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs index 68466be..800af94 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs +++ b/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; diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs index 2420b83..28ab8db 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs @@ -72,7 +72,7 @@ public async ValueTask ProcessAsync(FluidValue input, FilterArgument }); } - private void UpdateMenuItems(IEnumerable menuItems, bool localNav, IUrlHelper urlHelper) + private static void UpdateMenuItems(IEnumerable menuItems, bool localNav, IUrlHelper urlHelper) { if (menuItems == null) return; From 905ec3da3fa85f7a1fd24f8f620d43bbdb2345cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 9 Jan 2026 18:39:32 +0100 Subject: [PATCH 05/51] Upgrade scrutor. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 55f88a9..936d29c 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -44,7 +44,7 @@ - + From 141f822b8d002019c0b7fb28739cb8f9b1f20b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 14 Jan 2026 17:28:50 +0100 Subject: [PATCH 06/51] Upgrade OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index b5034d3..f22f262 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 936d29c..3b2209c 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From f196bb9a40b6ed5bd2f133b42cd812b568e6b271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 20 Jan 2026 00:17:19 +0100 Subject: [PATCH 07/51] Update branch selector. --- .github/workflows/publish-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index fac826d..8e61048 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.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 }} From 5461c3145aef9400ab3f6c0d13487a9e3a5264e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 20 Jan 2026 00:22:16 +0100 Subject: [PATCH 08/51] Update branch selectors. --- .github/workflows/validate-nuget-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-nuget-publish.yml b/.github/workflows/validate-nuget-publish.yml index 9f8979c..f0fd6be 100644 --- a/.github/workflows/validate-nuget-publish.yml +++ b/.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 From 295bc580e6078f9d5196b47832dae4a761abe0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 20 Jan 2026 12:38:24 +0100 Subject: [PATCH 09/51] CompatibilitySuppressions.xml --- CompatibilitySuppressions.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CompatibilitySuppressions.xml diff --git a/CompatibilitySuppressions.xml b/CompatibilitySuppressions.xml new file mode 100644 index 0000000..8af156c --- /dev/null +++ b/CompatibilitySuppressions.xml @@ -0,0 +1,8 @@ + + + + + PKV006 + net8.0 + + \ No newline at end of file From b430ce5be97cdd368afecf6a3bf2a3194f38c451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 20 Jan 2026 13:21:25 +0100 Subject: [PATCH 10/51] Nuget. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index f22f262..436c9bc 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 3b2209c..d6eeb86 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Tue, 20 Jan 2026 14:30:58 +0100 Subject: [PATCH 11/51] Delete all CompatibilitySuppressions so we may start from scratch. --- CompatibilitySuppressions.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 CompatibilitySuppressions.xml diff --git a/CompatibilitySuppressions.xml b/CompatibilitySuppressions.xml deleted file mode 100644 index 8af156c..0000000 --- a/CompatibilitySuppressions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PKV006 - net8.0 - - \ No newline at end of file From 293be591d3384b2e1dbd5f1e782fa61a09b0690b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 22 Jan 2026 16:50:43 +0100 Subject: [PATCH 12/51] Upgrade OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 436c9bc..878496f 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index d6eeb86..c33ea35 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 4d1d4735c8ae564865bfeb84f431d5acad280b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 22 Jan 2026 16:55:52 +0100 Subject: [PATCH 13/51] Fix obsoletes. --- Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs index 7b3d6d1..4413fed 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs @@ -54,7 +54,7 @@ await _contentDefinitionManager.AlterTypeDefinitionAsync(LiquidWidget, builder = await _contentDefinitionManager.AlterTypeDefinitionAsync(MenuWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) - .DisplayedAs("Menu Navigation Provider Widget") + .WithDisplayName("Menu Navigation Provider Widget") .WithDescription( $"Renders a menu whose contents are populated from {nameof(INavigationProvider)} implementations " + $"that look for the \"menu\" name (as opposed to admin menu navigation providers that use the " + @@ -143,7 +143,7 @@ await _contentDefinitionManager.AlterTypeDefinitionAsync(WidgetTypes.ContentItem public async Task UpdateFrom5Async() { await _contentDefinitionManager.AlterTypeDefinitionAsync(MenuWidget, builder => builder - .DisplayedAs("Menu Navigation Provider Widget") + .WithDisplayName("Menu Navigation Provider Widget") .WithDescription( $"Renders a menu whose contents are populated from {nameof(INavigationProvider)} implementations " + $"that look for the \"menu\" name (as opposed to admin menu navigation providers that use the " + From 1e85e1ea0e2c768fd2e5be3c48ca83f323b63dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 22 Jan 2026 19:40:27 +0100 Subject: [PATCH 14/51] HL nuget --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index c33ea35..d6e477c 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Thu, 22 Jan 2026 23:17:10 +0100 Subject: [PATCH 15/51] Update UITT NuGet. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 878496f..5d3b8ec 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From 12e69cd3064f65d097abdbedd8424f5049144370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 23 Jan 2026 12:15:16 +0100 Subject: [PATCH 16/51] UC preview update. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 5d3b8ec..e1fa495 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index d6e477c..1fca1c5 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 55dbb3819854d51ed9fd86cf7082c2075f28e811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 23 Jan 2026 17:01:50 +0100 Subject: [PATCH 17/51] Update HL nuget. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 1fca1c5..d984242 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Tue, 27 Jan 2026 13:42:01 +0100 Subject: [PATCH 18/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index e1fa495..f27839a 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index d984242..3d2ca89 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 2a9825cc4d7f62c7607a94a7479671ff63f36bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 28 Jan 2026 23:24:19 +0100 Subject: [PATCH 19/51] Update HL NuGet. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 3d2ca89..d1d0e6d 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Fri, 30 Jan 2026 22:05:58 +0100 Subject: [PATCH 20/51] Replace obsolete DisplayedAs with WithDisplayName. --- .../Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs index bf330c3..b39339a 100644 --- a/Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs +++ b/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()); AddSettingsWithout(codeBuilder, model.Settings); From 35656543db438c3ca6016162019e925a1be885dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 30 Jan 2026 23:38:59 +0100 Subject: [PATCH 21/51] Update verification code. --- .../Constants/GeneratedMigrationCodes.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Constants/GeneratedMigrationCodes.cs b/Lombiq.HelpfulExtensions.Tests.UI/Constants/GeneratedMigrationCodes.cs index a856d22..e6fa7b6 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Constants/GeneratedMigrationCodes.cs +++ b/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() From 4c3f83d9adf0984cfb385a24496daf6f29ad2e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 4 Feb 2026 18:04:55 +0100 Subject: [PATCH 22/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index f27839a..4e07aa7 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index d1d0e6d..03e49dc 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From c0897e72f8c18a2b27f195e9593ff603dc71db82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 5 Feb 2026 12:15:23 +0100 Subject: [PATCH 23/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 4e07aa7..e38a4f6 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 03e49dc..2fed3c9 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 28869fa2e1abb7d2e9de2babb9914b58fd9c8892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 5 Feb 2026 21:24:07 +0100 Subject: [PATCH 24/51] Update HL Nuget. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 2fed3c9..aef55a3 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Thu, 5 Feb 2026 21:51:18 +0100 Subject: [PATCH 25/51] Update UITT nuget. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index e38a4f6..25b9db5 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From 90a6e04c47093f39e1ac702eb87fcaf1f9789940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 5 Feb 2026 23:32:05 +0100 Subject: [PATCH 26/51] Workaround. --- Lombiq.HelpfulExtensions/Manifest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Lombiq.HelpfulExtensions/Manifest.cs b/Lombiq.HelpfulExtensions/Manifest.cs index 9c9c107..a5b4600 100644 --- a/Lombiq.HelpfulExtensions/Manifest.cs +++ b/Lombiq.HelpfulExtensions/Manifest.cs @@ -49,6 +49,7 @@ Description = "Adds helpful widgets such as Container or Liquid widgets.", Dependencies = [ + "OrchardCore.DataLocalization", // Can be removed after https://github.com/OrchardCMS/OrchardCore/issues/18800 is resolved. "OrchardCore.Html", "OrchardCore.Liquid", "OrchardCore.Title", From 78cf83ac14680179bd440dbcd50e8eea00341f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 6 Feb 2026 11:43:48 +0100 Subject: [PATCH 27/51] Upda --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- Lombiq.HelpfulExtensions/Manifest.cs | 1 - 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 25b9db5..019a29d 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index aef55a3..06920a7 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Lombiq.HelpfulExtensions/Manifest.cs b/Lombiq.HelpfulExtensions/Manifest.cs index a5b4600..9c9c107 100644 --- a/Lombiq.HelpfulExtensions/Manifest.cs +++ b/Lombiq.HelpfulExtensions/Manifest.cs @@ -49,7 +49,6 @@ Description = "Adds helpful widgets such as Container or Liquid widgets.", Dependencies = [ - "OrchardCore.DataLocalization", // Can be removed after https://github.com/OrchardCMS/OrchardCore/issues/18800 is resolved. "OrchardCore.Html", "OrchardCore.Liquid", "OrchardCore.Title", From 8fe5a78e0c9e773c9599da66b5fe23ec62233aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 7 Feb 2026 23:45:11 +0100 Subject: [PATCH 28/51] Update menu paths. --- .../OrchardRecipeMigration/Navigation/AdminMenu.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs index c745bdc..c8ed655 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs @@ -23,12 +23,11 @@ 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 - .Add(T["Orchard 1 Recipe Migration"], T["Orchard 1 Recipe Migration"], migration => migration - .Action(_hca.HttpContext, controller => controller.Index()) - .LocalNav() - ))); + builder.Add(T["Import/Export"], importExport => importExport + .Add(T["Orchard 1 Recipe Migration"], T["Orchard 1 Recipe Migration"], migration => migration + .Action(_hca.HttpContext, controller => controller.Index()) + .LocalNav() + )); return ValueTask.CompletedTask; } From d914e8ab078c941d1f960492fbaf05cb8f12d449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 8 Feb 2026 00:32:52 +0100 Subject: [PATCH 29/51] Fix admin menu. --- .../OrchardRecipeMigration/Navigation/AdminMenu.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs index c8ed655..09e3502 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs @@ -23,11 +23,12 @@ public ValueTask BuildNavigationAsync(string name, NavigationBuilder builder) { if (!name.EqualsOrdinalIgnoreCase("admin")) return ValueTask.CompletedTask; - builder.Add(T["Import/Export"], importExport => importExport - .Add(T["Orchard 1 Recipe Migration"], T["Orchard 1 Recipe Migration"], migration => migration - .Action(_hca.HttpContext, controller => controller.Index()) - .LocalNav() - )); + 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(_hca.HttpContext, controller => controller.Index()) + .LocalNav() + ))); return ValueTask.CompletedTask; } From c70ac4984744a6a313e46a5e17cf16fe48c9050a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 12 Feb 2026 23:27:28 +0100 Subject: [PATCH 30/51] Update OC to avoid missing method exceptions. --- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 06920a7..db14bae 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 283505fad8259cd531129b6474dc04e466f64a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 13 Feb 2026 21:44:05 +0100 Subject: [PATCH 31/51] Update OC previews to fix package downgrade. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 019a29d..8f1cfef 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA From 0db5936924b80f2cd9b5b52f5114dfa1562802fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Mon, 16 Feb 2026 17:32:39 +0100 Subject: [PATCH 32/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 06920a7..db14bae 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 5640a5739b00c9c0fe47d6724dd1faa93894fb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 21 Feb 2026 20:19:27 +0100 Subject: [PATCH 33/51] Update OC preview and fix build errors. --- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index db14bae..e963737 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 583ae075b23b483266de5dfe8f34af2e1a1968b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 21 Feb 2026 20:25:21 +0100 Subject: [PATCH 34/51] Fix package downgrade. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 8f1cfef..7ad915c 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA From 47dffc126a294e38b4c1c03457a9b14e5abf2518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 22 Feb 2026 10:17:18 +0100 Subject: [PATCH 35/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 7ad915c..7ed8720 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index e963737..0ad49b8 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From f53762bbcc3bdc348a926913c5d6537010e9b05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 22 Feb 2026 11:34:29 +0100 Subject: [PATCH 36/51] Update HL nuget. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 0ad49b8..139cea4 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Sun, 22 Feb 2026 12:33:59 +0100 Subject: [PATCH 37/51] UITT nuget --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 7ed8720..e9c0a6d 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From c6a4081ceb5a29a444ac967e9af65e4248246b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 22 Feb 2026 12:49:08 +0100 Subject: [PATCH 38/51] Update HL nuget correctly. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 139cea4..6cf5c6c 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Sun, 22 Feb 2026 15:59:50 +0100 Subject: [PATCH 39/51] Update UITT nuget correctly. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index e9c0a6d..93a5d72 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From 206c96da6d03167632e19f6ab24f4849a97d727c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 7 Mar 2026 11:32:52 +0100 Subject: [PATCH 40/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 6cf5c6c..a24729b 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From f6b96f3b8f492612331c1cfa31f8811d56f851f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 7 Mar 2026 12:19:23 +0100 Subject: [PATCH 41/51] nuget --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 4 ++-- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 93a5d72..b449ebb 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA @@ -41,7 +41,7 @@ - + diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index a24729b..6e5d383 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Fri, 20 Mar 2026 16:46:51 +0100 Subject: [PATCH 42/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index b449ebb..075860a 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 6e5d383..4473130 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 4cffa373138c3c1b976c29ffd068849d9be79ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 29 Mar 2026 01:38:58 +0100 Subject: [PATCH 43/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 075860a..c700472 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 4473130..8611443 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From c59c4ecca9718a754e387015a4eab406d60d7811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 29 Mar 2026 21:41:39 +0200 Subject: [PATCH 44/51] Update UITT nuget. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index c700472..d6051cf 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From 493e491b43a869294547a1137108ffd98b699610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 8 Apr 2026 22:19:04 +0200 Subject: [PATCH 45/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index d6051cf..23cf604 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 8611443..8b07807 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 6bbc551863fbebe9a4493d1a5a5feae06d658e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 11 Apr 2026 16:18:57 +0200 Subject: [PATCH 46/51] Fix obsolete "As". --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Drivers/AdditionalStylingPartDisplay.cs | 4 ++-- .../ListPartOrchardExportConverter.cs | 8 +++---- .../ContentLocalizationSiteTextService.cs | 4 ++-- .../SiteTexts/Services/SiteTextServiceBase.cs | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- .../Views/ContentItemWidget.cshtml | 2 +- ...iq.HelpfulExtensions.Flows.FlowPart.cshtml | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 23cf604..f9aa68a 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs b/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs index a106123..b12977b 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs @@ -17,7 +17,7 @@ public override IDisplayResult Edit(ContentItem model, BuildEditorContext contex public override async Task UpdateAsync(ContentItem model, UpdateEditorContext context) { - var additionalStylingPart = model.As(); + var additionalStylingPart = model.GetOrCreate(); if (additionalStylingPart == null) { @@ -31,7 +31,7 @@ public override async Task UpdateAsync(ContentItem model, Update private static void PopulateViewModel(ContentItem model, AdditionalStylingPart viewModel) { - var additionalStylingPart = model.As(); + var additionalStylingPart = model.GetOrCreate(); if (additionalStylingPart != null) { diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs index 602606b..2c62a0f 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs @@ -18,12 +18,12 @@ public class ListPartOrchardExportConverter : IOrchardExportConverter public Task UpdateContentItemsAsync(XDocument document, IList contentItems) { var itemsById = contentItems - .Where(item => !string.IsNullOrEmpty(item.As()?.ExportId)) - .ToDictionary(item => item.As().ExportId); + .Where(item => !string.IsNullOrEmpty(item.GetOrCreate()?.ExportId)) + .ToDictionary(item => item.GetOrCreate().ExportId); - foreach (var item in itemsById.Values.Where(item => !string.IsNullOrEmpty(item.As().Parent))) + foreach (var item in itemsById.Values.Where(item => !string.IsNullOrEmpty(item.GetOrCreate().Parent))) { - var parentId = item.As().Parent; + var parentId = item.GetOrCreate().Parent; if (!itemsById.TryGetValue(parentId, out var parent) || !parent.Has()) continue; item.Alter(part => diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs index 18a24a1..b2cc3d5 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs @@ -25,10 +25,10 @@ public override async Task RenderHtmlByIdAsync(string contentItemId) var part = await GetSiteTextMarkdownBodyPartByIdAsync(contentItemId); var culture = CultureInfo.CurrentCulture.Name; - if (part.As() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } && + if (part.GetOrCreate() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } && partCulture != culture && await _contentLocalizationManager.GetContentItemAsync(localizationSet, culture) is { } contentItem && - contentItem.As() is { } localizedPart) + contentItem.GetOrCreate() is { } localizedPart) { part = localizedPart; } diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs index 5e222ba..12f8429 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs @@ -51,7 +51,7 @@ private async Task GetSiteTextMarkdownBodyPartByIdInnerAsync(s throw new InvalidOperationException($"A content with the ID \"{contentItemId}\" does not exist."); } - if (contentItem.As() is not { } part) + if (contentItem.GetOrCreate() is not { } part) { throw new InvalidOperationException( $"A content with the ID \"{contentItemId}\" does not have a {nameof(MarkdownBodyPart)}."); diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 8b07807..1254d42 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml b/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml index a64116a..34094d9 100644 --- a/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml +++ b/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml @@ -8,7 +8,7 @@ @inject IUpdateModelAccessor UpdateModelAccessor @{ - if ((Model.ContentItem as ContentItem)?.As() is not { } part) { return; } + if ((Model.ContentItem as ContentItem)?.GetOrCreate() is not { } part) { return; } var ids = part.ContentToDisplay?.ContentItemIds ?? Array.Empty(); var contentItems = await ContentManager.GetAsync(ids); diff --git a/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml b/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml index e17dae2..dd8e63a 100644 --- a/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml +++ b/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml @@ -11,11 +11,11 @@ { var widgetContent = await ContentItemDisplayManager.BuildDisplayAsync( widget, Model.BuildPartDisplayContext.Updater, Model.BuildPartDisplayContext.DisplayType, Model.BuildPartDisplayContext.GroupId); - var flowMetadata = widget.As(); + var flowMetadata = widget.GetOrCreate(); if (flowMetadata != null) { - var additionalStyling = widget.As(); + var additionalStyling = widget.GetOrCreate(); bool removeGridExtensionClasses = false; if (additionalStyling != null) From d3864115760024f4f175cf67fc904e5268762cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 11 Apr 2026 22:35:13 +0200 Subject: [PATCH 47/51] Fix and clean up GetOrCreate usages. --- .../Drivers/AdditionalStylingPartDisplay.cs | 17 ++++------------- .../Services/ListPartOrchardExportConverter.cs | 15 ++++++++------- .../ContentLocalizationSiteTextService.cs | 4 ++-- .../SiteTexts/Services/SiteTextServiceBase.cs | 2 +- .../Views/ContentItemWidget.cshtml | 4 ++-- ...mbiq.HelpfulExtensions.Flows.FlowPart.cshtml | 9 +++------ 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs b/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs index b12977b..47291d8 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs @@ -17,12 +17,7 @@ public override IDisplayResult Edit(ContentItem model, BuildEditorContext contex public override async Task UpdateAsync(ContentItem model, UpdateEditorContext context) { - var additionalStylingPart = model.GetOrCreate(); - - if (additionalStylingPart == null) - { - return null; - } + if (!model.Has()) return null; await model.AlterAsync(model => context.Updater.TryUpdateModelAsync(model, Prefix)); @@ -31,12 +26,8 @@ public override async Task UpdateAsync(ContentItem model, Update private static void PopulateViewModel(ContentItem model, AdditionalStylingPart viewModel) { - var additionalStylingPart = model.GetOrCreate(); - - if (additionalStylingPart != null) - { - viewModel.CustomClasses = additionalStylingPart.CustomClasses; - viewModel.RemoveGridExtensionClasses = additionalStylingPart.RemoveGridExtensionClasses; - } + if (!model.TryGet(out var additionalStylingPart)) return; + viewModel.CustomClasses = additionalStylingPart.CustomClasses; + viewModel.RemoveGridExtensionClasses = additionalStylingPart.RemoveGridExtensionClasses; } } diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs index 2c62a0f..1e23841 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/ListPartOrchardExportConverter.cs @@ -18,18 +18,19 @@ public class ListPartOrchardExportConverter : IOrchardExportConverter public Task UpdateContentItemsAsync(XDocument document, IList contentItems) { var itemsById = contentItems - .Where(item => !string.IsNullOrEmpty(item.GetOrCreate()?.ExportId)) - .ToDictionary(item => item.GetOrCreate().ExportId); + .SelectWhere( + item => (Item: item, Ids: item.GetOrCreate()), + 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.GetOrCreate().Parent))) + foreach (var (item, ids) in itemsById.Values) { - var parentId = item.GetOrCreate().Parent; - if (!itemsById.TryGetValue(parentId, out var parent) || !parent.Has()) continue; + if (!itemsById.TryGetValue(ids.Parent, out var parentPair) || !parentPair.Item.Has()) continue; item.Alter(part => { - part.ListContentItemId = parent.ContentItemId; - part.ListContentType = parent.ContentType; + part.ListContentItemId = parentPair.Item.ContentItemId; + part.ListContentType = parentPair.Item.ContentType; }); } diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs index b2cc3d5..4192135 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/ContentLocalizationSiteTextService.cs @@ -25,10 +25,10 @@ public override async Task RenderHtmlByIdAsync(string contentItemId) var part = await GetSiteTextMarkdownBodyPartByIdAsync(contentItemId); var culture = CultureInfo.CurrentCulture.Name; - if (part.GetOrCreate() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } && + if (part.GetMaybe() is { Culture: { } partCulture, LocalizationSet: { } localizationSet } && partCulture != culture && await _contentLocalizationManager.GetContentItemAsync(localizationSet, culture) is { } contentItem && - contentItem.GetOrCreate() is { } localizedPart) + contentItem.TryGet(out var localizedPart)) { part = localizedPart; } diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs index 12f8429..ec9172a 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Services/SiteTextServiceBase.cs @@ -51,7 +51,7 @@ private async Task GetSiteTextMarkdownBodyPartByIdInnerAsync(s throw new InvalidOperationException($"A content with the ID \"{contentItemId}\" does not exist."); } - if (contentItem.GetOrCreate() is not { } part) + if (!contentItem.TryGet(out var part)) { throw new InvalidOperationException( $"A content with the ID \"{contentItemId}\" does not have a {nameof(MarkdownBodyPart)}."); diff --git a/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml b/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml index 34094d9..1d91a74 100644 --- a/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml +++ b/Lombiq.HelpfulExtensions/Views/ContentItemWidget.cshtml @@ -8,9 +8,9 @@ @inject IUpdateModelAccessor UpdateModelAccessor @{ - if ((Model.ContentItem as ContentItem)?.GetOrCreate() is not { } part) { return; } + if ((Model.ContentItem as ContentItem)?.TryGet(out var part) != true) { return; } - var ids = part.ContentToDisplay?.ContentItemIds ?? Array.Empty(); + var ids = part.ContentToDisplay?.ContentItemIds ?? []; var contentItems = await ContentManager.GetAsync(ids); var updater = UpdateModelAccessor.ModelUpdater; diff --git a/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml b/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml index dd8e63a..1487b55 100644 --- a/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml +++ b/Lombiq.HelpfulExtensions/Views/Lombiq.HelpfulExtensions.Flows.FlowPart.cshtml @@ -11,14 +11,11 @@ { var widgetContent = await ContentItemDisplayManager.BuildDisplayAsync( widget, Model.BuildPartDisplayContext.Updater, Model.BuildPartDisplayContext.DisplayType, Model.BuildPartDisplayContext.GroupId); - var flowMetadata = widget.GetOrCreate(); - if (flowMetadata != null) + if (widget.TryGet(out var flowMetadata)) { - var additionalStyling = widget.GetOrCreate(); - - bool removeGridExtensionClasses = false; - if (additionalStyling != null) + var removeGridExtensionClasses = false; + if (widget.TryGet(out var additionalStyling)) { if (!string.IsNullOrEmpty(additionalStyling.CustomClasses)) From ef1994b57fdafc7086c1897d80bd49c436429545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sun, 12 Apr 2026 00:28:42 +0200 Subject: [PATCH 48/51] Update HL Nuget. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 1254d42..66e23ca 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -52,10 +52,10 @@ - + - - + + Date: Mon, 13 Apr 2026 14:14:56 +0200 Subject: [PATCH 49/51] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index f9aa68a..0c1a4e9 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -27,7 +27,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 66e23ca..55daeaa 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -32,18 +32,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 0e0ade23567a243264bbeb6ea5fea77eb2fd301b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Mon, 13 Apr 2026 16:24:16 +0200 Subject: [PATCH 50/51] Update UITT nuget. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 0c1a4e9..27819c9 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - + From 2277e5b35cf4a9a8aa720e8c20fcb48494616070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Mon, 20 Apr 2026 10:49:46 +0200 Subject: [PATCH 51/51] Update UITT NuGet. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 27819c9..4db637a 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -41,7 +41,7 @@ - +