Merge pull request #184349 from MicrosoftDocs/master

1/06 AM Publish

Author: huypub

.openpublishing.redirection.active-directory.json

@@ -710,6 +710,36 @@
             "redirect_url": "https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-add-connected-service.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-add-connected-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-dotnet-what-happened.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-dotnet-what-happened",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-dotnet-getting-started.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-dotnet-getting-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-error.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-error",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-webapi-getting-started.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-webapi-getting-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/vs-active-directory-webapi-what-happened.md",
+            "redirect_url": "/visualstudio/azure/vs-active-directory-webapi-what-happened",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-application-proxy-connectors.md",
             "redirect_url": "/azure/active-directory/active-directory-application-proxy-connectors-azure-portal",

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

@@ -198,6 +198,7 @@ Use the general guidelines when implementing a SCIM endpoint to ensure compatibi
 * Microsoft AAD makes requests to fetch a random user and group to ensure that the endpoint and the credentials are valid. It's also done as a part of the **Test Connection** flow in the [Azure portal](https://portal.azure.com). 
 * Support HTTPS on your SCIM endpoint.
 * Custom complex and multivalued attributes are supported but AAD does not have many complex data structures to pull data from in these cases. Simple paired name/value type complex attributes can be mapped to easily, but flowing data to complex attributes with three or more subattributes are not well supported at this time.
+* The "type" sub-attribute values of multivalued complex attributes must be unique. For example, there can not be two different email addresses with the "work" sub-type. 
 
 ##### Retrieving Resources:
 * Response to a query/filter request should always be a `ListResponse`.

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

@@ -129,20 +129,6 @@
       href: ../develop/howto-add-branding-in-azure-ad-apps.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
     - name: Terms of Service and Privacy Statement
       href: ../develop/howto-add-terms-of-service-privacy-statement.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-  - name: Work with Visual Studio
-    items:
-    - name: Use the Active Directory connected service
-      href: ../develop/vs-active-directory-add-connected-service.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-    - name: Get started with .NET MVC projects
-      href: ../develop/vs-active-directory-dotnet-getting-started.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-    - name: What happened to my .NET MVC project?
-      href: ../develop/vs-active-directory-dotnet-what-happened.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-    - name: Get started with WebAPI projects
-      href: ../develop/vs-active-directory-webapi-getting-started.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-    - name: What happened to my WebAPI project?
-      href: ../develop/vs-active-directory-webapi-what-happened.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
-    - name: Error during authentication detection
-      href: ../develop/vs-active-directory-error.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
   - name: Bring an app to market
     items:
     - name: Publish to App Source

articles/active-directory/develop/TOC.yml

@@ -597,20 +597,6 @@
       href: v2-howto-app-gallery-listing.md
     - name: Publish to the Office 365 Seller Dashboard
       href: /office/dev/store/add-in-submission-guide
-  - name: Work with Visual Studio
-    items:
-    - name: Use the Active Directory connected service
-      href: vs-active-directory-add-connected-service.md
-    - name: Get started with .NET MVC projects
-      href: vs-active-directory-dotnet-getting-started.md
-    - name: What happened to my .NET MVC project?
-      href: vs-active-directory-dotnet-what-happened.md
-    - name: Get started with WebAPI projects
-      href: vs-active-directory-webapi-getting-started.md
-    - name: What happened to my WebAPI project?
-      href: vs-active-directory-webapi-what-happened.md
-    - name: Diagnose errors during authentication
-      href: vs-active-directory-error.md
   - name: Remove an app registration
     href: ./howto-remove-app.md
   - name: Restore or remove a deleted app registration

articles/active-directory/develop/media/vs-azure-active-directory/active-directory-connected-service-output.png

@@ -120,7 +120,7 @@ You can create a web API from scratch by using Microsoft.Identity.Web project te
 
 #### Starting from an existing ASP.NET Core 3.1 application
 
-Today, ASP.NET Core 3.1 uses the Microsoft.AspNetCore.AzureAD.UI library. The middleware is initialized in the Startup.cs file.
+ASP.NET Core 3.1 uses the Microsoft.AspNetCore.AzureAD.UI library. The middleware is initialized in the Startup.cs file.
 
 ```csharp
 using Microsoft.AspNetCore.Authentication.JwtBearer;