Merge branch 'main' into patch-8

Author: nicjohn79

.openpublishing.publish.config.json

@@ -34,7 +34,7 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
@@ -901,4 +901,4 @@
     "articles/container-apps/.openpublishing.redirection.container-apps.json",
     "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
   ]
-}
+}

.openpublishing.redirection.json

@@ -43933,6 +43933,11 @@
         "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
         "redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
         "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
+        "redirect_url": "/azure/virtual-desktop/overview",
+        "redirect_document_id": false
       }
   ]
 }

.vscode/settings.json

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 02/16/2022
+ms.date: 03/06/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -127,7 +127,7 @@ The **Mask** element contains the following attributes:
 | `Type` | Yes | The type of the claim mask. Possible values: `Simple` or `Regex`. The `Simple` value indicates that a simple text mask is applied to the leading portion of a string claim. The `Regex` value indicates that a regular expression is applied to the string claim as whole.  If the `Regex` value is specified, an optional attribute must also be defined with the regular expression to use. |
 | `Regex` | No | If **`Type`** is set to `Regex`, specify the regular expression to use.
 
-The following example configures a **PhoneNumber** claim with the `Simple` mask:
+The following example configures a **PhoneNumber** claim with the `Simple` mask. For more samples, check out the [Claim simple mask live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#simple-mask).
 
 ```xml
 <ClaimType Id="PhoneNumber">
@@ -142,7 +142,7 @@ The Identity Experience Framework renders the phone number while hiding the firs
 
 ![Phone number claim shown in browser with first six digits masked by Xs](./media/claimsschema/mask.png)
 
-The following example configures a **AlternateEmail** claim with the `Regex` mask:
+The following example configures a **AlternateEmail** claim with the `Regex` mask. For more samples, check out the [Regex mask live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#regex-mask).
 
 ```xml
 <ClaimType Id="AlternateEmail">
@@ -157,7 +157,6 @@ The Identity Experience Framework renders only the first letter of the email add
 
 ![Email claim shown in browser with characters masked by asterisks](./media/claimsschema/mask-regex.png)
 
-
 ### Restriction
 
 The **Restriction** element may contain the following attribute:
@@ -185,7 +184,7 @@ The **Enumeration** element contains the following attributes:
 |Value | Yes | The claim value that is associated with selecting this option. |
 | SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
 
-The following example configures a **city** dropdown list claim with a default value set to `New York`:
+The following example configures a **city** dropdown list claim with a default value set to `New York`. For more samples, check out the [Claim restriction enumeration live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#restriction-enumeration).
 
 ```xml
 <ClaimType Id="city">
@@ -390,7 +389,6 @@ The **Readonly** user input type is used to provide a readonly field to display
 </ClaimType>
 ```
 
-
 #### Paragraph
 
 The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag.  For example, &lt;p&gt;text&lt;/p&gt;. A **Paragraph** user input type `OutputClaim` of self-asserted technical profile, must set the `Required` attribute `false` (default).
@@ -404,10 +402,5 @@ The **Paragraph** user input type is used to provide a field that shows text onl
   <AdminHelpText>A claim responsible for holding response messages to send to the relying party</AdminHelpText>
   <UserHelpText>A claim responsible for holding response messages to send to the relying party</UserHelpText>
   <UserInputType>Paragraph</UserInputType>
-  <Restriction>
-    <Enumeration Text="B2C_V1_90001" Value="You cannot sign in because you are a minor" />
-    <Enumeration Text="B2C_V1_90002" Value="This action can only be performed by gold members" />
-    <Enumeration Text="B2C_V1_90003" Value="You have not been enabled for this operation" />
-  </Restriction>
 </ClaimType>
 ```

articles/active-directory-b2c/claimsschema.md

@@ -113,7 +113,7 @@ Under the project root folder, open the *appsettings.json* file. This file conta
 |---------|---------|---------|
 |AzureAdB2C|Instance| The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `https://contoso.b2clogin.com`).|
 |AzureAdB2C|Domain| Your Azure AD B2C tenant full [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
-|AzureAdB2C|ClientId| The web API application ID from [step 2](#step-2-register-a-web-application).|
+|AzureAdB2C|ClientId| The Web App Application (client) ID from [step 2](#step-2-register-a-web-application).|
 |AzureAdB2C|SignUpSignInPolicyId|The user flows or custom policy you created in [step 1](#step-1-configure-your-user-flow).|
 
 Your final configuration file should look like the following JSON:

articles/active-directory-b2c/configure-authentication-sample-web-app.md

@@ -31,7 +31,7 @@ zone_pivot_groups: b2c-policy-type
 
 ## Create an application
 
-To enable sign-in for users with a Twitter account in Azure AD B2C, you need to create a Twitter application. If you don't already have a Twitter account, you can sign up at [`https://twitter.com/signup`](https://twitter.com/signup). You also need to [Apply for a developer account](https://developer.twitter.com/en/apply/user.html). For more information, see [Apply for access](https://developer.twitter.com/en/apply-for-access).
+To enable sign-in for users with a Twitter account in Azure AD B2C, you need to create a Twitter application. If you don't already have a Twitter account, you can sign up at [`https://twitter.com/signup`](https://twitter.com/signup). You also need to [Apply for a developer account](https://developer.twitter.com/). For more information, see [Apply for access](https://developer.twitter.com/en/apply-for-access).
 
 1. Sign in to the [Twitter Developer Portal](https://developer.twitter.com/portal/projects-and-apps) with your Twitter account credentials.
 1. Under **Standalone Apps**, select **+Create App**.

articles/active-directory-b2c/identity-provider-twitter.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 01/21/2022
+ms.date: 03/06/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -110,24 +110,26 @@ The **Item** element contains the following attributes:
 | Value | Yes | The string claim value associated with selecting this option. |
 | SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
 
-The following example shows the use of the **LocalizedCollections** element. It contains two **LocalizedCollection** elements, one for English and another one for Spanish. Both set the **Restriction** collection of the claim `Gender` with a list of items for English and Spanish.
+The following example shows the use of the **LocalizedCollections** element. It contains two **LocalizedCollection** elements, one for English and another one for Spanish. Both set the **Restriction** collection of the claim `Gender` with a list of items for English and Spanish. For more samples, check out the [Claim restriction enumeration live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#restriction-enumeration).
 
 ```xml
 <LocalizedResources Id="api.selfasserted.en">
- <LocalizedCollections>
-   <LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
+  <LocalizedCollections>
+    <LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
       <Item Text="Female" Value="F" />
       <Item Text="Male" Value="M" />
     </LocalizedCollection>
-</LocalizedCollections>
+  </LocalizedCollections>
+</LocalizedResources>
 
 <LocalizedResources Id="api.selfasserted.es">
  <LocalizedCollections>
    <LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
       <Item Text="Femenino" Value="F" />
       <Item Text="Masculino" Value="M" />
     </LocalizedCollection>
-</LocalizedCollections>
+  </LocalizedCollections>
+</LocalizedResources>
 ```
 
 ### LocalizedStrings

articles/active-directory-b2c/localization.md

@@ -143,10 +143,22 @@ The top-level resource for policy keys in the Microsoft Graph API is the [Truste
 
 ## Application extension properties
 
+- [Create extension properties](/graph/api/application-post-extensionproperty)
 - [List extension properties](/graph/api/application-list-extensionproperty)
-- [Delete extension property](/graph/api/application-delete-extensionproperty)
+- [Get an extension property](/graph/api/extensionproperty-get)
+- [Delete extension property](/graph/api/extensionproperty-delete)
+- [Get available extension properties](/graph/api/directoryobject-getavailableextensionproperties)
+
+<!--
+#Hiding this note because user flows and extension attributes are different things in Microsoft Graph.
 
 Azure AD B2C provides a directory that can hold 100 custom attributes per user. For user flows, these extension properties are [managed by using the Azure portal](user-flow-custom-attributes.md). For custom policies, Azure AD B2C creates the property for you, the first time the policy writes a value to the extension property.
+-->
+
+Azure AD B2C provides a directory that can hold 100 extension values per user. To manage the extension values for a user, use the following [User APIs](/graph/api/resources/user) in Microsoft Graph.
+
+- [Update user](/graph/api/user-update): To write or remove the extension property value from the user.
+- [Get a user](/graph/api/user-get): To retrieve the extension property value for the user. The extension property will be returned by default through the `beta` endpoint, but only on `$select` through the `v1.0` endpoint.
 
 ## Audit logs