Merge pull request #244249 from MicrosoftDocs/main

Publish to live, Friday 4 AM PST, 7/7

Author: ttorble

includes/active-directory-develop-scenarios-prerequisites.md renamed to articles/active-directory/develop/includes/scenarios/scenarios-prerequisites.md

@@ -22,15 +22,15 @@ Although not required reading before completing your first quickstart or tutoria
     :::column:::
         **Authentication and authorization**
 
-        - [Authentication basics](../articles/active-directory/develop/authentication-vs-authorization.md)
-        - [ID tokens](../articles/active-directory/develop/id-tokens.md)
-        - [Access tokens](../articles/active-directory/develop/access-tokens.md)
+        - [Authentication basics](../../authentication-vs-authorization.md)
+        - [ID tokens](../../id-tokens.md)
+        - [Access tokens](../../access-tokens.md)
     :::column-end:::
     :::column:::
         **Microsoft identity platform**
 
-        - [Audiences](../articles/active-directory/develop/v2-supported-account-types.md)
-        - [Applications and service principals](../articles/active-directory/develop/app-objects-and-service-principals.md)
-        - [Permissions and consent](../articles/active-directory/develop/v2-permissions-and-consent.md)
+        - [Audiences](../../v2-supported-account-types.md)
+        - [Applications and service principals](../../app-objects-and-service-principals.md)
+        - [Permissions and consent](../../permissions-consent-overview.md)
     :::column-end:::
 :::row-end:::

includes/active-directory-develop-scenarios-production.md renamed to articles/active-directory/develop/includes/scenarios/scenarios-production.md

@@ -24,14 +24,14 @@ To help in debugging and authentication failure troubleshooting scenarios, the M
 
 :::row:::
     :::column:::
-        - [Logging in MSAL.NET](../articles/active-directory/develop/msal-logging-dotnet.md)
-        - [Logging in MSAL for Android](../articles/active-directory/develop/msal-logging-android.md)
-        - [Logging in MSAL.js](../articles/active-directory/develop/msal-logging-js.md)
+        - [Logging in MSAL.NET](../../msal-logging-dotnet.md)
+        - [Logging in MSAL for Android](../../msal-logging-android.md)
+        - [Logging in MSAL.js](../../msal-logging-js.md)
     :::column-end:::
     :::column:::
-        - [Logging in MSAL for iOS/macOS](../articles/active-directory/develop/msal-logging-ios.md)
-        - [Logging in MSAL for Java](../articles/active-directory/develop/msal-logging-java.md)
-        - [Logging in MSAL for Python](../articles/active-directory/develop/msal-logging-python.md)
+        - [Logging in MSAL for iOS/macOS](../../msal-logging-ios.md)
+        - [Logging in MSAL for Java](../../msal-logging-java.md)
+        - [Logging in MSAL for Python](../../msal-logging-python.md)
     :::column-end:::
 :::row-end:::
 
@@ -44,8 +44,8 @@ Here are some suggestions for data collection:
 
 ## Validate your integration
 
-Test your integration by following the [Microsoft identity platform integration checklist](../articles/active-directory/develop/identity-platform-integration-checklist.md).
+Test your integration by following the [Microsoft identity platform integration checklist](../../identity-platform-integration-checklist.md).
 
 ## Build for resilience
 
-Learn how to increase resiliency in your app. For details, see [Increase resilience of authentication and authorization applications you develop](../articles/active-directory/fundamentals/resilience-app-development-overview.md)
+Learn how to increase resiliency in your app. For details, see [Increase resilience of authentication and authorization applications you develop](../../../fundamentals/resilience-app-development-overview.md)

includes/active-directory-develop-scenarios-registration-client-secrets.md renamed to articles/active-directory/develop/includes/scenarios/scenarios-registration-client-secrets.md

@@ -24,10 +24,10 @@ You can add credentials to your client app's registration by using the [Azure po
 
 ### Add client credentials by using the Azure portal
 
-To add credentials to your confidential client application's app registration, follow the steps in [Quickstart: Register an application with the Microsoft identity platform](../articles/active-directory/develop/quickstart-register-app.md) for the type of credential you want to add:
+To add credentials to your confidential client application's app registration, follow the steps in [Quickstart: Register an application with the Microsoft identity platform](../../quickstart-register-app.md) for the type of credential you want to add:
 
-* [Add a client secret](../articles/active-directory/develop/quickstart-register-app.md#add-a-client-secret)
-* [Add a certificate](../articles/active-directory/develop/quickstart-register-app.md#add-a-certificate)
+* [Add a client secret](../../quickstart-register-app.md#add-a-client-secret)
+* [Add a certificate](../../quickstart-register-app.md#add-a-certificate)
 
 ### Add client credentials by using PowerShell
 

articles/active-directory/develop/scenario-daemon-app-registration.md

@@ -43,7 +43,7 @@ Daemon applications require that a tenant admin pre-consent to the application c
 
 If you're an ISV building a multitenant application, you should read the section [Deployment - case of multitenant daemon apps](scenario-daemon-production.md#deployment---multitenant-daemon-apps).
 
-[!INCLUDE [Pre-requisites](../../../includes/active-directory-develop-scenarios-registration-client-secrets.md)]
+[!INCLUDE [Pre-requisites](./includes/scenarios/scenarios-prerequisites.md)]
 
 ## Next steps
 

articles/active-directory/develop/scenario-daemon-overview.md

@@ -60,7 +60,7 @@ For developers, the end-to-end experience for this scenario has the following as
 
 ## Recommended reading
 
-[!INCLUDE [recommended-topics](../../../includes/active-directory-develop-scenarios-prerequisites.md)]
+[!INCLUDE [recommended-topics](./includes/scenarios/scenarios-prerequisites.md)]
 
 ## Next steps
 

articles/active-directory/develop/scenario-daemon-production.md

@@ -31,7 +31,7 @@ If you're an ISV creating a daemon application that can run in several tenants,
 
 You'll need to explain to your customers how to perform these operations. For more info, see [Requesting consent for an entire tenant](v2-permissions-and-consent.md#requesting-consent-for-an-entire-tenant).
 
-[!INCLUDE [Common steps to move to production](../../../includes/active-directory-develop-scenarios-production.md)]
+[!INCLUDE [Pre-requisites](./includes/scenarios/scenarios-production.md)]
 
 ## Code samples
 

articles/active-directory/develop/scenario-desktop-overview.md

@@ -56,7 +56,7 @@ Desktop applications have few specificities. They depend mainly on whether your
 
 ## Recommended reading
 
-[!INCLUDE [recommended-topics](../../../includes/active-directory-develop-scenarios-prerequisites.md)]
+[!INCLUDE [recommended-topics](./includes/scenarios/scenarios-prerequisites.md)]
 
 ## Next steps
 

articles/active-directory/develop/scenario-desktop-production.md

@@ -103,7 +103,7 @@ AcquireTokenSilent(scopesForVendorApi, accounts.FirstOrDefault()).ExecuteAsync()
 
 For Microsoft personal account users, reprompting for consent on each native client (desktop or mobile app) call to authorize is the intended behavior. Native client identity is inherently insecure, which is contrary to confidential client application identity. Confidential client applications exchange a secret with the Microsoft Identity platform to prove their identity. The Microsoft identity platform chose to mitigate this insecurity for consumer services by prompting the user for consent each time the application is authorized.
 
-[!INCLUDE [Common steps to move to production](../../../includes/active-directory-develop-scenarios-production.md)]
+[!INCLUDE [Common steps to move to production](./includes/scenarios/scenarios-production.md)]
 
 ## Next steps
 

articles/active-directory/develop/scenario-mobile-overview.md

@@ -51,7 +51,7 @@ Keep in mind the following considerations when you build a mobile app on Microso
 
 ## Recommended reading
 
-[!INCLUDE [recommended-topics](../../../includes/active-directory-develop-scenarios-prerequisites.md)]
+[!INCLUDE [recommended-topics](./includes/scenarios/scenarios-prerequisites.md)]
 
 ## Next steps
 

articles/active-directory/develop/scenario-mobile-production.md

@@ -31,7 +31,7 @@ For each Microsoft Authentication Library (MSAL) type, you can find sample code
 - [MSAL.NET wiki](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki)
 
 
-[!INCLUDE [Common steps to move to production](../../../includes/active-directory-develop-scenarios-production.md)]
+[!INCLUDE [Common steps to move to production](./includes/scenarios/scenarios-production.md)]
 
 ## Next steps