Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into sharedDisks

Author: roygara

.openpublishing.redirection.json

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 03/02/2020
+ms.date: 02/12/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -47,7 +47,7 @@ The **ClaimType** element contains the following elements:
 | Element | Occurrences | Description |
 | ------- | ----------- | ----------- |
 | DisplayName | 1:1 | The title that's displayed to users on various screens. The value can be [localized](localization.md). |
-| DataType | 1:1 | The type of the claim. The data types of boolean, date, dateTime, int, long, string, stringCollection can be used. Primitive data type represents the equivalent of C# variable data type. stringCollection represents a collection of strings. For more information see [C# Types and variables](https://docs.microsoft.com/dotnet/csharp/tour-of-csharp/types-and-variables). Date follows ISO 8601 convention. |
+| DataType | 1:1 | The type of the claim. The data types of boolean, date, dateTime, int, long, string, stringCollection and phoneNumber can be used. Primitive data type represents the equivalent of C# variable data type. stringCollection represents a collection of strings. For more information see [C# Types and variables](https://docs.microsoft.com/dotnet/csharp/tour-of-csharp/types-and-variables). Date follows ISO 8601 convention. |
 | DefaultPartnerClaimTypes | 0:1 | The partner default claim types to use for a specified protocol. The value can be overwritten in the **PartnerClaimType** specified in the **InputClaim** or **OutputClaim** elements. Use this element to specify the default name for a protocol.  |
 | 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. |
 | 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). |

articles/active-directory-b2c/claimsschema.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 12/17/2019
+ms.date: 02/12/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -29,7 +29,7 @@ This claim validates the format of the phone number. If it is in a valid format,
 | Item | TransformationClaimType | Data Type | Notes |
 | ---- | ----------------------- | --------- | ----- |
 | InputClaim | inputClaim | string | The claim of string type converting from. |
-| OutputClaim | outputClaim | string | The result of this claims transformation. |
+| OutputClaim | outputClaim | phoneNumber | The result of this claims transformation. |
 
 The **ConvertStringToPhoneNumberClaim** claims transformation is always executed from a [validation technical profile](validation-technical-profile.md) that is called by a [self-asserted technical profile](self-asserted-technical-profile.md) or [display control](display-controls.md). The **UserMessageIfClaimsTransformationInvalidPhoneNumber** self-asserted technical profile metadata controls the error message that is presented to the user.
 

articles/active-directory-b2c/phone-number-claims-transformations.md

@@ -176,6 +176,8 @@
   items:
   - name: Glossary
     href: ../develop/developer-glossary.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
+  - name: Videos
+    href: videos.md
   - name: Azure roadmap
     href: https://azure.microsoft.com/roadmap/?category=security-identity
   - name: Azure AD blog

articles/active-directory/azuread-dev/TOC.yml

@@ -53,5 +53,8 @@ The following articles provide detailed information about APIs, protocol message
 | [Glossary](../develop/developer-glossary.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json)                                      | Terminology and definitions of words that are used throughout this documentation. |
 |  |  |
 
+## Videos
+
+See [Azure Active Directory developer platform videos](videos.md) for help migrating to the new Microsoft identity platform.
 
 [!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]

articles/active-directory/azuread-dev/v1-overview.md

@@ -0,0 +1,71 @@
+---
+title: Azure ADAL to MSAL migration videos | Azure
+description: Videos that help you migrate from the Azure Active Directory developer platform to the Microsoft identity platform
+services: active-directory
+author: mmacy
+manager: CelesteDG
+ms.service: active-directory
+ms.subservice: develop
+ms.topic: conceptual
+ms.workload: identity
+ms.date: 02/12/2020
+ms.author: marsma
+ms.custom: aaddev
+ms.reviewer: celested
+titleSuffix: Microsoft identity platform
+---
+
+# Azure Active Directory developer platform videos
+
+Learn about the new Microsoft identity platform and how to migrate to it from the Azure Active Directory (Azure AD) developer platform. The videos are typically 1-2 minutes long.
+
+## Migrate from v1.0 to v2.0
+
+**Learn about migrating to the the latest version of the Microsoft identity platform**
+
+:::row:::
+    :::column:::
+        New Microsoft identity platform overview
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/bNlcFuIo3r8]
+    :::column-end:::
+    :::column:::
+        Introduction to the MSAL libraries
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/apbbx2n4tnU]
+    :::column-end:::
+:::row-end:::
+:::row:::
+    :::column:::
+        Endpoints and the benefits of moving to v2.0
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/qpdC45tZYDg]
+    :::column-end:::
+     :::column:::
+        Migrating your ADAL codebase to MSAL
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/xgL_z9yCnrE]
+    :::column-end:::
+:::row-end:::
+:::row:::
+    :::column:::
+        Why migrate from ADAL to MSAL
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/qpdC45tZYDg]
+    :::column-end:::
+    :::column:::
+        Advantages of MSAL over ADAL
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/q-TDszj2O-4]
+    :::column-end:::
+:::row-end:::
+
+## Next steps
+
+Learn about the new [Microsoft identity platform](https://docs.microsoft.com/azure/active-directory/develop)

articles/active-directory/azuread-dev/videos.md

@@ -19,20 +19,30 @@
     href: concept-conditional-access-policy-common.md
   - name: Conditional Access policy components
     href: concept-conditional-access-policies.md
-  - name: Cloud apps and actions
-    href: concept-conditional-access-cloud-apps.md
-  - name: Conditions
-    href: conditions.md
-  - name: Location conditions
-    href: location-condition.md
-  - name: Controls
-    href: controls.md
+  - name: Assignments
+    items: 
+     - name: Users and groups
+       href: concept-conditional-access-users-groups.md
+     - name: Cloud apps or actions
+       href: concept-conditional-access-cloud-apps.md
+     - name: Conditions
+       href: concept-conditional-access-conditions.md
+  - name: Access controls
+    items: 
+     - name: Grant
+       href: concept-conditional-access-grant.md
+     - name: Session
+       href: concept-conditional-access-session.md
   - name: Report-only mode
     href: concept-conditional-access-report-only.md
   - name: Service dependencies
     href: service-dependencies.md
+  - name: Location conditions
+    href: location-condition.md
   - name: What if tool
     href: what-if-tool.md
+  - name: Controls
+    href: controls.md
   - name: Classic policy migrations
     href: policy-migration.md
   - name: Baseline protection policies
@@ -84,10 +94,6 @@
     items:
     - name: Troubleshoot using the What If tool 
       href: troubleshoot-conditional-access-what-if.md
-- name: Reference
-  items:
-  - name: Technical reference
-    href: technical-reference.md
 - name: Resources
   items:
   - name: Azure feedback forum

articles/active-directory/conditional-access/TOC.yml

@@ -35,15 +35,15 @@ In the Conditional Access terminology, these client apps are known as **approved
 
 ![Conditional Access](./media/app-based-conditional-access/05.png)
 
-For a list of approved client apps, see [approved client app requirement](technical-reference.md#approved-client-app-requirement).
+For a list of approved client apps, see [approved client app requirement](concept-conditional-access-grant.md).
 
 You can combine app-based Conditional Access policies with other policies such as [device-based Conditional Access policies](require-managed-devices.md) to provide flexibility in how to protect data for both personal and corporate devices.
 
 ## Before you begin
 
 This topic assumes that you are familiar with:
 
-- The [approved client app requirement](technical-reference.md#approved-client-app-requirement) technical reference.
+- The [approved client app requirement](concept-conditional-access-grant.md).
 - The basic concepts of [Conditional Access in Azure Active Directory](overview.md).
 - How to [configure a Conditional Access policy](app-based-mfa.md).
 - The [migration of Conditional Access policies](best-practices.md#policy-migration).

articles/active-directory/conditional-access/app-based-conditional-access.md

@@ -35,7 +35,7 @@ In the Conditional Access terminology, these client apps are known to be policy
 
 ![Conditional Access](./media/app-protection-based-conditional-access/05.png)
 
-For a list of policy-protected client apps, see [App protection policy requirement](technical-reference.md#approved-client-app-requirement).
+For a list of policy-protected client apps, see [App protection policy requirement](concept-conditional-access-grant.md).
 
 You can combine app-protection-based Conditional Access policies with other policies, such as [device-based Conditional Access policies](require-managed-devices.md). This way, you can provide flexibility in how to protect data for both personal and corporate devices.
 
@@ -54,8 +54,8 @@ Similar to compliance that's reported by Intune for iOS and Android for a manage
 
 This article assumes that you're familiar with:
 
-- The [app protection policy requirement](technical-reference.md#app-protection-policy-requirement) technical reference.
-- The [approved client app requirement](technical-reference.md#approved-client-app-requirement) technical reference.
+- The [app protection policy requirement](concept-conditional-access-grant.md).
+- The [approved client app requirement](concept-conditional-access-grant.md).
 - The basic concepts of [Conditional Access in Azure Active Directory](overview.md).
 - How to [configure a Conditional Access policy](app-based-mfa.md).
 

articles/active-directory/conditional-access/app-protection-based-conditional-access.md

@@ -18,7 +18,7 @@ ms.collection: M365-identity-device-management
 ---
 # Quickstart: Block access when a session risk is detected with Azure Active Directory Conditional Access  
 
-To keep your environment protected, you might want to block suspicious users from sign-in. [Azure Active Directory (Azure AD) Identity Protection](../active-directory-identityprotection.md) analyzes each sign-in and calculates the likelihood that a sign-in attempt was not performed by the legitimate owner of a user account. The likelihood (low, medium, high) is indicated in form of a calculated value called [sign-in risk levels](conditions.md#sign-in-risk). By setting the sign-in risk condition, you can configure a Conditional Access policy to respond to specific sign-in risk levels.
+To keep your environment protected, you might want to block suspicious users from sign-in. [Azure Active Directory (Azure AD) Identity Protection](../active-directory-identityprotection.md) analyzes each sign-in and calculates the likelihood that a sign-in attempt was not performed by the legitimate owner of a user account. The likelihood (low, medium, high) is indicated in form of a calculated value called [sign-in risk levels](concept-conditional-access-conditions.md#sign-in-risk). By setting the sign-in risk condition, you can configure a Conditional Access policy to respond to specific sign-in risk levels.
 
 This quickstart shows how to configure a [Conditional Access policy](../active-directory-conditional-access-azure-portal.md) that blocks a sign-in when a configured sign-in risk level has been detected.