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/Middlewares/DeferredTaskMiddleware.cs

@@ -5,12 +5,8 @@
 
 namespace Lombiq.HelpfulLibraries.AspNetCore.Middlewares;
 
-public class DeferredTaskMiddleware
+public class DeferredTaskMiddleware(RequestDelegate next)
 {
-    private readonly RequestDelegate _next;
-
-    public DeferredTaskMiddleware(RequestDelegate next) => _next = next;
-
     public async Task InvokeAsync(
         HttpContext context,
         IEnumerable<IDeferredTask> deferredTasks)
@@ -23,7 +19,7 @@ public async Task InvokeAsync(
             await deferredTask.PreProcessAsync(context);
         }
 
-        await _next(context);
+        await next(context);
 
         foreach (var deferredTask in deferredTasksList) await deferredTask.PostProcessAsync(context);
     }

Lombiq.HelpfulLibraries.AspNetCore/Mvc/ActionResultHelpers.cs

@@ -27,11 +27,7 @@ public static FileResult ZipFile(IDictionary<string, Stream> files, string zipFi
                 var entry = archive.CreateEntry(fileName, CompressionLevel.Optimal);
                 using var entryStream = entry.Open();
                 fileStream.CopyTo(entryStream);
-
-                // False positive.
-#pragma warning disable S3966 // Objects should not be disposed more than once.
                 fileStream.Dispose();
-#pragma warning restore S3966 // Objects should not be disposed more than once.
             }
         }
 

Lombiq.HelpfulLibraries.AspNetCore/Mvc/JsonModelBinder.cs

@@ -8,16 +8,9 @@
 
 namespace Lombiq.HelpfulLibraries.AspNetCore.Mvc;
 
-public class JsonModelBinder : IModelBinder
+public class JsonModelBinder(ILogger<JsonModelBinder> logger, IObjectModelValidator validator) : IModelBinder
 {
-    private readonly ILogger<JsonModelBinder> _logger;
-    private readonly IObjectModelValidator _validator;
-
-    public JsonModelBinder(ILogger<JsonModelBinder> logger, IObjectModelValidator validator)
-    {
-        _logger = logger;
-        _validator = validator;
-    }
+    private static readonly JsonSerializerOptions SerializeOptions = new(JsonSerializerDefaults.Web);
 
     public Task BindModelAsync(ModelBindingContext bindingContext)
     {
@@ -28,14 +21,14 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
             var parsed = value is null ? null : JsonSerializer.Deserialize(
                 value,
                 bindingContext.ModelType,
-                new JsonSerializerOptions(JsonSerializerDefaults.Web));
+                SerializeOptions);
 
             if (parsed is null)
             {
                 return Task.CompletedTask;
             }
 
-            _validator.Validate(
+            validator.Validate(
                 bindingContext.ActionContext,
                 validationState: bindingContext.ValidationState,
                 prefix: string.Empty,
@@ -45,15 +38,15 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
         }
         catch (JsonException jsonException)
         {
-            _logger.LogError(jsonException, "Failed to bind parameter '{FieldName}'", bindingContext.FieldName);
+            logger.LogError(jsonException, "Failed to bind parameter '{FieldName}'", bindingContext.FieldName);
             bindingContext.ActionContext.ModelState.TryAddModelError(
                 key: jsonException.Path,
                 exception: jsonException,
                 bindingContext.ModelMetadata);
         }
         catch (Exception exception) when (exception is FormatException or OverflowException)
         {
-            _logger.LogError(exception, "Failed to bind parameter '{FieldName}'", bindingContext.FieldName);
+            logger.LogError(exception, "Failed to bind parameter '{FieldName}'", bindingContext.FieldName);
             bindingContext.ActionContext.ModelState.TryAddModelError(
                 string.Empty,
                 exception,

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();
@@ -129,7 +130,7 @@ static void UpdateIfMissing(ref string cookie, ref bool changed, string test, st
             context.Response.OnStarting(() =>
             {
                 var setCookie = context.Response.Headers[setCookieHeader];
-                if (!setCookie.Any()) return Task.CompletedTask;
+                if (setCookie.Count == 0) return Task.CompletedTask;
 
                 var newCookies = new List<string>(capacity: setCookie.Count);
                 var changed = false;

Lombiq.HelpfulLibraries.AspNetCore/Security/CdnContentSecurityPolicyProvider.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -46,19 +46,19 @@ public ValueTask UpdateAsync(IDictionary<string, string> securityPolicies, HttpC
     {
         var any = false;
 
-        if (PermittedStyleSources.Any())
+        if (!PermittedStyleSources.IsEmpty)
         {
             any = true;
             MergeValues(securityPolicies, StyleSrc, PermittedStyleSources);
         }
 
-        if (PermittedScriptSources.Any())
+        if (!PermittedScriptSources.IsEmpty)
         {
             any = true;
             MergeValues(securityPolicies, ScriptSrc, PermittedScriptSources);
         }
 
-        if (PermittedFontSources.Any())
+        if (!PermittedFontSources.IsEmpty)
         {
             any = true;
             MergeValues(securityPolicies, FontSrc, PermittedFontSources);

Lombiq.HelpfulLibraries.Cli/CliProgram.cs

@@ -10,13 +10,11 @@
 
 namespace Lombiq.HelpfulLibraries.Cli;
 
-public class CliProgram
+public class CliProgram(string command)
 {
     public static CliProgram DotNet { get; } = new("dotnet");
 
-    private readonly string _command;
-
-    public CliProgram(string command) => _command = command + OperatingSystemHelper.GetExecutableExtension();
+    private readonly string _command = command + OperatingSystemHelper.GetExecutableExtension();
 
     /// <summary>
     /// Creates a <see cref="Command"/> object based on the passed <paramref name="arguments"/>.

Lombiq.HelpfulLibraries.Cli/Helpers/CliWrapHelper.cs

@@ -19,7 +19,7 @@ public static class CliWrapHelper
     /// <param name="name">The application name you can invoke directly in the command line.</param>
     public static async Task<IEnumerable<FileInfo>> WhichAsync(string name)
     {
-        var appName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "where" : "which";
+        var appName = OperatingSystem.IsOSPlatform(nameof(OSPlatform.Windows)) ? "where" : "which";
         var result = await CliWrap.Cli.Wrap(appName)
             .WithArguments(name)
             .WithValidation(CommandResultValidation.None)
@@ -46,7 +46,7 @@ public static async Task StreamAsync(
         Func<Command, Command> configureCommand = null)
     {
         var command = CliWrap.Cli.Wrap(program);
-        if (arguments?.Any() == true) command = command.WithArguments(arguments);
+        if (arguments?.Count != 0) command = command.WithArguments(arguments);
         if (configureCommand != null) command = configureCommand(command);
 
         await foreach (var commandEvent in command.ListenAsync()) handler(commandEvent);

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/DependencyInjection/ServiceCollectionExtensions.cs

@@ -13,10 +13,8 @@ public static class ServiceCollectionExtensions
     public static void AddLazyInjectionSupport(this IServiceCollection services) =>
         services.TryAddTransient(typeof(Lazy<>), typeof(Lazier<>));
 
-    private sealed class Lazier<T> : Lazy<T>
+    private sealed class Lazier<T>(IServiceProvider provider) : Lazy<T>(provider.GetRequiredService<T>)
         where T : class
     {
-        public Lazier(IServiceProvider provider)
-            : base(provider.GetRequiredService<T>) { }
     }
 }

Lombiq.HelpfulLibraries.Common/Extensions/EnumerableExtensions.cs

@@ -301,7 +301,7 @@ public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T> collection) =>
     /// cref="Array.Empty{TResult}"/>.
     /// </summary>
     public static IEnumerable<T> EmptyIfNull<T>(this T[] array) =>
-        array ?? Array.Empty<T>();
+        array ?? [];
 
     /// <summary>
     /// Maps the provided collection of pairs using a selector with separate arguments.

Lombiq.HelpfulLibraries.Common/Extensions/RandomNumberGeneratorExtensions.cs

@@ -19,7 +19,7 @@ public static class RandomNumberGeneratorExtensions
     /// </remarks>
     public static int Next(this RandomNumberGenerator randomNumberGenerator, int minValue, int maxValue)
     {
-        if (minValue > maxValue) throw new ArgumentOutOfRangeException(nameof(minValue));
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(minValue, maxValue);
         if (minValue == maxValue) return minValue;
 
         var diff = (long)maxValue - minValue;

Lombiq.HelpfulLibraries.Common/Extensions/StringExtensions.cs

@@ -84,13 +84,13 @@ public static string MakeFileSystemFriendly(this string text, bool noSpaceOrDot
     /// Returns an array by splitting the input along commas and stripping empty entries.
     /// </summary>
     public static string[] SplitByCommas(this string? text) =>
-        text?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+        text?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? [];
 
     /// <summary>
     /// Returns the input split into lines (using <see cref="Environment.NewLine"/>).
     /// </summary>
     public static string[] SplitByNewLines(this string? text) =>
-        text?.Split(Environment.NewLine) ?? Array.Empty<string>();
+        text?.Split(Environment.NewLine) ?? [];
 
     /// <summary>
     /// A shortcut for <c>string.Contains(string, StringComparison.InvariantCultureIgnoreCase)</c>. It also safely
@@ -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/Extensions/CustomSqlExtensions.cs

@@ -1,5 +1,4 @@
 using LinqToDB;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Lombiq.HelpfulLibraries.LinqToDb.Extensions;
 
@@ -9,16 +8,13 @@ public static class CustomSqlExtensions
     // used by the attribute.
     [Sql.Expression(ProviderName.SqlServer, "JSON_VALUE({0}, {1})", ServerSideOnly = true, InlineParameters = true)]
     [Sql.Expression(ProviderName.SQLite, "json_extract({0}, {1})", ServerSideOnly = true, InlineParameters = true)]
-    [SuppressMessage("Usage", "CA1801:Review unused parameters", Justification = "Used in the Sql.Expression attribute.")]
     public static string JsonValue(object expression, string path) => null;
 
     [Sql.Expression(ProviderName.SqlServer, "JSON_MODIFY({0}, {1}, {2})", ServerSideOnly = true, InlineParameters = true)]
     [Sql.Expression(ProviderName.SQLite, "json_replace({0}, {1}, {2})", ServerSideOnly = true, InlineParameters = true)]
-    [SuppressMessage("Usage", "CA1801:Review unused parameters", Justification = "Used in the Sql.Expression attribute.")]
     public static string JsonModify(string json, string path, string newValue) => null;
 
     [Sql.Expression(ProviderName.SqlServer, "JSON_QUERY({0})", ServerSideOnly = true, InlineParameters = true)]
     [Sql.Expression(ProviderName.SQLite, "json({0})", ServerSideOnly = true, InlineParameters = true)]
-    [SuppressMessage("Usage", "CA1801:Review unused parameters", Justification = "Used in the Sql.Expression attribute.")]
     public static string JsonQuery(string value) => null;
 }

Lombiq.HelpfulLibraries.LinqToDb/LinqToDbConnection.cs

@@ -5,13 +5,12 @@
 
 namespace Lombiq.HelpfulLibraries.LinqToDb;
 
-public class LinqToDbConnection : DataConnection, ITableAccessor
+public class LinqToDbConnection(
+    IDataProvider dataProvider,
+    DbTransaction dbTransaction,
+    string tablePrefix) : DataConnection(dataProvider, dbTransaction), ITableAccessor
 {
-    private readonly string _tablePrefix;
-
-    public LinqToDbConnection(IDataProvider dataProvider, DbTransaction dbTransaction, string tablePrefix)
-        : base(dataProvider, dbTransaction) =>
-            _tablePrefix = tablePrefix;
+    private readonly string _tablePrefix = tablePrefix;
 
     /// <summary>
     /// For the current query, overrides <see cref="ITable{T}.TableName"/> of the table-like source

Lombiq.HelpfulLibraries.LinqToDb/LinqToDbQueryExecutor.cs

@@ -12,9 +12,7 @@ namespace Lombiq.HelpfulLibraries.LinqToDb;
 public static class LinqToDbQueryExecutor
 {
     // We have no control over where these fields are declared.
-#pragma warning disable CA1810 // Initialize reference type static fields inline
     static LinqToDbQueryExecutor()
-#pragma warning restore CA1810 // Initialize reference type static fields inline
     {
         // Generate aliases for final projection.
         Sql.GenerateFinalAliases = true;

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>
 
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="linq2db" Version="5.2.2" />
-    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.7.0" />
+    <PackageReference Include="linq2db" Version="5.3.2" />
+    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.8.2" />
   </ItemGroup>
 </Project>

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>