Merge pull request #7368 from MicrosoftDocs/master637738274859756295

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

docs/get-started/csharp/tutorial-debugger.md

@@ -102,7 +102,7 @@ First, you'll create a .NET Core console application project. The project type c
 
 1. On the **Create a new project** window, enter or type *console* in the search box. Next, choose **C#** from the Language list, and then choose **Windows** from the Platform list. 
 
-   After you apply the language and platform filters, choose the **Console App** template for .NET Core, and then choose **Next**.
+   After you apply the language and platform filters, choose the **Console Application** template for .NET Core, and then choose **Next**.
 
    ![Screenshot of the C# template for the Console App.](../csharp/media/vs-2019/get-started-create-console-project.png)
 
@@ -111,7 +111,7 @@ First, you'll create a .NET Core console application project. The project type c
 
 1. In the **Configure your new project** window, type or enter *GetStartedDebugging* in the **Project name** box. Then, choose **Next**.
 
-1. Choose either the recommended target framework (.NET Core 3.1) or .NET 5, and then choose **Create**.
+1. Choose either the recommended target framework (.NET Core 3.1 (Long-term support)) or .NET 5.0 (Current) , and then choose **Create**.
 
    Visual Studio opens your new project.
 
@@ -136,7 +136,7 @@ First, you'll create a .NET Core console application project. The project type c
 
 1. In the **Configure your new project** window, type or enter *GetStartedDebugging* in the **Project name** box. Then, choose **Next**.
 
-1. In the **Additional information** window, ensure that **.NET 6.0** is selected in the **Framework** dropdown menu, and then choose **Create**.
+1. In the **Additional information** window, ensure that **.NET 6.0 (Long-term support)** is selected in the **Framework** dropdown menu, and then choose **Create**.
 
     Visual Studio opens your new project.
 

docs/get-started/visual-basic/tutorial-projects-solutions.md

@@ -233,7 +233,7 @@ We're going to use the new unit test project to test our method in the **QuickDa
 
 1. Choose the **References** node in the **QuickTest** project, and from the right-click or context menu, choose **Add Reference**.
 
-   ![creenshot showing the context menu for the References node in the QuickTest project, with the 'Add Reference' option selected.](media/tutorial-projects-add-reference-vb.png)
+   ![Screenshot showing the context menu for the References node in the QuickTest project, with the 'Add Reference' option selected.](media/tutorial-projects-add-reference-vb.png)
 
    The **Reference Manager** dialog box opens.
 

docs/ide/reference/general-environment-options-dialog-box.md

@@ -2,7 +2,7 @@
 title: General, Environment, Options Dialog Box
 description: Learn how to use the General page in the Environment section to change color themes, status bar settings, file extension associations, and more for the IDE.
 ms.custom: SEO-VS-2020
-ms.date: 07/26/2019
+ms.date: 11/29/2021
 ms.topic: reference
 f1_keywords:
 - VS.Environment.General
@@ -34,7 +34,26 @@ Use this page to change color themes, status bar settings, and file extension as
 
 Choose the **Blue**, **Light**, **Dark**, or **Blue (Extra Contrast)** color theme for the IDE.
 
-You can install additional predefined themes and create custom themes by downloading and installing the **Visual Studio Color Theme Editor** from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=VisualStudioPlatformTeam.VisualStudio2017ColorThemeEditor). After you install this tool, additional color themes appear in the **Color Theme** list box.
+::: moniker range="vs-2022"
+
+You can also choose to use the theme that Windows uses by selecting **Use system setting**.
+
+::: moniker-end
+
+You can install additional predefined themes and create custom themes by downloading and installing the **Visual Studio Color Theme Designer** for the version that you're currently using, as follows:
+
+- [Color Theme Designer for Visual Studio 2022](https://marketplace.visualstudio.com/items?itemName=idex.colorthemedesigner2022)
+- [Color Theme Designer for Visual Studio 2019](https://marketplace.visualstudio.com/items?itemName=ms-madsk.ColorThemeDesigner).
+- [Color Theme Editor for Visual Studio 2017](https://marketplace.visualstudio.com/items?itemName=VisualStudioPlatformTeam.VisualStudio2017ColorThemeEditor)
+
+After you install this tool, additional color themes appear in the **Color Theme** list box.
+
+::: moniker range="vs-2022"
+
+> [!NOTE]
+> Want even more themes to choose from? Check out the wide range of custom themes on the [**Visual Studio Marketplace**](https://marketplace.visualstudio.com/search?target=VS&category=Tools&vsVersion=&subCategory=Themes&sortBy=Installs). And to see examples of new Visual Studio 2022 custom themes based on VS Code, take a look at the [**Introducing a collection of new Visual Studio themes**](https://devblogs.microsoft.com/visualstudio/custom-themes/) blog post.
+
+::: moniker-end
 
 **Apply title case styling to menu bar**
 

docs/ide/reference/generate-xml-documentation-comments.md

@@ -2,7 +2,7 @@
 title: Insert XML documentation comments
 description: Learn how to insert XML documentation comments in your code that you can use to create a compiler-generated XML file to distribute alongside your .NET assembly.
 ms.custom: SEO-VS-2020
-ms.date: 01/22/2020
+ms.date: 11/23/2021
 ms.topic: reference
 author: mikadumont
 ms.author: midumont
@@ -13,15 +13,15 @@ ms.workload:
 ---
 # How to: Insert XML comments for documentation generation
 
-Visual Studio can help you document code elements such as classes and methods, by automatically generating the standard XML documentation comment structure. At compile time, you can generate an XML file that contains the documentation comments.
+Visual Studio can help you document code elements such as classes and methods, by automatically generating the standard XML documentation comment structure. At compile time, you can generate an XML file that contains the documentation comments. To enable that option, select **Generate a file containing API documentation** on the **Build** > **Output** tab of your project's properties.
 
 > [!TIP]
-> For information about configuring the name and location of the generated XML file, see [Documenting your code with XML comments (C# Guide)](/dotnet/csharp/codedoc).
+> If you want to configure a non-default name and location for the documentation file, add the [DocumentationFile](/dotnet/core/project-sdk/msbuild-props#documentationfile) property to your *.csproj*, *.vbproj*, or *.fsproj* file.
 
 The compiler-generated XML file can be distributed alongside your .NET assembly so that Visual Studio and other IDEs can use IntelliSense to show quick information about types and members. Additionally, the XML file can be run through tools like [DocFX](https://dotnet.github.io/docfx/) and [Sandcastle](https://www.microsoft.com/download/details.aspx?id=10526) to generate API reference websites.
 
 > [!NOTE]
-> The **Insert Comment** command that automatically inserts XML documentation comments is available in [C#](/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments) and [Visual Basic](/dotnet/visual-basic/programming-guide/program-structure/how-to-create-xml-documentation). However, you can manually insert [XML documentation comments in C++](/cpp/build/reference/xml-documentation-visual-cpp) files and still generate XML documentation files at compile time.
+> The **Insert Comment** command that automatically inserts XML documentation comments is available in [C#](/dotnet/csharp/programming-guide/xmldoc/) and [Visual Basic](/dotnet/visual-basic/programming-guide/program-structure/how-to-create-xml-documentation). However, you can manually insert [XML documentation comments in C++](/cpp/build/reference/xml-documentation-visual-cpp) files and still generate XML documentation files at compile time.
 
 ## To insert XML comments for a code element
 
@@ -47,15 +47,14 @@ The compiler-generated XML file can be distributed alongside your .NET assembly
 
 You can use styles in XML comments that will render in Quick Info when hovering over the element. These styles include: italics, bold, bullets, and a clickable link.
 
-   ![Screenshot showing the completed comment with style tags for italics, bold, bullets, and a clickable link.](media/doc-style-cs.png) 
+   ![Screenshot showing the completed comment with style tags for italics, bold, bullets, and a clickable link.](media/doc-style-cs.png)
 
 > [!NOTE]
 > There is an [option](../../ide/reference/options-text-editor-csharp-advanced.md) to toggle XML documentation comments after typing `///` in C# or `'''` Visual Basic. From the menu bar, choose **Tools** > **Options** to open the **Options** dialog box. Then, navigate to **Text Editor** > **C#** or **Basic** > **Advanced**. In the **Editor Help** section, look for the **Generate XML documentation comments** option.
 
 ## See also
 
-- [XML documentation comments (C# Programming Guide)](/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments)
-- [Documenting your code with XML comments (C# Guide)](/dotnet/csharp/codedoc)
+- [Documenting your code with XML comments (C# Guide)](/dotnet/csharp/language-reference/xmldoc/)
 - [How to: Create XML documentation (Visual Basic)](/dotnet/visual-basic/programming-guide/program-structure/how-to-create-xml-documentation)
 - [C++ Comments](/cpp/cpp/comments-cpp)
 - [XML Documentation (C++)](/cpp/build/reference/xml-documentation-visual-cpp)

docs/ide/reference/options-text-editor-csharp-advanced.md

@@ -84,13 +84,13 @@ Use the **Advanced** options page to modify the settings for editor formatting,
    using System.Linq;
    ```
 
-::: moniker range=">=vs-2019"                                              
+::: moniker range=">=vs-2019"
 - Suggest usings for types in .NET Framework assemblies
 ::: moniker-end
-                                         
-::: moniker range="vs-2017"                                                
+
+::: moniker range="vs-2017"
 - Suggest usings for types in reference assemblies
-::: moniker-end                                                            
+::: moniker-end
 
 - Suggest usings for types in NuGet packages
 
@@ -132,25 +132,25 @@ Select these check boxes to display dotted vertical lines between the curly brac
 
 - Generate XML documentation comments for ///
 
-   When selected, inserts the XML elements for XML documentation comments after you type the `///` comment introduction. For more information about XML documentation, see [XML Documentation Comments (C# Programming Guide)](/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments).
+  When selected, inserts the XML elements for XML documentation comments after you type the `///` comment introduction. For more information about XML documentation, see [XML Documentation Comments (C# Programming Guide)](/dotnet/csharp/programming-guide/xmldoc/).
 
 ::: moniker range=">=vs-2019"
 
 ## Inline Hints
 
-- Inline Parameter Name Hints 
-    
-    When selected, inserts parameter name hints for literals, cast literals, and object instantiations prior to each argument in function calls.  
-    
+- Inline Parameter Name Hints
+
+    When selected, inserts parameter name hints for literals, cast literals, and object instantiations prior to each argument in function calls.
+
     ![Inline Parameter Name Hints for CSharp](media/inline-parameter-name-hints-csharp.png)
 
-- Inline Type Hints 
-    
-    When selected, inserts type hints for variables with inferred types and lambda parameter types.  
-    
+- Inline Type Hints
+
+    When selected, inserts type hints for variables with inferred types and lambda parameter types.
+
     ![Inline Type Hints for CSharp](media/inline-type-hints-csharp.png)
 
-## Inheritance Margin 
+## Inheritance Margin
 
 - When selected, adds icons to the margins representing your code's implementations and overrides. Clicking on the inheritance margin icons will display inheritance options that you can select to navigate to.
 
@@ -161,7 +161,6 @@ Select these check boxes to display dotted vertical lines between the curly brac
 ## See also
 
 - [How to: Insert XML comments for documentation generation](../../ide/reference/generate-xml-documentation-comments.md)
-- [XML Documentation Comments (C# Programming Guide)](/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments)
-- [Document your code with XML comments (C# Guide)](/dotnet/csharp/codedoc)
+- [Document your code with XML comments (C# Guide)](/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments)
 - [Set language-specific editor options](../../ide/reference/setting-language-specific-editor-options.md)
 - [C# IntelliSense](../../ide/visual-csharp-intellisense.md)

docs/ide/work-with-multiple-user-accounts.md

@@ -13,15 +13,15 @@ ms.workload:
 ---
 # Work with multiple user accounts
 
+This article shows you how to add multiple accounts to Visual Studio. It also shows you how to see the resources accessible from those accounts in places such as the **Add Connected Service** dialog, **Server Explorer**, and **Team Explorer**.
+
 If you have multiple Microsoft accounts and/or work or school accounts, you can add them all to Visual Studio so that you can access the resources from any account without having to sign in to it separately. Azure, Application Insights, Azure DevOps, and Microsoft 365 services all support the streamlined sign-in experience.
 
 After you add multiple accounts on one machine, that set of accounts roams with you if you sign in to Visual Studio on another machine.
 
 > [!NOTE]
 > Although the account names roam, the credentials do not. You'll be prompted to enter credentials for those other accounts the first time you attempt to use their resources on a new machine.
 
-This article shows you how to add multiple accounts to Visual Studio. It also shows you how to see the resources accessible from those accounts in places such as the **Add Connected Service** dialog, **Server Explorer**, and **Team Explorer**.
-
 ## Sign in to Visual Studio
 
 Sign into Visual Studio with a Microsoft account or an organizational account. You should see your user name appear in the upper corner of the window, similar to this:
@@ -56,14 +56,6 @@ Azure Active Directory (AAD) enables support for end-user single sign-in in ASP.
 
 To see this in action, create a new **ASP.NET Core Web Application** project. In the **New ASP.NET Core Web Application** dialog box, choose the **Web Application** template, and then choose **Change Authentication**.
 
-::: moniker-end
-
-::: moniker range=">=vs-2019"
-
-To see this in action, create a new **ASP.NET Core Web App** project. On the **Create a new ASP.NET Core Web Application** page, choose **ASP.NET Core 3.1** from the drop-down, choose the **Web Application** template, and then choose **Change** under **Authentication**.
-
-::: moniker-end
-
 The **Change Authentication** dialog box appears where you can choose what kind of authentication to use in your application.
 
 ![Change authentication dialog for ASP.NET](../ide/media/vs2015_change_authentication.png)
@@ -76,6 +68,20 @@ From the main menu, choose **Team** > **Manage Connections** to open the **Team
 
 For more information, see [Connect to projects in Team Explorer](connect-team-project.md).
 
+::: moniker-end
+
+::: moniker range="vs-2019"
+
+To see this in action, create a new **ASP.NET Core Web App** project. On the **Additional information** page, choose **.NET Core 3.1 (Long-term support)** from the **Target Framework** drop-down, and then choose **Microsoft Identity Platform** from the **Authentication Type** drop-down.
+
+::: moniker-end
+
+::: moniker range=">=vs-2022"
+
+To see this in action, create a new **ASP.NET Core Web App** project. On the **Additional information** page, choose **.NET Core 6 (Long-term support)** from the **Target Framework** drop-down, and then choose **Microsoft Identity Platform** from the **Authentication Type** drop-down.
+
+::: moniker-end
+
 ## Add an additional account to Visual Studio
 
 To add an additional account to Visual Studio:

subscriptions/about-benefits.md

@@ -2,9 +2,9 @@
 title: Understand benefits in Visual Studio subscriptions | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 0a02232c-437f-4c48-85c1-93ca7887236b
-ms.date: 10/08/2021
+ms.date: 11/29/2021
 ms.topic: how-to
 description:  Learn about what benefits are included in subscriptions, and how to activate them.
 ---

subscriptions/access-github.md

@@ -2,7 +2,7 @@
 title: Visual Studio subscriptions with GitHub Enterprise | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 2249b32a-46d7-4e29-b543-4769c71ceda6
 ms.date: 10/08/2021
 ms.topic: conceptual

subscriptions/account-removed.md

@@ -2,7 +2,7 @@
 title:  Visual Studio subscription assignments deleted by Microsoft | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: f853ed9d-3543-4f5f-a754-92381ee03523
 ms.date: 09/30/2021
 ms.topic: how-to

subscriptions/add-monthly-subs.md

@@ -2,7 +2,7 @@
 title: Add new monthly subscriptions to Subscriptions Administration Portal | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 36f0d9f1-fe28-469f-a54c-dc46638270a8
 ms.date: 10/08/2021
 ms.topic: how-to

subscriptions/admin-expiration.md

@@ -2,7 +2,7 @@
 title: Admin portal changes for expired Visual Studio subscription agreements | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: f38092ba-051c-4e58-97f5-4255dbe873ba
 ms.date: 10/08/2021
 ms.topic: conceptual

subscriptions/admin-inventory.md

@@ -2,7 +2,7 @@
 title: Pre-production inventory in Visual Studio subscription  | Visual Studio Marketplace
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 7d74e113-8fb2-490e-8502-48cce7b1327a
 ms.date: 10/08/2021
 ms.topic: conceptual

subscriptions/admin-preferences.md

@@ -2,7 +2,7 @@
 title:  Set preferences in the Visual Studio subscriptions admin portal
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 0fe9eaa4-f589-429e-a443-13bf86637d5a
 ms.date: 10/08/2021
 ms.topic: conceptual

subscriptions/admin-responsibilities.md

@@ -2,7 +2,7 @@
 title: Admin responsibilities in Visual Studio subscriptions | Visual Studio Marketplace
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: b26b31dc-1eeb-4871-9ce6-2c980e703f1e
 ms.date: 03/19/2021
 ms.topic: conceptual

subscriptions/admin-roles.md

@@ -2,7 +2,7 @@
 title:  Super admin and admin roles for Visual Studio subscriptions
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 6601c395-f778-48c1-ab76-cf454b9193e4
 ms.date: 03/19/2021
 ms.topic: conceptual

subscriptions/agreement-renewals.md

@@ -2,7 +2,7 @@
 title: What happens when Visual Studio subscription agreements renew | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: c7198d87-dfbf-4b2f-8ed4-bb4d56873dc1
 ms.date: 11/10/2021
 ms.topic: conceptual

subscriptions/aliasing.md

@@ -2,7 +2,7 @@
 title: Signing in to Visual Studio Subscriptions May Fail When Using Aliases | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 97bf7474-c6c2-49b3-b2c9-f1b2808eed1a
 ms.date: 03/19/2021
 ms.topic: conceptual

subscriptions/anonymization.md

@@ -2,7 +2,7 @@
 title: Anonymization of Visual Studio subscriber data | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: ce5fc8a4-484c-4df6-97c3-cb60174fb66b
 ms.date: 03/11/2021
 ms.topic: conceptual

subscriptions/assign-github.md

@@ -2,7 +2,7 @@
 title: Assign Visual Studio subscriptions with GitHub Enterprise | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: f271d623-dcde-442a-865c-4dca5ad8a9c5
 ms.date: 03/03/2021
 ms.topic: conceptual

subscriptions/assign-guid.md

@@ -2,7 +2,7 @@
 title: Assign specific GUIDs to Visual Studio subscribers | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.date: 03/19/2021
 ms.topic: conceptual
 ms.assetid: f9c82d7d-55bd-4e41-a170-6077b28ba5af

subscriptions/assign-license-bulk.md

@@ -2,7 +2,7 @@
 title: Assign Visual Studio subscriptions to multiple users | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.date: 10/21/2021
 ms.topic: conceptual
 description:  Learn how admins can assign multiple subscriptions at one time.

subscriptions/assign-license.md

@@ -2,7 +2,7 @@
 title: Assign Visual Studio subscriptions to users | Microsoft Docs
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 4e529a43-7aed-4eee-895d-862a631952df
 ms.date: 10/25/2021
 ms.topic: conceptual

subscriptions/assignments-orders.md

@@ -2,7 +2,7 @@
 title: Track assignments and process orders in Visual Studio subscriptions | Visual Studio Marketplace
 author: evanwindom
 ms.author: amast
-manager: amast
+manager: shve
 ms.assetid: 83a9162a-b9e7-43a4-b07f-6c1fd8580f78
 ms.date: 03/21/2021
 ms.topic: conceptual