Skip to content

Commit bbda5a0

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aca/java-metrics
2 parents 0d51b4a + e6aec10 commit bbda5a0

File tree

867 files changed

+14344
-8014
lines changed

Some content is hidden

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

867 files changed

+14344
-8014
lines changed

.openpublishing.redirection.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/blobs/blob-v11-samples-dotnet.md",
5+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-dotnet",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/storage/blobs/blob-v11-samples-javascript.md",
10+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-javascript",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/blobs/blob-v2-samples-python.md",
15+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v2-samples-python",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/common/geo-redundant-design-legacy.md",
20+
"redirect_url": "/previous-versions/azure/storage/common/geo-redundant-design-legacy",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path": "articles/germany/index.yml",
525
"redirect_url": "/previous-versions/azure/germany/index",
@@ -3410,6 +3430,12 @@
34103430
"redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
34113431
"redirect_document_id": false
34123432
},
3433+
{
3434+
"source_path_from_root": "/articles/ai-studio/how-to/model-catalog.md",
3435+
"redirect_url": "/azure/ai-studio/how-to/model-catalog-overview",
3436+
"redirect_document_id": false
3437+
},
3438+
34133439
{
34143440
"source_path_from_root": "/articles/service-fabric/upgrade-managed-disks.md",
34153441
"redirect_url": "/azure/service-fabric/service-fabric-scale-up-primary-node-type",
@@ -4000,15 +4026,15 @@
40004026
"redirect_url":"/azure/reliability/reliability-containers",
40014027
"redirect_document_id":false
40024028
},
4003-
{
4004-
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
4005-
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
4006-
"redirect_document_id":false
4007-
},
40084029
{
40094030
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
40104031
"redirect_url":"/azure/aks/generation-2-vm",
40114032
"redirect_document_id":false
4033+
},
4034+
{
4035+
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
4036+
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
4037+
"redirect_document_id":false
40124038
}
40134039
]
40144040
}

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Notice the claims transformations we defined in [step 3.2](#step-32---define-cla
225225

226226
Just like in sign-in with a local account, you need to configure the [Microsoft Entra Technical Profiles](active-directory-technical-profile.md), which you use to connect to Microsoft Entra ID storage, to store or read a user social account.
227227

228-
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile by using the following code:
228+
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile below it by using the following code:
229229

230230
```xml
231231
<TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -517,6 +517,7 @@ Use the following steps to add a combined local and social account:
517517
```xml
518518
<OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="localIdpAuthentication" AlwaysUseDefaultValue="true" />
519519
```
520+
Make sure you also add the `authenticationSource` claim in the output claims collection of the `UserSignInCollector` self-asserted technical profile.
520521

521522
1. In the `UserJourneys` section, add a new user journey, `LocalAndSocialSignInAndSignUp` by using the following code:
522523

articles/active-directory-b2c/custom-policies-series-store-user.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010

1111
ms.topic: how-to
1212
ms.custom: b2c-docs-improvements
13-
ms.date: 01/11/2024
13+
ms.date: 05/11/2024
1414
ms.author: kengaderdus
1515
ms.reviewer: yoelh
1616
ms.subservice: B2C
@@ -206,7 +206,7 @@ We use the `ClaimGenerator` technical profile to execute three claims transforma
206206
</Precondition>
207207
</Preconditions>
208208
</ValidationTechnicalProfile>
209-
<ValidationTechnicalProfile ReferenceId="DisplayNameClaimGenerator"/>
209+
<ValidationTechnicalProfile ReferenceId="UserInputDisplayNameGenerator"/>
210210
<ValidationTechnicalProfile ReferenceId="AAD-UserWrite"/>
211211
</ValidationTechnicalProfiles>
212212
<!--</TechnicalProfile>-->
@@ -407,15 +407,14 @@ To configure a display control, use the following steps:
407407

408408
1. Use the procedure in [step 6](#step-6---upload-policy) and [step 7](#step-7---test-policy) to upload your policy file, and test it. This time, you must verify your email address before a user account is created.
409409

410-
<a name='update-user-account-by-using-azure-ad-technical-profile'></a>
411410

412411
## Update user account by using Microsoft Entra ID technical profile
413412

414-
You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the `Metadata` collection by using the following code. The *Operation* needs to be set to *Write*:
413+
You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the metadata collection by using the following code. Also, remove the `Key="UserMessageIfClaimsPrincipalAlreadyExists` metadata entry. The *Operation* needs to be set to *Write*:
415414

416415
```xml
417416
<Item Key="Operation">Write</Item>
418-
<Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">true</Item>
417+
<Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">false</Item>
419418
```
420419

421420
## Use custom attributes

0 commit comments

Comments
 (0)