Merge pull request #33984 from dotnet/main

Merge to Live

Author: Rick-Anderson

.openpublishing.redirection.json

@@ -1,4 +1,4 @@
-{ 
+{
     "redirections": [
         {
             "source_path": "aspnetcore/web-api/microsoft.dotnet-openapi.md",
@@ -10,6 +10,11 @@
             "redirect_url": "/aspnet/core/fundamentals/openapi/aspnetcore-openapi",
             "redirect_document_id": false
         },
+        {
+          "source_path": "aspnetcore/fundamentals/openapi/buildtime-openapi.md",
+          "redirect_url": "/aspnet/core/fundamentals/openapi/aspnetcore-openapi#generate-openapi-documents-at- build-time",
+          "redirect_document_id": false
+        },
         {
             "source_path": "aspnetcore/security/authentication/samples.md",
             "redirect_url": "/aspnet/core/security/authorization/introduction",

aspnetcore/blazor/components/quickgrid.md

@@ -313,7 +313,7 @@ The <xref:Microsoft.AspNetCore.Components.QuickGrid.GridItemsProvider%601> conve
 ```razor
 @page "/food-recalls"
 @inject HttpClient Http
-@inject NavigationManager NavManager
+@inject NavigationManager Navigation
 
 <PageTitle>Food Recalls</PageTitle>
 
@@ -332,14 +332,14 @@ The <xref:Microsoft.AspNetCore.Components.QuickGrid.GridItemsProvider%601> conve
 <p>Total: <strong>@numResults results found</strong></p>
 
 @code {
-    GridItemsProvider<FoodRecall>? foodRecallProvider;
-    int numResults;
+    private GridItemsProvider<FoodRecall>? foodRecallProvider;
+    private int numResults;
 
     protected override async Task OnInitializedAsync()
     {
         foodRecallProvider = async req =>
         {
-            var url = NavManager.GetUriWithQueryParameters(
+            var url = Navigation.GetUriWithQueryParameters(
                 "https://api.fda.gov/food/enforcement.json", 
                 new Dictionary<string, object?>
             {

aspnetcore/blazor/components/render-modes.md

@@ -688,7 +688,7 @@ The `Shared` folder maintains the `AccountLayout` layout component. The componen
 ```razor
 @inherits LayoutComponentBase
 @layout BlazorSample.Components.Layout.MainLayout
-@inject NavigationManager NavigationManager
+@inject NavigationManager Navigation
 
 @if (HttpContext is null)
 {
@@ -707,7 +707,7 @@ else
     {
         if (HttpContext is null)
         {
-            NavigationManager.Refresh(forceReload: true);
+            Navigation.Refresh(forceReload: true);
         }
     }
 }
@@ -756,7 +756,7 @@ The app has a custom layout that can be applied to components around the app. Us
 ```razor
 @inherits LayoutComponentBase
 @layout MainLayout
-@inject NavigationManager NavigationManager
+@inject NavigationManager Navigation
 
 @if (HttpContext is null)
 {
@@ -775,7 +775,7 @@ else
     {
         if (HttpContext is null)
         {
-            NavigationManager.Refresh(forceReload: true);
+            Navigation.Refresh(forceReload: true);
         }
     }
 }

aspnetcore/blazor/fundamentals/index.md

@@ -178,22 +178,6 @@ Documentation sample apps are available for inspection and download:
 
 Locate a sample app by first selecting the version folder that matches the version of .NET that you're working with.
 
-:::moniker range=">= aspnetcore-8.0"
-
-Samples apps in the repository:
-
-* Blazor Web App
-* Blazor WebAssembly
-* Blazor Web App with EF Core (<xref:blazor/blazor-ef-core>)
-* Blazor Web App with SignalR (<xref:blazor/tutorials/signalr-blazor>)
-* Two Blazor Web Apps and a Blazor WebAssembly app for calling web (server) APIs (<xref:blazor/call-web-api>)
-* Blazor Web App with OIDC (BFF and non-BFF patterns) (<xref:blazor/security/blazor-web-app-oidc>)
-* Blazor WebAssembly scopes-enabled logging (<xref:blazor/fundamentals/logging#client-side-log-scopes>)
-* Blazor WebAssembly with ASP.NET Core Identity (<xref:blazor/security/webassembly/standalone-with-identity>)
-* .NET MAUI Blazor Hybrid app with a Blazor Web App and a shared UI provided by a Razor class library (RCL) (<xref:blazor/hybrid/tutorials/maui-blazor-web-app>)
-
-:::moniker-end
-
 :::moniker range="< aspnetcore-8.0"
 
 The sample repo contains two types of samples:
@@ -206,7 +190,7 @@ The sample repo contains two types of samples:
 
 :::moniker-end
 
-For more information, see the [Blazor samples GitHub repository README.md file](https://github.com/dotnet/blazor-samples).
+For more information and a list of the samples in the repository, see the [Blazor samples GitHub repository README.md file](https://github.com/dotnet/blazor-samples).
 
 The ASP.NET Core repository's Basic Test App is also a helpful set of samples for various Blazor scenarios:
 

aspnetcore/blazor/security/webassembly/hosted-with-identity-server.md

@@ -133,6 +133,8 @@ The following services are registered.
         .AddEntityFrameworkStores<ApplicationDbContext>();
     ```
 
+    [!INCLUDE[](~/blazor/security/includes/secure-authentication-flows.md)]
+
   * Identity Server with an additional <xref:Microsoft.Extensions.DependencyInjection.IdentityServerBuilderConfigurationExtensions.AddApiAuthorization%2A> helper method that sets up default ASP.NET Core conventions on top of Identity Server:
 
     ```csharp