Skip to content

Commit 1c2439e

Browse files
Merge pull request #34782 from dotnet/main
Merge to Live
2 parents dd7d52d + 26f2328 commit 1c2439e

File tree

6 files changed

+24
-6
lines changed

6 files changed

+24
-6
lines changed

aspnetcore/fundamentals/servers/yarp/extensibility.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,25 @@ There are 2 main styles of extensibility for YARP, depending on the routing beha
2121

2222
YARP uses the concept of [Routes](xref:fundamentals/servers/yarp/config-files#routes), [Clusters](xref:fundamentals/servers/yarp/config-files#clusters) and Destinations. These can be supplied through [configuration files](xref:fundamentals/servers/yarp/config-files) or [directly through code](xref:fundamentals/servers/yarp/config-providers). Based on the routing rules, YARP picks a cluster and enumerates the possible destinations. It then uses the middleware pipeline to select the destination based on destination health, session affinity, load balancing etc.
2323

24-
![Middleware pipeline diagram](https://github.com/user-attachments/assets/ff17a04f-0c3c-46c7-8ec2-a1ed3dbc948c)
24+
![Middleware pipeline diagram](~/fundamentals/servers/yarp/media/yarp-pipeline.png)
2525

26-
Most of the pre-built pipeline modules can be customized through code. You can also change the pipeline definition to replace modules with your own implementation(s) or add additional modules as needed.
26+
Most of the pre-built pipeline can be customized through code:
2727

28-
For more information see [Middleware](xref:fundamentals/servers/yarp/middleware).
28+
- [Configuration Providers](xref:fundamentals/servers/yarp/config-providers)
29+
- [Destination Enumeration](xref:fundamentals/servers/yarp/destination-resolvers)
30+
- [Session Affinity](xref:fundamentals/servers/yarp/session-affinity)
31+
- [Load Balancing](xref:fundamentals/servers/yarp/load-balancing)
32+
- [Health Checks](xref:fundamentals/servers/yarp/dests-health-checks)
33+
- [Request Transforms](xref:fundamentals/servers/yarp/transform-extensibility)
34+
- [HttpClient configuration](./http-client-config.md#code-configuration)
35+
36+
You can also change the pipeline definition to replace modules with your own implementation(s) or add additional modules as needed. For more information see [Middleware](xref:fundamentals/servers/yarp/middleware).
2937

3038
## Http Forwarder
3139

3240
If the YARP pipeline is too rigid for your needs, or the scale of routing rules and destinations is not suitable for loading into memory, then you can implement your own routing logic and use the HTTP Forwarder to direct requests to your chosen destination. The HttpForwarder component takes the HTTP context and forwards the request to the supplied destination.
3341

34-
![HTTP forwarder diagram](https://github.com/user-attachments/assets/1a060a7e-fa43-49a4-bfad-f95d7d35be63)
42+
![HTTP forwarder diagram](~/fundamentals/servers/yarp/media/yarp-forwarder.png)
3543

3644
The transform component can still be used with the forwarder is needed.
3745

146 KB
Loading
142 KB
Loading

aspnetcore/migration/inc/samples/wrapped/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
options.RegisterKey<int>("test-value");
99
options.RegisterKey<SessionDemoModel>("SampleSessionItem");
1010
})
11-
.WrapAspNetCoreSession();
11+
.AddWrappedAspNetCoreSession();
1212
// </snippet_WrapAspNetCoreSession>
1313

1414
var app = builder.Build();

aspnetcore/release-notes/aspnetcore-10/includes/blazor.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,11 @@ For more information, see the following resources:
2929
The [`[Route]` attribute](xref:Microsoft.AspNetCore.Components.RouteAttribute) now supports route syntax highlighting to help visualize the structure of the route template:
3030

3131
![Route template pattern for the Order ID is highlighted in a method that maps endpoints](~/release-notes/aspnetcore-10/_static/route-template-highlighting.png)
32+
33+
<!-- PREVIEW 2
34+
35+
### `NavigateTo` no longer scrolls to the top for same-page navigations
36+
37+
Previously, <xref:Microsoft.AspNetCore.Components.NavigationManager.NavigateTo%2A?displayProperty=nameWithType> scrolled to the top of the page for same-page navigations. This behavior has been changed in .NET 10 so that the browser no longer scrolls to the top of the page when navigating to the same page. This means the viewport is no longer reset when making updates to the address for the current page, such as changing the query string or fragment.
38+
39+
-->

aspnetcore/tutorials/first-mvc-app/adding-model.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ author: wadepickett
44
description: Part 4 of tutorial series on ASP.NET Core MVC.
55
monikerRange: '>= aspnetcore-3.1'
66
ms.author: wpickett
7-
ms.date: 07/24/2024
7+
ms.date: 2/20/2025
88
uid: tutorials/first-mvc-app/adding-model
99
---
1010

@@ -61,6 +61,8 @@ Build the project as a check for compiler errors.
6161

6262
# [Visual Studio Code](#tab/visual-studio-code)
6363

64+
Open a command window in the project directory. The project directory is the directory that contains the `Program.cs` and `.csproj` files.
65+
6466
[!INCLUDE[](~/includes/add-EF-NuGet-SQLite-CLI-9.md)]
6567

6668
In Visual Studio Code, press <kbd>Ctrl</kbd>+<kbd>F5</kbd> to run the app without debugging.

0 commit comments

Comments
 (0)