Merge pull request #6926 from MicrosoftDocs/master637636287652562378

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

Author: ghogen

docs/debugger/attach-to-running-processes-with-the-visual-studio-debugger.md

@@ -2,7 +2,7 @@
 title: "Attach to running processes with the debugger"
 description: Discover how to attach the Visual Studio debugger to a running process on a local or remote computer.
 ms.custom: "SEO-VS-2020"
-ms.date: "06/12/2020"
+ms.date: "06/28/2021"
 ms.topic: "conceptual"
 f1_keywords:
   - "vs.debug.processes.attach"

docs/debugger/create-custom-visualizers-of-data.md

@@ -2,7 +2,7 @@
 title: "Create custom data visualizers | Microsoft Docs"
 description: Visual Studio debugger visualizers are components that display data. Learn about the six standard visualizers, and about how you can write or download others. 
 ms.custom: SEO-VS-2020
-ms.date: "07/13/2021"
+ms.date: "07/29/2021"
 ms.topic: "conceptual"
 f1_keywords:
   - "vs.debug.visualizer.troubleshoot"
@@ -41,10 +41,14 @@ You can write a custom visualizer for an object of any managed class except for
 
 The architecture of a debugger visualizer has two parts:
 
-- The *debugger side* runs within the Visual Studio debugger, and creates and displays the visualizer user interface.
+- The *debugger side* runs within the Visual Studio debugger, and creates and displays the visualizer user interface. 
+
+  Because Visual Studio executes on the .NET Framework Runtime, this component has to be written for .NET Framework. For this reason, it is not possible to write it for .NET Core.
 
 - The *debuggee side* runs within the process Visual Studio is debugging (the *debuggee*). The data object to visualize (for example, a String object) exists in the debuggee process. The debuggee side sends the object to the debugger side, which displays it in the user interface you create.
 
+  The runtime for which you build this component should match the one in which the debuggee process will run, that is, either .NET Framework or .NET Core.
+
 The debugger side receives the data object from an *object provider* that implements the <xref:Microsoft.VisualStudio.DebuggerVisualizers.IVisualizerObjectProvider> interface. The debuggee side sends the object through the *object source*, which is derived from <xref:Microsoft.VisualStudio.DebuggerVisualizers.VisualizerObjectSource>.
 
 The object provider can also send data back to the object source, which lets you write a visualizer that can edit data. You override the object provider to talk to the expression evaluator and the object source.
@@ -80,8 +84,8 @@ This section describes the steps you should take to make sure your visualizer is
 this scenario.
 
 - For compatibility reasons, the <xref:Microsoft.VisualStudio.DebuggerVisualizers.DialogDebuggerVisualizer.Show%2A> method
-that was overridden in the preceding section still takes in an <xref:Microsoft.VisualStudio.DebuggerVisualizers.IVisualizerObjectProvider>. Nonetheless, it is actually of type <xref:Microsoft.VisualStudio.DebuggerVisualizers.IVisualizerObjectProvider2>.
-Therefore, cast the `objectProvider` object to the updated interface.
+that was overridden in the preceding section still takes in an <xref:Microsoft.VisualStudio.DebuggerVisualizers.IVisualizerObjectProvider>. However, starting in Visual Studio 2019 version 16.10, it is actually of type <xref:Microsoft.VisualStudio.DebuggerVisualizers.IVisualizerObjectProvider2>.
+For this reason, cast the `objectProvider` object to the updated interface.
 
 - When sending objects, like commands or data, to the *debuggee-side* use the `IVisualizerObjectProvider2.Serialize` method
 to pass it to a stream, it will determine the best serialization format to use based on the runtime of the *debuggee* process.

docs/debugger/supported-code-changes-csharp.md

@@ -2,7 +2,7 @@
 title: "Supported Code Changes (C# and Visual Basic) | Microsoft Docs"
 description: Understand what code changes are supported when you are using the Edit and Continue feature while debugging a C# or Visual Basic project in Visual Studio.
 ms.custom: SEO-VS-2020
-ms.date: "10/11/2018"
+ms.date: "9/03/2020"
 ms.topic: "conceptual"
 dev_langs:
   - "CSharp"

docs/debugger/using-breakpoints.md

@@ -2,7 +2,7 @@
 title: Use breakpoints in the debugger | Microsoft Docs
 description: Learn about breakpoints, one of the most important debugging techniques. The article covers breakpoint actions, tracepoints, conditions, and much more.
 ms.custom: SEO-VS-2020
-ms.date: 06/30/2020
+ms.date: 12/21/2020
 ms.topic: how-to
 f1_keywords: 
   - vs.debug.breakpointswin

docs/debugger/walkthrough-debugging-a-parallel-application.md

@@ -248,7 +248,7 @@ This walkthrough shows how to use the **Parallel Tasks** and **Parallel Stacks**
 
 1. To resume execution until the second breakpoint is hit, on the **Debug** menu, click **Continue**.
 
-     Previously, the **Status** column showed all tasks as Active, but now two of the tasks are Blocked. Tasks can be blocked for many different reasons. In the **Status** column, hover over a waiting task to learn why it is blocked. For example, in the following illustration, task 3 is waiting on task 4.
+     Previously, the **Status** column showed all tasks as Active, but now two of the tasks are Blocked. Tasks can be blocked for [many different reasons](/dotnet/standard/parallel-programming/potential-pitfalls-in-data-and-task-parallelism). In the **Status** column, hover over a waiting task to learn why it is blocked. For example, in the following illustration, task 3 is waiting on task 4.
 
      ![Two waiting tasks in Tasks window](../debugger/media/pdb_walkthrough_7.png "PDB_Walkthrough_7")
 

docs/debugger/walkthrough-writing-a-visualizer-in-csharp.md

@@ -36,7 +36,7 @@ Follow the tasks below to create a visualizer.
     ::: moniker range=">=vs-2019"
     Choose **File** > **New** > **Project**. In the language drop-down, choose **C#**. In the search box, type **class library**, and then choose **Class Library (.NET Framework)**. Click **Next**. In the dialog box that appears, type the name `MyFirstVisualizer`, and then click **Create**.
 
-    For the visualizer project, make sure you select a .NET Framework class library and not .NET. Although the visualizer needs to be .NET Framework, the calling app can be .NET Core.
+    For the visualizer project, make sure you select a .NET Framework class library and not .NET. Although the visualizer needs to be .NET Framework, the calling app can be .NET.
     ::: moniker-end
     ::: moniker range="vs-2017"
     From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, under **Visual C#**, choose **.NET Framework**, and then in the middle pane choose **Class Library (.NET Framework)**.
@@ -174,7 +174,7 @@ In the debugger-side code, you specify the type to visualize (the object source)
     Choose **File** > **New** > **Project**. In the language drop-down, choose **C#**. In the search box, type **console app**, and then choose either **Console App (.NET Framework)** or **Console Application** for .NET. Click **Next**. In the dialog box that appears, type the name `MyTestConsole`, and then click **Create**.
 
     > [!NOTE]
-    > If you want to easily test the visualizer using a test harness, create a .NET Framework console app. You can create a .NET console app instead, but the test harness described later is not yet supported for .NET, so you will need to install the visualizer to test it. For a .NET console app, first create the console app here, add the required DLL and project references, and then follow steps described in [Add a debuggee-side data object](#add-a-debuggee-side-data-object).
+    > If you want to easily test the visualizer using a test harness, create a .NET Framework console app. You can create a .NET console app instead, but the test harness described later is not yet supported for .NET, so you will need to install the visualizer to test it. For a .NET console app, first create the console app here, add the required DLL and project references, and then follow steps described in [Add a debuggee-side data object](#add-a-debuggee-side-data-object). For ASP.NET Core scenarios, see [Special debugger side considerations for .NET 5.0+](../debugger/create-custom-visualizers-of-data.md#special-debugger-side-considerations-for-net-50).
     ::: moniker-end
     ::: moniker range="vs-2017"
     From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, under **Visual C#**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.

docs/extensibility/internals/custom-colorable-items.md

@@ -24,9 +24,9 @@ You can override the list of types for colorizing, such as keywords and comments
  Because the IDE handles user overrides of colorable items in the **Fonts and Colors** dialog box, you need only supply each custom colorable item with a name. This name is what appears in the **Display items** list. The colorable items appear in alphabetical order. To group your language service's custom colorable items, you can begin each name with your language name, for example **NewLanguage - Comment** and **NewLanguage - Keyword**.
 
 > [!CAUTION]
-> You should include the language name in the colorable item name to avoid collisions with existing colorable item names. If you change the name of one of your colorable items during development, you must reset the cache that was created the first time your colorable items were accessed. You can reset the experimental cache with the **CreateExpInstance** tool, which is installed with the Visual Studio SDK, typically in the directory:
+> You should include the language name in the colorable item name to avoid collisions with existing colorable item names. If you change the name of one of your colorable items during development, you must reset the cache that was created the first time your colorable items were accessed. You can reset the experimental cache with the **CreateExpInstance** tool, which is installed with the Visual Studio SDK, typically in the following directory under the Visual Studio installation folder:
 >
-> *C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Tools\Bin*
+> *VSSDK\VisualStudioIntegration\Tools\Bin*
 >
 > To reset the cache, enter **CreateExpInstance /Reset**. For more information about **CreateExpInstance**, see [CreateExpInstance utility](../../extensibility/internals/createexpinstance-utility.md).
 

docs/ide/find-in-files.md

@@ -2,7 +2,7 @@
 title: Find in Files
 description: Learn about the Find in Files feature and how to use it to search a specific set of files.
 ms.custom: SEO-VS-2020
-ms.date: 07/23/2021
+ms.date: 08/02/2021
 ms.topic: conceptual
 f1_keywords:
 - vs.findinfiles
@@ -69,9 +69,9 @@ To search for a new text string or expression, specify it in the Search box. To
 
 You can select or clear the following option(s):
 
-- **Match case** - When selected, a **Find Results** search will be case-sensitive.
-- **Match whole word** - When selected, the **Find Results** windows will only return whole word matches.
-- **Use regular expressions** - When selected, you can use special notations to define patterns of text to match in the Search box (or in the **Replace** text box). For a list of these notations, see [Using regular expressions in Visual Studio](../ide/using-regular-expressions-in-visual-studio.md).
+- **Match case** - Use this option to make sure that your search is case-sensitive.
+- **Match whole word** - Use this option to make sure that your search returns only whole word matches.
+- **Use regular expressions** - Use this option to use special notations that define patterns of text to match in the Search box (or in the **Replace** text box). For a list of these notations, see [Using regular expressions in Visual Studio](../ide/using-regular-expressions-in-visual-studio.md).
 
     > [!Important]
     > The **Expression Builder** button appears next to the Search box only if you've selected the **Use regular expressions** checkbox.
@@ -82,13 +82,20 @@ You can select or clear the following option(s):
 
 The option you choose from the **Look in** drop-down list determines whether **Find in Files** searches the entire workspace, the entire solution, the current project, the current directory, all open documents, or the current document.
 
-You can also use the adjacent **Browse (...)** button to locate where you want search.
+You can also use the adjacent **Browse (...)** button to locate where you want search. Even better, if you've already specified a directory, this button will append the new directory instead of replacing is. For instance, if your "Look in" value was ".\Code", you could click the **Browse (...)** button and navigate to a folder named "Shared Code". The **Browse (...)** box would now show ".\Code;.\Shared Code" and when the Find command is executed, it will search both of those folders.
 
-And, you can toggle either the **Include external items** checkbox or the **Include miscellaneous files** checkbox, or both.
+To refine your search, you can select or clear the following option(s):
+
+- **Include external items** - Use this option to include external items, such as files like "windows.h" that you might reference but aren't part of a solution.
+- **Include miscellaneous files** - Use this option to include miscellaneous files, such as files that you've opened but aren't part of a solution.
 
 ## File types
 
-The **File types** option indicates the types of files to search through in the **Look in** directories. Select any item in the list to enter a preconfigured search string that will find files of those particular types. You can also can exclude files. To do so, prefix any path or file type with the "!" character to exclude it from the search.
+The **File types** option indicates the types of files to search through in the **Look in** directories. Select any item in the list to enter a preconfigured search string that will find files of those particular types.
+
+:::image type="content" source="media/find-file-types.png" alt-text="Screenshot of the File Types section of the Find In Files dialog box.":::
+
+You can search for multiple file types by separating them with a semicolon (`;`). You can also can exclude folders and files by prefixing any path or file type with an exclamation mark (`!`).
 
 ### Append results
 
@@ -127,9 +134,7 @@ Specifies that subfolders of the **Look in** folder will be searched.
 
 ## Find options
 
-You can expand or collapse the **Find options** section. The following options can be selected or cleared:
-
-You can select or clear the following option(s):
+You can expand or collapse the **Find options** section. You can select or clear the following option(s):
 
 **Match case**
 
@@ -178,6 +183,14 @@ Displays a list of files containing search matches rather than displaying the se
 
 ::: moniker-end
 
+## Multiple searches
+
+You can keep the results from one search while you're performing other searches. This makes it easy to compare results and see them side-by-side.
+
+:::image type="content" source="media/find-files-search-results.png" alt-text="Screenshot of the Search Results window with three search results as tabs showing.":::
+
+To keep several search results, select the **Keep Results** button after each search. Then, when you search for something else, the results are shown in a new tab. You can keep the results of up to five searches. If you've already got five search results showing, the next search will reuse the oldest search result tab.
+
 ## See also
 
 - [Replace in files](../ide/replace-in-files.md)

docs/ide/media/find-file-types.png

@@ -5,8 +5,8 @@ ms.custom: SEO-VS-2020
 ms.date: 03/25/2020
 ms.topic: conceptual
 ms.assetid: e03835db-a616-41e6-b339-92b41d0cfc70
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/ide/media/find-files-search-results.png

@@ -6,8 +6,8 @@ ms.date: 04/16/2021
 ms.custom: 
 ms.topic: overview
 ms.assetid: 9a3fdb28-db3d-4970-bc17-7417a985f0fb
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/advanced-build-tools-container.md

@@ -9,8 +9,8 @@ helpviewer_keywords:
 - automate
 - installation
 - command-line
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/applying-administrator-updates.md

@@ -5,8 +5,8 @@ ms.date: 09/24/2019
 ms.custom: seodec18
 ms.topic: conceptual
 ms.assetid: d79260be-6234-4fd3-89b5-a9756b4a93c1
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/automated-installation-with-response-file.md

@@ -5,8 +5,8 @@ ms.date: 02/18/2020
 ms.custom: seodec18
 ms.topic: conceptual
 ms.assetid: 140083f1-05bc-4014-949e-fb5802397c7a
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/automatically-apply-product-keys-when-deploying-visual-studio.md

@@ -6,8 +6,8 @@ ms.date: 03/25/2020
 ms.custom: seodec18
 ms.topic: conceptual
 ms.assetid: d5c038e2-e70d-411e-950c-8a54917b578a
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/build-tools-container-issues.md

@@ -9,8 +9,8 @@ helpviewer_keywords:
 - select an installation location for Visual Studio files
 - move installation files to different drives
 - use the D drive
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/build-tools-container.md

@@ -3,8 +3,8 @@ title: When package payloads change after a release
 description: When creating a layout, learn how to determine if package payloads changed after a release has already shipped.
 ms.date: 05/22/2019
 ms.topic: how-to
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/change-installation-locations.md

@@ -5,8 +5,8 @@ ms.date: 03/30/2019
 ms.custom: seodec18
 ms.topic: conceptual
 ms.assetid: 837F31AA-F121-46e9-9996-F8BCE768E579
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/changed-payloads.md

@@ -8,8 +8,8 @@ helpviewer_keywords:
 - '{{PLACEHOLDER}}'
 - '{{PLACEHOLDER}}'
 ms.assetid: 35C7AB05-07D5-4B38-BCAC-AB88444E7368
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/command-line-parameter-examples.md

@@ -8,8 +8,8 @@ helpviewer_keywords:
 - '{{PLACEHOLDER}}'
 - '{{PLACEHOLDER}}'
 ms.assetid: 4CABFD20-962E-482C-8A76-E4012052F701
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/controlling-updates-to-visual-studio-deployments.md

@@ -9,8 +9,8 @@ f1_keywords:
 - offline install [Visual Studio]
 - layout [Visual Studio]
 ms.assetid: f8625d5e-f6ea-4db0-83c0-619b77fab3cf
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/create-a-network-installation-of-visual-studio.md

@@ -11,8 +11,8 @@ helpviewer_keywords:
 - '{{PLACEHOLDER}}'
 - '{{PLACEHOLDER}}'
 ms.assetid: 2429993A-3F0E-41C5-9562-FEA6AE994440
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/create-an-offline-installation-of-visual-studio.md

@@ -6,8 +6,8 @@ ms.date: 04/06/2021
 ms.custom: 
 ms.topic: overview
 ms.assetid: 546fbad6-f12b-49cf-bccc-f2e63e051a18
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/disable-or-move-the-package-cache.md

@@ -9,8 +9,8 @@ helpviewer_keywords:
 - export installation configuration
 - install Visual Studio
 - Visual Studio installer
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.workload:
 - multiple

docs/install/enabling-administrator-updates.md

@@ -1,6 +1,6 @@
 ---
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.date: 05/28/2021
 ms.prod: visual-studio-windows

docs/install/import-export-installation-configurations.md

@@ -1,6 +1,6 @@
 ---
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.date: 03/23/2020
 ms.prod: visual-studio-windows

docs/install/includes/install-error-codes-md.md

@@ -2,8 +2,8 @@
 title: Visual Studio Build Tools 2017 workload and component IDs
 titleSuffix: ""
 description: "Use Visual Studio workload and component IDs to build classic Windows-based applications"
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.date: 2/12/2019
 ms.prod: visual-studio-windows

docs/install/includes/install_get_support_md.md

@@ -3,8 +3,8 @@ title: Visual Studio Community 2017 workload and component IDs
 titleSuffix: ""
 description: "Use workload and component IDs to install Visual Studio by using the command line or to specify as a dependency in a VSIX manifest"
 keywords:
-author: j-martens
-ms.author: jmartens
+author: anandmeg
+ms.author: meghaanand
 manager: jmartens
 ms.date: 2/12/2019
 ms.prod: visual-studio-windows