Rendering zones before rendering layout

src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderSectionTag.cs

@@ -6,6 +6,7 @@
 using Fluid.Ast;
 using Fluid.Tags;
 using Microsoft.AspNetCore.Html;
+using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.Liquid.Ast;
 
 namespace OrchardCore.DisplayManagement.Liquid.Tags
@@ -30,7 +31,7 @@ public override async ValueTask<Completion> WriteToAsync(TextWriter writer, Text
             var required = arguments.HasNamed("required") && Convert.ToBoolean(arguments["required"].ToStringValue());
             var zone = layout[name];
 
-            if (required && zone != null && zone.Items.Count == 0)
+            if (required && zone != null && zone is Shape && zone.Items.Count == 0)
             {
                 throw new InvalidOperationException("Zone not found while invoking 'render_section': " + name);
             }

src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorPage.cs

@@ -335,7 +335,7 @@ public Task<IHtmlContent> RenderBodyAsync()
 
             var zone = ThemeLayout[name];
 
-            if (required && zone != null && zone.Items.Count == 0)
+            if (required && zone != null && zone is Shape && zone.Items.Count == 0)
             {
                 throw new InvalidOperationException("Zone not found: " + name);
             }

src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs

@@ -1,11 +1,15 @@
+using System;
+using System.Linq;
 using System.Threading.Tasks;
+using OrchardCore.DisplayManagement.Shapes;
+using OrchardCore.DisplayManagement.Zones;
 
 namespace OrchardCore.DisplayManagement.Theming
 {
     /// <summary>
-    /// This class represents a precompiled _Layout.cshtml view that renders a 
+    /// This class represents a precompiled _Layout.cshtml view that renders a
     /// Layout shape and the View's body in its Content zone.
-    /// 
+    ///
     /// 1- Views look for any _ViewStart.cshtml
     /// 2- <see cref="ThemingViewsFeatureProvider"/> has registered <see cref="ThemeViewStart"/> as the top one
     /// 3- <see cref="ThemeViewStart"/> then set a special Layout filename as the default View's Layout.
@@ -16,15 +20,35 @@ public class ThemeLayout : Razor.RazorPage<dynamic>
     {
         public override async Task ExecuteAsync()
         {
-            // The View's body is rendered 
+            // The View's body is rendered
             var body = RenderLayoutBody();
 
             if (ThemeLayout != null)
             {
                 // Then is added to the Content zone of the Layout shape
                 ThemeLayout.Content.Add(body);
 
-                // Finally we render the Shape's HTML to the page's output
+                // Render Shapes in Content
+                if(ThemeLayout.Content is IShape content)
+                {
+                    var htmlContent = await DisplayAsync(content);
+                    ThemeLayout.Content = htmlContent;
+                }
+
+                if (ThemeLayout is ZoneHolding layout)
+                {
+                    foreach (var zone in layout.Properties.ToArray())
+                    {
+                        if(zone.Value is IShape shape)
+                        {
+                            // Render each layout zone
+                            var htmlZone = await DisplayAsync(shape);
+                            layout.Properties[zone.Key] = htmlZone;
+                        }
+                    }
+                }
+
+                // Finally we render the Layout Shape's HTML to the page's output
                 Write(await DisplayAsync(ThemeLayout));
             }
             else