Merge pull request #7045 from MicrosoftDocs/master637671711990657730

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/28/2021"
+ms.date: "09/10/2021"
 ms.topic: "conceptual"
 f1_keywords:
   - "vs.debug.processes.attach"
@@ -102,7 +102,13 @@ For more complete instructions for debugging ASP.NET applications that have been
 
      Verify that Visual Studio adds the required port to the computer name, which appears in the format: **\<remote computer name>:port**
 
-     ::: moniker range=">= vs-2019"
+     ::: moniker range=">= vs-2022"
+
+     > [!NOTE]
+     > If you can't connect using the remote computer name, try using the IP and port address (for example, `123.45.678.9:4022`). 4026 is the default port for the Visual Studio 2022 x64 remote debugger. For other remote debugger port assignments, see [Remote debugger port assignments](remote-debugger-port-assignments.md).
+
+     ::: moniker-end
+     ::: moniker range="vs-2019"
 
      > [!NOTE]
      > If you can't connect using the remote computer name, try using the IP and port address (for example, `123.45.678.9:4022`). 4024 is the default port for the Visual Studio 2019 x64 remote debugger. For other remote debugger port assignments, see [Remote debugger port assignments](remote-debugger-port-assignments.md).

docs/debugger/configure-the-windows-firewall-for-remote-debugging.md

@@ -2,7 +2,7 @@
 title: Configure Windows Firewall for remote debugging | Microsoft Docs
 description: Configure Windows Firewall for remote debugging. Configure ports for remote debugging. Troubleshoot the remote debugging connection.
 ms.custom: SEO-VS-2020
-ms.date: 10/31/2018
+ms.date: 09/10/2021
 ms.topic: how-to
 ms.assetid: 66e3230a-d195-4473-bbce-8ca198516014
 author: mikejo5000
@@ -49,27 +49,35 @@ Visual Studio and the remote debugger try to open the correct ports during insta
 
 For Windows Firewall, you can use PowerShell commands such as [New-NetFirewallRule](/powershell/module/netsecurity/new-netfirewallrule).
 
+::: moniker range="vs-2022"
+The following example opens port 4026 for the remote debugger on the remote computer. The path you need to use may be different.
+
+```ps
+New-NetFirewallRule -DisplayName "msvsmon" -Direction Inbound -Program "Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Remote Debugger\x86\msvsmon.exe" -LocalPort 4026 -Protocol TCP -Authentication Required -Action Allow
+```
+::: moniker-end
+::: moniker range="vs-2019"
 The following example opens port 4024 for the remote debugger on the remote computer. The path you need to use may be different.
 
 ```ps
 New-NetFirewallRule -DisplayName "msvsmon" -Direction Inbound -Program "Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Remote Debugger\x86\msvsmon.exe" -LocalPort 4024 -Protocol TCP -Authentication Required -Action Allow
 ```
+::: moniker-end
 
 ### Ports on the remote computer that enable remote debugging
 
 For remote debugging, the following ports must be open on the remote computer:
 
-::: moniker range="vs-2017"
+::: moniker range="vs-2022"
 
 |**Ports**|**Incoming/Outgoing**|**Protocol**|**Description**|
 |-|-|-|-|
-|4022|Incoming|TCP|For VS 2017. The port number increments by 2 for each Visual Studio version. For more information, see [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
-|4023|Incoming|TCP|For VS 2017. The port number increments by 2 for each Visual Studio version. This port is only used to remote debug a 32-bit process from a 64-bit version of the remote debugger. For more information, see  [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
+|4026|Incoming|TCP|For VS 2022. The port number increments by 2 for each Visual Studio version. For more information, see [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
+|4027|Incoming|TCP|For VS 2022. The port number increments by 2 for each Visual Studio version. This port is only used to remote debug a 32-bit process from a 64-bit version of the remote debugger. For more information, see  [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
 |3702|Outgoing|UDP|(Optional) Required for remote debugger discovery.|
 
 ::: moniker-end
-
-::: moniker range=">= vs-2019"
+::: moniker range="vs-2019"
 
 |**Ports**|**Incoming/Outgoing**|**Protocol**|**Description**|
 |-|-|-|-|
@@ -79,6 +87,18 @@ For remote debugging, the following ports must be open on the remote computer:
 
 ::: moniker-end
 
+::: moniker range="vs-2017"
+
+|**Ports**|**Incoming/Outgoing**|**Protocol**|**Description**|
+|-|-|-|-|
+|4022|Incoming|TCP|For VS 2017. The port number increments by 2 for each Visual Studio version. For more information, see [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
+|4023|Incoming|TCP|For VS 2017. The port number increments by 2 for each Visual Studio version. This port is only used to remote debug a 32-bit process from a 64-bit version of the remote debugger. For more information, see  [Visual Studio remote debugger port assignments](../debugger/remote-debugger-port-assignments.md).|
+|3702|Outgoing|UDP|(Optional) Required for remote debugger discovery.|
+
+::: moniker-end
+
+
+
 If you select **Use Managed Compatibility Mode** under **Tools** > **Options** > **Debugging**, open these additional remote debugger ports. Debugger Managed Compatibility Mode enables a legacy, Visual Studio 2010 version of the debugger.
 
 |**Ports**|**Incoming/Outgoing**|**Protocol**|**Description**|

docs/debugger/includes/remote-debugger-download.md

@@ -5,7 +5,7 @@
  author: mikejo5000
  ms.service: ""
  ms.topic: include
- ms.date: 05/23/2018
+ ms.date: 09/10/2021
  ms.author: mikejo
  ms.custom: include file
 ---
@@ -15,7 +15,19 @@ On the remote device or server that you want to debug on, rather than the Visual
 - Download the most recent remote tools for your version of Visual Studio. The latest remote tools version is compatible with earlier Visual Studio versions, but earlier remote tools versions aren't compatible with later Visual Studio versions. (For example, if you are using Visual Studio 2017, download the latest update of the remote tools for Visual Studio 2017. In this scenario, do not download the remote tools for Visual Studio 2019.)
 - Download the remote tools with the same architecture as the machine you're installing them on. For example, if you want to debug a 32-bit app on a remote computer running a 64-bit operating system, install the 64-bit remote tools.
 
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+
+|Version|Link|Notes|
+|-|-|-|
+|Visual Studio 2022 Preview|[Remote tools for the Preview](https://visualstudio.microsoft.com/vs/preview/)|Compatible with all Visual Studio 2022 versions. Download the version matching your device operating system (x86, x64, or ARM64). On Windows Server, see [Unblock the file download](../../debugger/remote-debugging-unblock-file-download.md) for help downloading the remote tools.|
+|Visual Studio 2019|[Remote tools](https://visualstudio.microsoft.com/downloads#remote-tools-for-visual-studio-2019)|Compatible with all Visual Studio 2019 versions. Download the version matching your device operating system (x86, x64, or ARM64). On Windows Server, see [Unblock the file download](../../debugger/remote-debugging-unblock-file-download.md) for help downloading the remote tools.|
+|Visual Studio 2017|[Remote tools](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202017)|Compatible with all Visual Studio 2017 versions. Download the version matching your device operating system (x86, x64, or ARM64). On Windows Server, see [Unblock the file download](../../debugger/remote-debugging-unblock-file-download.md) for help downloading the remote tools.|
+|Visual Studio 2015|[Remote tools](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202015)|Remote tools for Visual Studio 2015 are available from My.VisualStudio.com. If prompted, join the free [Visual Studio Dev Essentials](https://visualstudio.microsoft.com/dev-essentials/) program, or sign in with your Visual Studio subscription ID. On Windows Server, see [Unblock the file download](../../debugger/remote-debugging-unblock-file-download.md) for help downloading the remote tools.|
+|Visual Studio 2013|[Remote tools](/previous-versions/visualstudio/visual-studio-2013/bt727f1t(v=vs.120)#installing-the-remote-tools)|Download page in Visual Studio 2013 documentation|
+|Visual Studio 2012|[Remote tools](/previous-versions/visualstudio/visual-studio-2012/bt727f1t(v=vs.110)#installing-the-remote-tools)|Download page in Visual Studio 2012 documentation|
+
+::: moniker-end
+::: moniker range="vs-2019"
 
 |Version|Link|Notes|
 |-|-|-|

docs/debugger/remote-debugger-port-assignments.md

@@ -2,7 +2,7 @@
 title: "Remote Debugger Port Assignments | Microsoft Docs"
 description: Understand Visual Studio remote debugger port assignments on 32-bit operating systems, 64-bit operating systems, and Azure. Learn about the discovery port.
 ms.custom: SEO-VS-2020
-ms.date: "05/18/2018"
+ms.date: "09/10/2021"
 ms.topic: "reference"
 ms.assetid: 238bb4ec-bb00-4c2b-986e-18ac278f3959
 author: "mikejo5000"
@@ -14,7 +14,10 @@ ms.workload:
 ---
 # Remote Debugger Port Assignments
 The Visual Studio Remote Debugger can run as an application or as a background service. When it runs as an application, it uses a port that is assigned by default as follows:
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+- Visual Studio 2022: 4026
+::: moniker-end
+::: moniker range="vs-2019"
 - Visual Studio 2019: 4024
 ::: moniker-end
 - Visual Studio 2017: 4022
@@ -29,7 +32,10 @@ In other words, the number of the port assigned to the remote debugger is increm
 
 ## The Remote Debugger Port on 32-bit Operating Systems
 
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+ TCP 4026 (in Visual Studio 2022) is the main port, and is required for all scenarios. You can configure this from either the command line or the remote debugger window.
+::: moniker-end
+::: moniker range="vs-2019"
  TCP 4024 (in Visual Studio 2019) is the main port, and is required for all scenarios. You can configure this from either the command line or the remote debugger window.
 ::: moniker-end
 ::: moniker range="vs-2017"
@@ -43,7 +49,10 @@ In other words, the number of the port assigned to the remote debugger is increm
  You can find all the remote debugger command line switches in the remote debugging help (press **F1** or click **Help > Usage** in the remote debugger window).
 
 ## The Remote Debugger Port on 64-bit Operating Systems
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+ When the 64-bit version of the remote debugger is started, it uses the main port (4026) by default.  If you debug a 32-bit process, the 64-bit version of the remote debugger starts a 32-bit version of the remote debugger on port 4027 (the main port number incremented by 1). If you run the 32-bit remote debugger, it uses 4026, and 4027 is not used.
+::: moniker-end
+::: moniker range="vs-2019"
  When the 64-bit version of the remote debugger is started, it uses the main port (4024) by default.  If you debug a 32-bit process, the 64-bit version of the remote debugger starts a 32-bit version of the remote debugger on port 4025 (the main port number incremented by 1). If you run the 32-bit remote debugger, it uses 4024, and 4025 is not used.
 ::: moniker-end
 ::: moniker range="vs-2017"

docs/debugger/remote-debugging-aspnet-on-a-remote-iis-7-5-computer.md

@@ -209,7 +209,10 @@ For information on running the remote debugger as a service, see [Run the remote
 
     Verify that Visual Studio adds the required port to the computer name, which appears in the format: **\<remote computer name>:port**
 
-    ::: moniker range=">=vs-2019"
+    ::: moniker range=">=vs-2022"
+    On Visual Studio 2022, you should see **\<remote computer name>:4026**
+    ::: moniker-end
+    ::: moniker range="vs-2019"
     On Visual Studio 2019, you should see **\<remote computer name>:4024**
     ::: moniker-end
     ::: moniker range="vs-2017"
@@ -263,6 +266,9 @@ In most setups, required ports are opened by the installation of ASP.NET and the
 Required ports:
 
 * 80 - Required for IIS
+::: moniker range=">=vs-2022"
+* 4026 - Required for remote debugging from Visual Studio 2022 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
+::: moniker-end
 ::: moniker range=">=vs-2019"
 * 4024 - Required for remote debugging from Visual Studio 2019 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
 ::: moniker-end

docs/debugger/remote-debugging-aspnet-on-a-remote-iis-computer.md

@@ -195,7 +195,10 @@ For information on running the remote debugger as a service, see [Run the remote
 
     Verify that Visual Studio adds the required port to the computer name, which appears in the format: **\<remote computer name>:port**
 
-    ::: moniker range=">=vs-2019"
+    ::: moniker range=">=vs-2022"
+    On Visual Studio 2022, you should see **\<remote computer name>:4026**
+    ::: moniker-end
+    ::: moniker range="vs-2019"
     On Visual Studio 2019, you should see **\<remote computer name>:4024**
     ::: moniker-end
     ::: moniker range="vs-2017"
@@ -257,7 +260,10 @@ In most setups, required ports are opened by the installation of ASP.NET and the
 Required ports:
 
 * 80 - Required for IIS (HTTP)
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+* 4026 - Required for remote debugging from Visual Studio 2022 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
+::: moniker-end
+::: moniker range="vs-2019"
 * 4024 - Required for remote debugging from Visual Studio 2019 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
 ::: moniker-end
 ::: moniker range="vs-2017"

docs/debugger/remote-debugging-azure.md

@@ -127,7 +127,7 @@ This article includes steps on setting up a basic configuration of IIS on Window
 
   * Before you begin, follow all the steps described in [Create a Windows Virtual Machine](/azure/virtual-machines/windows/quick-create-portal), which includes steps to install the IIS web server.
 
-  * Make sure you open port 80 in the Azure [Network security group](/azure/virtual-machines/windows/nsg-quickstart-portal). When you verify that port 80 is open, also open the [correct port](#bkmk_openports) for the remote debugger (4024 or 4022). That way, you won't have to open it later. If you're using Web Deploy, also open port 8172.
+  * Make sure you open port 80 in the Azure [Network security group](/azure/virtual-machines/windows/nsg-quickstart-portal). When you verify that port 80 is open, also open the [correct port](#bkmk_openports) for the remote debugger (4026, 4024, or 4022). That way, you won't have to open it later. If you're using Web Deploy, also open port 8172.
 
 ### Update browser security settings on Windows Server
 
@@ -246,7 +246,10 @@ Download the version of the remote tools that matches your version of Visual Stu
 
     Verify that Visual Studio adds the required port to the computer name, which appears in the format: **\<remote computer name>:port**
 
-    ::: moniker range=">=vs-2019"
+    ::: moniker range=">=vs-2022"
+    On Visual Studio 2022, you should see **\<remote computer name>:4026**
+    ::: moniker-end
+    ::: moniker range="vs-2019"
     On Visual Studio 2019, you should see **\<remote computer name>:4024**
     ::: moniker-end
     ::: moniker range="vs-2017"
@@ -306,7 +309,10 @@ On an Azure VM, you must open ports through the [Network security group](/azure/
 Required ports:
 
 * 80 - Required for IIS
-::: moniker range=">=vs-2019"
+::: moniker range=">=vs-2022"
+* 4026 - Required for remote debugging from Visual Studio 2022 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
+::: moniker-end
+::: moniker range="vs-2019"
 * 4024 - Required for remote debugging from Visual Studio 2019 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
 ::: moniker-end
 ::: moniker range="vs-2017"

docs/debugger/remote-debugging-csharp.md

@@ -68,7 +68,10 @@ The debugger cannot deploy Visual C# or Visual Basic desktop applications to a r
 6. Choose **Use remote machine**, and type **yourmachinename:port** in the text box. (The port number is shown in the remote debugger window. The port number increments 2 in each version of Visual Studio).
 
     In this example, use:
-    ::: moniker range=">=vs-2019"
+	::: moniker range="vs-2022"
+    **MJO-DL:4026** on Visual Studio 2019
+    ::: moniker-end
+    ::: moniker range="vs-2019"
     **MJO-DL:4024** on Visual Studio 2019
     ::: moniker-end
     ::: moniker range="vs-2017"
@@ -86,7 +89,7 @@ The debugger cannot deploy Visual C# or Visual Basic desktop applications to a r
     > [!CAUTION]
     > Do not make changes to the code or rebuild (or you must repeat this step). The executable you copied to the remote machine must exactly match your local source and symbols.
 
-    You can copy the project manually, use XCopy, Robocopy, Powershell, or other options.
+    You can copy the project manually, use XCopy, Robocopy, PowerShell, or other options.
 
 11. Make sure the remote debugger is running on the target machine (If it's not, search for **Remote Debugger** in the **Start** menu). The remote debugger window looks like this.
 
@@ -116,4 +119,4 @@ The debugger cannot deploy Visual C# or Visual Basic desktop applications to a r
 - [Configure the Windows Firewall for Remote Debugging](../debugger/configure-the-windows-firewall-for-remote-debugging.md)
 - [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md)
 - [Remote Debugging ASP.NET on a Remote IIS Computer](../debugger/remote-debugging-aspnet-on-a-remote-iis-computer.md)
-- [Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)
+- [Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)

docs/debugger/remote-debugging.md

@@ -2,7 +2,7 @@
 title: "Remote debugging | Microsoft Docs"
 description: Debug a Visual Studio application that has been deployed on a different computer by using the Visual Studio remote debugger.
 ms.custom: ['remotedebugging', 'seodec18', 'SEO-VS-2020']
-ms.date: "7/26/2021"
+ms.date: "09/10/2021"
 ms.topic: "conceptual"
 f1_keywords:
   - "vs.debug.remote.overview"

docs/debugger/watch-and-quickwatch-windows.md

@@ -2,8 +2,10 @@
 title: Set a watch on variables | Microsoft Docs
 description: While you debug, see variables and expressions in Watch and QuickWatch. Watch can display several variables, QuickWatch only one, and only while in break.
 ms.custom: "SEO-VS-2020"
-ms.date: 10/11/2018
+ms.date: 09/10/2021
 ms.topic: how-to
+f1_keywords:
+  - "vs.debug.quickwatch"
 helpviewer_keywords: 
   - debugging [Visual Studio], Watch window
   - expressions [debugger], evaluating
@@ -22,7 +24,7 @@ ms.workload:
 
 While you're debugging, you can use **Watch** windows and **QuickWatch** to watch variables and expressions. The windows are only available during a debugging session.
 
-**Watch** windows can display several variables at a time while debugging. The **QuickWatch** dialog displays a single variable at a time, and must be closed before debugging can continue.
+**Watch** windows can display several variables at a time while debugging. The **QuickWatch** dialog displays a single variable at a time, and must be closed before debugging can continue. For more information on using QuickWatch, see [Observe a single variable or expression with QuickWatch](#observe-a-single-variable-or-expression-with-quickwatch).
 
 > [!NOTE]
 > If this is the first time that you've tried to debug code, you may want to read [Debugging for absolute beginners](../debugger/debugging-absolute-beginners.md) and [Debugging techniques and tools](../debugger/write-better-code-with-visual-studio.md) before going through this article.