Skip to content

Commit 2387a51

Browse files
Merge pull request #112338 from cephalin/dotnetrefresh2
update core quickstart
2 parents ec5a264 + be6b897 commit 2387a51

31 files changed

+242
-234
lines changed

articles/app-service/app-service-web-get-started-dotnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Quickstart: Create a C# ASP.NET Core app"
33
description: Learn how to run web apps in Azure App Service by deploying the default C# ASP.NET Core web app template from Visual Studio.
44
ms.assetid: b1e6bd58-48d1-4007-9d6c-53fd6db061e3
55
ms.topic: quickstart
6-
ms.date: 03/17/2020
6+
ms.date: 04/22/2020
77
ms.custom: mvc, devcenter, vs-azure, seodec18
88
---
99

@@ -102,7 +102,7 @@ Follow these steps to update and redeploy your web app:
102102

103103
1. In **Solution Explorer**, under your project, open **Pages** > **Index.cshtml**.
104104

105-
1. Replace the two `<div>` tags with the following code:
105+
1. Replace the entire `<div>` tag with the following code:
106106

107107
```HTML
108108
<div class="jumbotron">

articles/app-service/app-service-web-get-started-html.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ The `az webapp up` command does the following actions:
5858

5959
This command may take a few minutes to run. While running, it displays information similar to the following example:
6060

61-
```json
61+
<pre>
6262
{
63-
"app_url": "https://<app_name>.azurewebsites.net",
63+
"app_url": "https://&lt;app_name&gt;.azurewebsites.net",
6464
"location": "westeurope",
65-
"name": "<app_name>",
65+
"name": "&lt;app_name&gt;",
6666
"os": "Windows",
6767
"resourcegroup": "appsvc_rg_Windows_westeurope",
6868
"serverfarm": "appsvc_asp_Windows_westeurope",
6969
"sku": "FREE",
70-
"src_path": "/home/<username>/quickstart/html-docs-hello-world ",
71-
< JSON data removed for brevity. >
70+
"src_path": "/home/&lt;username&gt;/quickstart/html-docs-hello-world ",
71+
&lt; JSON data removed for brevity. &gt;
7272
}
73-
```
73+
</pre>
7474

7575
Make a note of the `resourceGroup` value. You need it for the [clean up resources](#clean-up-resources) section.
7676

articles/app-service/app-service-web-get-started-nodejs.experimental.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ az webapp create --resource-group myResourceGroup --plan myAppServicePlan --name
7272

7373
When the web app has been created, the Azure CLI shows output similar to the following example:
7474

75-
```json
75+
<pre>
7676
{
7777
"availabilityState": "Normal",
7878
"clientAffinityEnabled": true,
7979
"clientCertEnabled": false,
8080
"cloningInfo": null,
8181
"containerSize": 0,
8282
"dailyMemoryTimeQuota": 0,
83-
"defaultHostName": "<app_name>.azurewebsites.net",
83+
"defaultHostName": "&lt;app_name&gt;.azurewebsites.net",
8484
"enabled": true,
85-
< JSON data removed for brevity. >
85+
&lt; JSON data removed for brevity. &gt;
8686
}
87-
```
87+
</pre>
8888

8989
### Set Node.js runtime
9090

articles/app-service/app-service-web-get-started-php.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,21 @@ az --% webapp create --resource-group myResourceGroup --plan myAppServicePlan --
8080
8181
When the web app has been created, the Azure CLI shows output similar to the following example:
8282

83-
```json
84-
Local git is configured with url of 'https://<username>@<app_name>.scm.azurewebsites.net/<app_name>.git'
83+
<pre>
84+
Local git is configured with url of 'https://&lt;username&gt;@&lt;app_name&gt;.scm.azurewebsites.net/&lt;app_name&gt;.git'
8585
{
8686
"availabilityState": "Normal",
8787
"clientAffinityEnabled": true,
8888
"clientCertEnabled": false,
8989
"cloningInfo": null,
9090
"containerSize": 0,
9191
"dailyMemoryTimeQuota": 0,
92-
"defaultHostName": "<app_name>.azurewebsites.net",
92+
"defaultHostName": "&lt;app_name&gt;.azurewebsites.net",
9393
"enabled": true,
94-
< JSON data removed for brevity. >
94+
&lt; JSON data removed for brevity. &gt;
9595
}
96-
```
96+
</pre>
97+
9798
You've created an empty new web app, with git deployment enabled.
9899

99100
> [!NOTE]

articles/app-service/app-service-web-tutorial-connect-msi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ az webapp identity assign --resource-group myResourceGroup --name <app-name>
200200

201201
Here's an example of the output:
202202

203-
```json
203+
<pre>
204204
{
205205
"additionalProperties": {},
206206
"principalId": "21dfa71c-9e6f-4d17-9e90-1d28801c9735",
207207
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
208208
"type": "SystemAssigned"
209209
}
210-
```
210+
</pre>
211211

212212
### Grant permissions to managed identity
213213

articles/app-service/app-service-web-tutorial-dotnetcore-sqldb.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,23 @@ az sql server create --name <server_name> --resource-group myResourceGroup --loc
9595

9696
When the SQL Database logical server is created, the Azure CLI shows information similar to the following example:
9797

98-
```json
98+
<pre>
9999
{
100-
"administratorLogin": "sqladmin",
100+
"administratorLogin": "&lt;db_username&gt;",
101101
"administratorLoginPassword": null,
102-
"fullyQualifiedDomainName": "<server_name>.database.windows.net",
103-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/<server_name>",
102+
"fullyQualifiedDomainName": "&lt;server_name&gt;.database.windows.net",
103+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/&lt;server_name&gt;",
104104
"identity": null,
105105
"kind": "v12.0",
106106
"location": "westeurope",
107-
"name": "<server_name>",
107+
"name": "&lt;server_name&gt;",
108108
"resourceGroup": "myResourceGroup",
109109
"state": "Ready",
110110
"tags": null,
111111
"type": "Microsoft.Sql/servers",
112112
"version": "12.0"
113113
}
114-
```
114+
</pre>
115115

116116
### Configure a server firewall rule
117117

@@ -226,7 +226,7 @@ git commit -m "connect to SQLDB in Azure"
226226

227227
[!INCLUDE [app-service-plan-no-h](../../includes/app-service-web-git-push-to-azure-no-h.md)]
228228

229-
```bash
229+
<pre>
230230
Counting objects: 98, done.
231231
Delta compression using up to 8 threads.
232232
Compressing objects: 100% (92/92), done.
@@ -248,9 +248,9 @@ remote: Finished successfully.
248248
remote: Running post deployment command(s)...
249249
remote: Deployment successful.
250250
remote: App container will begin restart within 10 seconds.
251-
To https://<app_name>.scm.azurewebsites.net/<app_name>.git
251+
To https://&lt;app_name&gt;.scm.azurewebsites.net/&lt;app_name&gt;.git
252252
* [new branch] master -> master
253-
```
253+
</pre>
254254

255255
### Browse to the Azure app
256256

articles/app-service/app-service-web-tutorial-nodejs-mongodb-app.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ npm start
8383

8484
When the app is fully loaded, you see something similar to the following message:
8585

86-
```console
86+
<pre>
8787
--
8888
MEAN.JS - Development Environment
8989

@@ -93,7 +93,7 @@ Database: mongodb://localhost/mean-dev
9393
App version: 0.5.0
9494
MEAN.JS version: 0.5.0
9595
--
96-
```
96+
</pre>
9797

9898
Navigate to `http://localhost:3000` in a browser. Click **Sign Up** in the top menu and create a test user.
9999

@@ -138,7 +138,7 @@ The *--kind MongoDB* parameter enables MongoDB client connections.
138138

139139
When the Cosmos DB account is created, the Azure CLI shows information similar to the following example:
140140

141-
```json
141+
<pre>
142142
{
143143
"consistencyPolicy":
144144
{
@@ -147,12 +147,12 @@ When the Cosmos DB account is created, the Azure CLI shows information similar t
147147
"maxStalenessPrefix": 100
148148
},
149149
"databaseAccountOfferType": "Standard",
150-
"documentEndpoint": "https://<cosmosdb_name>.documents.azure.com:443/",
150+
"documentEndpoint": "https://&lt;cosmosdb_name&gt;.documents.azure.com:443/",
151151
"failoverPolicies":
152152
...
153-
< Output truncated for readability >
153+
&lt; Output truncated for readability &gt;
154154
}
155-
```
155+
</pre>
156156

157157
## Connect app to production MongoDB
158158

@@ -168,14 +168,14 @@ az cosmosdb list-keys --name <cosmosdb_name> --resource-group myResourceGroup
168168

169169
The Azure CLI shows information similar to the following example:
170170

171-
```json
171+
<pre>
172172
{
173173
"primaryMasterKey": "RS4CmUwzGRASJPMoc0kiEvdnKmxyRILC9BWisAYh3Hq4zBYKr0XQiSE4pqx3UchBeO4QRCzUt1i7w0rOkitoJw==",
174174
"primaryReadonlyMasterKey": "HvitsjIYz8TwRmIuPEUAALRwqgKOzJUjW22wPL2U8zoMVhGvregBkBk9LdMTxqBgDETSq7obbwZtdeFY7hElTg==",
175175
"secondaryMasterKey": "Lu9aeZTiXU4PjuuyGBbvS1N9IRG3oegIrIh95U6VOstf9bJiiIpw3IfwSUgQWSEYM3VeEyrhHJ4rn3Ci0vuFqA==",
176176
"secondaryReadonlyMasterKey": "LpsCicpVZqHRy7qbMgrzbRKjbYCwCKPQRl0QpgReAOxMcggTvxJFA94fTi0oQ7xtxpftTJcXkjTirQ0pT7QFrQ=="
177177
}
178-
```
178+
</pre>
179179

180180
Copy the value of `primaryMasterKey`. You need this information in the next step.
181181

@@ -221,16 +221,16 @@ node server.js
221221

222222
When the app is loaded, check to make sure that it's running in the production environment:
223223

224-
```console
224+
<pre>
225225
--
226226
MEAN.JS
227227

228228
Environment: production
229229
Server: http://0.0.0.0:8443
230-
Database: mongodb://<cosmosdb_name>:<primary_master_key>@<cosmosdb_name>.documents.azure.com:10250/mean?ssl=true&sslverifycertificate=false
230+
Database: mongodb://&lt;cosmosdb_name&gt;:&lt;primary_master_key&gt;@&lt;cosmosdb_name&gt;.documents.azure.com:10250/mean?ssl=true&sslverifycertificate=false
231231
App version: 0.5.0
232232
MEAN.JS version: 0.5.0
233-
```
233+
</pre>
234234

235235
Navigate to `http://localhost:8443` in a browser. Click **Sign Up** in the top menu and create a test user. If you are successful creating a user and signing in, then your app is writing data to the Cosmos DB database in Azure.
236236

@@ -280,7 +280,7 @@ db: {
280280

281281
[!INCLUDE [app-service-plan-no-h](../../includes/app-service-web-git-push-to-azure-no-h.md)]
282282

283-
```bash
283+
<pre>
284284
Counting objects: 5, done.
285285
Delta compression using up to 4 threads.
286286
Compressing objects: 100% (5/5), done.
@@ -296,9 +296,9 @@ remote: Handling node.js deployment.
296296
.
297297
.
298298
remote: Deployment successful.
299-
To https://<app_name>.scm.azurewebsites.net/<app_name>.git
299+
To https://&lt;app_name&gt;.scm.azurewebsites.net/&lt;app_name&gt;.git
300300
* [new branch]      master -> master
301-
```
301+
</pre>
302302

303303
You may notice that the deployment process runs [Gulp](https://gulpjs.com/) after `npm install`. App Service does not run Gulp or Grunt tasks during deployment, so this sample repository has two additional files in its root directory to enable it:
304304

articles/app-service/app-service-web-tutorial-php-mysql.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ az mysql server create --resource-group myResourceGroup --name <mysql_server_nam
165165
166166
When the MySQL server is created, the Azure CLI shows information similar to the following example:
167167

168-
```json
168+
<pre>
169169
{
170170
"location": "westeurope",
171-
"name": "<mysql_server_name>",
171+
"name": "&lt;mysql_server_name&gt;",
172172
"resourceGroup": "myResourceGroup",
173173
"sku": {
174174
"additionalProperties": {},
@@ -180,9 +180,9 @@ When the MySQL server is created, the Azure CLI shows information similar to the
180180
},
181181
"sslEnforcement": "Enabled",
182182
... +
183-
- < Output has been truncated for readability >
183+
- &lt; Output has been truncated for readability &gt;
184184
}
185-
```
185+
</pre>
186186

187187
### Configure server firewall
188188

@@ -396,7 +396,7 @@ By default, Azure App Service points the root virtual application path (_/_) to
396396

397397
[!INCLUDE [app-service-plan-no-h](../../includes/app-service-web-git-push-to-azure-no-h.md)]
398398

399-
```bash
399+
<pre>
400400
Counting objects: 3, done.
401401
Delta compression using up to 8 threads.
402402
Compressing objects: 100% (3/3), done.
@@ -408,8 +408,8 @@ remote: Preparing deployment for commit id 'a5e076db9c'.
408408
remote: Running custom deployment command...
409409
remote: Running deployment command...
410410
...
411-
< Output has been truncated for readability >
412-
```
411+
&lt; Output has been truncated for readability &gt;
412+
</pre>
413413

414414
> [!NOTE]
415415
> You may notice that the deployment process installs [Composer](https://getcomposer.org/) packages at the end. App Service does not run these automations during default deployment, so this sample repository has three additional files in its root directory to enable it:

articles/app-service/app-service-web-tutorial-rest-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ In this step, you deploy your SQL Database-connected .NET Core application to Ap
9292

9393
[!INCLUDE [app-service-plan-no-h](../../includes/app-service-web-git-push-to-azure-no-h.md)]
9494

95-
```bash
95+
<pre>
9696
Counting objects: 98, done.
9797
Delta compression using up to 8 threads.
9898
Compressing objects: 100% (92/92), done.
@@ -114,9 +114,9 @@ remote: Finished successfully.
114114
remote: Running post deployment command(s)...
115115
remote: Deployment successful.
116116
remote: App container will begin restart within 10 seconds.
117-
To https://<app_name>.scm.azurewebsites.net/<app_name>.git
117+
To https://&lt;app_name&gt;.scm.azurewebsites.net/&lt;app_name&gt;.git
118118
* [new branch] master -> master
119-
```
119+
</pre>
120120

121121
### Browse to the Azure app
122122

-207 KB
Loading

0 commit comments

Comments
 (0)