Skip to content

Commit 13ab8e3

Browse files
author
Trevor Bye
committed
Merge master
2 parents 9637d14 + 94f9ecd commit 13ab8e3

File tree

716 files changed

+10370
-6403
lines changed

Some content is hidden

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

716 files changed

+10370
-6403
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-pytorch",
157+
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158+
"branch": "master",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-quickstart-templates",
157163
"url": "https://github.com/Azure/azure-functions-templates",

‎.openpublishing.redirection.json

Lines changed: 49 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,16 @@
801801
"redirect_url": "/azure/machine-learning",
802802
"redirect_document_id": false
803803
},
804+
{
805+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
806+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
807+
"redirect_document_id": false
808+
},
809+
{
810+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-qna-bot.md",
811+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base#create-a-bot",
812+
"redirect_document_id": false
813+
},
804814
{
805815
"source_path": "articles/cognitive-services/QnAMaker/concepts/data-sources-supported.md",
806816
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/reference-document-format-guidelines",
@@ -846,78 +856,6 @@
846856
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
847857
"redirect_document_id": false
848858
},
849-
{
850-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-csharp.md",
851-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
852-
"redirect_document_id": false
853-
},
854-
{
855-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-go.md",
856-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
857-
"redirect_document_id": false
858-
},
859-
{
860-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-java.md",
861-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
862-
"redirect_document_id": false
863-
},
864-
{
865-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-python.md",
866-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
867-
"redirect_document_id": false
868-
},
869-
{
870-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-csharp.md",
871-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
872-
"redirect_document_id": false
873-
},
874-
{
875-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-go.md",
876-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
877-
"redirect_document_id": false
878-
},
879-
{
880-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-java.md",
881-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
882-
"redirect_document_id": false
883-
},
884-
{
885-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-python.md",
886-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
887-
"redirect_document_id": false
888-
},
889-
{
890-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-nodejs.md",
891-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
892-
"redirect_document_id": false
893-
},
894-
895-
{
896-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-csharp.md",
897-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
898-
"redirect_document_id": false
899-
},
900-
{
901-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-go.md",
902-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
903-
"redirect_document_id": false
904-
},
905-
{
906-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-java.md",
907-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
908-
"redirect_document_id": false
909-
},
910-
{
911-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-python.md",
912-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
913-
"redirect_document_id": false
914-
},
915-
{
916-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-nodejs.md",
917-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
918-
"redirect_document_id": false
919-
},
920-
921859
{
922860
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-csharp-appinsights.md",
923861
"redirect_url": "/azure/cognitive-services/LUIS/luis-csharp-tutorial-bf-v4",
@@ -7277,7 +7215,7 @@
72777215
"source_path": "articles/azure-functions/functions-create-first-azure-function-azure-cli-linux.md",
72787216
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-python",
72797217
"redirect_document_id": false
7280-
},
7218+
},
72817219
{
72827220
"source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
72837221
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
@@ -13492,7 +13430,7 @@
1349213430
"source_path": "articles/event-hubs/event-hubs-authentication-and-security-model-overview.md",
1349313431
"redirect_url": "/azure/event-hubs/authenticate-shared-access-signature",
1349413432
"redirect_document_id": false
13495-
},
13433+
},
1349613434
{
1349713435
"source_path": "articles/event-hubs/event-hubs-c-ephcs-getstarted.md",
1349813436
"redirect_url": "/azure/event-hubs/event-hubs-c-getstarted-send",
@@ -14978,6 +14916,11 @@
1497814916
"redirect_url": "/azure/machine-learning/how-to-designer-sample-text-classification",
1497914917
"redirect_document_id": true
1498014918
},
14919+
{
14920+
"source_path": "articles/machine-learning/designer-sample-datasets.md",
14921+
"redirect_url": "/azure/machine-learning/sample-designer-datasets",
14922+
"redirect_document_id": false
14923+
},
1498114924
{
1498214925
"source_path": "articles/machine-learning/service/how-to-enable-app-insights.md",
1498314926
"redirect_url": "/azure/machine-learning/how-to-enable-app-insights",
@@ -15283,6 +15226,16 @@
1528315226
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
1528415227
"redirect_document_id": true
1528515228
},
15229+
{
15230+
"source_path": "articles/machine-learning/algorithm-module-reference/pca-based-anomaly-detection.md",
15231+
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15232+
"redirect_document_id": false
15233+
},
15234+
{
15235+
"source_path": "articles/machine-learning/algorithm-module-reference/train-anomaly-detection-model.md",
15236+
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15237+
"redirect_document_id": false
15238+
},
1528615239
{
1528715240
"source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
1528815241
"redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
@@ -18618,6 +18571,11 @@
1861818571
"redirect_url": "/azure/backup/backup-azure-backup-faq",
1861918572
"redirect_document_id": false
1862018573
},
18574+
{
18575+
"source_path": "articles/backup/backup-configure-vault.md",
18576+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
18577+
"redirect_document_id": false
18578+
},
1862118579
{
1862218580
"source_path": "articles/backup/backup-upgrade-backup-vault.md",
1862318581
"redirect_url": "/azure/backup/backup-azure-backup-faq",
@@ -26913,6 +26871,16 @@
2691326871
"redirect_url": "/azure/storage/common/storage-azure-cli",
2691426872
"redirect_document_id": true
2691526873
},
26874+
{
26875+
"source_path": "articles/storage/common/storage-azure-cli.md",
26876+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26877+
"redirect_document_id": true
26878+
},
26879+
{
26880+
"source_path": "articles/storage/common/storage-azure-cli-nodejs.md",
26881+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26882+
"redirect_document_id": false
26883+
},
2691626884
{
2691726885
"source_path": "articles/storage/storage-backup-and-disaster-recovery-for-azure-iaas-disks.md",
2691826886
"redirect_url": "/azure/storage/common/storage-backup-and-disaster-recovery-for-azure-iaas-disks",
@@ -31100,7 +31068,7 @@
3110031068
},
3110131069
{
3110231070
"source_path": "articles/backup/backup-configure-vault-classic.md",
31103-
"redirect_url": "/azure/backup/backup-configure-vault",
31071+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
3110431072
"redirect_document_id": false
3110531073
},
3110631074
{
@@ -31110,7 +31078,7 @@
3111031078
},
3111131079
{
3111231080
"source_path": "articles/backup/backup-try-azure-backup-in-10-mins.md",
31113-
"redirect_url": "/azure/backup/backup-configure-vault",
31081+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
3111431082
"redirect_document_id": false
3111531083
},
3111631084
{
@@ -49203,6 +49171,11 @@
4920349171
"source_path": "articles/jenkins/install-jenkins-solution-template.md",
4920449172
"redirect_url": "/azure/jenkins/install-solution-template-tutorial",
4920549173
"redirect_document_id": true
49174+
},
49175+
{
49176+
"source_path": "articles/cognitive-services/Speech-Service/sapi-phoneset-usage.md",
49177+
"redirect_url": "/azure/cognitive-services/speech-service/speech-ssml-phonetic-sets",
49178+
"redirect_document_id": false
4920649179
}
4920749180
]
4920849181
}

‎articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/13/2020
12+
ms.date: 03/05/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -24,8 +24,8 @@ Azure Active Directory B2C (Azure AD B2C) provides support for the Azure Active
2424

2525
The **Name** attribute of the **Protocol** element needs to be set to `Proprietary`. The **handler** attribute must contain the fully qualified name of the protocol handler assembly `Web.TPEngine.Providers.AzureActiveDirectoryProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null`.
2626

27-
All Azure AD technical profiles include the **AAD-Common** technical profile. The following technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
28-
27+
Following [custom policy starter pack](custom-policy-get-started.md#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
28+
2929
- **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserReadUsingAlternativeSecurityId-NoError** - Look up a social account in the directory.
3030
- **AAD-UserWriteUsingAlternativeSecurityId** - Create a new social account.
3131
- **AAD-UserReadUsingEmailAddress** - Look up a local account in the directory.

‎articles/active-directory-b2c/claimsschema.md

Lines changed: 4 additions & 1 deletion
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/24/2020
11+
ms.date: 03/05/2020
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -52,9 +52,12 @@ The **ClaimType** element contains the following elements:
5252
| Mask | 0:1 | An optional string of masking characters that can be applied when displaying the claim. For example, the phone number 324-232-4343 can be masked as XXX-XXX-4343. |
5353
| UserHelpText | 0:1 | A description of the claim type that can be helpful for users to understand its purpose. The value can be [localized](localization.md). |
5454
| UserInputType | 0:1 | The type of input control that should be available to the user when manually entering the claim data for the claim type. See the user input types defined later in this page. |
55+
| AdminHelpText | 0:1 | A description of the claim type that can be helpful for administrators to understand its purpose. |
5556
| Restriction | 0:1 | The value restrictions for this claim, such as a regular expression (Regex) or a list of acceptable values. The value can be [localized](localization.md). |
5657
PredicateValidationReference| 0:1 | A reference to a **PredicateValidationsInput** element. The **PredicateValidationReference** elements enable you to perform a validation process to ensure that only properly formed data is entered. For more information, see [Predicates](predicates.md). |
5758

59+
60+
5861
### DataType
5962

6063
The **DataType** element supports the following values:

‎articles/active-directory-b2c/code-samples.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ The following tables provide links to samples for applications including iOS, An
4242

4343
| Sample | Description |
4444
|--------| ----------- |
45-
| [javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) | A single page application (SPA) calling a Web API. Authentication is done with Azure AD B2C by leveraging MSAL.js. |
46-
| [javascript-hellojs-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp) | A single page app, implemented with an ASP.NET Web API backend, that signs up & signs in users using Azure AD B2C and calls the web API using OAuth 2.0 access tokens. |
45+
| [javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) | A single page application (SPA) calling a Web API. Authentication is done with Azure AD B2C by using MSAL.js. |

‎articles/active-directory-b2c/custom-email.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/05/2020
12+
ms.date: 03/05/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -295,10 +295,6 @@ Add the following technical profiles to the `<ClaimsProviders>` element.
295295
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.OneTimePasswordProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
296296
<Metadata>
297297
<Item Key="Operation">VerifyCode</Item>
298-
<Item Key="UserMessage.VerificationHasExpired">You have exceed the maximum time allowed.</Item>
299-
<Item Key="UserMessage.MaxRetryAttemped">You have exceed the number of retries allowed.</Item>
300-
<Item Key="UserMessage.InvalidCode">You have entered the wrong code.</Item>
301-
<Item Key="UserMessage.ServerError">Cannot verify the code, please try again later.</Item>
302298
</Metadata>
303299
<InputClaims>
304300
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="identifier" />
@@ -359,6 +355,12 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
359355
<Item Key="IpAddressClaimReferenceId">IpAddress</Item>
360356
<Item Key="ContentDefinitionReferenceId">api.localaccountsignup</Item>
361357
<Item Key="language.button_continue">Create</Item>
358+
359+
<!--OTP validation error messages-->
360+
<Item Key="UserMessageIfSessionDoesNotExist">You have exceed the maximum time allowed.</Item>
361+
<Item Key="UserMessageIfMaxRetryAttempted">You have exceed the number of retries allowed.</Item>
362+
<Item Key="UserMessageIfInvalidCode">You have entered the wrong code.</Item>
363+
<Item Key="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</Item>
362364
</Metadata>
363365
<InputClaims>
364366
<InputClaim ClaimTypeReferenceId="email" />

‎articles/active-directory-b2c/implicit-flow-single-page-application.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
239239
240240
## Next steps
241241

242-
### Code sample: hello.js with Azure AD B2C
242+
### Code sample: Azure AD B2C with Microsoft Authentication Library for JavaScript
243243

244-
[Single-page application built on hello.js with Azure AD B2C][github-hello-js-example] (GitHub)
244+
[Single-page application built with msal.js for Azure AD B2C][github-msal-js-example] (GitHub)
245245

246-
This sample on GitHub is intended to help get you started with Azure AD B2C in a simple web application built on [hello.js][github-hello-js] and using pop-up-style authentication.
246+
This sample on GitHub is intended to help get you started to Azure AD B2C in a simple web application built with [msal.js][github-msal-js] and using pop-up-style authentication.
247247

248248
<!-- Links - EXTERNAL -->
249-
[github-hello-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp
250-
[github-hello-js]: https://github.com/MrSwitch/hello.js
249+
[github-msal-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp
250+
[github-msal-js]: https://github.com/AzureAD/microsoft-authentication-library-for-js

‎articles/active-directory-b2c/jwt-issuer-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 10/30/2018
12+
ms.date: 03/06/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -52,6 +52,7 @@ The **InputClaims**, **OutputClaims**, and **PersistClaims** elements are empty
5252
| allow_infinite_rolling_refresh_token | No | If set to `true`, the refresh token sliding window lifetime never expires. |
5353
| IssuanceClaimPattern | No | Controls the Issuer (iss) claim. One of the values:<ul><li>AuthorityAndTenantGuid - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, and your tenant identifier https:\//login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/</li><li>AuthorityWithTfp - The iss claim includes your domain name, such as `login.microsoftonline` or `tenant-name.b2clogin.com`, your tenant identifier and your relying party policy name. https:\//login.microsoftonline.com/tfp/00000000-0000-0000-0000-000000000000/b2c_1a_tp_sign-up-or-sign-in/v2.0/</li></ul> Default value: AuthorityAndTenantGuid |
5454
| AuthenticationContextReferenceClaimPattern | No | Controls the `acr` claim value.<ul><li>None - Azure AD B2C doesn't issue the acr claim</li><li>PolicyId - the `acr` claim contains the policy name</li></ul>The options for setting this value are TFP (trust framework policy) and ACR (authentication context reference). It is recommended setting this value to TFP, to set the value, ensure the `<Item>` with the `Key="AuthenticationContextReferenceClaimPattern"` exists and the value is `None`. In your relying party policy, add `<OutputClaims>` item, add this element `<OutputClaim ClaimTypeReferenceId="trustFrameworkPolicy" Required="true" DefaultValue="{policy}" />`. Also make sure your policy contains the claim type `<ClaimType Id="trustFrameworkPolicy"> <DisplayName>trustFrameworkPolicy</DisplayName> <DataType>string</DataType> </ClaimType>` |
55+
|RefreshTokenUserJourneyId| No | The identifier of a user journey that should be executed during the [refresh an access token](authorization-code-flow.md#4-refresh-the-token) POST request to the `/token` endpoint. |
5556

5657
## Cryptographic keys
5758

0 commit comments

Comments
 (0)