Skip to content

Commit 8c1d1b3

Browse files
author
v-masebo
committed
resolved conflicts
2 parents 46de725 + 758220c commit 8c1d1b3

File tree

201 files changed

+1665
-1253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+1665
-1253
lines changed

docs/cross-platform/cross-platform-mobile-development-in-visual-studio.md

Lines changed: 43 additions & 37 deletions
Large diffs are not rendered by default.

docs/debugger/general-debugging-options-dialog-box.md

Lines changed: 53 additions & 50 deletions
Large diffs are not rendered by default.

docs/debugger/how-to-debug-managed-and-native-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ In this tutorial, you will:
111111

112112
1. In *Program.cs*, replace the default code with the following code:
113113

114-
```c#
114+
```csharp
115115
using System;
116116
using System.Runtime.InteropServices;
117117

@@ -178,7 +178,7 @@ In most versions of Visual Studio 2017, you must enable mixed mode debugging for
178178

179179
1. In the C# project, open *Program.cs* and set a breakpoint in the following line of code by clicking in the left margin:
180180

181-
```c#
181+
```csharp
182182
int result = Multiply(7, 7);
183183
```
184184

docs/debugger/includes/remote-debugger-deploy-app-local.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Remote debugger download
3-
description: Download links for the remote debugger
2+
title: Deploy to local folder
3+
description: Deploy an app to a local folder
44
services: ""
55
author: mikejo5000
66
ms.service: ""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Deploy to local folder
3-
description: Deploy an app to the local folder
2+
title: Remote debugger download
3+
description: Download links for the remote debugger
44
services: ""
55
author: mikejo5000
66
ms.service: ""

docs/debugger/includes/remote-debugger-install-iis-role.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ For Windows Server operating systems, use the **Add Roles and Features** wizard
2020

2121
![The Web Server IIS role is selected in the Select server roles step.](../media/remotedbg-server-roles-ws2012.png)
2222

23-
On the **Role services** step, select the IIS role services you desire or accept the default role services provided.
23+
On the **Role services** step, select the IIS role services you desire or accept the default role services provided. If you plan to deploy using Web Deploy, make sure that **IIS Management Scripts and Tools** is selected.
2424

2525
Proceed through the confirmation steps to install the web server role and services. A server/IIS restart is not required after installing the Web Server (IIS) role.
Loading

docs/debugger/output-window-debugging-options-dialog-box.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ ms.workload:
2121
- "multiple"
2222
---
2323
# Output Window, Debugging, Options Dialog Box
24-
You can specify which types of debugging information appear in the **Output** window. To display these options, open the **Tools** menu, click **Options**, expand the **Debugging** node, and click **Output Window**.
25-
26-
**General Output Settings**
24+
You can specify which types of debugging information appear in the **Output** window. To display these options, open the **Tools** menu, click **Options**, expand the **Debugging** node, and click **Output Window**.
25+
26+
**General Output Settings**
2727
This category contains controls that determine whether general debug messages appear in the **Output** window. You can specify whether each type of message appears.
28+
29+
**WPF Trace Settings**
30+
This category contains controls that determine the level of WPF trace messages that appear in the **Output** window. You can specify whether each type of message appears and specify a level ranging from **Critical** to **All**.
31+
32+
For more information, see [How to: Display WPF Trace Information](../debugger/how-to-display-wpf-trace-information.md).
33+
34+
If you need to restore default settings, you can do that using **Tools** > **Import and Export Settings** > **Reset all settings**. If you only want to reset a subset of settings, save your settings in the **Import and Export Settings Wizard** before making the changes that you want to test, then import your saved settings later.
2835

29-
**WPF Trace Settings**
30-
This category contains controls that determine the level of WPF trace messages that appear in the **Output** window. You can specify whether each type of message appears and specify a level ranging from **Critical** to **All**.
31-
32-
For more information, see [How to: Display WPF Trace Information](../debugger/how-to-display-wpf-trace-information.md).
33-
34-
## See Also
35-
[Debugging, Options Dialog Box](../debugger/debugging-options-dialog-box.md)
36-
[Output Window](../ide/reference/output-window.md)
36+
## See also
37+
[Debugging, Options Dialog Box](../debugger/debugging-options-dialog-box.md)
38+
[Output Window](../ide/reference/output-window.md)

docs/debugger/quickstart-debug-aspnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The Visual Studio debugger provides many powerful features to help you debug you
3636

3737
1. In Solution Explorer, open About.cshtml.cs (under Pages/About.cshtml) and replace the following code
3838

39-
```c#
39+
```csharp
4040
public void OnGet()
4141
{
4242
Message = "Your application description page.";
@@ -45,7 +45,7 @@ The Visual Studio debugger provides many powerful features to help you debug you
4545

4646
with this code:
4747

48-
```c#
48+
```csharp
4949
public void OnGet()
5050
{
5151
LinkedList<int> result = doWork();

docs/debugger/quickstart-debug-with-managed.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The Visual Studio debugger provides many powerful features to help you debug you
3232

3333
4. In Program.cs or Module1.vb, replace the following code
3434

35-
```c#
35+
```csharp
3636
class Program
3737
{
3838
static void Main(string[] args)
@@ -50,7 +50,7 @@ The Visual Studio debugger provides many powerful features to help you debug you
5050

5151
with this code:
5252

53-
```c#
53+
```csharp
5454
class Program
5555
{
5656
private static void doWork()

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

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The remote debugger is supported on Windows Server starting with Windows Server
3333
3434
## App already running in IIS?
3535

36-
This article includes steps on setting up a basic configuration of IIS on Windows server and deploying the app from Visual Studio. These steps are included to make sure that requirements are in place and that you are ready to remote debug.
36+
This article includes steps on setting up a basic configuration of IIS on Windows server and deploying the app from Visual Studio. These steps are included to make sure that the server has required components installed, that the app can run correctly, and that you are ready to remote debug.
3737

3838
* If your app is running in IIS and you just want to download the remote debugger and start debugging, go to [Download and Install the remote tools on Windows Server](#BKMK_msvsmon).
3939

@@ -77,17 +77,47 @@ If you want more detailed information to install ASP.NET on IIS, see [IIS 8.0 Us
7777

7878
2. Restart the system (or execute **net stop was /y** followed by **net start w3svc** from a command prompt to pick up a change to the system PATH).
7979

80-
## (Optional) Install Web Deploy 3.6 for Hosting Servers on Windows Server
80+
## Choose a deployment option
8181

82-
In some scenarios, it can be faster to import publish settings in Visual Studio instead of manually configuring deployment options. If you prefer to import publish settings instead of configuring the publishing profile in Visual Studio, see [Import publish settings and deploy to IIS](../deployment/tutorial-import-publish-settings-iis.md). Otherwise, stay in this topic and continue reading. If you complete the article on importing publish settings and deploy the app successfully, then return to this topic and start in the section on [downloading the remote tools](#BKMK_msvsmon).
82+
If you need help to deploy the app to IIS, consider these options:
8383

84-
## <a name="BKMK_install_webdeploy"></a> (Optional) Install Web Deploy 3.6 on Windows Server
84+
* Deploy by creating a publish settings file in IIS and importing the settings in Visual Studio. In some scenarios, this is a fast way to deploy your app. When you create the publish settings file, permissions are automatically set up in IIS.
8585

86-
[!INCLUDE [remote-debugger-install-web-deploy](../debugger/includes/remote-debugger-install-web-deploy.md)]
86+
* Deploy by publishing to a local folder and copying the output by a preferred method to a prepared app folder on IIS.
8787

88-
## <a name="BKMK_deploy_asp_net"></a> Configure ASP.NET Web site on the Windows Server computer
88+
## (Optional) Deploy using a publish settings file
8989

90-
If you are importing publish settings, you can skip this section.
90+
You can use this option create a publish settings file and import it into Visual Studio.
91+
92+
> [!NOTE]
93+
> This deployment method uses Web Deploy. If you want to configure Web Deploy manually in Visual Studio instead of importing the settings, you can install Web Deploy 3.6 instead of Web Deploy 3.6 for Hosting Servers. However, if you configure Web Deploy manually, you will need to make sure that an app folder on the server is configured with the correct values and permissions (see [Configure ASP.NET Web site](#BKMK_deploy_asp_net)).
94+
95+
### Install and configure Web Deploy for Hosting Servers on Windows Server
96+
97+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/install-web-deploy-with-hosting-server.md)]
98+
99+
### Create the publish settings file in IIS on Windows Server
100+
101+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/create-publish-settings-iis.md)]
102+
103+
### Import the publish settings in Visual Studio and deploy
104+
105+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/import-publish-settings-vs.md)]
106+
107+
After the app deploys successfully, it should start automatically. If the app does not start from Visual Studio, start the app in IIS.
108+
109+
1. In the **Settings** dialog box, enable debugging by clicking **Next**, choose a **Debug** configuration, and then choose **Remove additional files at destination** under the **File Publish** options.
110+
111+
> [!NOTE]
112+
> If you choose a Release configuration, you disable debugging in the *web.config* file when you publish.
113+
114+
1. Click **Save** and then republish the app.
115+
116+
## (Optional) Deploy by publishing to a local folder
117+
118+
You can use this option to deploy your app if you want to copy the app to IIS using Powershell, RoboCopy, or you want to manually copy the files.
119+
120+
### <a name="BKMK_deploy_asp_net"></a> Configure the ASP.NET Web site on the Windows Server computer
91121

92122
1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
93123

@@ -105,13 +135,7 @@ If you are importing publish settings, you can skip this section.
105135

106136
8. With the site selected in the IIS Manager, choose **Edit Permissions**, and make sure that IUSR, IIS_IUSRS, or the user configured for the Application Pool is an authorized user with Read & Execute rights. If none of these users are present, add IUSR as a user with Read & Execute rights.
107137

108-
## <a name="bkmk_webdeploy"></a> (Optional) Publish and deploy the app using Web Deploy from Visual Studio
109-
110-
[!INCLUDE [remote-debugger-deploy-app-web-deploy](../debugger/includes/remote-debugger-deploy-app-web-deploy.md)]
111-
112-
Also, you may need to read the section on [Troubleshooting ports](#bkmk_openports).
113-
114-
## (Optional) Publish and Deploy the app by publishing to a local folder from Visual Studio
138+
### Publish and Deploy the app by publishing to a local folder from Visual Studio
115139

116140
You can also publish and deploy the app using the file system or other tools.
117141

@@ -136,6 +160,8 @@ You can also publish and deploy the app using the file system or other tools.
136160

137161
In this tutorial, we are using Visual Studio 2017.
138162

163+
If you have trouble opening the page with the remote debugger download, see [Unblock the file download](../debugger/remote-debugging.md#unblock_msvsmon) for help.
164+
139165
[!INCLUDE [remote-debugger-download](../debugger/includes/remote-debugger-download.md)]
140166

141167
> [!TIP]

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

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Debugging between two computers connected through a proxy is not supported. Debu
2929

3030
## App already running in IIS?
3131

32-
This article includes steps on setting up a basic configuration of IIS on Windows server and deploying the app from Visual Studio. These steps are included to make sure that requirements are in place and that you are ready to remote debug.
32+
This article includes steps on setting up a basic configuration of IIS on Windows server and deploying the app from Visual Studio. These steps are included to make sure that the server has required components installed, that the app can run correctly, and that you are ready to remote debug.
3333

3434
* If your app is running in IIS and you just want to download the remote debugger and start debugging, go to [Download and Install the remote tools on Windows Server](#BKMK_msvsmon).
3535

@@ -71,17 +71,47 @@ When you download the software, you may get requests to grant permission to load
7171
7272
3. Restart the system (or execute **net stop was /y** followed by **net start w3svc** from a command prompt to pick up a change to the system PATH).
7373

74-
## (Optional) Install Web Deploy 3.6 for Hosting Servers on Windows Server
74+
## Choose a deployment option
7575

76-
In some scenarios, it can be faster to import publish settings in Visual Studio instead of manually configuring deployment options. If you prefer to import publish settings instead of configuring the publishing profile in Visual Studio, see [Import publish settings and deploy to IIS](../deployment/tutorial-import-publish-settings-iis.md). Otherwise, stay in this topic and continue reading. If you complete the article on importing publish settings and deploy the app successfully, then return to this topic and start in the section on [downloading the remote tools](#BKMK_msvsmon).
76+
If you need help to deploy the app to IIS, consider these options:
7777

78-
## <a name="BKMK_install_webdeploy"></a> (Optional) Install Web Deploy 3.6 on Windows Server
78+
* Deploy by creating a publish settings file in IIS and importing the settings in Visual Studio. In some scenarios, this is a fast way to deploy your app. When you create the publish settings file, permissions are automatically set up in IIS.
7979

80-
[!INCLUDE [remote-debugger-install-web-deploy](../debugger/includes/remote-debugger-install-web-deploy.md)]
80+
* Deploy by publishing to a local folder and copying the output by a preferred method to a prepared app folder on IIS.
8181

82-
## <a name="BKMK_deploy_asp_net"></a> Configure ASP.NET Web site on the Windows Server computer
82+
## (Optional) Deploy using a publish settings file
8383

84-
If you are importing publish settings, you can skip this section.
84+
You can use this option create a publish settings file and import it into Visual Studio.
85+
86+
> [!NOTE]
87+
> This deployment method uses Web Deploy. If you want to configure Web Deploy manually in Visual Studio instead of importing the settings, you can install Web Deploy 3.6 instead of Web Deploy 3.6 for Hosting Servers. However, if you configure Web Deploy manually, you will need to make sure that an app folder on the server is configured with the correct values and permissions (see [Configure ASP.NET Web site](#BKMK_deploy_asp_net)).
88+
89+
### Install and configure Web Deploy for Hosting Servers on Windows Server
90+
91+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/install-web-deploy-with-hosting-server.md)]
92+
93+
### Create the publish settings file in IIS on Windows Server
94+
95+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/create-publish-settings-iis.md)]
96+
97+
### Import the publish settings in Visual Studio and deploy
98+
99+
[!INCLUDE [install-web-deploy-with-hosting-server](../deployment/includes/import-publish-settings-vs.md)]
100+
101+
After the app deploys successfully, it should start automatically. If the app 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**.
102+
103+
1. In the **Settings** dialog box, enable debugging by clicking **Next**, choose a **Debug** configuration, and then choose **Remove additional files at destination** under the **File Publish** options.
104+
105+
> [!NOTE]
106+
> If you choose a Release configuration, you disable debugging in the *web.config* file when you publish.
107+
108+
1. Click **Save** and then republish the app.
109+
110+
## (Optional) Deploy by publishing to a local folder
111+
112+
You can use this option to deploy your app if you want to copy the app to IIS using Powershell, RoboCopy, or you want to manually copy the files.
113+
114+
### <a name="BKMK_deploy_asp_net"></a> Configure the ASP.NET Web site on the Windows Server computer
85115

86116
1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
87117

@@ -101,18 +131,18 @@ If you are importing publish settings, you can skip this section.
101131

102132
If you don't see one of these users with access, go through steps to add IUSR as a user with Read & Execute rights.
103133

104-
## <a name="bkmk_webdeploy"></a> (Optional) Publish and deploy the app using Web Deploy from Visual Studio
105-
106-
[!INCLUDE [remote-debugger-deploy-app-web-deploy](../debugger/includes/remote-debugger-deploy-app-web-deploy.md)]
107-
108-
## (Optional) Publish and Deploy the app by publishing to a local folder from Visual Studio
134+
### Publish and Deploy the app by publishing to a local folder from Visual Studio
109135

110136
You can also publish and deploy the app using the file system or other tools.
111137

112138
[!INCLUDE [remote-debugger-deploy-app-local](../debugger/includes/remote-debugger-deploy-app-local.md)]
113139

114140
## <a name="BKMK_msvsmon"></a> Download and Install the remote tools on Windows Server
115141

142+
In this tutorial, we are using Visual Studio 2017.
143+
144+
If you have trouble opening the page with the remote debugger download, see [Unblock the file download](../debugger/remote-debugging.md#unblock_msvsmon) for help.
145+
116146
[!INCLUDE [remote-debugger-download](../debugger/includes/remote-debugger-download.md)]
117147

118148
> [!TIP]

0 commit comments

Comments
 (0)