Merge in 'release/8.0-rc2' changes

Author: dotnet-bot

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs

@@ -127,6 +127,17 @@ private void SendBatchAsStreamingUpdate(in RenderBatch renderBatch, TextWriter w
                     continue;
                 }
 
+                // Of the components that updated, we want to emit the roots of all the streaming subtrees, and not
+                // any non-streaming ancestors. There's no point emitting non-streaming ancestor content since there
+                // are no markers in the document to receive it. Also we don't want to call WriteComponentHtml for
+                // nonstreaming ancestors, as that would make us skip over their descendants who may in fact be the
+                // roots of streaming subtrees.
+                var componentState = (EndpointComponentState)GetComponentState(componentId);
+                if (!componentState.StreamRendering)
+                {
+                    continue;
+                }
+
                 // This format relies on the component producing well-formed markup (i.e., it can't have a
                 // </template> at the top level without a preceding matching <template>). Alternatively we
                 // could look at using a custom TextWriter that does some extra encoding of all the content

src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs

@@ -268,4 +268,11 @@ public async void StopsProcessingStreamingOutputFromPreviousRequestAfterEnhanced
         // Tidy up
         await new HttpClient().GetAsync(endResponseUrl);
     }
+
+    [Fact]
+    public void CanStreamDirectlyIntoSectionContentConnectedToNonStreamingOutlet()
+    {
+        Navigate($"{ServerPathBase}/streaming-with-sections");
+        Browser.Equal("This is some streaming content", () => Browser.Exists(By.Id("streaming-message")).Text);
+    }
 }

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingWithSections.razor

@@ -0,0 +1,20 @@
+@page "/streaming-with-sections"
+@using Microsoft.AspNetCore.Components.Sections
+
+<h1>Streaming with sections</h1>
+
+<p>
+    If a section outlet is rendered from a nonstreaming component, but the section content comes from a streaming component,
+    then we should still see streaming updates arriving in the section outlet.
+</p>
+
+<p>
+    This component is not streaming, but it has a child that does stream, and supplies content back here to the parent.
+</p>
+
+<fieldset>
+    <legend>Section outlet in nonstreaming component</legend>
+    <SectionOutlet SectionName="streaming-outlet" />
+</fieldset>
+
+<StreamingWithSectionsContentSupplier />

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingWithSectionsContentSupplier.razor

@@ -0,0 +1,24 @@
+@using Microsoft.AspNetCore.Components.Sections
+@attribute [StreamRendering]
+
+@*
+    For the test to be relevant, it's important that the streaming output comes from *this component* and not some descendant.
+    This is to ensure we correctly represent issue https://github.com/dotnet/aspnetcore/issues/50804
+    If it's a descendant that streams, the descendant simply lives within the SectionOutlet and encapsulates its own streaming,
+    and sections aren't really involved. But if the streaming output goes *directly* into SectionContent, then we're in a more
+    challenging situation because we need the SectionOutletContentRenderer to become streaming.
+*@
+
+<SectionContent SectionName="streaming-outlet">
+    <span id="streaming-message">@message</span>
+</SectionContent>
+
+@code {
+    string message = "Starting...";
+
+    protected override async Task OnInitializedAsync()
+    {
+        await Task.Delay(1000);
+        message = "This is some streaming content";
+    }
+}