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/66] 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 79151198..b5034d37 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 267b72f1..55f88a95 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/66] 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 d6629e1e..a97d37d5 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 0bf86640..1c8d40b5 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 43d9873e..68466bee 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 5f2e7c50..dc161820 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/66] 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 ab7a2559..1f947ec4 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 1c8d40b5..c35e94a9 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 dc161820..2420b83f 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 62ea50f2..ed83e0a9 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/66] 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 68466bee..800af945 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 2420b83f..28ab8db2 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/66] 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 55f88a95..936d29c6 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/66] 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 b5034d37..f22f2620 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 936d29c6..3b2209ca 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/66] 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 fac826db..8e61048b 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/66] 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 9f8979c5..f0fd6be1 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/66] 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 00000000..8af156c8 --- /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/66] 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 f22f2620..436c9bc3 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 3b2209ca..d6eeb86f 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/66] 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 8af156c8..00000000 --- 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/66] 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 436c9bc3..878496fc 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 d6eeb86f..c33ea356 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/66] 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 7b3d6d1a..4413fed9 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/66] 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 c33ea356..d6e477c6 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/66] 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 878496fc..5d3b8ec5 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/66] 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 5d3b8ec5..e1fa4953 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 d6e477c6..1fca1c57 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/66] 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 1fca1c57..d9842424 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/66] 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 e1fa4953..f27839a1 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 d9842424..3d2ca89a 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/66] 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 3d2ca89a..d1d0e6d4 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/66] 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 bf330c36..b39339af 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/66] 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 a856d224..e6fa7b6b 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/66] 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 f27839a1..4e07aa78 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 d1d0e6d4..03e49dcd 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/66] 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 4e07aa78..e38a4f69 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 03e49dcd..2fed3c90 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/66] 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 2fed3c90..aef55a3b 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/66] 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 e38a4f69..25b9db59 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/66] Workaround. --- Lombiq.HelpfulExtensions/Manifest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Lombiq.HelpfulExtensions/Manifest.cs b/Lombiq.HelpfulExtensions/Manifest.cs index 9c9c1077..a5b46009 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/66] 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 25b9db59..019a29df 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 aef55a3b..06920a7e 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 a5b46009..9c9c1077 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/66] 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 c745bdc8..c8ed655b 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/66] 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 c8ed655b..09e35021 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/66] 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 06920a7e..db14bae4 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/66] 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 019a29df..8f1cfef2 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/66] 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 06920a7e..db14bae4 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/66] 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 db14bae4..e9637379 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/66] 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 8f1cfef2..7ad915c9 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/66] 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 7ad915c9..7ed8720f 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 e9637379..0ad49b81 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/66] 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 0ad49b81..139cea49 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/66] 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 7ed8720f..e9c0a6de 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/66] 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 139cea49..6cf5c6c2 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/66] 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 e9c0a6de..93a5d725 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/66] 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 6cf5c6c2..a24729b3 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/66] 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 93a5d725..b449ebb0 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 a24729b3..6e5d3831 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/66] 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 b449ebb0..075860a7 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 6e5d3831..4473130f 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/66] 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 075860a7..c700472c 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 4473130f..8611443c 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/66] 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 c700472c..d6051cfc 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 f242ea5d66d568be28bced0324a6d70571dab017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Mon, 30 Mar 2026 11:32:54 +0200 Subject: [PATCH 45/66] Use OC module SDKs. --- .../Lombiq.HelpfulExtensions.csproj | 48 ++++--------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 8611443c..f673475f 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -1,39 +1,22 @@ - - - - + net10.0 - true - $(DefaultItemExcludes);.git* + + + + true Lombiq Helpful Extensions for Orchard Core - Lombiq Technologies - Copyright © 2013, Lombiq Technologies Ltd. - Lombiq Helpful Extensions for Orchard Core: Orchard Core module containing some handy extensions (e.g. useful content types and widgets). It's also available on all sites of DotNest, the Orchard SaaS. See the project website for detailed documentation. - NuGetIcon.png + 2013 + Orchard Core module containing some handy extensions (e.g. useful content types and widgets). It's also available on all sites of DotNest, the Orchard SaaS. See the project website for detailed documentation. OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets https://github.com/Lombiq/Helpful-Extensions - https://github.com/Lombiq/Helpful-Extensions - BSD-3-Clause - - - - - - - - - - - @@ -41,24 +24,11 @@ - - - - - - - - - - - - - - + + From 59c6da54d11e8b8fae930abaeed31cf325360716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 31 Mar 2026 22:24:48 +0200 Subject: [PATCH 46/66] Remove `true` from projects. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index f673475f..16526b72 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -7,7 +7,6 @@ - true Lombiq Helpful Extensions for Orchard Core 2013 Orchard Core module containing some handy extensions (e.g. useful content types and widgets). It's also available on all sites of DotNest, the Orchard SaaS. See the project website for detailed documentation. From fd5a05bad493ec53c91b529aaa9a48d659255db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 31 Mar 2026 23:31:56 +0200 Subject: [PATCH 47/66] Update NuGet versions. --- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 16526b72..3a2cd73f 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -4,7 +4,7 @@ - + Lombiq Helpful Extensions for Orchard Core @@ -29,5 +29,5 @@ - + From 351beb6dc79676a4b15bcec6224784caa87e382b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 1 Apr 2026 00:25:08 +0200 Subject: [PATCH 48/66] Use UI Test SDK where applicable. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index d6051cfc..b3e7d989 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -1,25 +1,22 @@ - - + net10.0 - $(DefaultItemExcludes);.git* + + + Lombiq Helpful Extensions for Orchard Core - UI Test Extensions Lombiq Technologies - Copyright © 2013, Lombiq Technologies Ltd. - 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. - NuGetIcon.png + 2013 + Extension methods that test various features in Lombiq Helpful Extensions for Orchard Core. See the project website for detailed documentation. OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets https://github.com/Lombiq/Helpful-Extensions https://github.com/Lombiq/Helpful-Extensions/tree/dev/Lombiq.HelpfulExtensions.Tests.UI - BSD-3-Clause - - PreserveNewest true @@ -36,12 +33,6 @@ - - - - - - - - + + From d1135c7cae6f9c77c21f3adbabedeabc2d7d4cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 2 Apr 2026 15:19:54 +0200 Subject: [PATCH 49/66] Create new SLNX files. --- Lombiq.HelpfulExtensions.slnx | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Lombiq.HelpfulExtensions.slnx diff --git a/Lombiq.HelpfulExtensions.slnx b/Lombiq.HelpfulExtensions.slnx new file mode 100644 index 00000000..65251805 --- /dev/null +++ b/Lombiq.HelpfulExtensions.slnx @@ -0,0 +1,4 @@ + + + + From c71d3b4aa136a8a362c09ef6fcf4bdf88adff02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 2 Apr 2026 16:04:33 +0200 Subject: [PATCH 50/66] Update validate-nuget-publish.yml issue branch. --- .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 f0fd6be1..48943086 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@issue/OSOE-925 + uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@issue/OSOE-1199 From 25c0b672dc9777bd303315acd73222d9aa2c61cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 3 Apr 2026 19:09:20 +0200 Subject: [PATCH 51/66] Remove SLN files. --- Lombiq.HelpfulExtensions.sln | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 Lombiq.HelpfulExtensions.sln diff --git a/Lombiq.HelpfulExtensions.sln b/Lombiq.HelpfulExtensions.sln deleted file mode 100644 index f9569097..00000000 --- a/Lombiq.HelpfulExtensions.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32319.34 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.HelpfulExtensions", "Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj", "{207243C1-5934-4D94-AAF2-F46D4DB2F20F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.HelpfulExtensions.Tests.UI", "Lombiq.HelpfulExtensions.Tests.UI\Lombiq.HelpfulExtensions.Tests.UI.csproj", "{B1077AC7-10D3-451C-B467-DA0B4D7BD5A4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {207243C1-5934-4D94-AAF2-F46D4DB2F20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {207243C1-5934-4D94-AAF2-F46D4DB2F20F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {207243C1-5934-4D94-AAF2-F46D4DB2F20F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {207243C1-5934-4D94-AAF2-F46D4DB2F20F}.Release|Any CPU.Build.0 = Release|Any CPU - {B1077AC7-10D3-451C-B467-DA0B4D7BD5A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1077AC7-10D3-451C-B467-DA0B4D7BD5A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1077AC7-10D3-451C-B467-DA0B4D7BD5A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1077AC7-10D3-451C-B467-DA0B4D7BD5A4}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5F8B26CF-89E9-487E-B4B0-643F1A109459} - EndGlobalSection -EndGlobal From 7b7c163212697f9a17cccd9e1506393ffd875323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 7 Apr 2026 13:09:25 +0200 Subject: [PATCH 52/66] Move "See the project website for detailed documentation." boilerplate text into built-in DescriptionBody suffix. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index b3e7d989..b2c58775 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -10,7 +10,7 @@ Lombiq Helpful Extensions for Orchard Core - UI Test Extensions Lombiq Technologies 2013 - Extension methods that test various features in Lombiq Helpful Extensions for Orchard Core. See the project website for detailed documentation. + Extension methods that test various features in Lombiq Helpful Extensions for Orchard Core. OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets https://github.com/Lombiq/Helpful-Extensions https://github.com/Lombiq/Helpful-Extensions/tree/dev/Lombiq.HelpfulExtensions.Tests.UI diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 3a2cd73f..61945f46 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -9,7 +9,7 @@ Lombiq Helpful Extensions for Orchard Core 2013 - Orchard Core module containing some handy extensions (e.g. useful content types and widgets). It's also available on all sites of DotNest, the Orchard SaaS. See the project website for detailed documentation. + Orchard Core module containing some handy extensions (e.g. useful content types and widgets). It's also available on all sites of DotNest, the Orchard SaaS. OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets https://github.com/Lombiq/Helpful-Extensions 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 53/66] 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 d6051cfc..23cf6045 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 8611443c..8b078079 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 54/66] 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 23cf6045..f9aa68a2 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 a106123a..b12977b3 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 602606bb..2c62a0f7 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 18a24a14..b2cc3d5b 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 5e222bab..12f8429c 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 8b078079..1254d429 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 a64116a6..34094d95 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 e17dae2b..dd8e63ae 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 55/66] 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 b12977b3..47291d80 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 2c62a0f7..1e238418 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 b2cc3d5b..41921357 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 12f8429c..ec9172af 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 34094d95..1d91a747 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 dd8e63ae..1487b554 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 56/66] 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 1254d429..66e23cab 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 57/66] 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 f9aa68a2..0c1a4e96 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 66e23cab..55daeaab 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 58/66] 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 0c1a4e96..27819c96 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 59/66] 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 27819c96..4db637a3 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 b3e61e0be7f875ad0b24bb1cf8234a709ce2439d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 25 Apr 2026 01:56:27 +0200 Subject: [PATCH 60/66] Update NuGet and apply library SDK where applicable --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 4 ++-- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 4 ++-- 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 3db63174..e39b5ab2 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -4,7 +4,7 @@ - + Lombiq Helpful Extensions for Orchard Core - UI Test Extensions @@ -34,5 +34,5 @@ - + diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 3040336e..f6db8f06 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -4,7 +4,7 @@ - + Lombiq Helpful Extensions for Orchard Core @@ -29,5 +29,5 @@ - + From c37a3ce7e93780fbee09a59cebdbfd078936fd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Mon, 27 Apr 2026 23:57:03 +0200 Subject: [PATCH 61/66] Update GHA 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 48943086..f0fd6be1 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@issue/OSOE-1199 + uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@issue/OSOE-925 From b034b8a0415e80a861f1ab2d40282f76ca3e1068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Tue, 28 Apr 2026 12:39:27 +0200 Subject: [PATCH 62/66] Update OC preview. --- .../Lombiq.HelpfulExtensions.csproj | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index f6db8f06..0e026193 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -15,16 +15,16 @@ - - - - - - - - - - + + + + + + + + + + From 871b632e49c32e2160848f2fee24cff1e65eb76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 6 May 2026 23:39:08 +0200 Subject: [PATCH 63/66] 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 e39b5ab2..47b7b8bb 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -24,7 +24,7 @@ - + OCCMA From 4acb9cfaea2cc6fc18835d5fc3323fabcca40474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 16 May 2026 15:34:00 +0200 Subject: [PATCH 64/66] Update OC preview. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- .../Lombiq.HelpfulExtensions.csproj | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 47b7b8bb..a8994669 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -24,7 +24,7 @@ - + OCCMA diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 0e026193..54b1ac18 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -15,16 +15,16 @@ - - - - - - - - - - + + + + + + + + + + From 7c181ef313e009c70810571fe4d39fc4b8f288a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 16 May 2026 15:50:37 +0200 Subject: [PATCH 65/66] Update SDKs. --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 4 ++-- Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 4 ++-- 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 a8994669..3b44ed57 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj +++ b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj @@ -4,7 +4,7 @@ - + Lombiq Helpful Extensions for Orchard Core - UI Test Extensions @@ -34,5 +34,5 @@ - + diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 54b1ac18..46ce105f 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -4,7 +4,7 @@ - + Lombiq Helpful Extensions for Orchard Core @@ -29,5 +29,5 @@ - + From 37601576fcd7b209dcf3b071225344dc74d4aefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Sat, 16 May 2026 18:49:17 +0200 Subject: [PATCH 66/66] Make test less dependent on the blog recipe. --- .../TrumbowygBlogPostsTestCaseUITestContextExtensions.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TrumbowygBlogPostsTestCaseUITestContextExtensions.cs b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TrumbowygBlogPostsTestCaseUITestContextExtensions.cs index 0ce3b759..eaadfd28 100644 --- a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TrumbowygBlogPostsTestCaseUITestContextExtensions.cs +++ b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TrumbowygBlogPostsTestCaseUITestContextExtensions.cs @@ -22,7 +22,9 @@ void AssertCodeSnippetIsHighlighted() => await context.SignInDirectlyAndGoToDashboardAsync(); - await context.ClickReliablyOnByLinkTextAsync("Blog"); + await context.GoToContentItemListAsync("Blog"); + await context.ClickReliablyOnAsync(By.ClassName("view")); + context.SwitchToLastWindow(); await context.ClickReliablyOnByLinkTextAsync("Man must explore, and this is exploration at its greatest"); await context.ClickReliablyOnAsync(By.ClassName("trumbowyg-highlight-button"));