OSOE-751: Upgrade to Orchard Core 1.8

Lombiq.HelpfulLibraries.AspNetCore/Extensions/HttpRequestExtensions.cs

@@ -1,4 +1,5 @@
-using Lombiq.HelpfulLibraries.Common.Utilities;
+using Lombiq.HelpfulLibraries.Common.Utilities;
+using OrchardCore.Modules;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Lombiq.HelpfulLibraries.AspNetCore/Lombiq.HelpfulLibraries.AspNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
   </PropertyGroup>
 
@@ -27,6 +27,10 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.8.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Lombiq.HelpfulLibraries.Common\Lombiq.HelpfulLibraries.Common.csproj" />
   </ItemGroup>

Lombiq.HelpfulLibraries.AspNetCore/Security/ApplicationBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Security;
+using Lombiq.HelpfulLibraries.AspNetCore.Security;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using System;
@@ -98,7 +99,7 @@ public static IApplicationBuilder UseNosniffContentTypeOptionsHeader(this IAppli
 
             if (!context.Response.Headers.ContainsKey(key))
             {
-                context.Response.Headers.Add(key, "nosniff");
+                context.Response.Headers.Append(key, "nosniff");
             }
 
             await next();

Lombiq.HelpfulLibraries.Cli/Lombiq.HelpfulLibraries.Cli.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

Lombiq.HelpfulLibraries.Common/Extensions/StringExtensions.cs

@@ -99,12 +99,6 @@ public static string[] SplitByNewLines(this string? text) =>
     public static bool ContainsLoose(this string? text, string? toFind) =>
         text != null && toFind != null && text.Contains(toFind, StringComparison.InvariantCultureIgnoreCase);
 
-    /// <summary>
-    /// A shortcut for <c>string.Equals(string, StringComparison.OrdinalIgnoreCase)</c>.
-    /// </summary>
-    public static bool EqualsOrdinalIgnoreCase(this string text, string? value) =>
-        text.Equals(value, StringComparison.OrdinalIgnoreCase);
-
     /// <summary>
     /// A shortcut for <c>string.Contains(string, StringComparison.OrdinalIgnoreCase)</c>.
     /// </summary>

Lombiq.HelpfulLibraries.Common/Lombiq.HelpfulLibraries.Common.csproj

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

Lombiq.HelpfulLibraries.LinqToDb/Lombiq.HelpfulLibraries.LinqToDb.csproj

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

Lombiq.HelpfulLibraries.OrchardCore.Testing/Lombiq.HelpfulLibraries.OrchardCore.Testing.csproj

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

Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentDefinitionCommands.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Environment.Commands;
+using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulLibraries.OrchardCore.Contents;
 
@@ -28,6 +29,6 @@ public ContentDefinitionCommands(
         " /Part:<contentPartName>" +
         "\r\n\t" + "Attaches a content part to a content type.")]
     [OrchardSwitches(nameof(Type) + ", " + nameof(Part))]
-    public void AttachContentPart() =>
-        _contentDefinitionManager.AlterTypeDefinition(Type, type => type.WithPart(Part));
+    public Task AttachContentPartAsync() =>
+         _contentDefinitionManager.AlterTypeDefinitionAsync(Type, type => type.WithPart(Part));
 }

Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentDefinitionManagerExtensions.cs

@@ -1,6 +1,7 @@
 using OrchardCore.ContentManagement.Metadata.Builders;
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace OrchardCore.ContentManagement.Metadata;
 
@@ -13,13 +14,13 @@ public static class ContentDefinitionManagerExtensions
     /// <param name="contentType">Technical name of the content type.</param>
     /// <param name="contentPartName">Technical name of the content part.</param>
     /// <returns>Content part settings object.</returns>
-    public static T GetContentPartSettings<T>(
+    public static async Task<T> GetContentPartSettingsAsync<T>(
         this IContentDefinitionManager contentDefinitionManager,
         string contentType,
         string contentPartName)
         where T : class, new()
     {
-        var contentTypeDefinition = contentDefinitionManager.GetTypeDefinition(contentType);
+        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentType);
         var contentTypePartDefinition = contentTypeDefinition.Parts
             .FirstOrDefault(part => part.PartDefinition.Name == contentPartName);
 
@@ -30,20 +31,20 @@ public static T GetContentPartSettings<T>(
     /// Alters the definition of a content part whose technical name is its model's type name. It uses the typed wrapper
     /// <see cref="ContentPartDefinitionBuilder{TPart}"/> for configuration.
     /// </summary>
-    public static string AlterPartDefinition<TPart>(
+    public static async Task<string> AlterPartDefinitionAsync<TPart>(
         this IContentDefinitionManager manager,
         Action<ContentPartDefinitionBuilder<TPart>> configure)
         where TPart : ContentPart
     {
         var name = typeof(TPart).Name;
-        manager.AlterPartDefinition(name, part => configure(part.AsPart<TPart>()));
+        await manager.AlterPartDefinitionAsync(name, part => configure(part.AsPart<TPart>()));
         return name;
     }
 
     /// <summary>
     /// Prepares a <paramref name="contentType"/> to be used as a Taxonomy by resetting all content type settings to
     /// <see langword="false"/> and adding <c>TitlePart</c>.
     /// </summary>
-    public static void AlterTypeDefinitionForTaxonomy(this IContentDefinitionManager manager, string contentType) =>
-        manager.AlterTypeDefinition(contentType, type => type.NoAbilities().WithTitlePart());
+    public static Task AlterTypeDefinitionForTaxonomyAsync(this IContentDefinitionManager manager, string contentType) =>
+        manager.AlterTypeDefinitionAsync(contentType, type => type.NoAbilities().WithTitlePart());
 }

Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentExtensions.cs

@@ -118,7 +118,7 @@ public static async Task SanitizeContentItemVersionsAsync(this IContent content,
         {
             toRemove.Published = false;
             toRemove.Latest = false;
-            session.Save(toRemove);
+            await session.SaveAsync(toRemove);
         }
     }
 

Lombiq.HelpfulLibraries.OrchardCore/Data/IndexDataMigration.cs

@@ -1,4 +1,5 @@
 using OrchardCore.Data.Migration;
+using System.Threading.Tasks;
 using YesSql.Indexes;
 using YesSql.Sql;
 using YesSql.Sql.Schema;
@@ -15,11 +16,11 @@ public abstract class IndexDataMigration<TIndex> : DataMigration
 {
     protected virtual int CreateVersion => 1;
 
-    public int Create()
+    public async Task<int> CreateAsync()
     {
-        SchemaBuilder.CreateMapIndexTable<TIndex>(CreateIndex);
+        await SchemaBuilder.CreateMapIndexTableAsync<TIndex>(CreateIndex);
 
-        SchemaBuilder.CreateDocumentIdIndex<TIndex>();
+        await SchemaBuilder.CreateDocumentIdIndexAsync<TIndex>();
 
         return CreateVersion;
     }

Lombiq.HelpfulLibraries.OrchardCore/Data/SchemaBuilderExtensions.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using YesSql.Sql;
 
 namespace Lombiq.HelpfulLibraries.OrchardCore.Data;
@@ -15,8 +16,8 @@ public static class SchemaBuilderExtensions
     /// </summary>
     /// <typeparam name="T">Index table type.</typeparam>
     /// <param name="schemaBuilder">SchemaBuilder Interface.</param>
-    public static void CreateDocumentIdIndex<T>(this ISchemaBuilder schemaBuilder) =>
-        schemaBuilder.AlterTable(typeof(T).Name, table => table
+    public static Task CreateDocumentIdIndexAsync<T>(this ISchemaBuilder schemaBuilder) =>
+        schemaBuilder.AlterTableAsync(typeof(T).Name, table => table
             .CreateIndex(
                 $"IDX_{typeof(T).Name}_{DocumentId}",
                 DocumentId));
@@ -34,7 +35,7 @@ public static void CreateDocumentIdIndex<T>(this ISchemaBuilder schemaBuilder) =
     /// <exception cref="ArgumentException">
     /// It is thrown when the <paramref name="columnNames"/> is null or empty.
     /// </exception>
-    public static ISchemaBuilder AddDatabaseIndex<TTable>(this ISchemaBuilder schemaBuilder, params string[] columnNames)
+    public static Task AddDatabaseIndexAsync<TTable>(this ISchemaBuilder schemaBuilder, params string[] columnNames)
     {
         if (columnNames?.Any() != true)
         {
@@ -44,11 +45,11 @@ public static ISchemaBuilder AddDatabaseIndex<TTable>(this ISchemaBuilder schema
         if (columnNames.Exists(string.IsNullOrWhiteSpace))
         {
             throw new ArgumentException(
-                "The column names shouldn't be null, empty or all whitespace.",
+                "The column names shouldn't be null, empty, or all whitespace.",
                 nameof(columnNames));
         }
 
-        return schemaBuilder.AlterTable(typeof(TTable).Name, table => table
+        return schemaBuilder.AlterTableAsync(typeof(TTable).Name, table => table
             .CreateIndex(
                 $"IDX_{typeof(TTable).Name}_{string.Join('_', columnNames)}",
                 columnNames));
@@ -57,10 +58,10 @@ public static ISchemaBuilder AddDatabaseIndex<TTable>(this ISchemaBuilder schema
     /// <summary>
     /// Creates a Map Index table with the provided index type of <typeparamref name="T"/>.
     /// </summary>
-    public static ISchemaBuilder CreateMapIndexTable<T>(
+    public static Task CreateMapIndexTableAsync<T>(
         this ISchemaBuilder builder,
         string collection = null) =>
-        builder.CreateMapIndexTable(
+        builder.CreateMapIndexTableAsync(
             typeof(T),
             table =>
             {

Lombiq.HelpfulLibraries.OrchardCore/Fields/NoneShapeTableProvider.cs

@@ -23,13 +23,18 @@ public class NoneShapeTableProvider : IShapeTableProvider
     public NoneShapeTableProvider(IContentDefinitionManager contentDefinitionManager) =>
         _contentDefinitionManager = contentDefinitionManager;
 
+    public void Discover(ShapeTableBuilder builder)
+    {
+        // The interface requires this method to be implemented so this is temporarily here.
+        // Remove this method once it gets deleted in IShapeTableProvider.
+    }
+
     /// <summary>
     /// Adds a "None" option to every field's display and editor and renders an empty shape.
     /// </summary>
-    public void Discover(ShapeTableBuilder builder)
+    public async Task DiscoverAsync(ShapeTableBuilder builder)
     {
-        var allFieldNames = _contentDefinitionManager
-            .ListPartDefinitions()
+        var allFieldNames = (await _contentDefinitionManager.ListPartDefinitionsAsync())
             .SelectMany(part => part.Fields)
             .Select(field => field.FieldDefinition.Name)
             .Distinct();

Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
   </PropertyGroup>
 
@@ -24,26 +24,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Alias" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Html" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Markdown" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Media.Core" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Taxonomies" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Queries" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Users.Core" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Title" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Themes" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Infrastructure" Version="1.7.0" />
-    <PackageReference Include="NodaTime" Version="3.1.9" />
+    <PackageReference Include="OrchardCore.Alias" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Autoroute" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Html" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Markdown" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Media.Core" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Taxonomies" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Queries" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Users.Core" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Title" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Themes" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Infrastructure" Version="1.8.2" />
+    <PackageReference Include="NodaTime" Version="3.1.10" />
     <!-- Necessary so tag helpers will work in the projects depending on this. -->
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="1.8.2" />
     <PackageReference Include="OrchardCore.Setup.Abstractions" Version="1.7.0" />
   </ItemGroup>
 

Lombiq.HelpfulLibraries.OrchardCore/Mvc/TypedRoute.cs

@@ -7,6 +7,7 @@
 using Newtonsoft.Json;
 using OrchardCore.Admin;
 using OrchardCore.Environment.Extensions;
+using OrchardCore.Modules;
 using OrchardCore.Modules.Manifest;
 using OrchardCore.Mvc.Core.Utilities;
 using System;

Lombiq.HelpfulLibraries.OrchardCore/Navigation/NavigationProviderBase.cs

@@ -1,6 +1,7 @@
 using Lombiq.HelpfulLibraries.Common.Utilities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Localization;
+using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using System;
 using System.Threading.Tasks;

Lombiq.HelpfulLibraries.OrchardCore/Shapes/PerTenantShapeTableManager.cs

@@ -84,7 +84,7 @@ public async Task<ShapeTable> GetShapeTableAsync(string themeId)
             var strategyFeature = _typeFeatureProvider.GetFeatureForDependency(bindingStrategy.GetType());
 
             var builder = new ShapeTableBuilder(strategyFeature, excludedFeatures);
-            bindingStrategy.Discover(builder);
+            await bindingStrategy.DiscoverAsync(builder);
             var builtAlterations = builder.BuildAlterations();
 
             BuildDescriptors(bindingStrategy, builtAlterations, shapeDescriptors);

Lombiq.HelpfulLibraries.OrchardCore/TagHelpers/EditorFieldSetTagHelper.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using System;
+using OrchardCore.Modules;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;

Lombiq.HelpfulLibraries.RestEase/Lombiq.HelpfulLibraries.RestEase.csproj

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

Lombiq.HelpfulLibraries.Samples/Lombiq.HelpfulLibraries.Samples.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <IsPackable>false</IsPackable>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Autoroute" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup>