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

Author: v-alje

.openpublishing.redirection.json

@@ -6242,14 +6242,9 @@
       "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-users.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
       "redirect_document_id": false
     },
     {
@@ -20526,6 +20521,56 @@
       "redirect_url": "https://docs.microsoft.com/legal/marketplace/terms",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
+      "redirect_document_id": true
+    },    
+    {
+      "source_path": "articles/marketplace/enable-lead-sharing.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/listing-type-requirements.md",
+      "redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/promote-your-business-with-microsoft.md",
+      "redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/publishing-checklist-appsource.md",
+      "redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/publishing-checklist-azure-marketplace.md",
+      "redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/support-appsource.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/support",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/store-your-appSource-package-to-azure-storage-and-generate-sas-key.md",
+      "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/dynamics-365-solution-preparation.md",
+      "redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/request-to-publish-the-app.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/marketplace/marketplace-participation-policy.md",
       "redirect_url": "https://docs.microsoft.com/legal/marketplace/participation-policy",
@@ -20588,7 +20633,12 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -20597,10 +20647,15 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-users.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-publish-cortana-intelligence-app.md",
       "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
@@ -31681,29 +31736,64 @@
       "redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-with-cicd-vsts",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/add-bank-tax-info.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account#payout-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/azure-vm-create-offer",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
+      "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/marketplace/enable-trial-using-azure-ad.md",
       "redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/marketplace/gtm-promote-your-business.md",
-      "redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
+      "redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/become-publisher.md",
       "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
-      "redirect_document_id": true
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/gtm-promote-your-business.md",
+      "redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/become-publisher.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/guidelines.md",
-      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
-      "redirect_document_id": true
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/guidelines.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/register-dev-center.md",
-      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/register-dev-center.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -31719,7 +31809,7 @@
     {
       "source_path": "articles/marketplace/grow-your-business-with-appsource.md",
       "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/billing-options-azure-marketplace.md",
@@ -31793,7 +31883,22 @@
     },
     {
       "source_path": "articles/marketplace-publishing/marketplace-publishing-accounts-creation-registration.md",
-      "redirect_url": "https://docs.microsoft.com/azure/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-management-solution-publish.md",
+      "redirect_url": "/azure/marketplace",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-publisher-profile.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -52074,6 +52179,11 @@
       "source_path": "articles/media-services/azure-media-player/azure-media-player-license.md",
       "redirect_url": "/legal/azure-media-player/azure-media-player-license",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
+      "redirect_url": "/articles/load-balancer/concepts",
+      "redirect_document_id": false
     }
  ]
 }

articles/active-directory/develop/access-tokens.md

@@ -2,7 +2,7 @@
 title: Microsoft identity platform access tokens reference | Azure
 description: Learn about access tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints.
 services: active-directory
-author: rwike77
+author: hpsin
 manager: CelesteDG
 
 ms.service: active-directory

articles/active-directory/develop/active-directory-certificate-credentials.md

@@ -3,7 +3,7 @@ title: Microsoft identity platform certificate credentials
 titleSuffix: Microsoft identity platform
 description: This article discusses the registration and use of certificate credentials for application authentication.
 services: active-directory
-author: rwike77
+author: hpsin
 manager: CelesteDG
 
 ms.service: active-directory

articles/active-directory/develop/active-directory-v2-protocols.md

@@ -2,7 +2,7 @@
 title: OAuth 2.0 and OpenID Connect protocols - Microsoft identity platform | Azure
 description: A guide to OAuth 2.0 and OpenID Connect protocols that are supported by the Microsoft identity platform endpoint.
 services: active-directory
-author: rwike77
+author: hpsin
 manager: CelesteDG
 
 ms.service: active-directory

articles/active-directory/develop/id-tokens.md

@@ -2,7 +2,7 @@
 title: Microsoft identity platform ID token reference
 description: Learn how to use id_tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints. 
 services: active-directory
-author: rwike77
+author: hpsin
 manager: CelesteDG
 
 ms.service: active-directory

articles/active-directory/develop/msal-net-system-browser-android-considerations.md

@@ -15,7 +15,6 @@ ms.author: marsma
 ms.reviewer: saeeda
 ms.custom: aaddev
 #Customer intent: As an application developer, I want to learn about considerations for using Xamarin Android and MSAL.NET so I can decide if this platform meets my application development needs.
-ms.collection: M365-identity-device-management
 ---
 
 #  Xamarin Android system browser considerations for using MSAL.NET

articles/active-directory/develop/msal-net-token-cache-serialization.md

@@ -121,7 +121,7 @@ $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\{A
  }
 ```
 
-A preview of a product quality token cache file based serializer for public client applications (for desktop applications running on Windows, Mac and Linux) is available from the [Microsoft.Identity.Client.Extensions.Msal](https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet/tree/master/src/Microsoft.Identity.Client.Extensions.Msal) open-source library. You can include it in your applications from the following nuget package: [Microsoft.Identity.Client.Extensions.Msal](https://www.nuget.org/packages/Microsoft.Identity.Client.Extensions.Msal/).
+A product quality token cache file based serializer for public client applications (for desktop applications running on Windows, Mac and Linux) is available from the [Microsoft.Identity.Client.Extensions.Msal](https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet/tree/master/src/Microsoft.Identity.Client.Extensions.Msal) open-source library. You can include it in your applications from the following NuGet package: [Microsoft.Identity.Client.Extensions.Msal](https://www.nuget.org/packages/Microsoft.Identity.Client.Extensions.Msal/).
 
 #### Dual token cache serialization (MSAL unified cache and ADAL v3)
 
@@ -270,9 +270,57 @@ namespace CommonCacheMsalV3
 
 In web apps or web APIs the cache could leverage the session, a Redis cache, or a database.
 
-In web apps or web APIs, keep one token cache per account.  For web apps, the token cache should be keyed by the account ID.  For web APIs, the account should be keyed by the hash of the token used to call the API. MSAL.NET provides custom token cache serialization in .NET Framework and .NET Core subplatforms. Events are fired when the cache is accessed, apps can choose whether to serialize or deserialize the cache. On confidential client applications that handle users (web apps that sign in users and call web APIs, and web APIs calling downstream web APIs), there can be many users and the users are processed in parallel. For security and performance reasons, our recommendation is to serialize one cache per user. Serialization events compute a cache key based on the identity of the processed user and serialize/deserialie a token cache for that user.
+In web apps or web APIs, keep one token cache per account.  For web apps, the token cache should be keyed by the account ID.  For web APIs, the account should be keyed by the hash of the token used to call the API. MSAL.NET provides custom token cache serialization in .NET Framework and .NET Core subplatforms. Events are fired when the cache is accessed, apps can choose whether to serialize or deserialize the cache. On confidential client applications that handle users (web apps that sign in users and call web APIs, and web APIs calling downstream web APIs), there can be many users and the users are processed in parallel. For security and performance reasons, our recommendation is to serialize one cache per user. Serialization events compute a cache key based on the identity of the processed user and serialize/deserialize a token cache for that user.
 
-Examples of how to use token caches for web apps and web APIs are available in the [ASP.NET Core web app tutorial](https://docs.microsoft.com/aspnet/core/tutorials/first-mvc-app/) in the phase [2-2 Token Cache](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-2-TokenCache). For implementations have a look at the folder [TokenCacheProviders](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/Microsoft.Identity.Web/TokenCacheProviders) in the [microsoft-authentication-extensions-for-dotnet](https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet) library (in the [Microsoft.Identity.Client.Extensions.Web](https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet/tree/master/src/Microsoft.Identity.Client.Extensions.Web) folder. 
+The [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web) library provides a preview NuGet package [Microsoft.Identity.Web](https://www.nuget.org/packages/Microsoft.Identity.Web) containing token cache serialization:
+
+
+| Extension Method | Microsoft.Identity.Web sub namespace | Description  |
+| ---------------- | --------- | ------------ |
+| `AddInMemoryTokenCaches` | `TokenCacheProviders.InMemory` | In memory token cache serialization. This implementation is great in samples. It's also good in production applications provided you don't mind if the token cache is lost when the web app is restarted. `AddInMemoryTokenCaches` takes an optional parameter of type `MsalMemoryTokenCacheOptions` that enables you to specify the duration after which the cache entry will expire unless it's used.
+| `AddSessionTokenCaches` | `TokenCacheProviders.Session` | The token cache is bound to the user session. This option isn't ideal if the ID token contains many claims as the cookie would become too large.
+| `AddDistributedTokenCaches` | `TokenCacheProviders.Distributed` | The token cache is an adapter against the ASP.NET Core `IDistributedCache` implementation, therefore enabling you to choose between a distributed memory cache, a Redis cache, a distributed NCache, or a SQL Server cache. For details about the `IDistributedCache` implementations, see https://docs.microsoft.com/aspnet/core/performance/caching/distributed#distributed-memory-cache.
+
+Simple case using the in-memory cache:
+
+```C#
+// or use a distributed Token Cache by adding
+    services.AddSignIn(Configuration);
+    services.AddWebAppCallsProtectedWebApi(Configuration, new string[] { scopesToRequest })
+            .AddInMemoryTokenCaches();
+```
+
+
+Examples of possible distributed caches:
+
+```C#
+// or use a distributed Token Cache by adding
+    services.AddSignIn(Configuration);
+    services.AddWebAppCallsProtectedWebApi(Configuration, new string[] { scopesToRequest })
+            .AddDistributedTokenCaches();
+
+// and then choose your implementation
+
+// For instance the distributed in memory cache (not cleared when you stop the app)
+services.AddDistributedMemoryCache()
+
+// Or a Redis cache
+services.AddStackExchangeRedisCache(options =>
+{
+ options.Configuration = "localhost";
+ options.InstanceName = "SampleInstance";
+});
+
+// Or even a SQL Server token cache
+services.AddDistributedSqlServerCache(options =>
+{
+ options.ConnectionString = _config["DistCache_ConnectionString"];
+ options.SchemaName = "dbo";
+ options.TableName = "TestCache";
+});
+```
+
+Their usage is featured in the [ASP.NET Core web app tutorial](https://docs.microsoft.com/aspnet/core/tutorials/first-mvc-app/) in the phase [2-2 Token Cache](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-2-TokenCache).
 
 ## Next steps
 The following samples illustrate token cache serialization.

articles/active-directory/develop/msal-net-uwp-considerations.md

@@ -15,7 +15,6 @@ ms.author: marsma
 ms.reviewer: saeeda
 ms.custom: aaddev
 #Customer intent: As an application developer, I want to learn about considerations for using Universal Windows Platform and MSAL.NET so that I can decide if this platform meets my application development needs.
-ms.collection: M365-identity-device-management
 ---
 
 # Considerations for using Universal Windows Platform with MSAL.NET

articles/active-directory/develop/msal-net-xamarin-android-considerations.md

@@ -15,7 +15,6 @@ ms.author: marsma
 ms.reviewer: saeeda
 ms.custom: aaddev
 #Customer intent: As an application developer, I want to learn about considerations for using Xamarin Android and MSAL.NET so that I can decide if this platform meets my application development needs.
-ms.collection: M365-identity-device-management
 ---
 
 # Considerations for using Xamarin Android with MSAL.NET

articles/active-directory/develop/msal-net-xamarin-ios-considerations.md

@@ -15,7 +15,6 @@ ms.author: marsma
 ms.reviewer: saeeda
 ms.custom: aaddev
 #Customer intent: As an application developer, I want to learn about considerations for using Xamarin iOS and MSAL.NET so I can decide if this platform meets my application development needs.
-ms.collection: M365-identity-device-management
 ---
 
 # Considerations for using Xamarin iOS with MSAL.NET