Skip to content

Commit c3e9101

Browse files
authored
Merge branch 'master' into amburns-vsmac-feedback
2 parents 124c4c3 + a3c0f4d commit c3e9101

15 files changed

+74
-60
lines changed

docs/debugger/intellitrace-features.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ You can use IntelliTrace to record events and method calls your application, whi
5959
If you're debugging, stop debugging. Go to **Tools / Options / IntelliTrace / IntelliTrace Events**. Choose the events you want IntelliTrace to record.
6060

6161
## <a name="GoingFurther"></a> Collect IntelliTrace events and call information
62-
This isn't enabled by default, but IntelliTrace can record method calls along with events. To enable collection of method calls go to **Tools / Options / IntelliTrace / General**, and select **IntelliTrace events and call information**.
62+
This isn't enabled by default, but IntelliTrace can record method calls along with events. To enable collection of method calls go to **Tools / Options / IntelliTrace / General**, and select **IntelliTrace events and call information**.
63+
64+
> [!NOTE]
65+
> Call information is not currently available for ASP.NET Core apps.
6366
6467
This lets you see the call stack history and step backward and forward through calls in your code. IntelliTrace records data such as method names, method entry and exit points, and certain parameter values and return values.
6568

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Remote Debug ASP.NET on a Remote IIS Computer | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
3+
ms.custom: "remotedebugging"
44
ms.date: "07/26/2017"
55
ms.reviewer: ""
66
ms.suite: ""
@@ -41,7 +41,7 @@ There are many ways you can deploy and debug on IIS. Here are a few of the commo
4141
|-|-|-|
4242
|[Azure App Service](https://docs.microsoft.com/en-us/aspnet/core/tutorials/publish-to-azure-webapp-using-vs)|From Visual Studio, you can quickly publish and debug your app to a fully provisioned instance of IIS. However, the configuration of IIS is preset and you cannot customize it. To use this option, choose **Microsoft Azure App Service** from the **Publish** dialog box, follow the prompts to publish, and debug in **Server Explorer** by right-clicking on the App Service instance, and choosing **Attach Debugger**.|
4343
|[Azure VM](../debugger/remote-debugging-azure.md)|If you want more control of the IIS configuration, you can [install the IIS role on an Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-hero-role), download and run the RDP file, and open ports in the Network security group, as described in the [Azure VM tutorial](../debugger/remote-debugging-azure.md).|
44-
|[Windows Server](#bkmk_configureII)|Follow the steps in this tutorial to remote debug on Windows Server or a VM running Windows Server.|
44+
|[Windows Server](#bkmk_configureIIS)|Follow the steps in this tutorial to remote debug on Windows Server or a VM running Windows Server.|
4545

4646
## Create the ASP.NET 4.5.2 application on the Visual Studio computer
4747

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Remote Debug ASP.NET Core on a Remote IIS Computer | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
4-
ms.date: "03/22/2017"
3+
ms.custom: "remotedebugging"
4+
ms.date: "07/26/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -42,7 +42,7 @@ There are many ways you can deploy and debug on IIS. Here are a few of the commo
4242
|-|-|-|
4343
|[Azure App Service](https://docs.microsoft.com/en-us/aspnet/core/tutorials/publish-to-azure-webapp-using-vs)|From Visual Studio, you can quickly publish and debug your app to a fully provisioned instance of IIS. However, the configuration of IIS is preset and you cannot customize it. To use this option, choose **Microsoft Azure App Service** from the **Publish** dialog box, follow the prompts to publish, and debug in **Server Explorer** by right-clicking on the App Service instance, and choosing **Attach Debugger**.|
4444
|[Azure VM](../debugger/remote-debugging-azure.md)|If you want more control of the IIS configuration, you can [install the IIS role on an Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-hero-role), download and run the RDP file, and open ports in the Network security group, as described in the [Azure VM tutorial](../debugger/remote-debugging-azure.md).|
45-
|[Windows Server](#bkmk_configureII)|Follow the steps in this tutorial to remote debug on Windows Server or a VM running Windows Server.|
45+
|[Windows Server](#bkmk_configureIIS)|Follow the steps in this tutorial to remote debug on Windows Server or a VM running Windows Server.|
4646

4747
## Create the ASP.NET Core application on the Visual Studio 2017 computer
4848

docs/debugger/remote-debugging-azure.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Remote Debug ASP.NET Core on IIS and Azure | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
4-
ms.date: "03/31/2017"
3+
ms.custom: "remotedebugging"
4+
ms.date: "07/26/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -42,6 +42,9 @@ This topic shows how to:
4242

4343
* Remote debug ASP.NET Core on an Azure VM
4444

45+
> [!NOTE]
46+
> To debug ASP.NET Core on Azure Service Fabric, see [Debug a remote Service Fabric application](/azure/service-fabric/service-fabric-debugging-your-application#debug-a-remote-service-fabric-application).
47+
4548
## Create the ASP.NET Core application on the Visual Studio 2017 computer
4649

4750
1. Create a new ASP.NET Core application. (Choose **File / New / Project**, then select **Visual C# / Web / ASP.NET Core Web Application (.NET Core)**)

docs/debugger/remote-debugging-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Remote Debug a Visual C++ Project | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
3+
ms.custom: "remotedebugging"
44
ms.date: "05/18/2017"
55
ms.reviewer: ""
66
ms.suite: ""

docs/debugger/remote-debugging-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Remote Debug a C# or VB Project in Visual Studio | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
3+
ms.custom: "remotedebugging"
44
ms.date: "05/18/2017"
55
ms.reviewer: ""
66
ms.suite: ""

docs/debugger/remote-debugging.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Remote debugging in Visual Studio | Microsoft Docs"
3-
ms.custom: "H1Hack27Feb2017"
4-
ms.date: "04/03/2017"
3+
ms.custom: "remotedebugging"
4+
ms.date: "07/26/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -51,7 +51,7 @@ For in-depth instructions on remote debugging, see these topics.
5151
|C++|[Remote Debugging a C++ Project](remote-debugging-cpp.md)|
5252
|Universal Windows Apps (UWP)|[Debug an Installed App Package](debug-installed-app-package.md)|
5353
|Azure|[Remote Debugging ASP.NET on Azure](remote-debugging-azure.md)|
54-
|Azure Cloud Service|[Debugging an Azure cloud service](https://docs.microsoft.com/en-us/azure/vs-azure-tools-debug-cloud-services-virtual-machines)|
54+
|Azure Service Fabric|[Debug a remote Service Fabric application](/azure/service-fabric/service-fabric-debugging-your-application#debug-a-remote-service-fabric-application).|
5555

5656
If you just want to download and install the remote debugger and don't need any additional instructions for your scenario, follow the steps in this article.
5757

docs/debugger/unable-to-connect-to-the-microsoft-visual-studio-remote-debugging-monitor.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ This message may occur because the remote debugging monitor is not properly set
4848
The `Unable to Connect to the Microsoft Visual Studio Remote Debugging Monitor` message is generic. Usually, a more specific message is included in the error string and that may help you identify the cause of the problem or search for a more exact fix. Here are a few of the more common error messages that are appended to the main error message:
4949

5050
- [The debugger cannot connect to the remote computer. The debugger was unable to resolve the specified computer name](#cannot_connect)
51+
- [Connection request was rejected by the remote debugger](#rejected)
5152
- [There is no server by the specified name running on the remote computer](#no_server)
5253
- [The requested name was valid, but no data of the requested type was found](#valid_name)
5354
- [The Visual Studio Remote Debugger on the target computer cannot connect back to this computer](#cant_connect_back)
@@ -61,6 +62,12 @@ An invalid computer name was entered in the **Attach to Process** dialog box or
6162

6263
If correcting the computer name does not resolve this error, see [The remote machine is not reachable](#dns).
6364

65+
## <a name="rejected"></a> Connection request was rejected by the remote debugger
66+
67+
In the **Attach to Process** dialog box or in the project properties, make sure that the remote computer name and the port number matches the name and port number shown in the remote debugger window. If incorrect, fix and try again.
68+
69+
If these values are correct and the message mentions **Windows Authentication** mode, check that the remote debugger is in the correct authentication mode (**Tools / Options**).
70+
6471
## <a name="no_server"></a> There is no server by the specified name running on the remote computer
6572

6673
Visual Studio could not connect to the remote debugger. This message may occur for several reasons:

docs/debugger/using-saved-intellitrace-data.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,14 @@ Go to specific points in your application's execution when you start debugging f
8484

8585
|**Section**|**Contains**|**Collection Source**|
8686
|-----------------|------------------|---------------------------|
87-
|[Performance Violations](#Performance)|Performance events with function calls that exceed the configured threshold|Microsoft Monitoring Agent, either alone or with System Center 2012 R2 Operations Manager for ASP.NET web apps hosted on IIS|
87+
|[Performance Violations](#Performance)|Performance events with function calls that exceed the configured threshold|Microsoft Monitoring Agent, either standalone collector or with System Center 2012 R2 Operations Manager for ASP.NET web apps hosted on IIS|
8888
|[Exception Data](#ExceptionData)|Exceptions, including the full call stack for each exception|All sources|
89-
|[Analysis](#Analysis)|For SharePoint 2010 and SharePoint 2013 applications only. Diagnose IntelliTrace and SharePoint events, such as debugger events, ULS events, unhandled exceptions, and other data that the Microsoft Monitoring Agent recorded.|Microsoft Monitoring Agent, either alone or with System Center 2012 R2 Operations Manager|
89+
|[Analysis](#Analysis)|For SharePoint 2010 and SharePoint 2013 applications only. Diagnose IntelliTrace and SharePoint events, such as debugger events, ULS events, unhandled exceptions, and other data that the Microsoft Monitoring Agent recorded.|Microsoft Monitoring Agent, either standalone collector or with System Center 2012 R2 Operations Manager|
9090
|[System Info](#SystemInfo)|Settings and specifications of the host system|All sources|
9191
|[Threads List](#ThreadsList)|Threads that ran during collection|All sources|
9292
|[Test Data](#TestData)|Test steps and their results from a test session|Test Manager|
93-
|[Modules](#Modules)|Modules that the target process loaded in the order that they loaded.|All sources|
93+
|[Modules](#Modules)|Modules that the target process loaded in the order that they loaded.|All sources|
94+
|[Web Request](#Modules)|Web request data for production IIS web applications and SharePoint 2010 and SharePoint 2013|Microsoft Monitoring Agent and the standalone collector|
9495

9596
Here's some tips to help you find information in each section:
9697

docs/debugger/walkthrough-using-intellitrace.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ You can use IntelliTrace to collect information about specific events or categor
9393
8. If you didn't find the bug, try examining other events leading up to the bug. You can also have IntelliTrace record call information so you can step through function calls.
9494

9595
## Using IntelliTrace with events and function calls
96-
IntelliTrace can record function calls along with events. This lets you see the call stack history and step backward and forward through calls in your code. IntelliTrace records data such as function names, function entry and exit points, and certain parameter values and return values. See [IntelliTrace Features](../debugger/intellitrace-features.md).
96+
IntelliTrace can record function calls along with events. This lets you see the call stack history and step backward and forward through calls in your code. IntelliTrace records data such as function names, function entry and exit points, and certain parameter values and return values. See [IntelliTrace Features](../debugger/intellitrace-features.md).
97+
98+
> [!NOTE]
99+
> Call information is not currently available for ASP.NET Core apps.
97100

98101
1. Turn on call collection. (On **Tools / Options / IntelliTrace / General**, select **IntelliTrace events and call information**. IntelliTrace will start collecting this information when the next debugging session starts.
99102

docs/ide/how-to-sign-application-and-deployment-manifests.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If you want to publish an application by using ClickOnce deployment, the applica
4444

4545
Signing the ClickOnce manifests is optional for .exe-based applications. For more information, see the "Generating Unsigned Manifests" section of this document.
4646

47-
For information about creating key files, see [How to: Create a Public-Private Key Pair](http://msdn.microsoft.com/Library/05026813-f3bd-4d7c-9e0b-fc588eb3d114).
47+
For information about creating key files, see [How to: Create a Public-Private Key Pair](/dotnet/framework/app-domains/how-to-create-a-public-private-key-pair).
4848

4949
> [!NOTE]
5050
> [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] supports only Personal Information Exchange (PFX) key files that have the .pfx extension. However, you can select other types of certificates from the current user's Windows certificate store by clicking **Select from Store** on the **Signing** page of project properties.
@@ -119,7 +119,7 @@ If you want to publish an application by using ClickOnce deployment, the applica
119119
3. Publish the application.
120120

121121
## See Also
122-
[Strong-Named Assemblies](http://msdn.microsoft.com/Library/d4a80263-f3e0-4d81-9b61-f0cbeae3797b)
123-
[How to: Create a Public-Private Key Pair](http://msdn.microsoft.com/Library/05026813-f3bd-4d7c-9e0b-fc588eb3d114)
122+
[Strong-Named Assemblies](/dotnet/framework/app-domains/strong-named-assemblies)
123+
[How to: Create a Public-Private Key Pair](/dotnet/framework/app-domains/how-to-create-a-public-private-key-pair)
124124
[Signing Page, Project Designer](../ide/reference/signing-page-project-designer.md)
125125
[ClickOnce Security and Deployment](../deployment/clickonce-security-and-deployment.md)

docs/ide/managing-assembly-and-manifest-signing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ Strong-name signing gives a software component a globally unique identity. Stron
7474
> [!WARNING]
7575
> You should always protect your key file with a password to prevent someone else from using it. You can also secure your keys by using providers or certificate stores.
7676
77-
You can also point to a key you have already created. For more information about creating keys, see [How to: Create a Public-Private Key Pair](http://msdn.microsoft.com/Library/05026813-f3bd-4d7c-9e0b-fc588eb3d114).
77+
You can also point to a key you have already created. For more information about creating keys, see [How to: Create a Public-Private Key Pair](/dotnet/framework/app-domains/how-to-create-a-public-private-key-pair).
7878

7979
If you have access only to a public key, you can use delay signing to defer assigning the key. You enable delay signing by selecting the **Delay sign only** check box. A delay-signed project won't run, and you can't debug it. However, you can skip verification during development by using the [Sn.exe (Strong Name Tool)](/dotnet/framework/tools/sn-exe-strong-name-tool) with the `-Vr` option.
8080

8181
For information about signing manifests, see [How to: Sign Application and Deployment Manifests](../ide/how-to-sign-application-and-deployment-manifests.md).
8282

8383
## See Also
84-
[Strong-Named Assemblies](http://msdn.microsoft.com/Library/d4a80263-f3e0-4d81-9b61-f0cbeae3797b)
84+
[Strong-Named Assemblies](/dotnet/framework/app-domains/strong-named-assemblies)
8585
[Strong Name Assemblies (Assembly Signing) (C++/CLI)](/cpp/dotnet/strong-name-assemblies-assembly-signing-cpp-cli)

docs/ide/reference/signing-page-project-designer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Use the **Signing** page of the **Project Designer** to sign the application and
7676

7777
## Assembly Signing
7878
**Sign the assembly** check box
79-
Select this check box to sign the assembly and create a strongly named key file. For more information about signing the assembly by using the **Project Designer**, see [How to: Sign an Assembly (Visual Studio)](http://msdn.microsoft.com/en-us/f468a7d3-234c-4353-924d-8e0ae5896564).
79+
Select this check box to sign the assembly and create a strongly named key file. For more information about signing the assembly by using the **Project Designer**, see [How to: Sign an Assembly (Visual Studio)](../managing-assembly-and-manifest-signing.md#how-to-sign-an-assembly-in-visual-studio).
8080

8181
This option uses the Al.exe tool provided by the [!INCLUDE[winsdklong](/dotnet/framework/app-domains/how-to-sign-an-assembly-with-a-strong-name).
8282

@@ -103,6 +103,6 @@ Use the **Signing** page of the **Project Designer** to sign the application and
103103
[Managing Assembly and Manifest Signing](../../ide/managing-assembly-and-manifest-signing.md)
104104
[Strong-Name Signing for Managed Applications](http://msdn.microsoft.com/en-us/5fef3490-c519-4363-94fd-8b1ad260dab5)
105105
[How to: Sign Application and Deployment Manifests](../../ide/how-to-sign-application-and-deployment-manifests.md)
106-
[How to: Sign an Assembly (Visual Studio)](http://msdn.microsoft.com/en-us/f468a7d3-234c-4353-924d-8e0ae5896564)
106+
[How to: Sign an Assembly (Visual Studio)](../managing-assembly-and-manifest-signing.md#how-to-sign-an-assembly-in-visual-studio)
107107
[How to: Sign an Assembly with a Strong Name](/dotnet/framework/app-domains/how-to-sign-an-assembly-with-a-strong-name)
108-
[Strong-Named Assemblies](http://msdn.microsoft.com/Library/d4a80263-f3e0-4d81-9b61-f0cbeae3797b)
108+
[Strong-Named Assemblies](/dotnet/framework/app-domains/strong-named-assemblies)

0 commit comments

Comments
 (0)