Skip to content

Commit 53a915d

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-link-v-ssudhir
2 parents abe43a3 + 1813fbb commit 53a915d

File tree

1,501 files changed

+18574
-49908
lines changed

Some content is hidden

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

1,501 files changed

+18574
-49908
lines changed

.openpublishing.publish.config.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
],
3535
"branches_to_filter": [],
3636
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
37-
"git_repository_branch_open_to_public_contributors": "master",
37+
"git_repository_branch_open_to_public_contributors": "main",
3838
"skip_source_output_uploading": false,
3939
"need_preview_pull_request": true,
4040
"contribution_branch_mappings": {},
@@ -381,6 +381,12 @@
381381
"branch": "main",
382382
"branch_mapping": {}
383383
},
384+
{
385+
"path_to_root": "media-services-v3-python",
386+
"url": "https://github.com/Azure-Samples/media-services-v3-python",
387+
"branch": "main",
388+
"branch_mapping": {}
389+
},
384390
{
385391
"path_to_root": "samples-javascript",
386392
"url": "https://github.com/Microsoft/tsiclient",
@@ -411,12 +417,6 @@
411417
"branch": "main",
412418
"branch_mapping": {}
413419
},
414-
{
415-
"path_to_root": "media-services-v3-python",
416-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
417-
"branch": "main",
418-
"branch_mapping": {}
419-
},
420420
{
421421
"path_to_root": "remote-monitoring-webui",
422422
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -901,4 +901,4 @@
901901
"articles/container-apps/.openpublishing.redirection.container-apps.json",
902902
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
903903
]
904-
}
904+
}

.openpublishing.redirection.active-directory.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,7 +3483,7 @@
34833483
{
34843484
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
34853485
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3486-
"redirect_document_id": true
3486+
"redirect_document_id": false
34873487
},
34883488
{
34893489
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
34983498
{
34993499
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
35003500
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
3501-
"redirect_document_id": true
3501+
"redirect_document_id": false
35023502
},
35033503
{
35043504
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
35103510
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
35113511
"redirect_document_id": true
35123512
},
3513+
{
3514+
"source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
3515+
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3516+
"redirect_document_id": true
3517+
},
35133518
{
35143519
"source_path_from_root": "/articles/active-directory/device-management-faq.md",
35153520
"redirect_url": "/azure/active-directory/devices/faq",

.openpublishing.redirection.json

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/blobs/storage-ios-how-to-use-blob-storage.md",
5+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-ios-how-to-use-blob-storage",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/virtual-machines/linux/login-using-aad.md",
510
"redirect_url": "/previous-versions/azure/virtual-machines/linux/login-using-aad",
@@ -683,6 +688,26 @@
683688
"redirect_url": "/azure/frontdoor/troubleshoot-issues",
684689
"redirect_document_id": false
685690
},
691+
{
692+
"source_path_from_root": "/articles/frontdoor/concept-rules-set-action.md",
693+
"redirect_url": "/azure/frontdoor/front-door-rules-engine-actions",
694+
"redirect_document_id": false
695+
},
696+
{
697+
"source_path_from_root": "/articles/frontdoor/concept-rules-set.md",
698+
"redirect_url": "/azure/frontdoor/front-door-rules-engine",
699+
"redirect_document_id": false
700+
},
701+
{
702+
"source_path_from_root": "/articles/frontdoor/concept-caching.md",
703+
"redirect_url": "/azure/frontdoor/front-door-caching",
704+
"redirect_document_id": false
705+
},
706+
{
707+
"source_path_from_root": "/articles/frontdoor/concept-route.md",
708+
"redirect_url": "/azure/frontdoor/front-door-route-matching",
709+
"redirect_document_id": false
710+
},
686711
{
687712
"source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
688713
"redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -6843,6 +6868,11 @@
68436868
"redirect_url": "/azure/azure-functions/functions-kubernetes-keda",
68446869
"redirect_document_id": false
68456870
},
6871+
{
6872+
"source_path_from_root": "/articles/azure-functions/functions-bindings-event-iot-output.md",
6873+
"redirect_url": "/azure/azure-functions/functions-bindings-event-hubs-output",
6874+
"redirect_document_id": false
6875+
},
68466876
{
68476877
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
68486878
"redirect_url": "/azure/azure-government",
@@ -32789,6 +32819,11 @@
3278932819
"redirect_url": "tutorial-app-containerization-java-kubernetes",
3279032820
"redirect_document_id": false
3279132821
},
32822+
{
32823+
"source_path_from_root": "/articles/migrate/migrate-appliance-architecture.md",
32824+
"redirect_url": "discovered-metadata",
32825+
"redirect_document_id": false
32826+
},
3279232827
{
3279332828
"source_path_from_root": "/articles/storage/common/storage-access-blobs-queues-portal.md",
3279432829
"redirect_url": "articles/storage/blobs/authorize-blob-access-portal",
@@ -43929,24 +43964,10 @@
4392943964
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
4393043965
"redirect_document_id": false
4393143966
},
43932-
{ "source_path_from_root": "/articles/azure/marketplace/co-sell-requirements.md",
43933-
"redirect_url": "/partner-center/co-sell-requirements",
43934-
"redirect_document_id": false
43935-
},
4393643967
{
43937-
"source_path_from_root": "/articles/azure/marketplace/co-sell-status.md",
43938-
"redirect_url": "/partner-center/co-sell-status",
43968+
"source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
43969+
"redirect_url": "/azure/virtual-desktop/overview",
4393943970
"redirect_document_id": false
43940-
},
43941-
{
43942-
"source_path_from_root": "/articles/azure/marketplace/co-sell-configure.md",
43943-
"redirect_url": "/partner-center/co-sell-configure",
43944-
"redirect_document_id": false
43945-
},
43946-
{
43947-
"source_path_from_root": "/articles/azure/marketplace/co-sell-overview.md",
43948-
"redirect_url": "/partner-center/co-sell-overview",
43949-
"redirect_document_id": false
4395043971
}
4395143972
]
4395243973
}

.vscode/settings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

articles/active-directory-b2c/claimsschema.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 02/16/2022
11+
ms.date: 03/06/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: "b2c-support"
@@ -127,7 +127,7 @@ The **Mask** element contains the following attributes:
127127
| `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. |
128128
| `Regex` | No | If **`Type`** is set to `Regex`, specify the regular expression to use.
129129

130-
The following example configures a **PhoneNumber** claim with the `Simple` mask:
130+
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).
131131

132132
```xml
133133
<ClaimType Id="PhoneNumber">
@@ -142,7 +142,7 @@ The Identity Experience Framework renders the phone number while hiding the firs
142142

143143
![Phone number claim shown in browser with first six digits masked by Xs](./media/claimsschema/mask.png)
144144

145-
The following example configures a **AlternateEmail** claim with the `Regex` mask:
145+
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).
146146

147147
```xml
148148
<ClaimType Id="AlternateEmail">
@@ -157,7 +157,6 @@ The Identity Experience Framework renders only the first letter of the email add
157157

158158
![Email claim shown in browser with characters masked by asterisks](./media/claimsschema/mask-regex.png)
159159

160-
161160
### Restriction
162161

163162
The **Restriction** element may contain the following attribute:
@@ -185,7 +184,7 @@ The **Enumeration** element contains the following attributes:
185184
|Value | Yes | The claim value that is associated with selecting this option. |
186185
| SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
187186

188-
The following example configures a **city** dropdown list claim with a default value set to `New York`:
187+
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).
189188

190189
```xml
191190
<ClaimType Id="city">
@@ -390,7 +389,6 @@ The **Readonly** user input type is used to provide a readonly field to display
390389
</ClaimType>
391390
```
392391

393-
394392
#### Paragraph
395393

396394
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
404402
<AdminHelpText>A claim responsible for holding response messages to send to the relying party</AdminHelpText>
405403
<UserHelpText>A claim responsible for holding response messages to send to the relying party</UserHelpText>
406404
<UserInputType>Paragraph</UserInputType>
407-
<Restriction>
408-
<Enumeration Text="B2C_V1_90001" Value="You cannot sign in because you are a minor" />
409-
<Enumeration Text="B2C_V1_90002" Value="This action can only be performed by gold members" />
410-
<Enumeration Text="B2C_V1_90003" Value="You have not been enabled for this operation" />
411-
</Restriction>
412405
</ClaimType>
413406
```

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ A computer that's running either:
6262

6363
# [Visual Studio](#tab/visual-studio)
6464

65-
* [Visual Studio 2019 16.8 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the **ASP.NET and web development** workload
66-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
65+
* [Visual Studio 2022 17.0 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the **ASP.NET and web development** workload
66+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
6767

6868
# [Visual Studio Code](#tab/visual-studio-code)
6969

7070
* [Visual Studio Code](https://code.visualstudio.com/download)
7171
* [C# for Visual Studio Code (latest version)](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
72-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
72+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
7373

7474
---
7575

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ A computer that's running either of the following:
4444

4545
# [Visual Studio](#tab/visual-studio)
4646

47-
* [Visual Studio 2019 16.8 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019), with the ASP.NET and web development workload
48-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
47+
* [Visual Studio 2022 17.0 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019), with the ASP.NET and web development workload
48+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
4949

5050
# [Visual Studio Code](#tab/visual-studio-code)
5151

5252
* [Visual Studio Code](https://code.visualstudio.com/download)
5353
* [C# for Visual Studio Code (latest version)](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
54-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
54+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
5555

5656
---
5757

@@ -76,7 +76,7 @@ To create the web app registration, do the following:
7676
1. Select **App registrations**, and then select **New registration**.
7777
1. Under **Name**, enter a name for the application (for example, *webapp1*).
7878
1. Under **Supported account types**, select **Accounts in any identity provider or organizational directory (for authenticating users with user flows)**.
79-
1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `https://localhost:5001/signin-oidc`.
79+
1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `https://localhost:44316/signin-oidc`.
8080
1. Under **Permissions**, select the **Grant admin consent to openid and offline access permissions** checkbox.
8181
1. Select **Register**.
8282
1. Select **Overview**.
@@ -113,7 +113,7 @@ Under the project root folder, open the *appsettings.json* file. This file conta
113113
|---------|---------|---------|
114114
|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`).|
115115
|AzureAdB2C|Domain| Your Azure AD B2C tenant full [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
116-
|AzureAdB2C|ClientId| The web API application ID from [step 2](#step-2-register-a-web-application).|
116+
|AzureAdB2C|ClientId| The Web App Application (client) ID from [step 2](#step-2-register-a-web-application).|
117117
|AzureAdB2C|SignUpSignInPolicyId|The user flows or custom policy you created in [step 1](#step-1-configure-your-user-flow).|
118118

119119
Your final configuration file should look like the following JSON:
@@ -131,7 +131,7 @@ Your final configuration file should look like the following JSON:
131131
## Step 5: Run the sample web app
132132

133133
1. Build and run the project.
134-
1. Go to `https://localhost:5001`.
134+
1. Go to `https://localhost:44316`.
135135
1. Select **Sign Up/In**.
136136

137137
![Screenshot of the "Sign Up/In" button on the project Welcome page.](./media/configure-authentication-sample-web-app/web-app-sign-in.png)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ zone_pivot_groups: b2c-policy-type
3131

3232
## Create an application
3333

34-
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).
34+
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).
3535

3636
1. Sign in to the [Twitter Developer Portal](https://developer.twitter.com/portal/projects-and-apps) with your Twitter account credentials.
3737
1. Under **Standalone Apps**, select **+Create App**.

articles/active-directory-b2c/localization.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 01/21/2022
10+
ms.date: 03/06/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -110,24 +110,26 @@ The **Item** element contains the following attributes:
110110
| Value | Yes | The string claim value associated with selecting this option. |
111111
| SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
112112

113-
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.
113+
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).
114114

115115
```xml
116116
<LocalizedResources Id="api.selfasserted.en">
117-
<LocalizedCollections>
118-
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
117+
<LocalizedCollections>
118+
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
119119
<Item Text="Female" Value="F" />
120120
<Item Text="Male" Value="M" />
121121
</LocalizedCollection>
122-
</LocalizedCollections>
122+
</LocalizedCollections>
123+
</LocalizedResources>
123124

124125
<LocalizedResources Id="api.selfasserted.es">
125126
<LocalizedCollections>
126127
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
127128
<Item Text="Femenino" Value="F" />
128129
<Item Text="Masculino" Value="M" />
129130
</LocalizedCollection>
130-
</LocalizedCollections>
131+
</LocalizedCollections>
132+
</LocalizedResources>
131133
```
132134

133135
### LocalizedStrings

articles/active-directory-b2c/microsoft-graph-operations.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,22 @@ The top-level resource for policy keys in the Microsoft Graph API is the [Truste
143143

144144
## Application extension properties
145145

146+
- [Create extension properties](/graph/api/application-post-extensionproperty)
146147
- [List extension properties](/graph/api/application-list-extensionproperty)
147-
- [Delete extension property](/graph/api/application-delete-extensionproperty)
148+
- [Get an extension property](/graph/api/extensionproperty-get)
149+
- [Delete extension property](/graph/api/extensionproperty-delete)
150+
- [Get available extension properties](/graph/api/directoryobject-getavailableextensionproperties)
151+
152+
<!--
153+
#Hiding this note because user flows and extension attributes are different things in Microsoft Graph.
148154
149155
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.
156+
-->
157+
158+
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.
159+
160+
- [Update user](/graph/api/user-update): To write or remove the extension property value from the user.
161+
- [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.
150162

151163
## Audit logs
152164

0 commit comments

Comments
 (0)