Merge pull request #18071 from dotnet/master

guardrex · web-flow · commit 6318d2bdd631 · 2020-04-30T13:44:02.000-05:00
diff --git a/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/BlazorSample.csproj b/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/BlazorSample.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview5.20216.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview5.20216.8" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview5.20216.8" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/_Imports.razor b/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/_Imports.razor
@@ -3,6 +3,7 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using BlazorSample
 @using BlazorSample.Shared
diff --git a/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/wwwroot/css/app.css b/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/wwwroot/css/app.css
diff --git a/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/wwwroot/index.html b/aspnetcore/blazor/common/samples/3.x/BlazorWebAssemblySample/wwwroot/index.html
@@ -7,7 +7,7 @@
     <title>Blazor WebAssembly Sample</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
-    <link href="css/site.css" rel="stylesheet" />
+    <link href="css/app.css" rel="stylesheet" />
 </head>
 
 <body>
diff --git a/aspnetcore/blazor/get-started.md b/aspnetcore/blazor/get-started.md
@@ -5,7 +5,7 @@ description: Get started with Blazor by building a Blazor app with the tooling o
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 04/16/2020
+ms.date: 04/30/2020
 no-loc: [Blazor, SignalR]
 uid: blazor/get-started
 ---
@@ -28,7 +28,7 @@ To get started with Blazor, follow the guidance for your choice of tooling:
 1. Install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) preview template by running the following command:
 
    ```dotnetcli
-   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-preview5.20216.8
+   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
    ```
 
 1. Create a new project.
@@ -48,7 +48,7 @@ To get started with Blazor, follow the guidance for your choice of tooling:
 1. Optionally install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) preview template by running the following command:
 
    ```dotnetcli
-   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-preview5.20216.8
+   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
    ```
 
    > [!NOTE]
@@ -90,19 +90,19 @@ Blazor Server is supported in Visual Studio for Mac. Blazor WebAssembly isn't su
 
 1. Select **File** > **New Solution** or create a **New Project**.
 
-1. In the sidebar, select **.NET Core** > **App**.
+1. In the sidebar, select **Web and Console** > **App**.
 
-1. Select the **Blazor Server App** template. Select **Create**.
+1. Select the **Blazor Server App** template. Select **Next**.
 
    For information on the Blazor Server hosting model, see <xref:blazor/hosting-models>.
 
-1. Set the **Target Framework** to **.NET Core 3.1** and select **Next**.
+1. Confirm that the **Target Framework** is set to **.NET Core 3.1** and select **Next**.
 
 1. In the **Project Name** field, name the app `WebApplication1`. Select **Create**.
 
-1. Select **Run** > **Run Without Debugging** to run the app *without the debugger*. Run the app with **Start Debugging** to run the app *with the debugger*.
+1. Select **Run** > **Run Without Debugging** to run the app *without the debugger*. Run the app with **Start Debugging** or the Run (&#9654;) button to run the app *with the debugger*.
 
-If a prompt appears to trust the development certificate, trust the certificate and continue.
+If a prompt appears to trust the development certificate, trust the certificate and continue. The user and keychain passwords are required to trust the certificate.
 
 # [.NET Core CLI](#tab/netcore-cli/)
 
@@ -111,7 +111,7 @@ If a prompt appears to trust the development certificate, trust the certificate
 1. Optionally install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) preview template by running the following command:
 
    ```dotnetcli
-   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-preview5.20216.8
+   dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
    ```
 
    > [!NOTE]
diff --git a/aspnetcore/docfx.json b/aspnetcore/docfx.json
@@ -52,7 +52,7 @@
       "feedback_system": "GitHub",
       "ms.prod": "aspnet-core",
       "ms.topic": "conceptual",
-      "uhfHeaderId": "MSDocsHeader-DotNet",
+      "uhfHeaderId": [],
       "searchScope": [
         "ASP.NET Core"
       ]
diff --git a/aspnetcore/host-and-deploy/blazor/configure-linker.md b/aspnetcore/host-and-deploy/blazor/configure-linker.md
@@ -5,7 +5,7 @@ description: Learn how to control the Intermediate Language (IL) Linker when bui
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 03/23/2020
+ms.date: 04/29/2020
 no-loc: [Blazor, SignalR]
 uid: host-and-deploy/blazor/configure-linker
 ---
@@ -98,11 +98,11 @@ In the following example, the *LinkerConfig.xml* file is specified as an embedde
 
 By default, Blazor's linker configuration for Blazor WebAssembly apps strips out internationalization information except for locales explicitly requested. Removing these assemblies minimizes the app's size.
 
-To control which I18N assemblies are retained, set the `<MonoLinkerI18NAssemblies>` MSBuild property in the project file:
+To control which I18N assemblies are retained, set the `<BlazorWebAssemblyI18NAssemblies>` MSBuild property in the project file:
 
 ```xml
 <PropertyGroup>
-  <MonoLinkerI18NAssemblies>{all|none|REGION1,REGION2,...}</MonoLinkerI18NAssemblies>
+  <BlazorWebAssemblyI18NAssemblies>{all|none|REGION1,REGION2,...}</BlazorWebAssemblyI18NAssemblies>
 </PropertyGroup>
 ```
 
diff --git a/aspnetcore/host-and-deploy/blazor/index.md b/aspnetcore/host-and-deploy/blazor/index.md
@@ -5,7 +5,7 @@ description: Discover how to host and deploy Blazor apps.
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 03/11/2020
+ms.date: 04/30/2020
 no-loc: [Blazor, SignalR]
 uid: host-and-deploy/blazor/index
 ---
@@ -25,6 +25,11 @@ Apps are published for deployment in Release configuration.
 1. Select the *publish target*. To publish locally, select **Folder**.
 1. Accept the default location in the **Choose a folder** field or specify a different location. Select the **Publish** button.
 
+# [Visual Studio for Mac](#tab/visual-studio-mac)
+
+1. Select **Build** > **Publish to Folder**.
+1. Confirm the folder to receive the published assets and select **Publish**.
+
 # [.NET Core CLI](#tab/netcore-cli)
 
 Use the [dotnet publish](/dotnet/core/tools/dotnet-publish) command to publish the app with a Release configuration:
diff --git a/aspnetcore/includes/blazorwasm-3.2-template-article-notice.md b/aspnetcore/includes/blazorwasm-3.2-template-article-notice.md
@@ -1,2 +1,2 @@
 > [!NOTE]
-> The guidance in this article applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-preview5.20216.8`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
+> The guidance in this article applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-rc1.20223.4`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
diff --git a/aspnetcore/includes/blazorwasm-3.2-template-section-notice.md b/aspnetcore/includes/blazorwasm-3.2-template-section-notice.md
@@ -1,2 +1,2 @@
 > [!NOTE]
-> The guidance in this section applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-preview5.20216.8`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
+> The guidance in this section applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-rc1.20223.4`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
diff --git a/aspnetcore/security/authentication/scaffold-identity.md b/aspnetcore/security/authentication/scaffold-identity.md
@@ -5,7 +5,7 @@ description: Learn how to scaffold Identity in an ASP.NET Core project.
 monikerRange: '>= aspnetcore-2.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 01/15/2020
+ms.date: 5/1/2020
 uid: security/authentication/scaffold-identity
 ---
 # Scaffold Identity in ASP.NET Core projects
@@ -24,7 +24,19 @@ We recommend using a source control system that shows file differences and allow
 
 Services are required when using [Two Factor Authentication](xref:security/authentication/identity-enable-qrcodes), [Account confirmation and password recovery](xref:security/authentication/accconfirm), and other security features with Identity. Services or service stubs aren't generated when scaffolding Identity. Services to enable these features must be added manually. For example, see [Require Email Confirmation](xref:security/authentication/accconfirm#require-email-confirmation).
 
-This document contains more complete instructions than the *ScaffoldingReadme.txt* file which is generated when running the scaffolder.
+When scaffolding Identity with a new data context into a project with existing individual accounts:
+
+* In `Startup.ConfigureServices`, remove the calls to:
+  * `AddDbContext`
+  * `AddDefaultIdentity`
+
+For example, `AddDbContext` and `AddDefaultIdentity` are commented out in the following code:
+
+[!code-csharp[](scaffold-identity/3.1sample/StartupRemove.cs?name=snippet)]
+
+The preceeding code comments out the code that is duplicated in *Areas/Identity/IdentityHostingStartup.cs*
+
+Typically, apps that were created with individual accounts should ***not*** create a new data context.
 
 ## Scaffold identity into an empty project
 
diff --git a/aspnetcore/security/authentication/scaffold-identity/3.1sample/StartupRemove.cs b/aspnetcore/security/authentication/scaffold-identity/3.1sample/StartupRemove.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpsPolicy;
+using Microsoft.EntityFrameworkCore;
+using AddDefaultIdentity.Data;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace AddDefaultIdentity
+{
+    public class StartupRemove
+    {
+        public StartupRemove(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        #region snippet
+        public void ConfigureServices(IServiceCollection services)
+        {
+            //services.AddDbContext<ApplicationDbContext>(options =>
+            //    options.UseSqlServer(
+            //        Configuration.GetConnectionString("DefaultConnection")));
+            //services.AddDefaultIdentity<IdentityUser>(options => options.SignIn.RequireConfirmedAccount = true)
+            //    .AddEntityFrameworkStores<ApplicationDbContext>();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
+        }
+        #endregion
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+                app.UseDatabaseErrorPage();
+            }
+            else
+            {
+                app.UseExceptionHandler("/Home/Error");
+                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseHsts();
+            }
+            app.UseHttpsRedirection();
+            app.UseStaticFiles();
+
+            app.UseRouting();
+
+            app.UseAuthentication();
+            app.UseAuthorization();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllerRoute(
+                    name: "default",
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
+            });
+        }
+    }
+}
diff --git a/aspnetcore/tutorials/signalr-blazor-webassembly.md b/aspnetcore/tutorials/signalr-blazor-webassembly.md
@@ -5,7 +5,7 @@ description: Create a chat app that uses ASP.NET Core SignalR with Blazor WebAss
 monikerRange: '>= aspnetcore-3.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 04/23/2020
+ms.date: 04/30/2020
 no-loc: [Blazor, SignalR]
 uid: tutorials/signalr-blazor-webassembly
 ---
@@ -53,7 +53,7 @@ At the end of this tutorial, you'll have a working chat app.
 When not using Visual Studio version 16.6 Preview 2 or later, install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) template. The [Microsoft.AspNetCore.Components.WebAssembly.Templates](https://www.nuget.org/packages/Microsoft.AspNetCore.Components.WebAssembly.Templates/) package has a preview version while Blazor WebAssembly is in preview. In a command shell, execute the following command:
 
 ```dotnetcli
-dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-preview5.20216.8
+dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
 ```
 
 Follow the guidance for your choice of tooling:
diff --git a/aspnetcore/tutorials/signalr-blazor-webassembly/samples/3.x/BlazorSignalRApp/Client/BlazorSignalRApp.Client.csproj b/aspnetcore/tutorials/signalr-blazor-webassembly/samples/3.x/BlazorSignalRApp/Client/BlazorSignalRApp.Client.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.3" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\BlazorSignalRApp.Shared.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"feedback_system": "GitHub",`
`53`	`53`	`"ms.prod": "aspnet-core",`
`54`	`54`	`"ms.topic": "conceptual",`
`55`		`- "uhfHeaderId": "MSDocsHeader-DotNet",`
	`55`	`+ "uhfHeaderId": [],`
`56`	`56`	`"searchScope": [`
`57`	`57`	`"ASP.NET Core"`
`58`	`58`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`> [!NOTE]`
`2`		-> The guidance in this article applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-preview5.20216.8`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
	`2`	+> The guidance in this article applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-rc1.20223.4`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`> [!NOTE]`
`2`		-> The guidance in this section applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-preview5.20216.8`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.
	`2`	+> The guidance in this section applies to the ASP.NET Core Blazor WebAssembly template version 3.2 or later. To obtain the latest Blazor WebAssembly template (version `3.2.0-rc1.20223.4`) when not using Visual Studio version 16.6 Preview 2 or later, see <xref:blazor/get-started>.