OSOE-925: Upgrade OC preview

.github/workflows/publish-cloudsmith.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   publish-nuget:
     name: Publish to Cloudsmith
-    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
+    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-925
     with:
       source: https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json
     secrets:

.github/workflows/publish-nuget.yml

@@ -9,6 +9,6 @@ jobs:
   publish-nuget:
     name: Publish to NuGet
     if: ${{ !contains(github.ref_name, '-preview.') }}
-    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 }}

.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

Lombiq.HelpfulLibraries.AspNetCore/CompatibilitySuppressions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>net8.0</Target>
+  </Suppression>
+</Suppressions>

Lombiq.HelpfulLibraries.AspNetCore/Extensions/ForwardedHeadersApplicationBuilderExtensions.cs

@@ -32,7 +32,7 @@ public static IApplicationBuilder UseForwardedHeadersForCloudflareAndAzure(this
         };
 
         // These are not all known for Cloudflare and Azure.
-        forwardedHeadersOptions.KnownNetworks.Clear();
+        forwardedHeadersOptions.KnownIPNetworks.Clear();
         forwardedHeadersOptions.KnownProxies.Clear();
 
         builder.UseForwardedHeaders(forwardedHeadersOptions);

Lombiq.HelpfulLibraries.AspNetCore/Extensions/HttpRequestExtensions.cs

@@ -114,4 +114,27 @@ public static bool IsAction<TController>(
         string? area = null)
         where TController : ControllerBase =>
         request.IsAction(actionSelector.StripResult(), area);
+
+    /// <summary>
+    /// If the <paramref name="request"/> has a form body, it tries to find the value for <paramref name="key"/> amd
+    /// trims it. If that fails or if the result is an empty string, <see langword="null"/> is returned instead.
+    /// </summary>
+    public static string? GetFormValueMaybe(this HttpRequest request, string key)
+    {
+        if (!request.HasFormContentType) return null;
+
+        // We use try-catch in case the request is somehow broken or invalid because then just accessing the form can
+        // throw an exception.
+        try
+        {
+            return request.Form.TryGetValue(key, out var values) &&
+                values.WhereNot(string.IsNullOrWhiteSpace).FirstOrDefault()?.Trim() is { } value
+                    ? value
+                    : null;
+        }
+        catch
+        {
+            return null;
+        }
+    }
 }

Lombiq.HelpfulLibraries.AspNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -11,5 +11,5 @@ public static class ServiceCollectionExtensions
     /// </summary>
     public static void AddAsyncResultFilter<TFilter>(this IServiceCollection services)
         where TFilter : IAsyncResultFilter =>
-        services.Configure<MvcOptions>(options => options.Filters.Add(typeof(TFilter)));
+        services.Configure<MvcOptions>(options => options.Filters.Add<TFilter>());
 }

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

@@ -1,28 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
+
   <PropertyGroup>
     <Title>Lombiq Helpful Libraries - ASP.NET Core Libraries</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2011, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq Helpful Libraries - ASP.NET Core Libraries: Some useful extensions and other helpers for ASP.NET Core. See the project website for detailed documentation.</Description>
+    <CopyrightYear>2011</CopyrightYear>
+    <DescriptionBody>Some useful extensions and other helpers for ASP.NET Core. See the project website for detailed documentation.</DescriptionBody>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;</PackageTags>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
     <RepositoryUrl>https://github.com/Lombiq/Helpful-Libraries</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Helpful-Libraries/blob/dev/Lombiq.HelpfulLibraries.AspNetCore/Readme.md</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
@@ -31,4 +24,6 @@
     <ProjectReference Include="..\Lombiq.HelpfulLibraries.Common\Lombiq.HelpfulLibraries.Common.csproj" />
   </ItemGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
 </Project>

Lombiq.HelpfulLibraries.Attributes/Lombiq.HelpfulLibraries.Attributes.csproj

@@ -1,27 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
     <PropertyGroup>
       <TargetFramework>netstandard2.0</TargetFramework>
       <IsPackable>true</IsPackable>
       <Nullable>enable</Nullable>
-      <LangVersion>latest</LangVersion>
+      <LangVersion>14.0</LangVersion>
     </PropertyGroup>
 
+    <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+    <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
+
     <PropertyGroup>
         <Title>Lombiq Helpful Libraries - Attributes for Orchard Core</Title>
-        <Authors>Lombiq Technologies</Authors>
-        <Copyright>Copyright © 2011, Lombiq Technologies Ltd.</Copyright>
-        <Description>Lombiq Helpful Libraries - Attributes for Orchard Core: Adds attributes used by other projects. See the project website for detailed documentation.</Description>
-        <PackageIcon>NuGetIcon.png</PackageIcon>
+        <CopyrightYear>2011</CopyrightYear>
+        <DescriptionBody>Adds attributes used by other projects. See the project website for detailed documentation.</DescriptionBody>
         <PackageTags>OrchardCore;Lombiq;Attributes</PackageTags>
         <RepositoryUrl>https://github.com/Lombiq/Helpful-Libraries</RepositoryUrl>
         <PackageProjectUrl>https://github.com/Lombiq/Helpful-Libraries/blob/dev/Lombiq.HelpfulLibraries.Attributes/Readme.md</PackageProjectUrl>
-        <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="Readme.md" />
-        <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-    </ItemGroup>
-
+    <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+    <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
 </Project>

Lombiq.HelpfulLibraries.Cli/CompatibilitySuppressions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>net8.0</Target>
+  </Suppression>
+</Suppressions>

Lombiq.HelpfulLibraries.Cli/Extensions/CommandExtensions.cs

@@ -29,16 +29,15 @@ public static async Task ExecuteUntilOutputAsync(
         Action<StandardErrorCommandEvent>? stdErrHandler = default,
         CancellationToken cancellationToken = default)
     {
-        await using var enumerator = command.ListenAsync(cancellationToken).GetAsyncEnumerator(cancellationToken);
-
-        while (await enumerator.MoveNextAsync(cancellationToken))
+        await foreach (var commandEvent in command.ListenAsync(cancellationToken))
         {
-            if (enumerator.Current is StandardOutputCommandEvent stdOut && stdOut.Text.ContainsOrdinalIgnoreCase(outputToWaitFor))
+            if (commandEvent is StandardOutputCommandEvent stdOut &&
+                stdOut.Text.ContainsOrdinalIgnoreCase(outputToWaitFor))
             {
                 return;
             }
 
-            if (enumerator.Current is StandardErrorCommandEvent stdErr)
+            if (commandEvent is StandardErrorCommandEvent stdErr)
             {
                 stdErrHandler?.Invoke(stdErr);
             }

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

@@ -1,27 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
+
   <PropertyGroup>
     <Title>Lombiq Helpful Libraries - Command Line Libraries</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2011, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq Helpful Libraries - Command Line Libraries. This project helps with executing command line calls. See the project website for detailed documentation.</Description>
+    <CopyrightYear>2011</CopyrightYear>
+    <DescriptionBody>This project helps with executing command line calls. See the project website for detailed documentation.</DescriptionBody>
     <PackageTags>Lombiq;cli;CliWrap</PackageTags>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
     <RepositoryUrl>https://github.com/Lombiq/Helpful-Libraries</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Helpful-Libraries/blob/dev/Lombiq.HelpfulLibraries.Cli/Readme.md</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="CliWrap" Version="3.10.1" />
   </ItemGroup>
@@ -30,4 +24,6 @@
     <ProjectReference Include="..\Lombiq.HelpfulLibraries.Common\Lombiq.HelpfulLibraries.Common.csproj" />
   </ItemGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
 </Project>

Lombiq.HelpfulLibraries.Common/CompatibilitySuppressions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>net8.0</Target>
+  </Suppression>
+</Suppressions>

Lombiq.HelpfulLibraries.Common/Extensions/ArrayExtensions.cs

@@ -11,7 +11,7 @@ public static class ArrayExtensions
     /// it's better to use this instead of the general `Any()` extension method.
     /// </para>
     /// </remarks>
-    public static bool Exists<T>(this T?[] array, Predicate<T?> match) => Array.Exists(array, match);
+    public static bool Exists<T>(this T[] array, Predicate<T> match) => Array.Exists(array, match);
 
     /// <summary>
     /// A fluid alternative to <see cref="Array.Find{T}(T[], Predicate{T})"/>.
@@ -22,12 +22,12 @@ public static class ArrayExtensions
     /// it's better to use this instead of the general `FirstOrDefault()` extension method.
     /// </para>
     /// </remarks>
-    public static T? Find<T>(this T?[] array, Predicate<T?> match) => Array.Find(array, match);
+    public static T? Find<T>(this T[] array, Predicate<T> match) => Array.Find(array, match);
 
     /// <summary>
     /// A fluid alternative to <see cref="Array.FindAll{T}(T[], Predicate{T})"/>.
     /// </summary>
-    public static T?[] FindAll<T>(this T?[] array, Predicate<T?> match) => Array.FindAll(array, match);
+    public static T[] FindAll<T>(this T[] array, Predicate<T> match) => Array.FindAll(array, match);
 
     /// <summary>
     /// A fluid alternative to <see cref="Array.FindIndex{T}(T[], Predicate{T})"/>.
@@ -38,5 +38,5 @@ public static class ArrayExtensions
     /// it's better to use this instead of the general `All()` extension method.
     /// </para>
     /// </remarks>
-    public static bool TrueForAll<T>(this T?[] array, Predicate<T?> match) => Array.TrueForAll(array, match);
+    public static bool TrueForAll<T>(this T[] array, Predicate<T> match) => Array.TrueForAll(array, match);
 }

Lombiq.HelpfulLibraries.Common/Extensions/EnumerableExtensions.cs

@@ -93,7 +93,7 @@ public static async Task AwaitEachAsync<TItem>(
     }
 
     /// <summary>
-    /// Awaits the tasks sequentially while the action returns <see langword="false"/>.
+    /// Awaits the tasks sequentially while the action returns <see langword="true"/>.
     /// </summary>
     /// <returns><see langword="true"/> if the <see langword="foreach"/> was never broken.</returns>
     public static async Task<bool> AwaitWhileAsync<TItem>(

Lombiq.HelpfulLibraries.Common/Extensions/StringExtensions.cs

@@ -98,6 +98,12 @@ 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.Ordinal)</c>.
+    /// </summary>
+    public static bool EqualsOrdinal(this string? text, string? value) =>
+        text?.Equals(value, StringComparison.Ordinal) == true;
+
     /// <summary>
     /// A shortcut for <c>string.Equals(string, StringComparison.OrdinalIgnoreCase)</c>.
     /// </summary>
@@ -435,4 +441,11 @@ public static string Concat(this string text, IList<Range> ranges)
 
     /// <inheritdoc cref="Concat"/>
     public static string Join(this IList<Range> ranges, string text) => text.Concat(ranges);
+
+    /// <summary>
+    /// Returns <see langword="null"/> if the <paramref name="value"/> is <see langword="null"/> or whitespace. This
+    /// makes chaining with the null-coalescing operator (<c>??</c>) easier.
+    /// </summary>
+    public static string? NullIfWhiteSpace(this string value) =>
+        string.IsNullOrWhiteSpace(value) ? null : value;
 }

Lombiq.HelpfulLibraries.Common/Extensions/ZipArchiveExtensions.cs

@@ -10,7 +10,7 @@ public static class ZipArchiveExtensions
     /// </summary>
     public static async Task CreateTextEntryAsync(this ZipArchive zip, string entryName, IEnumerable<string?>? lines)
     {
-        await using var writer = new StreamWriter(zip.CreateEntry(entryName).Open());
+        await using var writer = new StreamWriter(await zip.CreateEntry(entryName).OpenAsync());
 
         if (lines == null) return;
 
@@ -31,7 +31,7 @@ public static Task CreateTextEntryAsync(this ZipArchive zip, string entryName, s
     /// </summary>
     public static async Task CreateBinaryEntryAsync(this ZipArchive zip, string entryName, ReadOnlyMemory<byte> data)
     {
-        await using var stream = zip.CreateEntry(entryName).Open();
+        await using var stream = await zip.CreateEntry(entryName).OpenAsync();
         await stream.WriteAsync(data);
     }
 }

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

@@ -1,33 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
+
   <PropertyGroup>
     <Title>Lombiq Helpful Libraries - Common Libraries</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2011, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq Helpful Libraries - Common Libraries: Various useful libraries that can be handy when developing for .NET. See the project website for detailed documentation.</Description>
+    <CopyrightYear>2011</CopyrightYear>
+    <DescriptionBody>Various useful libraries that can be handy when developing for .NET. See the project website for detailed documentation.</DescriptionBody>
     <PackageTags>Lombiq;DateTime;DependencyInjection;Utilities</PackageTags>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
     <RepositoryUrl>https://github.com/Lombiq/Helpful-Libraries</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Helpful-Libraries/blob/dev/Lombiq.HelpfulLibraries.Common/Readme.md</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="System.Linq.Async" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
   </ItemGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="1.0.1-alpha.15.osoe-1208" />
 </Project>

Lombiq.HelpfulLibraries.LinqToDb/CompatibilitySuppressions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>net8.0</Target>
+  </Suppression>
+</Suppressions>