Merge branch 'master' into sdg-master2

Author: sdgilley

.gitignore

@@ -1,5 +1,5 @@
 # Operating System files
- .DS_Store
+.DS_Store
 Thumbs.db
 
 # Visual Studio and VS Code files

.openpublishing.publish.config.json

@@ -210,6 +210,12 @@
       "branch": "tutorial",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-tsi",
+      "url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "media-services-v3-dotnet-core-tutorials",
       "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",

.openpublishing.redirection.json

@@ -16,20 +16,20 @@ ms.subservice: B2C
 
 [!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
 
-In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory (Azure AD) B2C.  You configure the entry as a dropdown, and define whether it's required.
+In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory (Azure AD) B2C.  You configure the entry as a dropdown and define whether it's required.
 
 ## Prerequisites
 
 Complete the steps in the article [Getting Started with Custom Policies](active-directory-b2c-get-started-custom.md). Test the sign-up or sign-in user journey to sign up a new local account before proceeding.
 
 ## Add claims
 
-Gathering initial data from your users is achieved using the sign-up or sign-in user journey. Additional claims can be gathered later by using a profile edit user journey. Anytime Azure AD B2C gathers information directly from the user interactively, the Identity Experience Framework uses its selfasserted provider.
+Gathering initial data from your users is achieved using the sign-up or sign-in user journey. Additional claims can be gathered later by using a profile edit user journey. Anytime Azure AD B2C gathers information directly from the user interactively, the Identity Experience Framework uses its self-asserted provider.
 
 
 ### Define the claim
 
-Lets ask the user for their city. Add the following element to the **ClaimsSchema** element in the TrustFrameworkBase policy file:
+Let's ask the user for their city. Add the following element to the **ClaimsSchema** element in the TrustFrameworkBase policy file:
 
 ```xml
 <ClaimType Id="city">

articles/active-directory-b2c/active-directory-b2c-configure-signup-self-asserted-custom.md

@@ -31,7 +31,7 @@ You need to store your certificate in your Azure AD B2C tenant.
 1. Sign in to the [Azure portal](https://portal.azure.com/).
 2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
 3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
-4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
+4. On the Overview page, select **Identity Experience Framework**.
 5. Select **Policy Keys** and then select **Add**.
 6. For **Options**, choose `Upload`.
 7. Enter a **Name** for the policy key. For example, `SamlCert`. The prefix `B2C_1A_` is added automatically to the name of your key.

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

@@ -356,8 +356,12 @@ As part of the LinkedIn migration from v1.0 to v2.0, an additional call to anoth
 
     ```XML
     <!-- Extra step for LinkedIn to get the email -->
-    <OrchestrationStep Order="4" Type="ClaimsExchange">
+    <OrchestrationStep Order="3" Type="ClaimsExchange">
       <Preconditions>
+        <Precondition Type="ClaimsExist" ExecuteActionsIf="false">
+          <Value>identityProvider</Value>
+          <Action>SkipThisOrchestrationStep</Action>
+        </Precondition>
         <Precondition Type="ClaimEquals" ExecuteActionsIf="false">
           <Value>identityProvider</Value>
           <Value>linkedin.com</Value>
@@ -372,4 +376,4 @@ As part of the LinkedIn migration from v1.0 to v2.0, an additional call to anoth
 
 Obtaining the email address from LinkedIn during sign-up is optional. If you choose not to obtain the email from LinkedIn but require one during sign up, the user is required to manually enter the email address and validate it.
 
-For a full sample of a policy that uses the LinkedIn identity provider, see the [Custom Policy Starter Pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/linkedin-identity-provider).
+For a full sample of a policy that uses the LinkedIn identity provider, see the [Custom Policy Starter Pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/linkedin-identity-provider).

articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md

@@ -29,7 +29,7 @@ ms.subservice: B2C
 1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
 2. Make sure you're using the directory that contains your Azure AD B2C tenant. Click the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant. 
 3. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
-4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
+4. On the Overview page, select **Identity Experience Framework**.
 
 ### Create the signing key
 

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

@@ -22,7 +22,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
 ## Prerequisites
 
-- [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload. 
+- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload. 
 - A social account from either Facebook, Google, Microsoft, or Twitter.
 - [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/master.zip) or clone the sample web app from GitHub.
 
@@ -41,14 +41,14 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
     ![Sample application](media/active-directory-b2c-quickstarts-desktop-app/wpf-sample-application.png)
 
-    The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter. 
+    The sample supports several sign-up options. These options include using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter. 
 
 
 2. Azure AD B2C presents a custom login page for a fictitious brand called Wingtip Toys for the sample web app. To sign up using a social identity provider, click the button of the identity provider you want to use. 
 
     ![Sign In or Sign Up provider](media/active-directory-b2c-quickstarts-desktop-app/sign-in-or-sign-up-wpf.png)
 
-    You authenticate (sign-in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
+    You authenticate (sign in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
 
 2. Finish the sign-in process for the identity provider.
 
@@ -76,15 +76,20 @@ Click **Call API** to make a request to the protected resource.
 
     The application includes the Azure AD access token in the request to the protected web API resource. The web API sends back the display name contained in the access token.
 
-You have successfully used your Azure AD B2C user account to make an authorized call an Azure AD B2C protected web API.
+You've successfully used your Azure AD B2C user account to make an authorized call an Azure AD B2C protected web API.
 
 ## Clean up resources
 
 You can use your Azure AD B2C tenant if you plan to try other Azure AD B2C quickstarts or tutorials. When no longer needed, you can [delete your Azure AD B2C tenant](active-directory-b2c-faqs.md#how-do-i-delete-my-azure-ad-b2c-tenant).
 
 ## Next steps
 
-In this quickstart, you used a sample desktop application to sign in with a custom login page, sign in with a social identity provider, create an Azure AD B2C account, and call a web API protected by Azure AD B2C. 
+In this quickstart, you used a sample desktop application to: 
+
+* Sign in with a custom login page
+* Sign in with a social identity provider
+* Create an Azure AD B2C account
+* Call a web API protected by Azure AD B2C
 
 Get started creating your own Azure AD B2C tenant. 
 

articles/active-directory-b2c/active-directory-b2c-quickstarts-desktop-app.md

@@ -21,7 +21,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
 ## Prerequisites
 
-- [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
+- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
 - Install [Node.js](https://nodejs.org/en/download/)
 - A social account from either Facebook, Google, Microsoft, or Twitter.
 - [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp/archive/master.zip) or clone the sample web app from GitHub.
@@ -60,7 +60,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
     ![Sign In or Sign Up provider](media/active-directory-b2c-quickstarts-spa/sign-in-or-sign-up-spa.png)
 
-    You authenticate (sign-in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
+    You authenticate (sign in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
 
 3. Finish the sign-in process for the identity provider.
 
@@ -78,7 +78,12 @@ You can use your Azure AD B2C tenant if you plan to try other Azure AD B2C quick
 
 ## Next steps
 
-In this quickstart, you used a sample single-page application to sign in with a custom login page, sign in with a social identity provider, create an Azure AD B2C account, and call a web API protected by Azure AD B2C. 
+In this quickstart, you used a sample single-page application to:
+
+* Sign in with a custom login page
+* Sign in with a social identity provider
+* Create an Azure AD B2C account
+* Call a web API protected by Azure AD B2C
 
 Get started creating your own Azure AD B2C tenant.
 

articles/active-directory-b2c/active-directory-b2c-quickstarts-spa.md

@@ -1,5 +1,5 @@
 ---
-title: Quickstart - Set up sign-in for an ASP.NET application using Azure Active Directory B2C | Microsoft Docs
+title: Quickstart - Set up sign in for an ASP.NET application using Azure Active Directory B2C | Microsoft Docs
 description: Run a sample ASP.NET web app that uses Azure Active Directory B2C to provide account sign-in.
 services: active-directory-b2c
 author: davidmu1
@@ -13,15 +13,15 @@ ms.author: davidmu
 ms.subservice: B2C
 ---
 
-# Quickstart: Set up sign-in for an ASP.NET application using Azure Active Directory B2C
+# Quickstart: Set up sign in for an ASP.NET application using Azure Active Directory B2C
 
 Azure Active Directory (Azure AD) B2C provides cloud identity management to keep your application, business, and customers protected. Azure AD B2C enables your applications to authenticate to social accounts and enterprise accounts using open standard protocols. In this quickstart, you use an ASP.NET application to sign in using a social identity provider and call an Azure AD B2C protected web API.
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
 ## Prerequisites
 
-- [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload. 
+- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload. 
 - A social account from either Facebook, Google, Microsoft, or Twitter.
 - [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-webapp-and-webapi/archive/master.zip) or clone the sample web application from GitHub.
 
@@ -31,7 +31,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
     These two projects are in the sample solution:
 
-    - **TaskWebApp** - A web application that creates and edits a task list. The web application uses the **sign-up or sign-in** user flow to sign-up or sign-in users.
+    - **TaskWebApp** - A web application that creates and edits a task list. The web application uses the **sign-up or sign-in** user flow to sign up or sign in users.
     - **TaskService** - A web API that supports the create, read, update, and delete task list functionality. The web API is protected by Azure AD B2C and called by the web application.
 
 ## Run the application in Visual Studio
@@ -53,11 +53,11 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
 
     The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter.
 
-2. Azure AD B2C presents a custom login page for a fictitious brand called Wingtip Toys for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
+2. Azure AD B2C presents a custom sign-in page for a fictitious brand called Wingtip Toys for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
 
     ![Sign In or Sign Up provider](media/active-directory-b2c-quickstarts-web-app/sign-in-or-sign-up-web.png)
 
-    You authenticate (sign-in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
+    You authenticate (sign in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
 
 3. Finish the sign-in process for the identity provider.
 
@@ -91,7 +91,12 @@ You can use your Azure AD B2C tenant if you plan to try other Azure AD B2C quick
 
 ## Next steps
 
-In this quickstart, you used a sample ASP.NET application to sign in with a custom login page, sign in with a social identity provider, create an Azure AD B2C account, and call a web API protected by Azure AD B2C. 
+In this quickstart, you used a sample ASP.NET application to:
+
+* Sign in with a custom login page
+* Sign in with a social identity provider
+* Create an Azure AD B2C account
+* Call a web API protected by Azure AD B2C
 
 Get started creating your own Azure AD B2C tenant.