From c57ba17deedd20723ea13a356995d0705584aee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Thu, 18 Jan 2024 11:57:56 +0100 Subject: [PATCH] Upgrading to .NET 8 and OC 1.8.2 --- .../Lombiq.HelpfulExtensions.Tests.UI.csproj | 2 +- ...ntentSetContentPickerFieldDisplayDriver.cs | 8 ++--- .../ContentSets/Indexes/ContentSetIndex.cs | 7 ++-- .../Extensions/ContentSets/Migrations.cs | 9 ++--- .../ContentSets/Services/ContentSetManager.cs | 5 ++- .../Extensions/ContentTypes/Migrations.cs | 15 ++++---- .../Handlers/AdditionalStylingPartHandler.cs | 6 ++-- .../Navigation/AdminMenu.cs | 4 +-- .../OrchardExportToRecipeConverter.cs | 4 ++- ...tSecurityPermissionAuthorizationHandler.cs | 9 +++-- .../SiteTexts/LocalizationMigrations.cs | 7 ++-- .../SiteTexts/SiteTextMigrations.cs | 7 ++-- .../Drivers/MvcConditionEvaluatorDriver.cs | 4 +-- .../Extensions/Widgets/Migrations.cs | 35 ++++++++++--------- .../Lombiq.HelpfulExtensions.csproj | 26 +++++++------- .../Views/MenuWidget.cshtml | 1 + 16 files changed, 76 insertions(+), 73 deletions(-) diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj index 47b85a28..e3366a44 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 @@ - net6.0 + net8.0 $(DefaultItemExcludes);.git*;node_modules\** diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs index 644cfa03..19a6a7b8 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs @@ -1,4 +1,4 @@ -using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events; +using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events; using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models; using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services; using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels; @@ -41,17 +41,17 @@ public override IDisplayResult Display( var name = fieldDisplayContext.PartFieldDefinition.Name; if (field.ContentItem.Get(name) is not { } part) return null; - return Initialize(GetDisplayShapeType(fieldDisplayContext), model => + return Initialize(GetDisplayShapeType(fieldDisplayContext), async model => { model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition; - return model.InitializeAsync( + await model.InitializeAsync( _contentSetManager, _contentSetEventHandlers, T, part, new ContentTypePartDefinition( name, - _contentDefinitionManager.GetPartDefinition(nameof(ContentSetPart)), + await _contentDefinitionManager.GetPartDefinitionAsync(nameof(ContentSetPart)), new JObject()), isNew: false); }) diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs index b03fe52b..7a89ff46 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs @@ -1,4 +1,4 @@ -using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models; +using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models; using Microsoft.Extensions.DependencyInjection; using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Metadata; @@ -37,15 +37,14 @@ public ContentSetIndexProvider(IServiceProvider provider) => _provider = provider; public override void Describe(DescribeContext context) => - context.For().Map(contentItem => + context.For().Map(async contentItem => { if (!contentItem.Latest) return Enumerable.Empty(); using var scope = _provider.CreateScope(); var contentDefinitionManager = scope.ServiceProvider.GetRequiredService(); - return contentDefinitionManager - .GetTypeDefinition(contentItem.ContentType) + return (await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType)) .Parts .Where(part => part.PartDefinition.Name == nameof(ContentSetPart)) .Select(part => new { Part = contentItem.Get(part.Name), part.Name }) diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Migrations.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Migrations.cs index 1c8364a7..46c3a4c4 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Migrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Migrations.cs @@ -1,9 +1,10 @@ -using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes; +using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes; using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models; using Lombiq.HelpfulLibraries.OrchardCore.Data; using OrchardCore.ContentManagement.Metadata; using OrchardCore.ContentManagement.Metadata.Settings; using OrchardCore.Data.Migration; +using System.Threading.Tasks; using YesSql.Sql; namespace Lombiq.HelpfulExtensions.Extensions.ContentSets; @@ -15,14 +16,14 @@ public class Migrations : DataMigration public Migrations(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public int Create() + public async Task CreateAsync() { - _contentDefinitionManager.AlterPartDefinition(nameof(ContentSetPart), builder => builder + await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(ContentSetPart), builder => builder .Attachable() .Reusable() .WithDisplayName("Content Set")); - SchemaBuilder.CreateMapIndexTable(table => table + await SchemaBuilder.CreateMapIndexTableAsync(table => table .Column(nameof(ContentSetIndex.ContentItemId), column => column.WithCommonUniqueIdLength()) .Column(nameof(ContentSetIndex.PartName)) .Column(nameof(ContentSetIndex.IsPublished)) diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Services/ContentSetManager.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Services/ContentSetManager.cs index 5145175d..226bfa21 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Services/ContentSetManager.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Services/ContentSetManager.cs @@ -1,4 +1,4 @@ -using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events; +using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events; using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes; using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models; using OrchardCore.ContentManagement; @@ -58,8 +58,7 @@ await _contentManager.CloneAsync(original) is not { } content) part.Key = newKey; }); - var contentTypePartDefinition = _contentDefinitionManager - .GetTypeDefinition(content.ContentType) + var contentTypePartDefinition = (await _contentDefinitionManager.GetTypeDefinitionAsync(content.ContentType)) .Parts .Single(definition => definition.Name == fromPartName); diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Migrations.cs b/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Migrations.cs index e07f5708..946d2380 100644 --- a/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Migrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Migrations.cs @@ -2,6 +2,7 @@ using OrchardCore.ContentManagement.Metadata; using OrchardCore.ContentManagement.Metadata.Settings; using OrchardCore.Data.Migration; +using System.Threading.Tasks; using static Lombiq.HelpfulExtensions.Extensions.ContentTypes.ContentTypes; namespace Lombiq.HelpfulExtensions.Extensions.ContentTypes; @@ -13,9 +14,9 @@ public class Migrations : DataMigration public Migrations(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public int Create() + public async Task CreateAsync() { - _contentDefinitionManager.AlterTypeDefinition(Page, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(Page, builder => builder .Creatable() .Securable() .Draftable() @@ -33,16 +34,16 @@ public int Create() .WithPart("FlowPart", part => part.WithPosition("2")) ); - _contentDefinitionManager.AlterTypeDefinition(Empty, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(Empty, builder => builder .WithDescription("A base content type for ad-hoc welding parts or fields on.") ); return 3; } - public int UpdateFrom1() + public async Task UpdateFrom1Async() { - _contentDefinitionManager.AlterTypeDefinition(Page, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(Page, builder => builder .WithPart("TitlePart", part => part.WithPosition("0")) .WithPart("AutoroutePart", part => part.WithPosition("1")) .WithPart("FlowPart", part => part.WithPosition("2")) @@ -51,9 +52,9 @@ public int UpdateFrom1() return 2; } - public int UpdateFrom2() + public async Task UpdateFrom2Async() { - _contentDefinitionManager.AlterTypeDefinition(Empty, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(Empty, builder => builder .WithDescription("A base content type for ad-hoc welding parts or fields on.") ); diff --git a/Lombiq.HelpfulExtensions/Extensions/Flows/Handlers/AdditionalStylingPartHandler.cs b/Lombiq.HelpfulExtensions/Extensions/Flows/Handlers/AdditionalStylingPartHandler.cs index 8b43e9a3..8fa611b0 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Flows/Handlers/AdditionalStylingPartHandler.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Flows/Handlers/AdditionalStylingPartHandler.cs @@ -14,15 +14,13 @@ public class AdditionalStylingPartHandler : ContentHandlerBase public AdditionalStylingPartHandler(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public override Task ActivatedAsync(ActivatedContentContext context) + public override async Task ActivatedAsync(ActivatedContentContext context) { if (!context.ContentItem.Has() && - _contentDefinitionManager.GetTypeDefinition(context.ContentItem.ContentType) + (await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType)) .GetSettings().Stereotype == "Widget") { context.ContentItem.Weld(); } - - return Task.CompletedTask; } } diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs index 622ca6b7..3ada4e8a 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Navigation/AdminMenu.cs @@ -1,9 +1,9 @@ -using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Controllers; +using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Controllers; using Lombiq.HelpfulLibraries.OrchardCore.Navigation; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Localization; +using OrchardCore.Modules; using OrchardCore.Navigation; -using System; using System.Threading.Tasks; namespace Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Navigation; diff --git a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs index 8d3c669b..d414e453 100644 --- a/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs +++ b/Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs @@ -37,7 +37,9 @@ public OrchardExportToRecipeConverter( _userConverters = userConverters; _contentTypes = contentDefinitionManager - .ListTypeDefinitions() + .ListTypeDefinitionsAsync() + .GetAwaiter() + .GetResult() .Select(definition => definition.Name) .ToList(); } diff --git a/Lombiq.HelpfulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs b/Lombiq.HelpfulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs index 97af29b4..f61d44db 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs @@ -27,20 +27,20 @@ public class StrictSecurityPermissionAuthorizationHandler : AuthorizationHandler public StrictSecurityPermissionAuthorizationHandler(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) + protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) { if ((context.Resource as IContent)?.ContentItem is not { } contentItem || !_permissionTemplates.TryGetValue(requirement.Permission.Name, out var claims) || - _contentDefinitionManager.GetTypeDefinition(contentItem.ContentType) is not { } definition || + await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType) is not { } definition || definition.GetSettings()?.Enabled != true) { - return Task.CompletedTask; + return; } if (!context.User.Identity.IsAuthenticated) { context.Fail(); - return Task.CompletedTask; + return; } var contentType = contentItem.ContentType; @@ -54,7 +54,6 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte .Select(claim => claim.Value); if (!permissionNames.Any(claims.Contains)) context.Fail(); - return Task.CompletedTask; } private static IList GetPermissionTemplates(Permission permission, IList templates) diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/LocalizationMigrations.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/LocalizationMigrations.cs index 84a47879..f52bdd82 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/LocalizationMigrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/LocalizationMigrations.cs @@ -1,6 +1,7 @@ -using OrchardCore.ContentLocalization.Models; +using OrchardCore.ContentLocalization.Models; using OrchardCore.ContentManagement.Metadata; using OrchardCore.Data.Migration; +using System.Threading.Tasks; using static Lombiq.HelpfulExtensions.Extensions.SiteTexts.Constants.ContentTypes; namespace Lombiq.HelpfulExtensions.Extensions.SiteTexts; @@ -12,9 +13,9 @@ public class LocalizationMigrations : DataMigration public LocalizationMigrations(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public int Create() + public async Task CreateAsync() { - _contentDefinitionManager.AlterTypeDefinition(SiteText, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(SiteText, builder => builder .WithPart(nameof(LocalizationPart))); return 1; diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/SiteTextMigrations.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/SiteTextMigrations.cs index 4a3f9d32..b7fb7ffe 100644 --- a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/SiteTextMigrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/SiteTextMigrations.cs @@ -1,9 +1,10 @@ -using OrchardCore.ContentLocalization.Models; +using OrchardCore.ContentLocalization.Models; using OrchardCore.ContentManagement.Metadata; using OrchardCore.ContentManagement.Metadata.Builders; using OrchardCore.ContentManagement.Metadata.Settings; using OrchardCore.Data.Migration; using OrchardCore.Markdown.Models; +using System.Threading.Tasks; using static Lombiq.HelpfulExtensions.Extensions.SiteTexts.Constants.ContentTypes; using static Lombiq.HelpfulLibraries.OrchardCore.Contents.ContentFieldEditorEnums; @@ -16,9 +17,9 @@ public class SiteTextMigrations : DataMigration public SiteTextMigrations(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public int Create() + public async Task CreateAsync() { - _contentDefinitionManager.AlterTypeDefinition(SiteText, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(SiteText, builder => builder .SetAbilities( creatable: true, securable: true, diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Drivers/MvcConditionEvaluatorDriver.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Drivers/MvcConditionEvaluatorDriver.cs index 1eff2d27..7a29c2c1 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Drivers/MvcConditionEvaluatorDriver.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Drivers/MvcConditionEvaluatorDriver.cs @@ -1,8 +1,8 @@ -using Lombiq.HelpfulExtensions.Extensions.Widgets.Models; +using Lombiq.HelpfulExtensions.Extensions.Widgets.Models; using Microsoft.AspNetCore.Http; using OrchardCore.ContentManagement.Display.ContentDisplay; +using OrchardCore.Modules; using OrchardCore.Rules; -using System; using System.Linq; using System.Threading.Tasks; diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs index 9425ebee..00147782 100644 --- a/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs +++ b/Lombiq.HelpfulExtensions/Extensions/Widgets/Migrations.cs @@ -4,6 +4,7 @@ using OrchardCore.ContentManagement.Metadata; using OrchardCore.ContentManagement.Metadata.Settings; using OrchardCore.Data.Migration; +using System.Threading.Tasks; using static Lombiq.HelpfulExtensions.Extensions.Widgets.WidgetTypes; namespace Lombiq.HelpfulExtensions.Extensions.Widgets; @@ -15,16 +16,16 @@ public class Migrations : DataMigration public Migrations(IContentDefinitionManager contentDefinitionManager) => _contentDefinitionManager = contentDefinitionManager; - public int Create() + public async Task CreateAsync() { - _contentDefinitionManager.AlterTypeDefinition(ContainerWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(ContainerWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart("TitlePart", part => part.WithPosition("0")) .WithPart("FlowPart", part => part.WithPosition("1")) ); - _contentDefinitionManager.AlterTypeDefinition(HtmlWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(HtmlWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart("HtmlBodyPart", part => part @@ -36,7 +37,7 @@ public int Create() ) ); - _contentDefinitionManager.AlterTypeDefinition(LiquidWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(LiquidWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart("LiquidPart", part => part @@ -44,12 +45,12 @@ public int Create() ) ); - _contentDefinitionManager.AlterTypeDefinition(MenuWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(MenuWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) ); - _contentDefinitionManager.AlterTypeDefinition(MarkdownWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(MarkdownWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart("MarkdownBodyPart", part => part @@ -57,7 +58,7 @@ public int Create() ) ); - var contentItemWidgetPartName = _contentDefinitionManager.AlterPartDefinition(builder => builder + var contentItemWidgetPartName = await _contentDefinitionManager.AlterPartDefinitionAsync(builder => builder .WithField(part => part.ContentToDisplay, field => field .WithDisplayName("Content to display") .WithSettings(new ContentPickerFieldSettings @@ -69,7 +70,7 @@ public int Create() .WithField(part => part.GroupId, field => field.WithDisplayName("Group ID")) ); - _contentDefinitionManager.AlterTypeDefinition(WidgetTypes.ContentItemWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(WidgetTypes.ContentItemWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart(contentItemWidgetPartName) @@ -78,9 +79,9 @@ public int Create() return 5; } - public int UpdateFrom1() + public async Task UpdateFrom1Async() { - _contentDefinitionManager.AlterTypeDefinition(ContainerWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(ContainerWidget, builder => builder .WithPart("TitlePart", part => part.WithPosition("0")) .WithPart("FlowPart", part => part.WithPosition("1")) ); @@ -88,9 +89,9 @@ public int UpdateFrom1() return 2; } - public int UpdateFrom2() + public async Task UpdateFrom2Async() { - _contentDefinitionManager.AlterTypeDefinition(MenuWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(MenuWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) ); @@ -98,9 +99,9 @@ public int UpdateFrom2() return 3; } - public int UpdateFrom3() + public async Task UpdateFrom3Async() { - _contentDefinitionManager.AlterTypeDefinition(MarkdownWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(MarkdownWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart("MarkdownBodyPart", part => part @@ -111,15 +112,15 @@ public int UpdateFrom3() return 4; } - public int UpdateFrom4() + public async Task UpdateFrom4Async() { - var contentItemWidgetPartName = _contentDefinitionManager.AlterPartDefinition(builder => builder + var contentItemWidgetPartName = await _contentDefinitionManager.AlterPartDefinitionAsync(builder => builder .WithField(part => part.ContentToDisplay, field => field.WithDisplayName("Content to display")) .WithField(part => part.DisplayType, field => field.WithDisplayName("Display type")) .WithField(part => part.GroupId, field => field.WithDisplayName("Group ID")) ); - _contentDefinitionManager.AlterTypeDefinition(WidgetTypes.ContentItemWidget, builder => builder + await _contentDefinitionManager.AlterTypeDefinitionAsync(WidgetTypes.ContentItemWidget, builder => builder .Securable() .Stereotype(CommonStereotypes.Widget) .WithPart(contentItemWidgetPartName) diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj index 53028f47..d81fff29 100644 --- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj +++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true $(DefaultItemExcludes);.git*;node_modules\** @@ -36,18 +36,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml b/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml index 68d66eaf..9f57bc86 100644 --- a/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml +++ b/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml @@ -1,5 +1,6 @@ @using Lombiq.HelpfulLibraries.Common.Utilities; @using Microsoft.AspNetCore.Http.Extensions +@using OrchardCore.Modules @using OrchardCore.Navigation