Merge pull request #18021 from dotnet/master

Author: guardrex

aspnetcore/blazor/hosting-model-configuration.md

@@ -5,7 +5,7 @@ description: Learn about Blazor hosting model configuration, including how to in
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 04/23/2020
+ms.date: 04/25/2020
 no-loc: [Blazor, SignalR]
 uid: blazor/hosting-model-configuration
 ---
@@ -295,53 +295,6 @@ Blazor Server apps are set up by default to prerender the UI on the server befor
 
 Rendering server components from a static HTML page isn't supported.
 
-### Render stateful interactive components from Razor pages and views
-
-Stateful interactive components can be added to a Razor page or view.
-
-When the page or view renders:
-
-* The component is prerendered with the page or view.
-* The initial component state used for prerendering is lost.
-* New component state is created when the SignalR connection is established.
-
-The following Razor page renders a `Counter` component:
-
-```cshtml
-<h1>My Razor Page</h1>
-
-<component type="typeof(Counter)" render-mode="ServerPrerendered" 
-    param-InitialValue="InitialValue" />
-
-@code {
-    [BindProperty(SupportsGet=true)]
-    public int InitialValue { get; set; }
-}
-```
-
-### Render noninteractive components from Razor pages and views
-
-In the following Razor page, the `Counter` component is statically rendered with an initial value that's specified using a form:
-
-```cshtml
-<h1>My Razor Page</h1>
-
-<form>
-    <input type="number" asp-for="InitialValue" />
-    <button type="submit">Set initial value</button>
-</form>
-
-<component type="typeof(Counter)" render-mode="Static" 
-    param-InitialValue="InitialValue" />
-
-@code {
-    [BindProperty(SupportsGet=true)]
-    public int InitialValue { get; set; }
-}
-```
-
-Since `MyComponent` is statically rendered, the component can't be interactive.
-
 ### Configure the SignalR client for Blazor Server apps
 
 Sometimes, you need to configure the SignalR client used by Blazor Server apps. For example, you might want to configure logging on the SignalR client to diagnose a connection issue.

aspnetcore/blazor/integrate-components.md

@@ -5,7 +5,7 @@ description: Learn about data binding scenarios for components and DOM elements
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 04/14/2020
+ms.date: 04/25/2020
 no-loc: [Blazor, SignalR]
 uid: blazor/integrate-components
 ---
@@ -237,11 +237,54 @@ For more information on namespaces, see the [Component namespaces](#component-na
 
 To render a component from a page or view, use the [Component Tag Helper](xref:mvc/views/tag-helpers/builtin-th/component-tag-helper).
 
-For more information on how components are rendered, component state, and the `Component` Tag Helper, see the following articles:
+### Render stateful interactive components
 
-* <xref:blazor/hosting-models>
-* <xref:blazor/hosting-model-configuration>
-* <xref:mvc/views/tag-helpers/builtin-th/component-tag-helper>
+Stateful interactive components can be added to a Razor page or view.
+
+When the page or view renders:
+
+* The component is prerendered with the page or view.
+* The initial component state used for prerendering is lost.
+* New component state is created when the SignalR connection is established.
+
+The following Razor page renders a `Counter` component:
+
+```cshtml
+<h1>My Razor Page</h1>
+
+<component type="typeof(Counter)" render-mode="ServerPrerendered" 
+    param-InitialValue="InitialValue" />
+
+@functions {
+    [BindProperty(SupportsGet=true)]
+    public int InitialValue { get; set; }
+}
+```
+
+For more information, see <xref:xref:mvc/views/tag-helpers/builtin-th/component-tag-helper>.
+
+### Render noninteractive components
+
+In the following Razor page, the `Counter` component is statically rendered with an initial value that's specified using a form. Since the component is statically rendered, the component isn't interactive:
+
+```cshtml
+<h1>My Razor Page</h1>
+
+<form>
+    <input type="number" asp-for="InitialValue" />
+    <button type="submit">Set initial value</button>
+</form>
+
+<component type="typeof(Counter)" render-mode="Static" 
+    param-InitialValue="InitialValue" />
+
+@functions {
+    [BindProperty(SupportsGet=true)]
+    public int InitialValue { get; set; }
+}
+```
+
+For more information, see <xref:xref:mvc/views/tag-helpers/builtin-th/component-tag-helper>.
 
 ## Component namespaces
 

aspnetcore/toc.yml

@@ -299,14 +299,14 @@
           uid: blazor/data-binding
         - name: Event handling
           uid: blazor/event-handling
+        - name: Lifecycle
+          uid: blazor/lifecycle
         - name: Templated components
           uid: blazor/templated-components
         - name: Integrate components
           uid: blazor/integrate-components
         - name: Globalization and localization
           uid: blazor/globalization-localization
-        - name: Lifecycle
-          uid: blazor/lifecycle
         - name: Layouts
           uid: blazor/layouts
         - name: Forms and validation

aspnetcore/tutorials/build-your-first-blazor-app/samples_snapshot/3.x/FetchData1_client.razor

@@ -5,5 +5,6 @@
 protected override async Task OnInitializedAsync()
 {
     forecasts = 
-        await Http.GetJsonAsync<WeatherForecast[]>("sample-data/weather.json");
+        await Http.GetFromJsonAsync<WeatherForecast[]>(
+            "sample-data/weather.json");
 }