Merge pull request #34889 from dotnet/main

Author: guardrex

aspnetcore/blazor/components/quickgrid.md

@@ -567,3 +567,94 @@ 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"
+
+## Multiple concurrent EF Core queries trigger `System.InvalidOperationException`
+
+Multiple concurrent EF Core queries can trigger the following <xref:System.InvalidOperationException?displayProperty=fullName>:
+
+> :::no-loc text="System.InvalidOperationException: A second operation was started on this context instance before a previous operation completed. This is usually caused by different threads concurrently using the same instance of DbContext. For more information on how to avoid threading issues with DbContext, see https://go.microsoft.com/fwlink/?linkid=2097913.":::
+
+This scenario is scheduled for improvement in an upcoming release of ASP.NET Core. For more information, see [[Blazor] Improve the experience with QuickGrid and EF Core (`dotnet/aspnetcore` #58716)](https://github.com/dotnet/aspnetcore/issues/58716).
+
+In the meantime, you can address the problem using an <xref:Microsoft.AspNetCore.Components.QuickGrid.QuickGrid%601.ItemsProvider%2A> with a cancellation token. The cancellation token prevents concurrent queries by cancelling the previous request when a new request is issued.
+
+Consider the following example, which is based on the movie database `Index` component for the <xref:blazor/tutorials/movie-database-app/index> tutorial. The simpler version scaffolded into the app can be seen in the article's [sample app](xref:blazor/tutorials/movie-database-app/index#sample-app). The `Index` component scaffolded into the app is replaced by the following component.
+
+`Components/Pages/MoviePages/Index.razor`:
+
+```razor
+@page "/movies"
+@rendermode InteractiveServer
+@using Microsoft.EntityFrameworkCore
+@using Microsoft.AspNetCore.Components.QuickGrid
+@using BlazorWebAppMovies.Models
+@using BlazorWebAppMovies.Data
+@inject IDbContextFactory<BlazorWebAppMovies.Data.BlazorWebAppMoviesContext> DbFactory
+
+<PageTitle>Index</PageTitle>
+
+<h1>Index</h1>
+
+<div>
+    <input type="search" @bind="titleFilter" @bind:event="oninput" />
+</div>
+
+<p>
+    <a href="movies/create">Create New</a>
+</p>
+
+<div>
+    <QuickGrid Class="table" TGridItem="Movie" ItemsProvider="GetMovies"
+            ItemKey="(x => x.Id)" Pagination="pagination">
+        <PropertyColumn Property="movie => movie.Title" Sortable="true" />
+        <PropertyColumn Property="movie => movie.ReleaseDate" Title="Release Date" />
+        <PropertyColumn Property="movie => movie.Genre" />
+        <PropertyColumn Property="movie => movie.Price" />
+        <PropertyColumn Property="movie => movie.Rating" />
+
+        <TemplateColumn Context="movie">
+            <a href="@($"movies/edit?id={movie.Id}")">Edit</a> |
+            <a href="@($"movies/details?id={movie.Id}")">Details</a> |
+            <a href="@($"movies/delete?id={movie.Id}")">Delete</a>
+        </TemplateColumn>
+    </QuickGrid>
+</div>
+
+<Paginator State="pagination" />
+
+@code {
+    private BlazorWebAppMoviesContext context = default!;
+    private PaginationState pagination = new PaginationState { ItemsPerPage = 5 };
+    private string titleFilter = string.Empty;
+
+    public async ValueTask<GridItemsProviderResult<Movie>> GetMovies(GridItemsProviderRequest<Movie> request)
+    {
+        using var context = DbFactory.CreateDbContext();
+        var totalCount = await context.Movie.CountAsync(request.CancellationToken);
+        IQueryable<Movie> query = context.Movie.OrderBy(x => x.Id);
+        query = request.ApplySorting(query).Skip(request.StartIndex);
+
+        if (request.Count.HasValue)
+        {
+            query = query.Take(request.Count.Value);
+        }
+
+        var items = await query.ToArrayAsync(request.CancellationToken);
+
+        var result = new GridItemsProviderResult<Movie>
+        {
+            Items = items,
+            TotalItemCount = totalCount
+        };
+
+        return result;
+    }
+}
+```
+
+:::moniker-end

aspnetcore/blazor/tutorials/movie-database-app/part-2.md

@@ -468,22 +468,25 @@ Add a movie to the database. In the following example, the classic sci-fi movie
 
 When you select the **:::no-loc text="Create":::** button, the movie data is posted to the server and saved in the database. 
 
-:::moniker range=">= aspnetcore-9.0"
-
-<!-- UPDATE 10.0 Revert when https://github.com/dotnet/aspnetcore/issues/53996 is addressed -->
+:::moniker range=">= aspnetcore-9.0 < aspnetcore-10.0"
 
 :::zone pivot="vs"
 
-A Visual Studio debugger regression breaks with a <xref:Microsoft.AspNetCore.Components.NavigationException> on the line that navigates back to the `Index` page:
+In .NET 9, the Visual Studio debugger may break with a <xref:Microsoft.AspNetCore.Components.NavigationException> on the line that navigates back to the `Index` page:
 
 ![Debugger regression: A navigation exception is thrown on the NavigateTo call.](~/blazor/tutorials/movie-database-app/part-2/_static/debugger_regression.png)
 
-To resolve this problem until the debugger is updated by a future Visual Studio release:
+To resolve this problem:
 
 1. Deselect the checkbox for **Break when this exception type is user-handled**.
 2. Select the **Continue** button in the menu bar to continue execution.
 
-The exception won't be thrown when the <xref:Microsoft.AspNetCore.Components.NavigationManager.NavigateTo%2A> method is executed throughout the rest of the tutorial series.
+The exception isn't thrown when a <xref:Microsoft.AspNetCore.Components.NavigationManager.NavigateTo%2A> method is executed throughout the rest of the tutorial series.
+
+In .NET 10 or later:
+
+* Updates to the way that <xref:Microsoft.AspNetCore.Components.NavigationManager.NavigateTo%2A> manages navigation never result in a <xref:Microsoft.AspNetCore.Components.NavigationException>.
+* The Visual Studio debugger doesn't break when processing <xref:Microsoft.AspNetCore.Components.NavigationManager.NavigateTo%2A> calls with a valid endpoint.
 
 :::zone-end
 

aspnetcore/release-notes/aspnetcore-10.0.md

@@ -4,7 +4,7 @@ author: rick-anderson
 description: Learn about the new features in ASP.NET Core 10.0.
 ms.author: riande
 ms.custom: mvc
-ms.date: 2/12/2025
+ms.date: 3/5/2025
 uid: aspnetcore-10
 ---
 # What's new in ASP.NET Core 10.0

aspnetcore/release-notes/aspnetcore-10/_static/route-template-highlighting.png

@@ -15,7 +15,7 @@ Apply a stylesheet class to a row of the grid based on the row item using the ne
 
 For more information, see <xref:blazor/components/quickgrid?view=aspnetcore-10.0#style-a-table-row-based-on-the-row-item>.
 
-### Blazor script
+### Blazor script as static web asset
 
 In prior releases of .NET, the Blazor script is served from an embedded resource in the ASP.NET Core shared framework. In .NET 10 or later, the Blazor script is served as a static web asset with automatic compression and fingerprinting.
 
@@ -28,7 +28,7 @@ For more information, see the following resources:
 
 The [`[Route]` attribute](xref:Microsoft.AspNetCore.Components.RouteAttribute) now supports route syntax highlighting to help visualize the structure of the route template:
 
-![Route template pattern for the Order ID is highlighted in a method that maps endpoints](~/release-notes/aspnetcore-10/_static/route-template-highlighting.png)
+![Route template pattern of a route attribute for the movie entity ID shows syntax highlighting](~/release-notes/aspnetcore-10/_static/route-template-highlighting.png)
 
 <!-- PREVIEW 2