Merge pull request #24257 from dotnet/main

Merge to Live

Author: Rick-Anderson

aspnetcore/fundamentals/index.md

@@ -15,7 +15,7 @@ uid: fundamentals/index
 
 This article provides an overview of key topics for understanding how to develop ASP.NET Core apps.
 
-## The Startup class
+## Program.cs
 
 The `Startup` class is where:
 
@@ -26,7 +26,6 @@ Here's a sample `Startup` class:
 
 [!code-csharp[](index/samples_snapshot/3.x/Startup.cs?highlight=3,12)]
 
-For more information, see <xref:fundamentals/startup>.
 
 ## Dependency injection (services)
 

aspnetcore/fundamentals/middleware/index.md

@@ -11,7 +11,7 @@ uid: fundamentals/middleware/index
 ---
 # ASP.NET Core Middleware
 
-::: moniker range=">= aspnetcore-6.0"
+:::moniker range=">= aspnetcore-6.0"
 
 By [Rick Anderson](https://twitter.com/RickAndMSFT) and [Steve Smith](https://ardalis.com/)
 
@@ -221,7 +221,7 @@ app.Map("/level1", level1App => {
 
 <xref:Microsoft.AspNetCore.Builder.MapWhenExtensions.MapWhen%2A> branches the request pipeline based on the result of the given predicate. Any predicate of type `Func<HttpContext, bool>` can be used to map requests to a new branch of the pipeline. In the following example, a predicate is used to detect the presence of a query string variable `branch`:
 
-[!code-csharp[](index/snapshot/Chain/StartupMapWhen.cs?highlight=14-15)]
+[!code-csharp[](index/snapshot/Chain60/ProgramMapWhen.cs?highlight=4)]
 
 The following table shows the requests and responses from `http://localhost:1234` using the previous code:
 
@@ -279,9 +279,9 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * <xref:fundamentals/middleware/extensibility>
 * <xref:fundamentals/middleware/extensibility-third-party-container>
 
-::: moniker-end
+:::moniker-end
 
-::: moniker range="< aspnetcore-6.0"
+:::moniker range="< aspnetcore-6.0"
 
 By [Rick Anderson](https://twitter.com/RickAndMSFT) and [Steve Smith](https://ardalis.com/)
 
@@ -548,4 +548,4 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * <xref:fundamentals/middleware/extensibility>
 * <xref:fundamentals/middleware/extensibility-third-party-container>
 
-::: moniker-end
+:::moniker-end

aspnetcore/fundamentals/static-files.md

@@ -116,7 +116,7 @@ Directory browsing is disabled by default for security reasons. For more informa
 
 Enable directory browsing with <xref:Microsoft.Extensions.DependencyInjection.DirectoryBrowserServiceExtensions.AddDirectoryBrowser%2A> and <xref:Microsoft.AspNetCore.Builder.DirectoryBrowserExtensions.UseDirectoryBrowser%2A>:
 
-[!code-csharp[](~/fundamentals/static-files/samples/6.x/StaticFilesSample/Program.cs?name=snippet_db&highlight=8,22-27)]  
+[!code-csharp[](~/fundamentals/static-files/samples/6.x/StaticFilesSample/Program.cs?name=snippet_db&highlight=9,23-37)]  
 
 <!-- Select RP Home > Directory browsing -->
 The preceding code allows directory browsing of the *wwwroot/images* folder using the URL `https://<hostname>/MyImages`, with links to each file and folder:

aspnetcore/fundamentals/static-files/samples/6.x/StaticFilesSample/Program.cs

@@ -1,4 +1,4 @@
-#define FECTP // DEFAULT RR RH DB DF DF2 UFS UFS2 TREE FECTP NS
+#define DB // DEFAULT RR RH DB DF DF2 UFS UFS2 TREE FECTP NS
 #if NEVER
 #elif DEFAULT
 #region snippet
@@ -94,6 +94,7 @@
 #endregion
 #elif DB  // Directory Browsing
 #region snippet_db
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.FileProviders;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -115,11 +116,20 @@
 
 app.UseStaticFiles();
 
+var fileProvider = new PhysicalFileProvider(Path.Combine(builder.Environment.WebRootPath, "images"));
+var requestPath = "/MyImages";
+
+// Enable displaying browser links.
+app.UseStaticFiles(new StaticFileOptions
+{
+    FileProvider = fileProvider,
+    RequestPath = requestPath
+});
+
 app.UseDirectoryBrowser(new DirectoryBrowserOptions
 {
-    FileProvider = new PhysicalFileProvider(
-           Path.Combine(builder.Environment.WebRootPath, "images")),
-    RequestPath = "/MyImages"
+    FileProvider = fileProvider,
+    RequestPath = requestPath
 });
 
 app.UseAuthorization();

aspnetcore/grpc/performance.md

@@ -264,3 +264,20 @@ The preceding code:
 * Attempts to get an array from `ByteString.Memory` with <xref:System.Runtime.InteropServices.MemoryMarshal.TryGetArray%2A?displayProperty=nameWithType>.
 * Uses the `ArraySegment<byte>` if it was successfully retrieved. The segment has a reference to the array, offset and count.
 * Otherwise, falls back to allocating a new array with `ByteString.ToByteArray()`.
+
+### gRPC services and large binary payloads
+
+gRPC and Protobuf can send and receive large binary payloads. Although binary Protobuf is more efficient than text-based JSON at serializing binary payloads, there are still important performance characteristics to keep in mind when working with large binary payloads.
+
+gRPC is a message-based RPC framework, which means:
+
+* The entire message is loaded into memory before gRPC can send it.
+* When the message is received, the entire message is deserialized into memory.
+
+Messages with large binary payloads can allocate byte arrays on the [large object heap](/dotnet/standard/garbage-collection/large-object-heap). Large allocations impact server performance and scalability.
+
+Advice for creating high-performance applications with large binary payloads:
+
+* **Avoid** large binary payloads in gRPC messages. A byte array larger than 85,000 bytes is considered a large object. Keeping below that size avoids allocating on the large object heap.
+* **Consider** splitting large binary payloads [using streaming](xref:grpc/client#client-streaming-call). Binary data is chunked and streamed over multiple messages.
+* **Consider** not using gRPC for large binary data. HTTP endpoints can be used alongside gRPC services. An HTTP endpoint that supports sending or receiving large files using the stream body is efficient.

aspnetcore/host-and-deploy/visual-studio-publish-profiles.md

@@ -147,7 +147,7 @@ When publishing to an Azure target, the *.pubxml* file contains your Azure subsc
 
 Sensitive information (like the publish password) is encrypted on a per user/machine level. It's stored in the *Properties/PublishProfiles/{PROFILE NAME}.pubxml.user* file. Because this file can store sensitive information, it shouldn't be checked into source control.
 
-For an overview of how to publish an ASP.NET Core web app, see <xref:host-and-deploy/index>. The MSBuild tasks and targets necessary to publish an ASP.NET Core web app are open-source in the [dotnet/websdk repository](https://github.com/dotnet/websdk).
+For an overview of how to publish an ASP.NET Core web app, see <xref:host-and-deploy/index>. The MSBuild tasks and targets necessary to publish an ASP.NET Core web app are open-source in the [dotnet/websdk repository](https://github.com/dotnet/sdk/tree/main/src/WebSdk).
 
 The following commands can use folder, MSDeploy, and [Kudu](https://github.com/projectkudu/kudu/wiki) publish profiles. Because MSDeploy lacks cross-platform support, the following MSDeploy options are supported only on Windows.
 
@@ -186,7 +186,7 @@ In the preceding examples:
 * `dotnet publish` and `dotnet build` support Kudu APIs to publish to Azure from any platform. Visual Studio publish supports the Kudu APIs, but it's supported by WebSDK for cross-platform publish to Azure.
 * Don't pass `DeployOnBuild` to the `dotnet publish` command.
 
-For more information, see [Microsoft.NET.Sdk.Publish](https://github.com/dotnet/websdk#microsoftnetsdkpublish).
+For more information, see [Microsoft.NET.Sdk.Publish](https://github.com/dotnet/sdk/tree/main/src/WebSdk#microsoftnetsdkpublish).
 
 Add a publish profile to the project's *Properties/PublishProfiles* folder with the following content:
 

aspnetcore/migration/proper-to-2x/index.md

@@ -1,6 +1,6 @@
 ---
 title: Migrate from ASP.NET to ASP.NET Core
-author: isaac2004
+author: isaacrlevin
 description: Receive guidance for migrating existing ASP.NET MVC or Web API apps to ASP.NET Core.web
 ms.author: scaddie
 ms.date: 10/18/2019

aspnetcore/migration/proper-to-2x/membership-to-core-identity.md

@@ -1,6 +1,6 @@
 ---
 title: Migrate from ASP.NET Membership authentication to ASP.NET Core 2.0 Identity
-author: isaac2004
+author: isaacrlevin
 description: Learn how to migrate existing ASP.NET apps using Membership authentication to ASP.NET Core 2.0 Identity.
 ms.author: scaddie
 ms.custom: mvc

aspnetcore/migration/proper-to-2x/mvc2.md

@@ -1,6 +1,6 @@
 ---
 title: Migrate from ASP.NET to ASP.NET Core 2.0
-author: isaac2004
+author: isaacrlevin
 description: Receive guidance for migrating existing ASP.NET MVC or Web API applications to ASP.NET Core 2.0.
 ms.author: scaddie
 ms.custom: mvc

aspnetcore/mvc/views/razor.md

@@ -13,6 +13,8 @@ By [Rick Anderson](https://twitter.com/RickAndMSFT), [Taylor Mullen](https://twi
 
 Razor is a markup syntax for embedding .NET based code into webpages. The Razor syntax consists of Razor markup, C#, and HTML. Files containing Razor generally have a `.cshtml` file extension. Razor is also found in [Razor component](xref:blazor/components/index) files (`.razor`). Razor syntax is similar to the templating engines of various JavaScript single-page application (SPA) frameworks, such as Angular, React, VueJs, and Svelte. For more information see, <xref:client-side/spa-services>.
 
+[Introduction to ASP.NET Web Programming Using the Razor Syntax](/aspnet/web-pages/overview/getting-started/introducing-razor-syntax-c) provides many samples of programming with Razor syntax. Although the topic was written for ASP.NET rather than ASP.NET Core, most of the samples apply to ASP.NET Core.
+
 ## Rendering HTML
 
 The default Razor language is HTML. Rendering HTML from Razor markup is no different than rendering HTML from an HTML file. HTML markup in `.cshtml` Razor files is rendered by the server unchanged.