Skip to content

Commit c19e388

Browse files
authored
Merge pull request #18109 from dotnet/master
2 parents 7559524 + 397573f commit c19e388

7 files changed

Lines changed: 59 additions & 25 deletions

File tree

aspnetcore/blazor/get-started.md

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Get started with Blazor by building a Blazor app with the tooling o
55
monikerRange: '>= aspnetcore-3.1'
66
ms.author: riande
77
ms.custom: mvc
8-
ms.date: 04/30/2020
8+
ms.date: 05/02/2020
99
no-loc: [Blazor, SignalR]
1010
uid: blazor/get-started
1111
---
@@ -25,7 +25,7 @@ To get started with Blazor, follow the guidance for your choice of tooling:
2525

2626
For information on the two Blazor hosting models, *Blazor WebAssembly* and *Blazor Server*, see <xref:blazor/hosting-models>.
2727

28-
1. Install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) preview template by running the following command:
28+
1. Install the Blazor WebAssembly Preview template by running the following command:
2929

3030
```dotnetcli
3131
dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
@@ -50,9 +50,11 @@ To get started with Blazor, follow the guidance for your choice of tooling:
5050
```dotnetcli
5151
dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
5252
```
53+
54+
For information on the two Blazor hosting models, *Blazor WebAssembly* and *Blazor Server*, see <xref:blazor/hosting-models>.
5355

5456
> [!NOTE]
55-
> The [.NET Core SDK version 3.1.201 or later](https://dotnet.microsoft.com/download/dotnet-core/3.1) is **required** to use the 3.2 Preview 4 Blazor WebAssembly template. Confirm the installed .NET Core SDK version by running `dotnet --version` in a command shell.
57+
> The [.NET Core SDK version 3.1.201 or later](https://dotnet.microsoft.com/download/dotnet-core/3.1) is **required** to use the 3.2 Preview Blazor WebAssembly template. Confirm the installed .NET Core SDK version by running `dotnet --version` in a command shell.
5658
5759
1. Install [Visual Studio Code](https://code.visualstudio.com/).
5860

@@ -70,8 +72,6 @@ To get started with Blazor, follow the guidance for your choice of tooling:
7072
dotnet new blazorwasm -o WebApplication1
7173
```
7274

73-
For information on the two Blazor hosting models, *Blazor Server* and *Blazor WebAssembly*, see <xref:blazor/hosting-models>.
74-
7575
1. Open the *WebApplication1* folder in Visual Studio Code.
7676

7777
1. The IDE requests that you add assets to build and debug the project. Select **Yes**.
@@ -84,38 +84,66 @@ To get started with Blazor, follow the guidance for your choice of tooling:
8484

8585
# [Visual Studio for Mac](#tab/visual-studio-mac)
8686

87-
Blazor Server is supported in Visual Studio for Mac. Blazor WebAssembly isn't supported at this time. To build Blazor WebAssembly apps on macOS, follow the guidance on the **.NET Core CLI** tab.
87+
Blazor Server is supported in Visual Studio for Mac. Blazor WebAssembly isn't supported at this time. To create Blazor WebAssembly apps on macOS, follow the guidance on the **.NET Core CLI** tab. For information on the two Blazor hosting models, *Blazor WebAssembly* and *Blazor Server*, see <xref:blazor/hosting-models>.
8888

8989
1. Install [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
9090

91-
1. Select **File** > **New Solution** or create a **New Project**.
91+
1. Select **File** > **New Solution** or create a **New** project from the **Start Window**.
9292

93-
1. In the sidebar, select **Web and Console** > **App**.
93+
1. In the sidebar, select **.NET Core** > **App**.
9494

9595
1. Select the **Blazor Server App** template. Select **Next**.
9696

97-
For information on the Blazor Server hosting model, see <xref:blazor/hosting-models>.
97+
1. Confirm the following configurations:
9898

99-
1. Confirm that the **Target Framework** is set to **.NET Core 3.1** and select **Next**.
99+
* **Target Framework** set to **.NET Core 3.1**.
100+
* **Authentication** set to **No Authentication**.
101+
102+
Select **Next**.
100103

101104
1. In the **Project Name** field, name the app `WebApplication1`. Select **Create**.
102105

103-
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*.
106+
1. Select **Run** > **Start Without Debugging** to run the app *without the debugger*. Debugging isn't supported at this time.
107+
108+
<!-- HOLD FOR 8.6 GA
109+
110+
1. Select **File** > **New Solution** or create a **New** project from the **Start Window**.
111+
112+
1. In the sidebar, select **Web and Console** > **App**.
113+
114+
1. For a Blazor WebAssembly experience, choose the **Blazor WebAssembly App** template. For a Blazor Server experience, choose the **Blazor Server App** template. Select **Next**.
115+
116+
For information on the two Blazor hosting models, *Blazor WebAssembly* and *Blazor Server*, see <xref:blazor/hosting-models>.
117+
118+
1. Confirm the following configurations:
119+
120+
* **Target Framework** set to **.NET Core 3.1**.
121+
* **Authentication** set to **No Authentication**.
122+
123+
Select **Next**.
124+
125+
1. In the **Project Name** field, name the app `WebApplication1`. Select **Create**.
126+
127+
1. Select **Run** > **Start Without Debugging** to run the app *without the debugger*. Run the app with **Run** > **Start Debugging** or the Run (&#9654;) button to run the app *with the debugger*.
128+
129+
-->
104130

105131
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.
106132

107133
# [.NET Core CLI](#tab/netcore-cli/)
108134

109135
1. Install the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1).
110136

111-
1. Optionally install the [Blazor WebAssembly](xref:blazor/hosting-models#blazor-webassembly) preview template by running the following command:
137+
1. Optionally install the Blazor WebAssembly preview template by running the following command:
112138

113139
```dotnetcli
114140
dotnet new -i Microsoft.AspNetCore.Components.WebAssembly.Templates::3.2.0-rc1.20223.4
115141
```
142+
143+
For information on the two Blazor hosting models, *Blazor WebAssembly* and *Blazor Server*, see <xref:blazor/hosting-models>.
116144

117145
> [!NOTE]
118-
> The [.NET Core SDK version 3.1.201 or later](https://dotnet.microsoft.com/download/dotnet-core/3.1) is **required** to use the 3.2 Preview 4 Blazor WebAssembly template. Confirm the installed .NET Core SDK version by running `dotnet --version` in a command shell.
146+
> The [.NET Core SDK version 3.1.201 or later](https://dotnet.microsoft.com/download/dotnet-core/3.1) is **required** to use the 3.2 Preview Blazor WebAssembly template. Confirm the installed .NET Core SDK version by running `dotnet --version` in a command shell.
119147
120148
1. For a Blazor Server experience, execute the following commands in a command shell:
121149

@@ -133,8 +161,6 @@ If a prompt appears to trust the development certificate, trust the certificate
133161
dotnet run
134162
```
135163

136-
For information on the two Blazor hosting models, *Blazor Server* and *Blazor WebAssembly*, see <xref:blazor/hosting-models>.
137-
138164
1. In a browser, navigate to `https://localhost:5001`.
139165

140166
---

aspnetcore/blazor/routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ The following component navigates to the app's `Counter` component when the butt
224224
The following component handles a location changed event. The `HandleLocationChanged` method is unhooked when `Dispose` is called by the framework. Unhooking the method permits garbage collection of the component.
225225

226226
```razor
227-
@implement IDisposable
227+
@implements IDisposable
228228
@inject NavigationManager NavigationManager
229229
230230
...

aspnetcore/grpc/comparison.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ uid: grpc/comparison
1212

1313
By [James Newton-King](https://twitter.com/jamesnk)
1414

15-
This article explains how [gRPC services](https://grpc.io/docs/guides/) compare to HTTP APIs (including ASP.NET Core [web APIs](xref:web-api/index)). The technology used to provide an API for your app is an important choice, and gRPC offers unique benefits compared to HTTP APIs. This article discusses the strengths and weaknesses of gRPC and recommends scenarios for using gRPC over other technologies.
15+
This article explains how [gRPC services](https://grpc.io/docs/guides/) compare to HTTP APIs with JSON (including ASP.NET Core [web APIs](xref:web-api/index)). The technology used to provide an API for your app is an important choice, and gRPC offers unique benefits compared to HTTP APIs. This article discusses the strengths and weaknesses of gRPC and recommends scenarios for using gRPC over other technologies.
1616

1717
## High-level comparison
1818

@@ -40,6 +40,8 @@ gRPC is designed for HTTP/2, a major revision of HTTP that provides significant
4040
* Binary framing and compression. HTTP/2 protocol is compact and efficient both in sending and receiving.
4141
* Multiplexing of multiple HTTP/2 calls over a single TCP connection. Multiplexing eliminates [head-of-line blocking](https://en.wikipedia.org/wiki/Head-of-line_blocking).
4242

43+
HTTP/2 is not exclusive to gRPC. Many request types, including HTTP APIs with JSON, can use HTTP/2 and benefit from its performance improvements.
44+
4345
### Code generation
4446

4547
All gRPC frameworks provide first-class support for code generation. A core file to gRPC development is the [.proto file](https://developers.google.com/protocol-buffers/docs/proto3), which defines the contract of gRPC services and messages. From this file gRPC frameworks will code generate a service base class, messages, and a complete client.

aspnetcore/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
ms.topic: hub-page
1212
author: WadePickett
1313
ms.author: wpickett
14-
ms.date: 04/26/2020
14+
ms.date: 05/01/2020
1515

1616
# highlightedContent section (optional)
1717
# Maximum of 8 items
@@ -37,7 +37,7 @@ highlightedContent:
3737
# Card
3838
- title: "Create your first web UI"
3939
itemType: get-started
40-
url: tutorials/build-your-first-blazor-app.md
40+
url: tutorials/razor-pages/razor-pages-start.md
4141
# Card
4242
- title: "Create your first web API"
4343
itemType: get-started

aspnetcore/security/blazor/server/index.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to secure Blazor Server apps as ASP.NET Core applications
55
monikerRange: '>= aspnetcore-3.1'
66
ms.author: riande
77
ms.custom: mvc
8-
ms.date: 04/27/2020
8+
ms.date: 05/02/2020
99
no-loc: [Blazor, SignalR]
1010
uid: security/blazor/server/index
1111
---
@@ -93,3 +93,7 @@ Using the `-o|--output` option, the command uses the value provided for the `{AP
9393
For more information, see the [dotnet new](/dotnet/core/tools/dotnet-new) command in the .NET Core Guide.
9494

9595
---
96+
97+
## Secure an existing app
98+
99+
Blazor Server apps are configured for security in the same manner as ASP.NET Core apps. For more information, see the articles under <xref:security/index>.

aspnetcore/signalr/authn-and-authz.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ In standard web APIs, bearer tokens are sent in an HTTP header. However, SignalR
108108

109109
[!code-csharp[Configure Server to accept access token from Query String](authn-and-authz/sample/Startup.cs?name=snippet)]
110110

111+
[!INCLUDE[request localized comments](~/includes/code-comments-loc.md)]
112+
111113
> [!NOTE]
112114
> The query string is used on browsers when connecting with WebSockets and Server-Sent Events due to browser API limitations. When using HTTPS, query string values are secured by the TLS connection. However, many servers log query string values. For more information, see [Security considerations in ASP.NET Core SignalR](xref:signalr/security). SignalR uses headers to transmit tokens in environments which support them (such as the .NET and Java clients).
113115

aspnetcore/tutorials/first-web-api.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ This tutorial creates the following API:
3333

3434
|API | Description | Request body | Response body |
3535
|--- | ---- | ---- | ---- |
36-
|GET /api/TodoItems | Get all to-do items | None | Array of to-do items|
37-
|GET /api/TodoItems/{id} | Get an item by ID | None | To-do item|
38-
|POST /api/TodoItems | Add a new item | To-do item | To-do item |
39-
|PUT /api/TodoItems/{id} | Update an existing item &nbsp; | To-do item | None |
40-
|DELETE /api/TodoItems/{id} &nbsp; &nbsp; | Delete an item &nbsp; &nbsp; | None | None|
36+
|`GET /api/TodoItems` | Get all to-do items | None | Array of to-do items|
37+
|`GET /api/TodoItems/{id}` | Get an item by ID | None | To-do item|
38+
|`POST /api/TodoItems` | Add a new item | To-do item | To-do item |
39+
|`PUT /api/TodoItems/{id}` | Update an existing item &nbsp; | To-do item | None |
40+
|`DELETE /api/TodoItems/{id}` &nbsp; &nbsp; | Delete an item &nbsp; &nbsp; | None | None|
4141

4242
The following diagram shows the design of the app.
4343

0 commit comments

Comments
 (0)