Skip to content

Commit 68368cb

Browse files
authored
Merge branch 'master' into ghogen-coauth
2 parents 8e9f560 + a3c0f4d commit 68368cb

File tree

41 files changed

+345
-387
lines changed

Some content is hidden

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

41 files changed

+345
-387
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/visualstudio-docs",
5454
"git_repository_branch_open_to_public_contributors": "master",
5555
"skip_source_output_uploading": false,
56+
"need_preview_pull_request": true,
5657
"dependent_repositories": [
5758
{
5859
"path_to_root": "_themes",
@@ -70,5 +71,6 @@
7071
}
7172
}
7273
],
74+
"branch_target_mapping": {},
7375
"need_generate_pdf_url_template": false
7476
}

docs/cross-platform/visual-studio-emulator-for-android.md

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Visual Studio Emulator for Android | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "07/17/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -33,23 +33,10 @@ The Visual Studio Emulator for Android is a desktop application that emulates an
3333

3434
The Visual Studio Emulator for Android is designed to provide comparable performance to an actual device. Before you publish your app, however, we recommend that you test your app on a physical device.
3535

36-
You can test your app on a unique device profile for each of the Android platforms, screen resolutions, and other hardware properties supported by Visual Studio Emulator for Android.
37-
38-
This topic contains the following sections.
39-
40-
- [Installing and uninstalling](#Installing)
41-
42-
- [System Requirements and backward compatibility](#Requirements)
43-
44-
- [Networking in the Visual Studio Emulator for Android](#Networking)
45-
46-
- [Configure the Visual Studio Emulator for Android](#Configuring)
47-
48-
- [Features that you can test in the emulator](#FeaturesTest)
49-
50-
- [Features that you can't test in the emulator](#FeaturesNonTest)
51-
52-
- [Support Resources](#Support)
36+
You can test your app on a unique device profile for each of the Android platforms, screen resolutions, and other hardware properties supported by Visual Studio Emulator for Android.
37+
38+
> [!NOTE]
39+
> The Google Android emulator is recommended for use with the Visual Studio Tools for Apache Cordova. For more information, see [Run your Apache Cordova app on Android](/visualstudio/cross-platform/tools-for-cordova/run-your-app/run-app-android#a-idgoogle-android-emulatora-run-on-the-google-android-emulator).
5340
5441
## <a name="Installing"></a> Installing and uninstalling
5542
Installing

docs/debugger/debug-installed-app-package.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ For more information about these features, see the blog post on updates for [deb
5353

5454
## Debug an Installed App Package or Running App on a Local Machine or Device
5555

56-
1. On your Windows 10 device, enable [developer mode](/windows/uwp/get-started/enable-your-device-for-development).
57-
58-
2. With your UWP project open in Visual Studio, select **Debug**, **Other Debug Targets**, and then **Debug Installed App Package**.
56+
1. With your UWP project open in Visual Studio, select **Debug**, **Other Debug Targets**, and then **Debug Installed App Package**.
5957

6058
2. Select either **Local Machine** or **Device**.
6159

docs/debugger/debugger-basics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Debugger Basics | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "07/11/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You must have administrative permissions on the remote computer.
3434

3535
![RemoteDebuggerWindow](../media/remotedebuggerwindow.png "RemoteDebuggerWindow")
3636

37-
The remote debugger is now waiting for a connection. Make a note of the server name and port number that is displayed, because you need this information later for configuration in Visual Studio.
37+
The remote debugger is now waiting for a connection. Make a note of the server name and port number that is displayed, because this must match the configuration you later use in Visual Studio.
3838

3939
When you are finished debugging and need to stop the remote debugger, click **File / Exit** on the window. You can restart it from the **Start** menu or from the command line:
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If you installed Web Deploy using the Web Platform Installer, you can deploy the
3030

3131
![RemoteDBG_Publish_WebDeployl](../media/remotedbg_iis_webdeploy_config.png "RemoteDBG_Publish_WebDeploy")
3232

33-
If a host name doesn't resolve when you try to validate in the next steps in the **Server** text box, try the IP address. Make sure you use port 80 in the **Server** text box, and make sure that port 80 is open in the firewall.
33+
If a host name doesn't resolve when you try to validate in the next steps in the **Server** text box, try the IP address. Include `http://` as a prefix in the **Server** field. Make sure you use port 80 in the **Server** text box, and make sure that port 80 is open in the firewall.
3434

3535
6. Click **Next**, choose a **Debug** configuration, and choose **Remove additional files at destination** under the **File Publish** options.
3636

docs/debugger/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The Visual Studio debugger helps you observe the run-time behavior of your progr
6464
</a>
6565
</li>
6666
<li>
67-
<a href="https://docs.microsoft.com/en-us/visualstudio/debugger/getting-started-with-the-debugger.md#video">
67+
<a href="https://docs.microsoft.com/en-us/visualstudio/debugger/getting-started-with-the-debugger#video">
6868
<div class="cardSize">
6969
<div class="cardPadding">
7070
<div class="card">

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/intellitrace.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "IntelliTrace | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "07/18/2017"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -66,12 +66,12 @@ You can spend less time debugging your application when you use IntelliTrace to
6666

6767
|||
6868
|-|-|
69-
|**Supported**|- Visual Basic and Visual C# applications that use .NET Framework 2.0 or higher versions.<br /> You can debug most applications, including ASP.NET, Microsoft Azure, Windows Forms, WCF, WPF, Windows Workflow, SharePoint 2010, SharePoint 2013, and 64-bit apps.<br /> To debug SharePoint applications with IntelliTrace, see [Walkthrough: Debugging a SharePoint Application by Using IntelliTrace](../sharepoint/walkthrough-debugging-a-sharepoint-application-by-using-intellitrace.md).<br /> To debug Microsoft Azure apps with IntelliTrace, see [Debugging a Published Cloud Service with IntelliTrace and Visual Studio](http://go.microsoft.com/fwlink/?LinkID=262248).|
69+
|**Supported**|- Visual Basic and Visual C# applications that use .NET Framework 2.0 or higher versions.<br /> You can debug most applications, including ASP.NET, Microsoft Azure, Windows Forms, WCF, WPF, Windows Workflow, SharePoint 2010, SharePoint 2013, and 64-bit apps.<br /> To debug SharePoint applications with IntelliTrace, see [Walkthrough: Debugging a SharePoint Application by Using IntelliTrace](../sharepoint/walkthrough-debugging-a-sharepoint-application-by-using-intellitrace.md).<br /> To debug Microsoft Azure apps with IntelliTrace, see [Debugging a Published Cloud Service with IntelliTrace and Visual Studio](/azure/vs-azure-tools-intellitrace-debug-published-cloud-services).|
7070
|**Limited support**|- F# apps on an experimental basis<br />- Windows Store apps supported for events only|
7171
|**Not supported**|- C++, other languages, and script<br />- Windows Services, Silverlight, Xbox, or [!INCLUDE[winmobile](../debugger/includes/winmobile_md.md)] apps|
7272

7373
> [!NOTE]
74-
> If you want to debug a process that is already running, you can't use IntelliTrace. You must start IntelliTrace when the process starts.
74+
> If you want to debug a process that is already running, you can collect IntelliTrace events only (no call information). You can attach to a 32-bit or 64-bit process on the local machine only. Events that occur before you attach to the process are not collected.
7575
7676
## <a name="IntelliTraceVSTraditional"></a> Why debug with IntelliTrace?
7777
Traditional or *live* debugging shows only your application's current state, with limited data about past events. You either have to infer these events based on the application's current state, or you have to recreate these events by rerunning your application.
@@ -82,7 +82,7 @@ You can spend less time debugging your application when you use IntelliTrace to
8282

8383
You can save IntelliTrace data from these sources:
8484

85-
- An IntelliTrace session in Visual Studio 2015 Enterprise or previous versions of Visual Studio Ultimate.
85+
- An IntelliTrace session in Visual Studio 2017 Enterprise, Visual Studio 2015 Enterprise, or previous versions of Visual Studio Ultimate.
8686

8787
- A test session in Microsoft Test Manager
8888

@@ -139,13 +139,11 @@ You can spend less time debugging your application when you use IntelliTrace to
139139

140140
By default, IntelliTrace records the most common .NET Framework events. For example:
141141

142-
- For a File Access event, IntelliTrace collects the file name.
143-
144142
- For a Check Checkbox event, IntelliTrace collects the checkbox state and text.
145143

146144
- **SharePoint 2010 and SharePoint 2013 application events**
147145

148-
You can record user profile events and a subset of Unified Logging System (ULS) events for SharePoint 2010 and 2013 applications running outside Visual Studio. You can save these events to an .iTrace file. Requires Visual Studio Enterprise 2015, a previous version of Visual Studio Ultimate, or [Microsoft Monitoring Agent](http://go.microsoft.com/fwlink/?LinkId=320384) running in **Trace** mode.
146+
You can record user profile events and a subset of Unified Logging System (ULS) events for SharePoint 2010 and 2013 applications running outside Visual Studio. You can save these events to an .iTrace file. Requires Visual Studio Enterprise 2017, Visual Studio Enterprise 2015, a previous version of Visual Studio Ultimate, or [Microsoft Monitoring Agent](http://go.microsoft.com/fwlink/?LinkId=320384) running in **Trace** mode.
149147

150148
When you open the .iTrace file, enter a SharePoint correlation ID to find its matching web request, view the recorded events, and start debugging from a specific event. If the file contains unhandled exceptions, you can choose a correlation ID to start debugging an exception.
151149

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Remote Debug ASP.NET 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:
@@ -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

@@ -87,13 +87,21 @@ On Windows Server 2012 R2, see [IIS Configuration](https://docs.asp.net/en/lates
8787

8888
## <a name="BKMK_deploy_asp_net"></a> Configure ASP.NET Web site on the Windows Server computer
8989

90-
1. Open the **Internet Information Services (IIS) Manager** and go to **Sites**.
90+
1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
9191

92-
2. Right-click the **Default Web Site** node and select **Add Application**.
92+
2. Open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
9393

94-
3. Set the **Alias** field to **MyASPApp** and the Application pool field to **ASP.NET v4.0** (ASP.NET 4.5 is not an option for the Application pool). Set the **Physical path** to **C:\Publish** (where you will later deploy the ASP.NET project).
94+
3. Under **Connections** in the left pane, go to **Sites**.
9595

96-
4. 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 are present, add IUSR as a user with Read & Execute rights.
96+
4. Select the **Default Web Site**, choose **Basic Settings**, and set the **Physical path** to **C:\Publish**.
97+
98+
5. Right-click the **Default Web Site** node and select **Add Application**.
99+
100+
6. Set the **Alias** field to **MyASPApp**, accept the default Application Pool (**DefaultAppPool**), and set the **Physical path** to **C:\Publish**.
101+
102+
7. Under **Connections**, select **Application Pools**. Open **DefaultAppPool** and set the Application pool field to **ASP.NET v4.0** (ASP.NET 4.5 is not an option for the Application pool).
103+
104+
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 are present, add IUSR as a user with Read & Execute rights.
97105

98106
## <a name="bkmk_webdeploy"></a> (Optional) Publish and deploy the app using Web Deploy from Visual Studio
99107

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

Lines changed: 15 additions & 7 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

@@ -82,13 +82,21 @@ When you download the software, you may get requests to grant permission to load
8282

8383
## <a name="BKMK_deploy_asp_net"></a> Configure ASP.NET Web site on the Windows Server computer
8484

85-
1. Open the **Internet Information Services (IIS) Manager** and go to **Sites**.
85+
1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
8686

87-
2. Right-click the **Default Web Site** node and select **Add Application**.
87+
2. Open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
8888

89-
3. Set the **Alias** field to **MyASPApp** and the Application pool field to **No Managed Code**. Set the **Physical path** to **C:\Publish** (where you will later deploy the ASP.NET project).
89+
3. Under **Connections** in the left pane, go to **Sites**.
9090

91-
4. 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.
91+
4. Select the **Default Web Site**, choose **Basic Settings**, and set the **Physical path** to **C:\Publish**.
92+
93+
4. Right-click the **Default Web Site** node and select **Add Application**.
94+
95+
5. Set the **Alias** field to **MyASPApp**, accept the default Application Pool (**DefaultAppPool**), and set the **Physical path** to **C:\Publish**.
96+
97+
6. Under **Connections**, select **Application Pools**. Open **DefaultAppPool** and set the Application pool field to **No Managed Code**.
98+
99+
7. Right-click the new site in the IIS Manager, choose **Edit Permissions**, and make sure that IUSR, IIS_IUSRS, or the user configured for access to the web app is an authorized user with Read & Execute rights.
92100

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

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: 2 additions & 2 deletions
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: ""
@@ -54,7 +54,7 @@ For information about remote debugging apps with Azure backends, see [Remote deb
5454

5555
[!INCLUDE [remote-debugger-configuration](../debugger/includes/remote-debugger-configuration.md)]
5656

57-
## Remote debug a Visual C++ project
57+
## <a name="remote_cplusplus"></a> Remote debug a Visual C++ project
5858
In the following procedure, the name and path of the project is C:\remotetemp\MyMfc, and the name of the remote computer is **MJO-DL**.
5959

6060
1. Create an MFC application named **mymfc.**

0 commit comments

Comments
 (0)