OCC-245: Update OC preview version and fix breaking changes

.github/workflows/publish-cloudsmith.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish-nuget:
-    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OCC-245
+    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
     with:
       source: https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json
     secrets:

.github/workflows/publish-nuget.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   publish-nuget:
+    if: ${{ ! contains(github.ref_name, '-preview.') }}
     uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
     secrets:
       API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}

Lombiq.HelpfulLibraries.AspNetCore/Mvc/HttpRequestInfo.cs

@@ -0,0 +1,37 @@
+#nullable enable
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace Lombiq.HelpfulLibraries.AspNetCore.Mvc;
+
+/// <summary>
+/// A simplified intermediate type that can be used to debug <see cref="HttpRequest"/>.
+/// </summary>
+public record HttpRequestInfo(
+    string Url,
+    string? ContentType,
+    IHeaderDictionary Headers,
+    IDictionary<string, string> Form,
+    IRequestCookieCollection Cookies)
+{
+    public HttpRequestInfo(HttpRequest request)
+        : this(
+            request.GetDisplayUrl(),
+            request.ContentType,
+            request.Headers,
+            request.HasFormContentType ?
+                request.Form.ToDictionaryIgnoreCase(pair => pair.Key, pair => pair.Value.ToString()) :
+                new Dictionary<string, string>(),
+            request.Cookies)
+    {
+    }
+
+    public override string ToString() => $"HTTP Request at \"{Url}\"";
+
+    public string ToJson() => JsonSerializer.Serialize(this);
+
+    public static string? ToJson(HttpRequest? request) => request == null ? null : new HttpRequestInfo(request).ToJson();
+}

Lombiq.HelpfulLibraries.OrchardCore/ResourceManagement/HtmlShape.cs

@@ -0,0 +1,59 @@
+#nullable enable
+
+using Microsoft.AspNetCore.Html;
+using OrchardCore.DisplayManagement;
+using OrchardCore.DisplayManagement.Html;
+using OrchardCore.DisplayManagement.Shapes;
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+
+namespace Lombiq.HelpfulLibraries.OrchardCore.ResourceManagement;
+
+public class HtmlShape : IHtmlContent, IPositioned, IShape
+{
+    private static readonly IDictionary<string, string> _dummyAttributes = new Dictionary<string, string>().ToFrozenDictionary();
+    private static readonly IDictionary<string, object> _dummyProperties = new Dictionary<string, object>().ToFrozenDictionary();
+
+    private readonly Func<IHtmlContent?> _getHtml;
+
+    public string? Position { get; set; }
+
+    public ShapeMetadata Metadata { get; set; } = new();
+
+    public string? Id { get; set; }
+
+    public string? TagName { get; set; }
+
+    public IList<string> Classes => [];
+
+    public IDictionary<string, string> Attributes => _dummyAttributes;
+
+    public IDictionary<string, object> Properties => _dummyProperties;
+
+    public IReadOnlyList<IPositioned> Items => [];
+
+    public HtmlShape(Func<IHtmlContent?> getHtml, string? position = null)
+    {
+        _getHtml = getHtml;
+        Position = position;
+    }
+
+    public HtmlShape(IHtmlContent? value, string? position = null)
+        : this(() => value, position)
+    {
+    }
+
+    public HtmlShape(string? value, string? position = null)
+        : this(new HtmlContentString(value ?? string.Empty), position)
+    {
+    }
+
+    public void WriteTo(TextWriter writer, HtmlEncoder encoder) => _getHtml.Invoke()?.WriteTo(writer, encoder);
+
+    public ValueTask<IShape> AddAsync(object item, string position) => throw new ReadOnlyException();
+}

Lombiq.HelpfulLibraries.OrchardCore/ResourceManagement/ScriptModuleResourceFilter.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.ResourceManagement;
 using System;
@@ -25,11 +24,11 @@ public record ScriptModuleResourceFilter(ILayoutAccessor LayoutAccessor) : IAsyn
 {
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
-        var shape = await context.HttpContext.RequestServices.CreateAdHocShapeForCurrentThemeAsync(
-            nameof(ScriptModuleResourceFilter),
-            displayContext => Task.FromResult(DisplayScriptModuleResources(displayContext.ServiceProvider)));
+        await LayoutAccessor.AddShapeToZoneAsync(
+            CommonLocationNames.Content,
+            new HtmlShape(() => DisplayScriptModuleResources(context.HttpContext.RequestServices)),
+            "After");
 
-        await LayoutAccessor.AddShapeToZoneAsync("Content", shape, "After");
         await next();
     }
 

Lombiq.HelpfulLibraries.OrchardCore/Shapes/ShapeExtensions.cs

@@ -1,3 +1,4 @@
+using Lombiq.HelpfulLibraries.OrchardCore.ResourceManagement;
 using Microsoft.AspNetCore.Html;
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.DisplayManagement.Descriptors;
@@ -60,6 +61,7 @@ public static T As<T>(this IShape shape)
     /// name="shapeTable"/>, then a new descriptor is added with binding that uses <paramref name="displayAsync"/>.
     /// If <paramref name="type"/> is null or empty, a new random unique name is generated.
     /// </summary>
+    [Obsolete($"This no longer works with the {nameof(DefaultShapeTableManager)}. Use {nameof(HtmlShape)} instead.")]
     public static IShape CreateAdHocShape(this ShapeTable shapeTable, string type, Func<DisplayContext, Task<IHtmlContent>> displayAsync)
     {
         if (string.IsNullOrEmpty(type)) type = $"AdHocShape_{Guid.NewGuid():D}";
@@ -102,6 +104,7 @@ public static IShape CreateAdHocShape(this ShapeTable shapeTable, string type, F
     /// uses <paramref name="displayAsync"/>. If <paramref name="type"/> is null or empty, a new random unique name is
     /// generated.
     /// </summary>
+    [Obsolete($"This no longer works with the {nameof(DefaultShapeTableManager)}. Use {nameof(HtmlShape)} instead.")]
     public static async Task<IShape> CreateAdHocShapeForCurrentThemeAsync(
         this IServiceProvider provider,
         string type,

NuGet.config

@@ -4,7 +4,6 @@
     <!-- Ignore global configuration -->
     <clear />
     <!-- Here so the Visual Studio package manager won't default to the next feed below. -->
-    <add key="OrchardCoreCommercePreview" value="https://nuget.cloudsmith.io/orchardcore/commerce/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
   </packageSources>
@@ -14,9 +13,6 @@
       <!-- OrchardCore.Translations.All is on a separate repo and doesn't have a preview -->
       <package pattern="OrchardCore.Translations.*" />
     </packageSource>
-    <packageSource key="OrchardCoreCommercePreview">
-      <package pattern="OrchardCore.Commerce*" />
-    </packageSource>
     <packageSource key="OrchardCorePreview">
       <package pattern="OrchardCore*" />
       <!-- OrchardCore theme packages -->