OSOE-751: Upgrade to Orchard Core 1.8

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
   </PropertyGroup>
 

Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs

@@ -1,4 +1,4 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore;
 using OrchardCore.Modules;
@@ -7,19 +7,10 @@
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Controllers;
 
 [Feature(FeatureIds.ContentSets)]
-public class ContentSetController : Controller
+public class ContentSetController(IContentSetManager contentSetManager, IOrchardHelper orchardHelper) : Controller
 {
-    private readonly IContentSetManager _contentSetManager;
-    private readonly IOrchardHelper _orchardHelper;
-
-    public ContentSetController(IContentSetManager contentSetManager, IOrchardHelper orchardHelper)
-    {
-        _contentSetManager = contentSetManager;
-        _orchardHelper = orchardHelper;
-    }
-
     public async Task<IActionResult> Create(string fromContentItemId, string fromPartName, string newKey) =>
-        await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
-            ? Redirect(_orchardHelper.GetItemEditUrl(content))
+        await contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
+            ? Redirect(orchardHelper.GetItemEditUrl(content))
             : NotFound();
 }

Lombiq.HelpfulExtensions/Controllers/OrchardRecipeMigrationAdminController.cs

@@ -1,4 +1,4 @@
-using AngleSharp.Io;
+using AngleSharp.Io;
 using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -16,21 +16,11 @@ namespace Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Controllers
 
 [Admin]
 [Feature(FeatureIds.OrchardRecipeMigration)]
-public class OrchardRecipeMigrationAdminController : Controller
+public class OrchardRecipeMigrationAdminController(
+    INotifier notifier,
+    IOrchardExportToRecipeConverter converter,
+    IHtmlLocalizer<OrchardRecipeMigrationAdminController> localizer) : Controller
 {
-    private readonly INotifier _notifier;
-    private readonly IOrchardExportToRecipeConverter _converter;
-    private readonly IHtmlLocalizer<OrchardRecipeMigrationAdminController> H;
-    public OrchardRecipeMigrationAdminController(
-        INotifier notifier,
-        IOrchardExportToRecipeConverter converter,
-        IHtmlLocalizer<OrchardRecipeMigrationAdminController> localizer)
-    {
-        _notifier = notifier;
-        _converter = converter;
-        H = localizer;
-    }
-
     public IActionResult Index() => View();
 
     [HttpPost]
@@ -46,16 +36,16 @@ public async Task<IActionResult> Convert(IFormFile file)
         }
         catch (Exception)
         {
-            await _notifier.ErrorAsync(H["Please add a file to import."]);
+            await notifier.ErrorAsync(localizer["Please add a file to import."]);
             return Redirect(nameof(Index));
         }
 
         await using (stream)
         {
-            json = await _converter.ConvertAsync(XDocument.Load(stream));
+            json = await converter.ConvertAsync(XDocument.Load(stream));
         }
 
-        Response.Headers.Add("Content-Disposition", "attachment;filename=export.recipe.json");
+        Response.Headers.Append("Content-Disposition", "attachment;filename=export.recipe.json");
         return Content(json, MimeTypeNames.ApplicationJson, Encoding.UTF8);
     }
 }

Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs

@@ -12,12 +12,10 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.CodeGeneration;
 
-public class CodeGenerationDisplayDriver : ContentTypeDefinitionDisplayDriver
+public class CodeGenerationDisplayDriver(IStringLocalizer<CodeGenerationDisplayDriver> stringLocalizer)
+    : ContentTypeDefinitionDisplayDriver
 {
-    private readonly IStringLocalizer T;
-
-    public CodeGenerationDisplayDriver(IStringLocalizer<CodeGenerationDisplayDriver> stringLocalizer) =>
-        T = stringLocalizer;
+    private readonly IStringLocalizer T = stringLocalizer;
 
     public override IDisplayResult Edit(ContentTypeDefinition model) =>
         Initialize<ContentTypeMigrationsViewModel>(

Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs

@@ -1,10 +1,9 @@
-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;
 using Lombiq.HelpfulLibraries.OrchardCore.Contents;
 using Microsoft.Extensions.Localization;
-using Newtonsoft.Json.Linq;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentManagement.Display.Models;
@@ -15,44 +14,31 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
 
-public class ContentSetContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<ContentSetContentPickerField>
+public class ContentSetContentPickerFieldDisplayDriver(
+    IContentDefinitionManager contentDefinitionManager,
+    IContentSetManager contentSetManager,
+    IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
+    IStringLocalizer<ContentSetPart> stringLocalizer) : ContentFieldDisplayDriver<ContentSetContentPickerField>
 {
-    private readonly IContentDefinitionManager _contentDefinitionManager;
-    private readonly IContentSetManager _contentSetManager;
-    private readonly IEnumerable<IContentSetEventHandler> _contentSetEventHandlers;
-    private readonly IStringLocalizer<ContentSetPart> T;
-
-    public ContentSetContentPickerFieldDisplayDriver(
-        IContentDefinitionManager contentDefinitionManager,
-        IContentSetManager contentSetManager,
-        IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
-        IStringLocalizer<ContentSetPart> stringLocalizer)
-    {
-        _contentDefinitionManager = contentDefinitionManager;
-        _contentSetManager = contentSetManager;
-        _contentSetEventHandlers = contentSetEventHandlers;
-        T = stringLocalizer;
-    }
-
     public override IDisplayResult Display(
         ContentSetContentPickerField field,
         BuildFieldDisplayContext fieldDisplayContext)
     {
         var name = fieldDisplayContext.PartFieldDefinition.Name;
         if (field.ContentItem.Get<ContentSetPart>(name) is not { } part) return null;
 
-        return Initialize<ContentSetContentPickerFieldViewModel>(GetDisplayShapeType(fieldDisplayContext), model =>
+        return Initialize<ContentSetContentPickerFieldViewModel>(GetDisplayShapeType(fieldDisplayContext), async model =>
             {
                 model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
-                return model.InitializeAsync(
-                    _contentSetManager,
-                    _contentSetEventHandlers,
-                    T,
+                await model.InitializeAsync(
+                    contentSetManager,
+                    contentSetEventHandlers,
+                    stringLocalizer,
                     part,
                     new ContentTypePartDefinition(
                         name,
-                        _contentDefinitionManager.GetPartDefinition(nameof(ContentSetPart)),
-                        new JObject()),
+                        await contentDefinitionManager.GetPartDefinitionAsync(nameof(ContentSetPart)),
+                        []),
                     isNew: false);
             })
             .Location(CommonContentDisplayTypes.Detail, CommonLocationNames.Content)

Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs

@@ -14,34 +14,21 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
 
-public class ContentSetPartDisplayDriver : ContentPartDisplayDriver<ContentSetPart>
+public class ContentSetPartDisplayDriver(
+    IContentSetManager contentSetManager,
+    IIdGenerator idGenerator,
+    IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
+    IStringLocalizer<ContentSetPart> stringLocalizer) : ContentPartDisplayDriver<ContentSetPart>
 {
     private const string ShapeType = $"{nameof(ContentSetPart)}_{CommonContentDisplayTypes.SummaryAdmin}";
 
-    private readonly IContentSetManager _contentSetManager;
-    private readonly IIdGenerator _idGenerator;
-    private readonly IEnumerable<IContentSetEventHandler> _contentSetEventHandlers;
-    private readonly IStringLocalizer<ContentSetPart> T;
-
-    public ContentSetPartDisplayDriver(
-        IContentSetManager contentSetManager,
-        IIdGenerator idGenerator,
-        IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
-        IStringLocalizer<ContentSetPart> stringLocalizer)
-    {
-        _contentSetManager = contentSetManager;
-        _idGenerator = idGenerator;
-        _contentSetEventHandlers = contentSetEventHandlers;
-        T = stringLocalizer;
-    }
-
     public override IDisplayResult Display(ContentSetPart part, BuildPartDisplayContext context)
     {
         ValueTask InitializeAsync(ContentSetPartViewModel model) =>
             model.InitializeAsync(
-                _contentSetManager,
-                _contentSetEventHandlers,
-                T,
+                contentSetManager,
+                contentSetEventHandlers,
+                stringLocalizer,
                 part,
                 context.TypePartDefinition,
                 isNew: false);
@@ -56,9 +43,9 @@ ValueTask InitializeAsync(ContentSetPartViewModel model) =>
 
     public override IDisplayResult Edit(ContentSetPart part, BuildPartEditorContext context) =>
         Initialize<ContentSetPartViewModel>($"{nameof(ContentSetPart)}_Edit", model => model.InitializeAsync(
-                _contentSetManager,
-                _contentSetEventHandlers,
-                T,
+                contentSetManager,
+                contentSetEventHandlers,
+                stringLocalizer,
                 part,
                 context.TypePartDefinition,
                 context.IsNew))
@@ -79,7 +66,7 @@ public override async Task<IDisplayResult> UpdateAsync(
             // item has not been saved yet.
             if (string.IsNullOrEmpty(part.ContentSet))
             {
-                part.ContentSet = _idGenerator.GenerateUniqueId();
+                part.ContentSet = idGenerator.GenerateUniqueId();
             }
         }
 

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;
@@ -27,25 +27,17 @@ public static ContentSetIndex FromPart(ContentSetPart part, string partName) =>
         };
 }
 
-public class ContentSetIndexProvider : IndexProvider<ContentItem>
+public class ContentSetIndexProvider(IServiceProvider provider) : IndexProvider<ContentItem>
 {
-    private readonly IServiceProvider _provider;
-
-    // We can't inject Lazy<IContentDefinitionManager> because it will throw a "Cannot resolve scoped service
-    // 'OrchardCore.ContentManagement.Metadata.IContentDefinitionManager' from root provider." exception.
-    public ContentSetIndexProvider(IServiceProvider provider) =>
-        _provider = provider;
-
     public override void Describe(DescribeContext<ContentItem> context) =>
-        context.For<ContentSetIndex>().Map(contentItem =>
+        context.For<ContentSetIndex>().Map(async contentItem =>
         {
             if (!contentItem.Latest) return Enumerable.Empty<ContentSetIndex>();
 
-            using var scope = _provider.CreateScope();
+            using var scope = provider.CreateScope();
             var contentDefinitionManager = scope.ServiceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            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<ContentSetPart>(part.Name), part.Name })

Lombiq.HelpfulExtensions/Extensions/ContentSets/Migrations.cs

@@ -1,28 +1,24 @@
-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;
 
-public class Migrations : DataMigration
+public class Migrations(IContentDefinitionManager contentDefinitionManager) : DataMigration
 {
-    private readonly IContentDefinitionManager _contentDefinitionManager;
-
-    public Migrations(IContentDefinitionManager contentDefinitionManager) =>
-        _contentDefinitionManager = contentDefinitionManager;
-
-    public int Create()
+    public async Task<int> CreateAsync()
     {
-        _contentDefinitionManager.AlterPartDefinition(nameof(ContentSetPart), builder => builder
+        await contentDefinitionManager.AlterPartDefinitionAsync(nameof(ContentSetPart), builder => builder
             .Attachable()
             .Reusable()
             .WithDisplayName("Content Set"));
 
-        SchemaBuilder.CreateMapIndexTable<ContentSetIndex>(table => table
+        await SchemaBuilder.CreateMapIndexTableAsync<ContentSetIndex>(table => table
             .Column<string>(nameof(ContentSetIndex.ContentItemId), column => column.WithCommonUniqueIdLength())
             .Column<string>(nameof(ContentSetIndex.PartName))
             .Column<bool>(nameof(ContentSetIndex.IsPublished))

Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/ContentSetContentPickerField.cs

@@ -1,12 +1,7 @@
-using OrchardCore.ContentManagement;
-using System.Diagnostics.CodeAnalysis;
+using OrchardCore.ContentManagement;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 
-[SuppressMessage(
-    "Minor Code Smell",
-    "S2094:Classes should not be empty",
-    Justification = "Only data we need is the field name.")]
 public class ContentSetContentPickerField : ContentField
 {
 }