Merge branch 'main' into blazor_otel_names

Author: guardrex

.openpublishing.redirection.json

@@ -1010,6 +1010,16 @@
             "redirect_url": "/aspnet/core/migration/fx-to-core/systemweb-adapters",
             "redirect_document_id": false
         },
+        {
+            "source_path": "aspnetcore/migration/inc/unit-testing.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/systemweb-adapters",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/unit-testing.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/systemweb-adapters",
+            "redirect_document_id": false
+        },
         {
             "source_path": "aspnetcore/migration/inc/blazor.md",
             "redirect_url": "/aspnet/core/migration/fx-to-core/inc/blazor",
@@ -1022,7 +1032,7 @@
         },
         {
             "source_path": "aspnetcore/migration/inc/overview.md",
-            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/overview",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/index",
             "redirect_document_id": false
         },
         {
@@ -1047,24 +1057,44 @@
         },
         {
             "source_path": "aspnetcore/migration/inc/start.md",
-            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/start",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/start",
             "redirect_document_id": false
         },
         {
-            "source_path": "aspnetcore/migration/inc/unit-testing.md",
-            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/unit-testing",
+            "source_path": "aspnetcore/migration/inc/usage_guidance.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/",
             "redirect_document_id": false
         },
         {
-            "source_path": "aspnetcore/migration/inc/usage_guidance.md",
-            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/usage_guidance",
+            "source_path": "aspnetcore/migration/fx-to-core/inc/usage_guidance.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/",
             "redirect_document_id": false
         },
         {
             "source_path": "aspnetcore/migration/inc/wrapped.md",
             "redirect_url": "/aspnet/core/migration/fx-to-core/inc/wrapped",
             "redirect_document_id": false
         },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/remote-session.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/session#remote-app-session-state",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/remote-authentication.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/authentication#remote-authentication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/session.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/wrapped.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/session#wrapped-aspnet-core-session-state",
+            "redirect_document_id": false
+        },
         {
             "source_path": "aspnetcore/security/blazor/server-side.md",
             "redirect_url": "/aspnet/core/blazor/security/server/",
@@ -1522,6 +1552,11 @@
             "source_path": "aspnetcore/migration/identity.md",
             "redirect_url": "/aspnet/core/migration/fx-to-core/examples/identity",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/blazor/progressive-web-app.md",
+            "redirect_url": "/aspnet/core/blazor/progressive-web-app/",
+            "redirect_document_id": false
         }
     ]
 }

aspnetcore/blazor/components/prerender.md

@@ -202,7 +202,7 @@ In the following example that serializes state for multiple components of the sa
 In the following example that serializes state for a dependency injection service:
 
 * Properties annotated with the `[SupplyParameterFromPersistentComponentState]` attribute are serialized during prerendering and deserialized when the app becomes interactive.
-* The `AddPersistentService` method is used to register the service for persistence. The render mode is required because the render mode can't be inferred from the service type. Use any of the following values:
+* The <xref:Microsoft.Extensions.DependencyInjection.RazorComponentsRazorComponentBuilderExtensions.RegisterPersistentService%2A> extension method is used to register the service for persistence. The render mode is required because the render mode can't be inferred from the service type. Use any of the following values:
   * `RenderMode.Server`: The service is available for the Interactive Server render mode.
   * `RenderMode.Webassembly`: The service is available for the Interactive Webassembly render mode.
   * `RenderMode.InteractiveAuto`: The service is available for both the Interactive Server and Interactive Webassembly render modes if a component renders in either of those modes.
@@ -231,7 +231,8 @@ public class CounterService
 In `Program.cs`:
 
 ```csharp
-builder.Services.AddPersistentService<CounterService>(RenderMode.InteractiveAuto);
+builder.Services.RegisterPersistentService<CounterService>(
+    RenderMode.InteractiveAuto);
 ```
 
 Serialized properties are identified from the actual service instance:

aspnetcore/blazor/components/quickgrid.md

@@ -602,10 +602,9 @@ dotnet aspnet-codegenerator blazor -h
 
 For an example use of the QuickGrid scaffolder, see <xref:blazor/tutorials/movie-database-app/index>.
 
-<!-- UPDATE 10.0 - PU work tracked by https://github.com/dotnet/aspnetcore/issues/58716.
-                   Versioning out at 10.0 for now. -->
-
-:::moniker range="< aspnetcore-10.0"
+<!-- UPDATE 11.0 - PU work tracked by https://github.com/dotnet/aspnetcore/issues/58716.
+                   We will continue to show this for now. The PU plans to look at it
+                   for framework updates at 11.0. -->
 
 ## Multiple concurrent EF Core queries trigger `System.InvalidOperationException`
 
@@ -690,5 +689,3 @@ Consider the following example, which is based on the movie database `Index` com
     }
 }
 ```
-
-:::moniker-end

aspnetcore/blazor/components/render-modes.md

@@ -221,11 +221,10 @@ Prerendering is enabled by default for interactive components.
 
 Internal navigation for interactive routing doesn't involve requesting new page content from the server. Therefore, prerendering doesn't occur for internal page requests, including for [enhanced navigation](xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling). For more information, see [Static versus interactive routing](xref:blazor/fundamentals/routing#static-versus-interactive-routing), [Interactive routing and prerendering](xref:blazor/components/prerender#interactive-routing-and-prerendering), and [Enhanced navigation and form handling](xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling).
 
-<!-- UPDATE 10.0 Tracking https://github.com/dotnet/aspnetcore/issues/55635
-                 for .NET 10 work in this area. Update the following remark
-                 if changes are made to the framework. -->
+<!-- UPDATE 11.0 Tracking https://github.com/dotnet/aspnetcore/issues/55635
+                 for .NET 11 work in this area. -->
 
-Disabling prerendering using the following techniques only takes effect for top-level render modes. If a parent component specifies a render mode, the prerendering settings of its children are ignored. This behavior is under investigation for possible changes with the release of .NET 10 in November, 2025.
+Disabling prerendering using the following techniques only takes effect for top-level render modes. If a parent component specifies a render mode, the prerendering settings of its children are ignored.
 
 To disable prerendering for a *component instance*, pass the `prerender` flag with a value of `false` to the render mode:
 

aspnetcore/blazor/components/rendering.md

@@ -53,6 +53,32 @@ Streaming rendering requires the server to avoid buffering the output. The respo
 
 To stream content updates when using static server-side rendering (static SSR) or prerendering, apply the [`[StreamRendering]` attribute](xref:Microsoft.AspNetCore.Components.StreamRenderingAttribute) in .NET 9 or later (use `[StreamRendering(true)]` in .NET 8) to the component. Streaming rendering must be explicitly enabled because streamed updates may cause content on the page to shift. Components without the attribute automatically adopt streaming rendering if the parent component uses the feature. Pass `false` to the attribute in a child component to disable the feature at that point and further down the component subtree. The attribute is functional when applied to components supplied by a [Razor class library](xref:blazor/components/class-libraries).
 
+:::moniker-end
+
+:::moniker range=">= aspnetcore-10.0"
+
+If [enhanced navigation](xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling) is active, streaming rendering renders [Not Found responses](xref:blazor/fundamentals/routing#not-found-responses) without reloading the page. When enhanced navigation is blocked, the framework redirects to Not Found content with a page refresh. 
+
+Streaming rendering can only render components that have a route, such as a [`NotFoundPage` assignment](xref:blazor/fundamentals/routing#not-found-responses) (`NotFoundPage="..."`) or a [Status Code Pages Re-execution Middleware page assignment](xref:fundamentals/error-handling#usestatuscodepageswithreexecute) (<xref:Microsoft.AspNetCore.Builder.StatusCodePagesExtensions.UseStatusCodePagesWithReExecute%2A>). The Not Found render fragment (`<NotFound>...</NotFound>`) and the `DefaultNotFound` 404 content ("`Not found`" plain text) don't have routes, so they can't be used during streaming rendering.
+
+Streaming `NavigationManager.NotFound` content rendering uses (in order):
+
+* A `NotFoundPage` passed to the `Router` component, if present.
+* A Status Code Pages Re-execution Middleware page, if configured.
+* No action if neither of the preceding approaches is adopted.
+
+Non-streaming `NavigationManager.NotFound` content rendering uses (in order):
+
+* A `NotFoundPage` passed to the `Router` component, if present.
+* Not Found render fragment content, if present. *Not recommended in .NET 10 or later.*
+* `DefaultNotFound` 404 content ("`Not found`" plain text).
+
+[Status Code Pages Re-execution Middleware](xref:fundamentals/error-handling#usestatuscodepageswithreexecute) with <xref:Microsoft.AspNetCore.Builder.StatusCodePagesExtensions.UseStatusCodePagesWithReExecute%2A> takes precedence for browser-based address routing problems, such as an incorrect URL typed into the browser's address bar or selecting a link that has no endpoint in the app.
+
+:::moniker-end
+
+:::moniker range=">= aspnetcore-8.0"
+
 The following example is based on the `Weather` component in an app created from the [Blazor Web App project template](xref:blazor/project-structure#blazor-web-app). The call to <xref:System.Threading.Tasks.Task.Delay%2A?displayProperty=nameWithType> simulates retrieving weather data asynchronously. The component initially renders placeholder content ("`Loading...`") without waiting for the asynchronous delay to complete. When the asynchronous delay completes and the weather data content is generated, the content is streamed to the response and patched into the weather forecast table.
 
 `Weather.razor`:

aspnetcore/blazor/forms/validation.md

@@ -1557,12 +1557,108 @@ The <xref:System.ComponentModel.DataAnnotations.CompareAttribute> doesn't work w
 
 :::moniker-end
 
-## Nested models, collection types, and complex types
+:::moniker range=">= aspnetcore-10.0"
+
+## Nested objects and collection types
+
+Blazor form validation includes support for validating properties of nested objects and collection items with the built-in <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator>.
+
+To create a validated form, use a <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator> component inside an <xref:Microsoft.AspNetCore.Components.Forms.EditForm> component, just as before.
+
+To opt into the nested objects and collection types validation feature:
+
+<!-- UPDATE 10.0 - API cross-links -->
+
+1. Call the `AddValidation` extension method in the `Program` file where services are registered.
+2. Declare the form model types in a C# class file, not in a Razor component (`.razor`).
+3. Annotate the root form model type with the `[ValidatableType]` attribute.
+
+Without following the preceding steps, form validation behavior doesn't include nested model and collection type validation.
+
+<!-- UPDATE 10.0 - Replace with a fully working, cut-'n-paste example -->
+
+The following example demonstrates customer orders with the improved form validation (details omitted for brevity):
+
+In `Program.cs`, call `AddValidation` on the service collection:
+
+```csharp
+builder.Services.AddValidation();
+```
+
+In the following `Order` class, the `[ValidatableType]` attribute is required on the top-level model type. The other types are discovered automatically. `OrderItem` and `ShippingAddress` aren't shown for brevity, but nested and collection validation works the same way in those types if they were shown.
+
+`Order.cs`:
+
+```csharp
+[ValidatableType]
+public class Order
+{
+    public Customer Customer { get; set; } = new();
+    public List<OrderItem> OrderItems { get; set; } = [];
+}
+
+public class Customer
+{
+    [Required(ErrorMessage = "Name is required.")]
+    public string? FullName { get; set; }
+
+    [Required(ErrorMessage = "Email is required.")]
+    public string? Email { get; set; }
+
+    public ShippingAddress ShippingAddress { get; set; } = new();
+}
+```
+
+In the following `OrderPage` component, the <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator> component is present in the <xref:Microsoft.AspNetCore.Components.Forms.EditForm> component.
+
+`OrderPage.razor`:
+
+```razor
+<EditForm Model="Model">
+    <DataAnnotationsValidator />
+
+    <h3>Customer Details</h3>
+    <div class="mb-3">
+        <label>
+            Full Name
+            <InputText @bind-Value="Model!.Customer.FullName" />
+        </label>
+        <ValidationMessage For="@(() => Model!.Customer.FullName)" />
+    </div>
+
+    // ... form continues ...
+</EditForm>
+
+@code {
+    public Order? Model { get; set; }
+
+    protected override void OnInitialized() => Model ??= new();
+}
+```
+
+The requirement to declare the model types outside of Razor components (`.razor` files) is due to the fact that both the new validation feature and the Razor compiler itself are using a source generator. Currently, output of one source generator can't be used as an input for another source generator.
+
+## Complex types
+
+Blazor provides support for validating form input using data annotations with the built-in <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator>. However, the <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator> only validates top-level properties of the model bound to the form that aren't complex-type properties.
+
+To validate the bound model's entire object graph, including complex-type properties, use the `ObjectGraphDataAnnotationsValidator` provided by the *experimental* [`Microsoft.AspNetCore.Components.DataAnnotations.Validation`](https://www.nuget.org/packages/Microsoft.AspNetCore.Components.DataAnnotations.Validation) package.
+
+> [!NOTE]
+> The `ObjectGraphDataAnnotationsValidator` isn't compatible with [nested objects and collection types validation](#nested-objects-and-collection-types), but it's capable of validating nested objects and collection types on its own.
+
+:::moniker-end
+
+:::moniker range="< aspnetcore-10.0"
+
+## Nested objects, collection types, and complex types
 
 Blazor provides support for validating form input using data annotations with the built-in <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator>. However, the <xref:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator> only validates top-level properties of the model bound to the form that aren't collection- or complex-type properties.
 
 To validate the bound model's entire object graph, including collection- and complex-type properties, use the `ObjectGraphDataAnnotationsValidator` provided by the *experimental* [`Microsoft.AspNetCore.Components.DataAnnotations.Validation`](https://www.nuget.org/packages/Microsoft.AspNetCore.Components.DataAnnotations.Validation) package:
 
+:::moniker-end
+
 ```razor
 <EditForm ...>
     <ObjectGraphDataAnnotationsValidator />

aspnetcore/blazor/fundamentals/configuration.md

@@ -300,12 +300,12 @@ var hostname = builder.Configuration["HostName"];
 
 ## Cached configuration
 
-Configuration files are cached for offline use. With [Progressive Web Applications (PWAs)](xref:blazor/progressive-web-app), you can only update configuration files when creating a new deployment. Editing configuration files between deployments has no effect because:
+Configuration files are cached for offline use. With [Progressive Web Applications (PWAs)](xref:blazor/progressive-web-app/index), you can only update configuration files when creating a new deployment. Editing configuration files between deployments has no effect because:
 
 * Users have cached versions of the files that they continue to use.
 * The PWA's `service-worker.js` and `service-worker-assets.js` files must be rebuilt on compilation, which signal to the app on the user's next online visit that the app has been redeployed.
 
-For more information on how background updates are handled by PWAs, see <xref:blazor/progressive-web-app#background-updates>.
+For more information on how background updates are handled by PWAs, see <xref:blazor/progressive-web-app/index#background-updates>.
 
 ## Options configuration