Merge pull request #104405 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

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

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 02/12/2020
+ms.date: 02/14/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -28,7 +28,8 @@ 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. |
+| InputClaim | phoneNumberString | string |  The string claim for the phone number. The phone number has to be in international format, complete with a leading "+" and country code. If input claim `country` is provided, the phone number is in local format (without the country code). |
+| InputClaim | country | string | [Optional] The string claim for the country code of the phone number in ISO3166 format (the two-letter ISO-3166 country code). |
 | 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.
@@ -40,7 +41,8 @@ You can use this claims transformation to ensure that the provided string claim
 ```XML
 <ClaimsTransformation Id="ConvertStringToPhoneNumber" TransformationMethod="ConvertStringToPhoneNumberClaim">
   <InputClaims>
-    <InputClaim ClaimTypeReferenceId="phoneString" TransformationClaimType="inputClaim" />
+    <InputClaim ClaimTypeReferenceId="phoneString" TransformationClaimType="phoneNumberString" />
+    <InputClaim ClaimTypeReferenceId="countryCode" TransformationClaimType="country" />
   </InputClaims>
   <OutputClaims>
     <OutputClaim ClaimTypeReferenceId="phoneNumber" TransformationClaimType="outputClaim" />
@@ -59,11 +61,19 @@ The self-asserted technical profile that calls the validation technical profile
 </TechnicalProfile>
 ```
 
-### Example
+### Example 1
 
 - Input claims:
-  - **inputClaim**: +1 (123) 456-7890
+  - **phoneNumberString**: 045 456-7890
+  - **country**: DK
 - Output claims:
+  - **outputClaim**: +450546148120
+
+### Example 2
+
+- Input claims:
+  - **phoneNumberString**: +1 (123) 456-7890
+- Output claims: 
   - **outputClaim**: +11234567890
 
 ## GetNationalNumberAndCountryCodeFromPhoneNumberString

articles/active-directory/develop/TOC.yml

@@ -7,6 +7,7 @@
   - name: Evolution of Microsoft identity platform
     href: about-microsoft-identity-platform.md  
 - name: Quickstarts
+  expanded: true
   items:
   - name: Set up a tenant
     href: quickstart-create-new-tenant.md
@@ -90,6 +91,7 @@
 - name: Samples
   href: sample-v2-code.md
 - name: Concepts
+  expanded: true
   items:
   - name: Authentication basics
     href: authentication-scenarios.md

articles/active-directory/develop/howto-convert-app-to-be-multi-tenant.md

@@ -172,7 +172,7 @@ In this article, you learned how to build an application that can sign in a user
 
 ## Related content
 
-* [Multi-tenant application samples](https://docs.microsoft.com/samples/browse/?products=azure-active-directory)
+* [Multi-tenant application sample](https://github.com/mspnp/multitenant-saas-guidance)
 * [Branding guidelines for applications][AAD-App-Branding]
 * [Application objects and service principal objects][AAD-App-SP-Objects]
 * [Integrating applications with Azure Active Directory][AAD-Integrating-Apps]

articles/aks/TOC.yml

@@ -174,6 +174,8 @@
       href: internal-lb.md
     - name: Use a Standard Load Balancer
       href: load-balancer-standard.md
+    - name: Use a user defined route for egress
+      href: egress-outboundtype.md
     - name: Use a static IP address
       href: static-ip.md
     - name: Ingress