Merge pull request #7019 from MicrosoftDocs/master637661126307480550

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/remote-debugging-aspnet-on-a-remote-iis-7-5-computer.md

@@ -2,7 +2,7 @@
 title: "Remote debug ASP.NET on an IIS computer"
 description: Learn how to set up and configure a Visual Studio ASP.NET MVC 4.5.2 application, deploy it to IIS, and attach the remote debugger from Visual Studio. 
 ms.custom: ['remotedebugging', 'seodec18']
-ms.date: 05/06/2020
+ms.date: 08/31/2021
 ms.topic: "conceptual"
 ms.assetid: 9cb339b5-3caf-4755-aad1-4a5da54b2a23
 author: "mikejo5000"
@@ -244,7 +244,16 @@ For information on running the remote debugger as a service, see [Run the remote
 
     The breakpoint should be hit in Visual Studio.
 
-## <a name="bkmk_openports"></a> Troubleshooting: Open required ports on Windows Server
+## Troubleshooting IIS deployment
+
+- If you can't connect to the host using the host name, try the IP address instead.
+- Make sure the required ports are open on the remote server.
+- Verify that the version of ASP.NET used in your app is the same as the version you installed on the server. For your app, you can view and set the version in the **Properties** page. To set the app to a different version, that version must be installed.
+- If the app tried to open, but you see a certificate warning, choose to trust the site. If you already closed the warning, you can edit the publishing profile, a *.pubxml file, in your project and add the following element (for test only): `<AllowUntrustedCertificate>true</AllowUntrustedCertificate>`
+- If the app does not start from Visual Studio, start the app in IIS to test that it deployed correctly.
+- Check the Output window in Visual Studio for status information, and check your error messages.
+- 
+## <a name="bkmk_openports"></a> Open required ports on Windows Server
 
 In most setups, required ports are opened by the installation of ASP.NET and the remote debugger. However, you may need to verify that ports are open.
 

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

@@ -2,7 +2,7 @@
 title: "Remote Debug ASP.NET Core on a Remote IIS Computer | Microsoft Docs"
 description: Debug an ASP.NET Core application that has been deployed to a remote Internet Information Services (IIS) computer using the Visual Studio remote debugger.
 ms.custom: "remotedebugging, SEO-VS-2020"
-ms.date: 05/06/2020
+ms.date: 08/27/2021
 ms.topic: "conceptual"
 ms.assetid: 573a3fc5-6901-41f1-bc87-557aa45d8858
 author: "mikejo5000"
@@ -81,7 +81,7 @@ When you download the software, you may get requests to grant permission to load
 
 1. Install the .NET Core Hosting Bundle on the hosting system. The bundle installs the .NET Core Runtime, .NET Core Library, and the ASP.NET Core Module. For more in-depth instructions, see [Publishing to IIS](/aspnet/core/publishing/iis?tabs=aspnetcore2x#iis-configuration).
 
-    For .NET Core 3, install the [.NET Core Hosting Bundle](https://dotnet.microsoft.com/permalink/dotnetcore-current-windows-runtime-bundle-installer).
+    For the current .NET Core hosting bundle, install the [ASP.NET Core Hosting Bundle](https://dotnet.microsoft.com/permalink/dotnetcore-current-windows-runtime-bundle-installer).
     For .NET Core 2, install the [.NET Core Windows Server Hosting](https://aka.ms/dotnetcore-2-windowshosting).
 
     > [!NOTE]
@@ -237,7 +237,17 @@ For information on running the remote debugger as a service, see [Run the remote
 
     The breakpoint should be hit in Visual Studio.
 
-## <a name="bkmk_openports"></a> Troubleshooting: Open required ports on Windows Server
+## Troubleshooting IIS deployment
+
+- If you can't connect to the host using the host name, try the IP address instead.
+- Make sure the required ports are open on the remote server.
+- For ASP.NET Core, you need to make sure that the Application pool field for the **DefaultAppPool** is set to **No Managed Code**.
+- Verify that the version of ASP.NET used in your app is the same as the version you installed on the server. For your app, you can view and set the version in the **Properties** page. To set the app to a different version, that version must be installed.
+- If the app tried to open, but you see a certificate warning, choose to trust the site. If you already closed the warning, you can edit the publishing profile, a *.pubxml file, in your project and add the following element (for test only): `<AllowUntrustedCertificate>true</AllowUntrustedCertificate>`
+- If the app does not start from Visual Studio, start the app in IIS to test that it deployed correctly.
+- Check the Output window in Visual Studio for status information, and check your error messages.
+
+## <a name="bkmk_openports"></a> Open required ports on Windows Server
 
 In most setups, required ports are opened by the installation of ASP.NET and the remote debugger. However, you may need to verify that ports are open.
 
@@ -246,14 +256,14 @@ In most setups, required ports are opened by the installation of ASP.NET and the
 
 Required ports:
 
-* 80 - Required for IIS
+* 80 - Required for IIS (HTTP)
 ::: 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"
 * 4022 - Required for remote debugging from Visual Studio 2017 (see [Remote Debugger Port Assignments](../debugger/remote-debugger-port-assignments.md) for more information).
 ::: moniker-end
-* UDP 3702 - (Optional) Discovery port enables you to the **Find** button when attaching to the remote debugger in Visual Studio.
+* UDP 3702 - (Optional) Discovery port enables you to use the **Find** button when attaching to the remote debugger in Visual Studio.
 
 1. To open a port on Windows Server, open the **Start** menu, search for **Windows Firewall with Advanced Security**.
 
@@ -266,6 +276,7 @@ Required ports:
 5. Select one or more network types to enable for the port and click **Next**.
 
     The type you select must include the network to which the remote computer is connected.
+
 6. Add the name (for example, **IIS**, **Web Deploy**, or **msvsmon**) for the Inbound Rule and click **Finish**.
 
     You should see your new rule in the Inbound Rules or Outbound Rules list.

docs/debugger/remote-debugging-azure.md

@@ -2,7 +2,7 @@
 title: "Remote Debug ASP.NET Core on IIS and Azure | Microsoft Docs"
 description: Learn how to set up and configure a Visual Studio ASP.NET Core app, deploy it to IIS using Azure, and attach the remote debugger from Visual Studio. 
 ms.custom: "remotedebugging"
-ms.date: 05/06/2020
+ms.date: 08/27/2021
 ms.topic: "conceptual"
 ms.assetid: a6c04b53-d1b9-4552-a8fd-3ed6f4902ce6
 author: "mikejo5000"
@@ -125,9 +125,9 @@ This article includes steps on setting up a basic configuration of IIS on Window
 
 * If you want help to make sure that your app is set up, deployed, and running correctly in IIS so that you can debug, follow all the steps in this topic.
 
-  * Before you begin, follow all the steps described in [Install and run IIS](/azure/virtual-machines/windows/quick-create-portal).
+  * 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.
 
-  * When you open port 80 in the Network security group, 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 (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
 
@@ -144,7 +144,7 @@ When you download the software, you may get requests to grant permission to load
 
 1. Install the .NET Core Hosting Bundle on the hosting system. The bundle installs the .NET Core Runtime, .NET Core Library, and the ASP.NET Core Module. For more in-depth instructions, see [Publishing to IIS](/aspnet/core/publishing/iis?tabs=aspnetcore2x#iis-configuration).
 
-    For .NET Core 3, install the [.NET Core Hosting Bundle](https://dotnet.microsoft.com/permalink/dotnetcore-current-windows-runtime-bundle-installer).
+    For the current .NET Core hosting bundle, install the [ASP.NET Core Hosting Bundle](https://dotnet.microsoft.com/permalink/dotnetcore-current-windows-runtime-bundle-installer).
     For .NET Core 2, install the [.NET Core Windows Server Hosting](https://aka.ms/dotnetcore-2-windowshosting).
 
     > [!NOTE]
@@ -287,7 +287,17 @@ Download the version of the remote tools that matches your version of Visual Stu
 
     The breakpoint should be hit in Visual Studio.
 
-### <a name="bkmk_openports"></a> Troubleshooting: Open required ports on Windows Server
+## Troubleshooting IIS deployment
+
+- If you can't connect to the host using the host name, try the IP address instead.
+- Make sure the required ports are open on the remote server.
+- For ASP.NET Core, you need to make sure that the Application pool field for the **DefaultAppPool** is set to **No Managed Code**.
+- Verify that the version of ASP.NET used in your app is the same as the version you installed on the server. For your app, you can view and set the version in the **Properties** page. To set the app to a different version, that version must be installed.
+- If the app tried to open, but you see a certificate warning, choose to trust the site. If you already closed the warning, you can edit the publishing profile, a *.pubxml file, in your project and add the following element (for test only): `<AllowUntrustedCertificate>true</AllowUntrustedCertificate>`
+- If the app does not start from Visual Studio, start the app in IIS to test that it deployed correctly.
+- Check the Output window in Visual Studio for status information, and check your error messages.
+
+### <a name="bkmk_openports"></a> Open required ports on Windows Server
 
 In most setups, required ports are opened by the installation of ASP.NET and the remote debugger. However, if you are troubleshooting deployment issues and the app is hosted behind a firewall, you may need to verify that the correct ports are open.
 

docs/deployment/includes/create-publish-settings-iis.md

@@ -33,9 +33,9 @@
    * The *msdeploy.axd* file referenced in the `publishUrl` attribute is a dynamically generated HTTP handler file for Web Deploy. (For testing purposes, `http://myhostname:8172` generally works as well.)
    * The `publishUrl` port is set to port 8172, which is the default for Web Deploy.
    * The `destinationAppUrl` port is set to port 80, which is the default for IIS.
-   * If you are unable to connect to the remote host in Visual Studio using the host name (in later steps), test the IP address in place of the host name.
+   * If, in later steps, you are unable to connect to the remote host from Visual Studio using the host name, test the server's IP address in place of the host name.
 
      > [!NOTE]
-     > If you are publishing to IIS running on an Azure VM, you must open the Web Deploy and IIS ports in the Network Security group. For detailed information, see [Install and run IIS](/azure/virtual-machines/windows/quick-create-portal#install-web-server).
+     > If you are publishing to IIS running on an Azure VM, you must open an inbound port for Web Deploy and IIS in the Network Security group. For detailed information, see [Open ports to a virtual machine](/azure/virtual-machines/windows/nsg-quickstart-portal).
 
 5. Copy this file to the computer where you are running Visual Studio.

docs/deployment/includes/install-web-deploy-with-hosting-server.md

@@ -1,5 +1,7 @@
 Web Deploy 3.6 for Hosting Servers provides additional configuration features that enable the creation of the publish settings file from the UI.
 
+The Web Platform Installer for IIS allows installation of version 3.6, not 4.0, so that is the version we recommend in this article.
+
 1. If you have Web Deploy already installed on Windows Server, uninstall it using **Control Panel** > **Programs** > **Uninstall a Program**.
 
 2. Next, install Web Deploy 3.6 for Hosting Servers on Windows Server.

docs/deployment/tutorial-import-publish-settings-azure.md

@@ -1,7 +1,7 @@
 ---
 title: "Publish to Azure by importing publish settings"
 description: "Create and import a publishing profile to deploy an application from Visual Studio to Azure App Service"
-ms.date: 05/06/2020
+ms.date: 08/27/2021
 ms.topic: tutorial
 helpviewer_keywords:
   - "deployment, publish settings"
@@ -85,7 +85,7 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr
         msdeploySite="DeployASPDotNetCore"
         userName="$DeployASPDotNetCore"
         userPWD="abcdefghijklmnopqrstuzwxyz"
-        destinationAppUrl="http://deployaspdotnetcore20180508031824.azurewebsites.net"
+        destinationAppUrl="http://deployaspdotnetcore2021.azurewebsites.net"
         SQLServerDBConnectionString=""
         mySQLDBConnectionString=""
         hostingProviderForumLink=""

docs/deployment/tutorial-import-publish-settings-iis.md

@@ -1,7 +1,7 @@
 ---
 title: "Publish to IIS by importing publish settings"
 description: "Create and import a publishing profile to deploy an application from Visual Studio to IIS"
-ms.date: 05/06/2020
+ms.date: 08/27/2021
 ms.topic: tutorial
 helpviewer_keywords:
   - "deployment, publish settings"
@@ -79,7 +79,17 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr
 
 [!INCLUDE [import-publish-settings](../deployment/includes/import-publish-settings-vs.md)]
 
-After the app deploys successfully, it should start automatically. If it does not start from Visual Studio, start the app in IIS. For ASP.NET Core, you need to make sure that the Application pool field for the **DefaultAppPool** is set to **No Managed Code**.
+After the app deploys successfully, it should start automatically.
+
+## Troubleshooting
+
+- If you can't connect to the host using the host name, try the IP address instead.
+- Make sure the required ports are open on the remote server.
+- For ASP.NET Core, you need to make sure that the Application pool field for the **DefaultAppPool** is set to **No Managed Code**.
+- Verify that the version of ASP.NET used in your app is the same as the version you installed on the server. For your app, you can view and set the version in the **Properties** page. To set the app to a different version, that version must be installed.
+- If the app tried to open, but you see a certificate warning, choose to trust the site. If you already closed the warning, you can edit the *.pubxml file in your project and add the following element (for test only): `<AllowUntrustedCertificate>true</AllowUntrustedCertificate>`
+- If the app does not start from Visual Studio, start the app in IIS to test that it deployed correctly.
+- Check the Output window in Visual Studio for status information, and check your error messages.
 
 ## Next steps
 

docs/ide/media/solution-explorer-context-menu-add-flyout.png

@@ -1,8 +1,9 @@
 ---
 title: Learn about the Solution Explorer tool window
 description: Learn how you can use the Solution Explorer tool window in Visual Studio to create & manage your files, projects, and solutions.
-ms.date: 06/29/2021
+ms.date: 08/31/2021
 ms.topic: conceptual
+ms.custom: contperf-fy22q1
 f1_keywords:
 - vs.addnewitem
 helpviewer_keywords:
@@ -25,7 +26,7 @@ You can use the Solution Explorer tool window to create & manage your solutions
 
 To start, let's take a look at the Solution Explorer tool window in the [Visual Studio IDE](../get-started/visual-studio-ide.md), with an open C# console solution that has two projects.
 
-[![The Solution Explorer tool window in Visual Studio.](media/solution-explorer-tool-window.png)](media/solution-explorer-tool-window.png#lightbox)
+[![An annotated screenshot of the Solution Explorer tool window in Visual Studio.](media/solution-explorer-tool-window.png)](media/solution-explorer-tool-window.png#lightbox)
 
 The tool window contains the following UI (user interface) elements:
 
@@ -45,7 +46,7 @@ The tool window contains the following UI (user interface) elements:
 
 To continue, let's take a closer look at the Solution Explorer menu bar.
 
-![The Solution Explorer menu bar in Visual Studio.](media/solution-explorer-menu-bar.png)
+![An annotated screenshot of the Solution Explorer menu bar in Visual Studio.](media/solution-explorer-menu-bar.png)
 
 The menu bar contains the following UI elements, from left to right:
 
@@ -61,9 +62,25 @@ The menu bar contains the following UI elements, from left to right:
 - **Properties** button, to view and change settings for specific files and components
 - **Preview Selected Items** button, to view a selected file or component in the code editor
 
-### Solution Explorer right-click context menu
+## Solution Explorer context menu
 
-In Solution Explorer, there are several file properties that you can interact with by using the right-click context menu. For more information about the right-click context menu options, see the [Manage project and solution properties](managing-project-and-solution-properties.md) page.
+In Solution Explorer, there are several options that you can interact with by using the context menu. The following screenshot shows the context menu options that appear when you right-click the **Solution** node.
+
+:::image type="content" source="media/solution-explorer-context-menu.png" alt-text="Screenshot of the right-click context menu in Solution Explorer.":::
+
+What you see in the context menu from the **Solution** node also depends on your solution. The following screenshot highlights the following extra options: **Project Dependencies**, **Project Build Order**, **Set Startup Projects**, and a **Git** fly-out menu. These extra options appear when you add another project to the solution and then add the solution to a repo.
+
+:::image type="content" source="media/solution-explorer-context-menu-added-items.png" alt-text="Screenshot of the right-click context menu in Solution Explorer with extra options.":::
+
+## Add menu
+
+In the Solution Explorer context menu, one of the most useful options is the **Add** fly-out menu. From it, you can [add another project](../get-started/csharp/tutorial-console-part-2.md#add-another-project) to a solution. You can also [add an item](reference/add-new-item-command.md) to a project, and more.
+
+:::image type="content" source="media/solution-explorer-context-menu-add-flyout.png" alt-text="Screenshot of the Add fly-out menu from the right-click context menu in Solution Explorer.":::
+
+You can view the **Add** fly-out menu from either the **Solution** node, the **Project** node, or the **Dependencies** node. The options vary, depending on which node you use.
+
+For a tutorial that walks you through how to add items and projects by using the context menu in Solution Explorer, see the [Introduction to projects and solutions](../get-started/tutorial-projects-solutions.md#add-an-item-to-the-project) page.
 
 ## See also