Merge pull request #17804 from dotnet/master

Merge to live April 14

Author: Rick-Anderson

aspnetcore/fundamentals/host/generic-host.md

@@ -12,9 +12,9 @@ uid: fundamentals/host/generic-host
 
 ::: moniker range=">= aspnetcore-3.0 <= aspnetcore-3.1"
 
-This article introduces the .NET Core Generic Host (<xref:Microsoft.Extensions.Hosting.HostBuilder>) and provides guidance on how to use it.
+The ASP.NET Core templates create a .NET Core Generic Host (<xref:Microsoft.Extensions.Hosting.HostBuilder>).
 
-## What's a host?
+## Host definition
 
 A *host* is an object that encapsulates an app's resources, such as:
 
@@ -27,16 +27,33 @@ When a host starts, it calls `IHostedService.StartAsync` on each implementation
 
 The main reason for including all of the app's interdependent resources in one object is lifetime management: control over app startup and graceful shutdown.
 
-In versions of ASP.NET Core earlier than 3.0, the [Web Host](xref:fundamentals/host/web-host) is used for HTTP workloads. The Web Host is no longer recommended for web apps and remains available only for backward compatibility.
-
 ## Set up a host
 
 The host is typically configured, built, and run by code in the `Program` class. The `Main` method:
 
 * Calls a `CreateHostBuilder` method to create and configure a builder object.
 * Calls `Build` and `Run` methods on the builder object.
 
-Here's *Program.cs* code for a non-HTTP workload, with a single `IHostedService` implementation added to the DI container. 
+The ASP.NET Core web templates generate the following code to create a host:
+
+```csharp
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        CreateHostBuilder(args).Build().Run();
+    }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
+}
+```
+
+The following code creates a non-HTTP workload with a `IHostedService` implementation added to the DI container.
 
 ```csharp
 public class Program
@@ -132,7 +149,7 @@ Inject the <xref:Microsoft.Extensions.Hosting.IHostEnvironment> service into a c
 
 * [ApplicationName](#applicationname)
 * [EnvironmentName](#environmentname)
-* [ContentRootPath](#contentrootpath)
+* [ContentRootPath](#contentroot)
 
 Web apps implement the `IWebHostEnvironment` interface, which inherits `IHostEnvironment` and adds the [WebRootPath](#webroot).
 
@@ -175,7 +192,7 @@ The [IHostEnvironment.ApplicationName](xref:Microsoft.Extensions.Hosting.IHostEn
 
 To set this value, use the environment variable. 
 
-### ContentRootPath
+### ContentRoot
 
 The [IHostEnvironment.ContentRootPath](xref:Microsoft.Extensions.Hosting.IHostEnvironment.ContentRootPath*) property determines where the host begins searching for content files. If the path doesn't exist, the host fails to start.
 
@@ -391,14 +408,14 @@ Kestrel has its own endpoint configuration API. For more information, see <xref:
 
 ### WebRoot
 
-The relative path to the app's static assets.
+The [IWebHostEnvironment.WebRootPath](xref:Microsoft.AspNetCore.Hosting.IWebHostEnvironment.WebRootPath) property determines the relative path to the app's static assets. If the path doesn't exist, a no-op file provider is used.  
 
 **Key**: `webroot`  
 **Type**: `string`  
-**Default**: The default is `wwwroot`. The path to *{content root}/wwwroot* must exist. If the path doesn't exist, a no-op file provider is used.  
+**Default**: The default is `wwwroot`. The path to *{content root}/wwwroot* must exist.  
 **Environment variable**: `<PREFIX_>WEBROOT`
 
-To set this value, use the environment variable or call `UseWebRoot`:
+To set this value, use the environment variable or call `UseWebRoot` on `IWebHostBuilder`:
 
 ```csharp
 webBuilder.UseWebRoot("public");
@@ -407,7 +424,7 @@ webBuilder.UseWebRoot("public");
 For more information, see:
 
 * [Fundamentals: Web root](xref:fundamentals/index#web-root)
-* [ContentRootPath](#contentrootpath)
+* [ContentRoot](#contentroot)
 
 ## Manage the host lifetime
 
@@ -970,9 +987,9 @@ public class MyClass
 
 ::: moniker range=">= aspnetcore-5.0"
 
-This article introduces the .NET Core Generic Host (<xref:Microsoft.Extensions.Hosting.HostBuilder>) and provides guidance on how to use it.
+The ASP.NET Core templates create a .NET Core Generic Host (<xref:Microsoft.Extensions.Hosting.HostBuilder>).
 
-## What's a host?
+## Host definition
 
 A *host* is an object that encapsulates an app's resources, such as:
 
@@ -985,16 +1002,33 @@ When a host starts, it calls `IHostedService.StartAsync` on each implementation
 
 The main reason for including all of the app's interdependent resources in one object is lifetime management: control over app startup and graceful shutdown.
 
-In versions of ASP.NET Core earlier than 3.0, the [Web Host](xref:fundamentals/host/web-host) is used for HTTP workloads. The Web Host is no longer recommended for web apps and remains available only for backward compatibility.
-
 ## Set up a host
 
 The host is typically configured, built, and run by code in the `Program` class. The `Main` method:
 
 * Calls a `CreateHostBuilder` method to create and configure a builder object.
 * Calls `Build` and `Run` methods on the builder object.
 
-Here's *Program.cs* code for a non-HTTP workload, with a single `IHostedService` implementation added to the DI container. 
+The ASP.NET Core web templates generate the following code to create a host:
+
+```csharp
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        CreateHostBuilder(args).Build().Run();
+    }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
+}
+```
+
+The following code creates a non-HTTP workload with a `IHostedService` implementation added to the DI container.
 
 ```csharp
 public class Program
@@ -1090,7 +1124,7 @@ Inject the <xref:Microsoft.Extensions.Hosting.IHostEnvironment> service into a c
 
 * [ApplicationName](#applicationname)
 * [EnvironmentName](#environmentname)
-* [ContentRootPath](#contentrootpath)
+* [ContentRootPath](#contentroot)
 
 Web apps implement the `IWebHostEnvironment` interface, which inherits `IHostEnvironment` and adds the [WebRootPath](#webroot).
 
@@ -1133,7 +1167,7 @@ The [IHostEnvironment.ApplicationName](xref:Microsoft.Extensions.Hosting.IHostEn
 
 To set this value, use the environment variable. 
 
-### ContentRootPath
+### ContentRoot
 
 The [IHostEnvironment.ContentRootPath](xref:Microsoft.Extensions.Hosting.IHostEnvironment.ContentRootPath*) property determines where the host begins searching for content files. If the path doesn't exist, the host fails to start.
 
@@ -1362,14 +1396,14 @@ Kestrel has its own endpoint configuration API. For more information, see <xref:
 
 ### WebRoot
 
-The relative path to the app's static assets.
+The [IWebHostEnvironment.WebRootPath](xref:Microsoft.AspNetCore.Hosting.IWebHostEnvironment.WebRootPath) property determines the relative path to the app's static assets. If the path doesn't exist, a no-op file provider is used.  
 
 **Key**: `webroot`  
 **Type**: `string`  
-**Default**: The default is `wwwroot`. The path to *{content root}/wwwroot* must exist. If the path doesn't exist, a no-op file provider is used.  
+**Default**: The default is `wwwroot`. The path to *{content root}/wwwroot* must exist.  
 **Environment variable**: `<PREFIX_>WEBROOT`
 
-To set this value, use the environment variable or call `UseWebRoot`:
+To set this value, use the environment variable or call `UseWebRoot` on `IWebHostBuilder`:
 
 ```csharp
 webBuilder.UseWebRoot("public");
@@ -1378,7 +1412,7 @@ webBuilder.UseWebRoot("public");
 For more information, see:
 
 * [Fundamentals: Web root](xref:fundamentals/index#web-root)
-* [ContentRootPath](#contentrootpath)
+* [ContentRoot](#contentroot)
 
 ## Manage the host lifetime
 

aspnetcore/fundamentals/index.md

@@ -199,7 +199,7 @@ The content root is the base path for:
   * Data files (*.db*)
 * The [Web root](#web-root), typically the *wwwroot* folder.
 
-During development, the content root defaults to the project's root directory. This directory is also the base path for both the app's content files and the [Web root](#web-root). Specify a different content root by setting its path when [building the host](#host). For more information, see [Content root](xref:fundamentals/host/generic-host#contentrootpath-1).
+During development, the content root defaults to the project's root directory. This directory is also the base path for both the app's content files and the [Web root](#web-root). Specify a different content root by setting its path when [building the host](#host). For more information, see [Content root](xref:fundamentals/host/generic-host#contentroot).
 
 ## Web root
 
@@ -209,7 +209,7 @@ The web root is the base path for public, static resource files, such as:
 * JavaScript (*.js*)
 * Images (*.png*, *.jpg*)
 
-By default, static files are served only from the web root directory and its sub-directories. The web root path defaults to *{content root}/wwwroot*. Specify a different web root by setting its path when [building the host](#host). For more information, see [Web root](xref:fundamentals/host/generic-host#webroot-1).
+By default, static files are served only from the web root directory and its sub-directories. The web root path defaults to *{content root}/wwwroot*. Specify a different web root by setting its path when [building the host](#host). For more information, see [Web root](xref:fundamentals/host/generic-host#webroot).
 
 Prevent publishing files in *wwwroot* with the [\<Content> project item](/visualstudio/msbuild/common-msbuild-project-items#content) in the project file. The following example prevents publishing content in *wwwroot/local* and its sub-directories:
 

aspnetcore/security/authentication/social/microsoft-logins.md

@@ -12,7 +12,7 @@ uid: security/authentication/microsoft-logins
 
 By [Valeriy Novytskyy](https://github.com/01binary) and [Rick Anderson](https://twitter.com/RickAndMSFT)
 
-This sample shows you how to enable users to sign in with their Microsoft account using the ASP.NET Core 3.0 project created on the [previous page](xref:security/authentication/social/index).
+This sample shows you how to enable users to sign in with their work, school, or personal Microsoft account using the ASP.NET Core 3.0 project created on the [previous page](xref:security/authentication/social/index).
 
 ## Create the app in Microsoft Developer Portal