Skip to content

Commit 5e3d291

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 33c86ba + 6b68837 commit 5e3d291

File tree

58 files changed

+935
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+935
-261
lines changed

articles/active-directory/develop/microsoft-identity-web.md

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: conceptual
1212
ms.workload: identity
13-
ms.date: 10/09/2020
13+
ms.date: 11/19/2021
1414
ms.author: jmprieur
1515
ms.reviewer: marsma
1616
ms.custom: "devx-track-csharp, aaddev"
@@ -21,6 +21,8 @@ ms.custom: "devx-track-csharp, aaddev"
2121

2222
Microsoft Identity Web is a set of ASP.NET Core libraries that simplifies adding authentication and authorization support to web apps and web APIs integrating with the Microsoft identity platform. It provides a single-surface API convenience layer that ties together ASP.NET Core, its authentication middleware, and the [Microsoft Authentication Library (MSAL) for .NET](https://github.com/azuread/microsoft-authentication-library-for-dotnet).
2323

24+
You can get Microsoft.Identity.Web from NuGet or by using a Visual Studio project template to create a new app project.
25+
2426
## Supported application scenarios
2527

2628
If you're building ASP.NET Core web apps or web APIs and want to use Azure Active Directory (Azure AD) or Azure AD B2C for identity and access management (IAM), we recommend using Microsoft Identity Web for all of these scenarios:
@@ -30,11 +32,7 @@ If you're building ASP.NET Core web apps or web APIs and want to use Azure Activ
3032
- [Protected web API that only authenticated users can access](scenario-protected-web-api-overview.md)
3133
- [Protected web API that calls another (downstream) web API on behalf of the signed-in user](scenario-web-api-call-api-overview.md)
3234

33-
## Get the library
34-
35-
You can get Microsoft Identity Web from [NuGet](#nuget), [.NET Core project templates](#project-templates), and [GitHub](#github).
36-
37-
#### NuGet
35+
## Install from NuGet
3836

3937
Microsoft Identity Web is available on NuGet as a set of packages that provide modular functionality based on your app's needs. Use the .NET CLI's `dotnet add` command or Visual Studio's **NuGet Package Manager** to install the packages appropriate for your project:
4038

@@ -43,37 +41,45 @@ Microsoft Identity Web is available on NuGet as a set of packages that provide m
4341
- [Microsoft.Identity.Web.MicrosoftGraph](https://www.nuget.org/packages/Microsoft.Identity.Web.MicrosoftGraph) - Optional. Provides simplified interaction with the Microsoft Graph API.
4442
- [Microsoft.Identity.Web.MicrosoftGraphBeta](https://www.nuget.org/packages/Microsoft.Identity.Web.MicrosoftGraphBeta) - Optional. Provides simplified interaction with the Microsoft Graph API [beta endpoint](/graph/api/overview?view=graph-rest-beta&preserve-view=true).
4543

46-
#### Project templates
44+
## Install by using a Visual Studio project template
45+
46+
Several project templates that use Microsoft Identity Web are included in .NET SDK versions 5.0 and above. The project templates aren't included in the ASP.NET Core 3.1 SDK, but you can install them separately.
4747

48-
Microsoft Identity Web project templates are included in .NET 5.0 and are available for download for ASP.NET Core 3.1 projects.
48+
### .NET 5.0+ - Project templates included
4949

50-
If you're using ASP.NET Core 3.1, install the templates with the .NET CLI:
50+
The Microsoft Identity Web project templates are included in .NET SDK versions 5.0 and above.
51+
52+
This example .NET CLI command creates a Blazor Server project that includes Microsoft Identity Web.
5153

5254
```dotnetcli
53-
dotnet new --install Microsoft.Identity.Web.ProjectTemplates::1.0.0
55+
dotnet new blazorserver --auth SingleOrg --calls-graph --client-id "00000000-0000-0000-0000-000000000000" --tenant-id "11111111-1111-1111-1111-111111111111" --output my-blazor-app
5456
```
5557

56-
The following diagram shows a high-level view of the supported app types and their relevant arguments:
58+
Don't append a `2` to the application type argument (`blazorserver` in the example) if you're using the templates included in .NET SDK 5.0+. Include the `2` suffix *only* if you're on ASP.NET Core 3.1 and you installed the templates separately as described in the next section.
5759

58-
:::image type="content" source="media/microsoft-identity-web-overview/diagram-microsoft-identity-web-templates.png" lightbox="media/microsoft-identity-web-overview/diagram-microsoft-identity-web-templates.png" alt-text="Diagram of the available dot net CLI project templates for Microsoft Identity Web":::
59-
<br /><sup><b>*</b></sup> `MultiOrg` is not supported with `webapi2`, but can be enabled in *appsettings.json* by setting tenant to `common` or `organizations`
60-
<br /><sup><b>**</b></sup> `--calls-graph` is not supported for Azure AD B2C
60+
### ASP.NET Core 3.1 - Install the project templates
6161

62-
This example .NET CLI command, taken from our [Blazor Server tutorial](tutorial-blazor-server.md), generates a new Blazor Server project that includes the right packages and starter code (placeholder values shown):
62+
If you're using ASP.NET Core 3.1, install the project templates from NuGet.
6363

6464
```dotnetcli
65-
dotnet new blazorserver2 --auth SingleOrg --calls-graph --client-id "00000000-0000-0000-0000-000000000000" --tenant-id "11111111-1111-1111-1111-111111111111" --output my-blazor-app
65+
dotnet new --install Microsoft.Identity.Web.ProjectTemplates
6666
```
6767

68-
#### GitHub
68+
For ASP.NET Core 3.1 *only*, append a `2` to the application type argument when you create a new project:
69+
70+
```dotnetcli
71+
dotnet new blazorserver2 --auth SingleOrg --calls-graph --client-id "00000000-0000-0000-0000-000000000000" --tenant-id "11111111-1111-1111-1111-111111111111" --output my-blazor-app
72+
```
6973

70-
Microsoft Identity Web is an open-source project hosted on GitHub: <a href="https://github.com/AzureAD/microsoft-identity-web" target="_blank">AzureAD/microsoft-identity-web</a>
74+
The following diagram shows several of the available app type templates and their arguments. Append a `2` to the app type argument (`blazorserver2` in the example) only if you're using the ASP.NET Core 3.1 SDK and you installed the templates by using `dotnet new --install`.
7175

72-
The [repository wiki](https://github.com/AzureAD/microsoft-identity-web/wiki) contains additional documentation, and if you need help or discover a bug, you can [file an issue](https://github.com/AzureAD/microsoft-identity-web/issues).
76+
:::image type="content" source="media/microsoft-identity-web-overview/diagram-microsoft-identity-web-templates.png" lightbox="media/microsoft-identity-web-overview/diagram-microsoft-identity-web-templates.png" alt-text="Diagram of the available dot net CLI project templates for Microsoft Identity Web":::
77+
<br /><sup><b>*</b></sup> `MultiOrg` is not supported with `webapi2`, but can be enabled in *appsettings.json* by setting tenant to `common` or `organizations`
78+
<br /><sup><b>**</b></sup> `--calls-graph` is not supported for Azure AD B2C
7379

74-
## Features
80+
## Features of the project templates
7581

76-
Microsoft Identity Web includes several features not provided if you use the default ASP.NET 3.1 project templates.
82+
Microsoft Identity Web includes several features not available in the default ASP.NET Core 3.1 project templates.
7783

7884
| Feature | ASP.NET Core 3.1 | Microsoft Identity Web |
7985
|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|

articles/active-directory/enterprise-users/groups-assign-sensitivity-labels.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: enterprise-users
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 09/28/2021
12+
ms.date: 11/19/2021
1313
ms.author: curtand
1414
ms.reviewer: krbain
1515
ms.custom: it-pro
@@ -72,6 +72,14 @@ To apply published labels to groups, you must first enable the feature. These st
7272
Set-AzureADDirectorySetting -Id $grpUnifiedSetting.Id -DirectorySetting $setting
7373
```
7474
75+
If you’re receiving a Request_BadRequest error, it's because the settings already exist in the tenant, so when you try to create a new property:value pair, the result is an error. In this case, take the following steps:
76+
77+
1. Repeat steps 1-4 from [Enable sensitivity label support in PowerShell](#enable-sensitivity-label-support-in-powershell).
78+
1. Issue a `Get-AzureADDirectorySetting | FL` cmdlet and check the ID. If several ID values are present, use the one where you see the EnableMIPLabels property on the Values settings. You will need the ID in step 4.
79+
1. Set the EnableMIPLabels property variable: `$Setting["EnableMIPLabels"] = "True"`
80+
1. Issue the `Set-AzureADDirectorySetting -DirectorySetting $Setting -ID` cmdlet, using the ID that you retrieved in step 2.
81+
1. Ensure that the value is now correctly updated by issuing `$Setting.Values` again.
82+
7583
You will also need to synchronize your sensitivity labels to Azure AD. For instructions, see [How to enable sensitivity labels for containers and synchronize labels](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites#how-to-enable-sensitivity-labels-for-containers-and-synchronize-labels).
7684
7785
## Assign a label to a new group in Azure portal

articles/aks/supported-kubernetes-versions.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ For the past release history, see [Kubernetes](https://en.wikipedia.org/wiki/Kub
174174
| 1.23 | Dec 2021 | Jan 2022 | Feb 2022 | 1.26 GA |
175175

176176
> [!NOTE]
177-
> 1.19 will be deprecated and removed from AKS at the end of January 2022.
177+
> AKS and the Holiday Season: To ease the burden of upgrade and change during the holiday season, AKS is extending a limited scope of support for all clusters and node pools on 1.19 as a courtesy. Customers with clusters and node pools on 1.19 after the [announced deprecation date of 2021-11-30](https://docs.microsoft.com/azure/aks/supported-kubernetes-versions#aks-kubernetes-release-calendar) will be granted an extension of capabilities outside the [usual scope of support for deprecated versions](https://docs.microsoft.com/azure/aks/supported-kubernetes-versions#kubernetes-version-support-policy).
178+
The scope of this limited extension is effective from '2021-12-01 to 2022-01-31' and is limited to the following:
179+
> * Creation of new clusters and node pools on 1.19.
180+
> * CRUD operations on 1.19 clusters.
181+
> * Azure Support of non-Kubernetes related, platform issues. Platform issues include trouble with networking, storage, or compute running on Azure. Any support requests for K8s patching and troubleshooting will be requested to upgrade into a supported version.
178182
179183
## FAQ
180184

articles/azure-functions/create-first-function-cli-node.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create a JavaScript function from the command line - Azure Functions
33
description: Learn how to create a JavaScript function from the command line, then publish the local Node.js project to serverless hosting in Azure Functions.
4-
ms.date: 11/03/2020
4+
ms.date: 11/18/2021
55
ms.topic: quickstart
66
ms.custom: devx-track-azurecli, devx-track-azurepowershell
77
---
@@ -30,7 +30,7 @@ Before you begin, you must have the following:
3030

3131
+ The Azure [Az PowerShell module](/powershell/azure/install-az-ps) version 5.9.0 or later.
3232

33-
+ [Node.js](https://nodejs.org/) version 14.
33+
+ [Node.js](https://nodejs.org/) version 14 or 16 (preview).
3434

3535
### Prerequisite check
3636

@@ -109,18 +109,18 @@ Each binding requires a direction, a type, and a unique name. The HTTP trigger h
109109
# [Azure CLI](#tab/azure-cli)
110110

111111
```azurecli
112-
az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location <REGION> --runtime node --runtime-version 12 --functions-version 3 --name <APP_NAME> --storage-account <STORAGE_NAME>
112+
az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location <REGION> --runtime node --runtime-version 14 --functions-version 4 --name <APP_NAME> --storage-account <STORAGE_NAME>
113113
```
114114

115-
The [az functionapp create](/cli/azure/functionapp#az_functionapp_create) command creates the function app in Azure. If you're using Node.js 10, also change `--runtime-version` to `10`.
115+
The [az functionapp create](/cli/azure/functionapp#az_functionapp_create) command creates the function app in Azure. If you're using Node.js 16, also change `--runtime-version` to `16`.
116116

117117
# [Azure PowerShell](#tab/azure-powershell)
118118

119119
```azurepowershell
120-
New-AzFunctionApp -Name <APP_NAME> -ResourceGroupName AzureFunctionsQuickstart-rg -StorageAccount <STORAGE_NAME> -Runtime node -RuntimeVersion 12 -FunctionsVersion 3 -Location <REGION>
120+
New-AzFunctionApp -Name <APP_NAME> -ResourceGroupName AzureFunctionsQuickstart-rg -StorageAccount <STORAGE_NAME> -Runtime node -RuntimeVersion 14 -FunctionsVersion 4 -Location <REGION>
121121
```
122122

123-
The [New-AzFunctionApp](/powershell/module/az.functions/new-azfunctionapp) cmdlet creates the function app in Azure. If you're using Node.js 10, change `-RuntimeVersion` to `10`.
123+
The [New-AzFunctionApp](/powershell/module/az.functions/new-azfunctionapp) cmdlet creates the function app in Azure. If you're using Node.js 16, change `-RuntimeVersion` to `16`.
124124

125125
---
126126

articles/azure-functions/create-first-function-cli-typescript.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create a TypeScript function from the command line - Azure Functions
33
description: Learn how to create a TypeScript function from the command line, then publish the local project to serverless hosting in Azure Functions.
4-
ms.date: 11/03/2020
4+
ms.date: 11/18/2021
55
ms.topic: quickstart
66
ms.custom: devx-track-azurecli, devx-track-azurepowershell
77
---
@@ -30,7 +30,7 @@ Before you begin, you must have the following:
3030

3131
+ The Azure [Az PowerShell module](/powershell/azure/install-az-ps) version 5.9.0 or later.
3232

33-
+ [Node.js](https://nodejs.org/) version 14.
33+
+ [Node.js](https://nodejs.org/) version 14 or 16 (preview).
3434

3535
### Prerequisite check
3636

@@ -142,18 +142,18 @@ Each binding requires a direction, a type, and a unique name. The HTTP trigger h
142142
# [Azure CLI](#tab/azure-cli)
143143

144144
```azurecli
145-
az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location <REGION> --runtime node --runtime-version 12 --functions-version 3 --name <APP_NAME> --storage-account <STORAGE_NAME>
145+
az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location <REGION> --runtime node --runtime-version 14 --functions-version 4 --name <APP_NAME> --storage-account <STORAGE_NAME>
146146
```
147147

148-
The [az functionapp create](/cli/azure/functionapp#az_functionapp_create) command creates the function app in Azure. If you're using Node.js 10, also change `--runtime-version` to `10`.
148+
The [az functionapp create](/cli/azure/functionapp#az_functionapp_create) command creates the function app in Azure. If you're using Node.js 16, also change `--runtime-version` to `16`.
149149

150150
# [Azure PowerShell](#tab/azure-powershell)
151151

152152
```azurepowershell
153-
New-AzFunctionApp -Name <APP_NAME> -ResourceGroupName AzureFunctionsQuickstart-rg -StorageAccount <STORAGE_NAME> -Runtime node -RuntimeVersion 12 -FunctionsVersion 3 -Location '<REGION>'
153+
New-AzFunctionApp -Name <APP_NAME> -ResourceGroupName AzureFunctionsQuickstart-rg -StorageAccount <STORAGE_NAME> -Runtime node -RuntimeVersion 14 -FunctionsVersion 4 -Location '<REGION>'
154154
```
155155

156-
The [New-AzFunctionApp](/powershell/module/az.functions/new-azfunctionapp) cmdlet creates the function app in Azure. If you're using Node.js 10, change `-RuntimeVersion` to `10`.
156+
The [New-AzFunctionApp](/powershell/module/az.functions/new-azfunctionapp) cmdlet creates the function app in Azure. If you're using Node.js 16, change `-RuntimeVersion` to `16`.
157157

158158
---
159159

articles/azure-functions/create-first-function-vs-code-node.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a JavaScript function using Visual Studio Code - Azure Functions
33
description: Learn how to create a JavaScript function, then publish the local Node.js project to serverless hosting in Azure Functions using the Azure Functions extension in Visual Studio Code.
44
ms.topic: quickstart
5-
ms.date: 07/01/2021
5+
ms.date: 11/18/2021
66
adobe-target: true
77
adobe-target-activity: DocsExp–386541–A/B–Enhanced-Readability-Quickstarts–2.19.2021
88
adobe-target-experience: Experience B
@@ -25,12 +25,14 @@ Before you get started, make sure you have the following requirements in place:
2525

2626
+ An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).
2727

28-
+ [Node.js 10.14.1+](https://nodejs.org/). Use the `node --version` command to check your version.
28+
+ [Node.js 14.x](https://nodejs.org/en/download/releases/) or [Node.js 16.x](https://nodejs.org/en/download/releases/) (preview). Use the `node --version` command to check your version.
2929

3030
+ [Visual Studio Code](https://code.visualstudio.com/) on one of the [supported platforms](https://code.visualstudio.com/docs/supporting/requirements#_platforms).
3131

3232
+ The [Azure Functions extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) for Visual Studio Code.
3333

34+
+ [Azure Functions Core Tools 4.x](functions-run-local.md#install-the-azure-functions-core-tools).
35+
3436
## <a name="create-an-azure-functions-project"></a>Create your local project
3537

3638
In this section, you use Visual Studio Code to create a local Azure Functions project in JavaScript. Later in this article, you'll publish your function code to Azure.

articles/azure-functions/create-first-function-vs-code-typescript.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a TypeScript function using Visual Studio Code - Azure Functions
33
description: Learn how to create a TypeScript function, then publish the local Node.js project to serverless hosting in Azure Functions using the Azure Functions extension in Visual Studio Code.
44
ms.topic: quickstart
5-
ms.date: 11/04/2020
5+
ms.date: 11/18/2021
66
---
77

88
# Quickstart: Create a function in Azure with TypeScript using Visual Studio Code
@@ -21,12 +21,14 @@ Before you get started, make sure you have the following requirements in place:
2121

2222
+ An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).
2323

24-
+ [Node.js](https://nodejs.org/), Active LTS and Maintenance LTS versions (10.14.1 recommended). Use the `node --version` command to check your version.
24+
+ [Node.js 14.x](https://nodejs.org/en/download/releases/) or [Node.js 16.x](https://nodejs.org/en/download/releases/) (preview). Use the `node --version` command to check your version.
2525

2626
+ [Visual Studio Code](https://code.visualstudio.com/) on one of the [supported platforms](https://code.visualstudio.com/docs/supporting/requirements#_platforms).
2727

2828
+ The [Azure Functions extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) for Visual Studio Code.
2929

30+
+ [Azure Functions Core Tools 4.x](functions-run-local.md#install-the-azure-functions-core-tools).
31+
3032
## <a name="create-an-azure-functions-project"></a>Create your local project
3133

3234
In this section, you use Visual Studio Code to create a local Azure Functions project in TypeScript. Later in this article, you'll publish your function code to Azure.

0 commit comments

Comments
 (0)