Skip to content

Commit fbbab5d

Browse files
authored
Merge pull request #3062 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents 2217b3a + ab29c36 commit fbbab5d

6 files changed

+14
-14
lines changed

docs/debugger/error-remote-debugging-monitor-msvsmon-exe-does-not-appear-to-be-running.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ This error message means that Visual Studio could not find the correct instance
3232
The following sections list some other reasons why you might have gotten this message, and what you can do to fix the issue.
3333

3434
## The remote machine is not reachable
35-
Try to [ping](https://technet.microsoft.com/en-us/library/ee624059\(v=ws.10\).aspx) the remote machine. If it doesn't reply to the ping, the remote tools won't be able to connect either. Try rebooting the remote machine and otherwise making sure that it is correctly configured on the network.
35+
Try to [ping](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/ee624059(v=ws.10)) the remote machine. If it doesn't reply to the ping, the remote tools won't be able to connect either. Try rebooting the remote machine and otherwise making sure that it is correctly configured on the network.
3636

3737
## The version of the remote debugger doesn't match the version of Visual Studio
3838
The version of Visual Studio that you are running locally needs to match the version of the remote debugging monitor that is running on the remote machine. To fix this, download and install the matching version of the remote debugging monitor. Go to the [Download Center](http://www.microsoft.com/en-us/download) to find the right version of the remote debugger.
3939

4040
## The local and remote machines have different authentication modes
41-
The local and remote machines need to use the same authentication mode. To fix this, make sure that both machines are using the same authentication mode. For more information about authentication modes, see [Windows Authentication Overview](https://technet.microsoft.com/en-us/library/hh831472.aspx).
41+
The local and remote machines need to use the same authentication mode. To fix this, make sure that both machines are using the same authentication mode. For more information about authentication modes, see [Windows Authentication Overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831472(v=ws.11)).
4242

4343
## The remote debugger is running under a different user account
4444
You can solve this in one of the following ways:
@@ -69,4 +69,4 @@ This error message means that Visual Studio could not find the correct instance
6969
res://*\<Visual Studio installation directory>*\Common7\IDE\Remote%20Debugger\x64\msvsmon.exe/help.htm
7070

7171
## See Also
72-
[Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)
72+
[Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ This may be a legacy issue specific to Windows XP and Windows 7. See this [infor
110110

111111
If you cannot connect using the remote computer name, try using the IP address instead. You can use `ipconfig` in a command line on the remote computer to get the IPv4 address. If you are using a HOSTS file, verify that it is configured correctly.
112112

113-
If that fails, verify that the remote computer is accessible on the network ([ping](https://technet.microsoft.com/en-us/library/cc732509(v=ws.10).aspx) the remote machine). Remote debugging over the Internet is not supported, except in some Microsoft Azure scenarios.
113+
If that fails, verify that the remote computer is accessible on the network ([ping](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/ee624059(v=ws.10)) the remote machine). Remote debugging over the Internet is not supported, except in some Microsoft Azure scenarios.
114114

115115
### <a name="server_incorrect"></a> The server name is incorrect or third-party software is interfering with the remote debugger
116116

@@ -147,7 +147,7 @@ You can solve this in one of the following ways:
147147
### The local and remote machines have different authentication modes
148148
The local and remote machines need to use the same authentication mode. To fix this, make sure that both machines are using the same authentication mode. You can change the authentication mode. In the remote debugger window, go to the **Tools > Options** dialog box.
149149

150-
For more information about authentication modes, see [Windows Authentication Overview](https://technet.microsoft.com/en-us/library/hh831472.aspx).
150+
For more information about authentication modes, see [Windows Authentication Overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831472(v=ws.11)).
151151

152152
### Anti-virus software is blocking the connections
153153
Windows anti-virus software allows remote debugger connections, but some third-party anti-virus software may block them. Check the documentation for your anti-virus software to find out how to allow these connections.
@@ -162,4 +162,4 @@ You can solve this in one of the following ways:
162162
To get more remote debugger help, open the remote debugger's Help page (**Help > Usage** in the remote debugger).
163163

164164
## See Also
165-
[Remote Debugging](../debugger/remote-debugging.md)
165+
[Remote Debugging](../debugger/remote-debugging.md)

docs/debugger/using-the-microsoft-monitoring-agent.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ms.workload:
1212
- "multiple"
1313
---
1414
# Using the Microsoft Monitoring Agent
15-
You can locally monitor IIS-hosted ASP.NET web apps and SharePoint 2010 or 2013 applications for errors, performance issues, or other problems by using **Microsoft Monitoring Agent**. You can save diagnostic events from the agent to an IntelliTrace log (.iTrace) file. You can then open the log in Visual Studio Enterprise (but not Professional or Community editions) to debug problems with all the Visual Studio diagnostic tools. You can also collect IntelliTrace diagnostic data and method data by running the agent in **Trace** mode. Microsoft Monitoring Agent can be integrated with [Application Insights](/azure/application-insights/) and [System Center Operation Manager](http://technet.microsoft.com/library/hh205987.aspx). Microsoft Monitoring Agent does alter the target system's environment when it is installed.
15+
You can locally monitor IIS-hosted ASP.NET web apps and SharePoint 2010 or 2013 applications for errors, performance issues, or other problems by using **Microsoft Monitoring Agent**. You can save diagnostic events from the agent to an IntelliTrace log (.iTrace) file. You can then open the log in Visual Studio Enterprise (but not Professional or Community editions) to debug problems with all the Visual Studio diagnostic tools. You can also collect IntelliTrace diagnostic data and method data by running the agent in **Trace** mode. Microsoft Monitoring Agent can be integrated with [Application Insights](/azure/application-insights/) and [System Center Operation Manager](/previous-versions/system-center/system-center-2012-R2/hh205987(v=sc.12)). Microsoft Monitoring Agent does alter the target system's environment when it is installed.
1616

1717
> [!NOTE]
1818
> You can also collect IntelliTrace diagnostic and method data for web, SharePoint, WPF, and Windows Form apps on remote machines without changing the target environment by using the **IntelliTrace stand-alone collector**. The stand-alone collector has a greater performance impact than running the Microsoft Monitoring Agent in **Monitor** mode. See [Using the IntelliTrace stand-alone collector](../debugger/using-the-intellitrace-stand-alone-collector.md).
1919
20-
If you use System Center 2012, use Microsoft Monitoring Agent with Operations Manager to get alerts about problems and create Team Foundation Server work items with links to the saved IntelliTrace logs. You can then assign these work items to others for further debugging. See [Integrating Operations Manager with Development Processes](http://technet.microsoft.com/library/jj614609.aspx) and [Monitoring with Microsoft Monitoring Agent](http://technet.microsoft.com/en-us/library/dn465153.aspx).
20+
If you use System Center 2012, use Microsoft Monitoring Agent with Operations Manager to get alerts about problems and create Team Foundation Server work items with links to the saved IntelliTrace logs. You can then assign these work items to others for further debugging. See [Integrating Operations Manager with Development Processes](/previous-versions/system-center/system-center-2012-R2/jj614609(v=sc.12)) and [Monitoring with Microsoft Monitoring Agent](/previous-versions/system-center/system-center-2012-R2/dn465153(v=sc.12)).
2121

2222
Before you start, check that you have the matching source and symbols for the built and deployed code. This helps you go directly to the application code when you start debugging and browsing diagnostic events in the IntelliTrace log. [Set up your builds](../debugger/diagnose-problems-after-deployment.md) so that Visual Studio can automatically find and open the matching source for your deployed code.
2323

@@ -28,13 +28,13 @@ You can locally monitor IIS-hosted ASP.NET web apps and SharePoint 2010 or 2013
2828
3. [Step 3: Save recorded events](#SaveEvents)
2929

3030
## <a name="SetUpMonitoring"></a> Step 1: Set up Microsoft Monitoring Agent
31-
Set up the standalone agent on your web server to perform local monitoring without changing your application. If you use System Center 2012, see [Installing Microsoft Monitoring Agent](http://technet.microsoft.com/library/dn465156.aspx).
31+
Set up the standalone agent on your web server to perform local monitoring without changing your application. If you use System Center 2012, see [Installing Microsoft Monitoring Agent](/previous-versions/system-center/system-center-2012-R2/dn465156(v=sc.12)).
3232

3333
### <a name="SetUpStandaloneMMA"></a> Set up the standalone agent
3434

3535
1. Make sure that:
3636

37-
- Your web server is running [supported versions of Internet Information Services (IIS)](http://technet.microsoft.com/en-us/library/dn465154.aspx).
37+
- Your web server is running [supported versions of Internet Information Services (IIS)](/previous-versions/system-center/system-center-2012-R2/dn465154(v=sc.12)).
3838

3939
- Your web server has .NET Framework 3.5, 4, or 4.5.
4040

@@ -295,4 +295,4 @@ You can locally monitor IIS-hosted ASP.NET web apps and SharePoint 2010 or 2013
295295
[Optimizing IntelliTrace Collection on Production Servers](http://go.microsoft.com/fwlink/?LinkId=255233)
296296

297297
#### Forums
298-
[Visual Studio Diagnostics](http://go.microsoft.com/fwlink/?LinkId=262263)
298+
[Visual Studio Diagnostics](http://go.microsoft.com/fwlink/?LinkId=262263)

docs/vsto/granting-trust-to-documents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.workload:
2727
## Trusted locations
2828
Applications in [!INCLUDE[Office_15_short](../vsto/includes/office-15-short-md.md)] and Office 2010 have Trust Centers where users can configure security and privacy settings, such as trusted locations. For Office solutions, the local computer is considered a trusted location. However, because of higher risk, there are certain directories that cannot ever be trusted, such as the temporary folders for the system, for each user, and for Internet Explorer.
2929

30-
For more information about the Trust Center, see [Security and policies and settings in Office 2010](http://go.microsoft.com/fwlink/?LinkId=89202). For more information about how to create, manage, remove, and configure trusted folders, see [Configure trusted locations and trusted publishers settings in the 2007 Office system](http://go.microsoft.com/fwlink/?LinkId=89203) and [Create, remove, or change a trusted location for your files](https://support.office.com/en-au/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
30+
For more information about the Trust Center, see [Security and policies and settings in Office 2010](http://go.microsoft.com/fwlink/?LinkId=89202). For more information about how to create, manage, remove, and configure trusted folders, see [Configure trusted locations and trusted publishers settings in the 2007 Office system](http://go.microsoft.com/fwlink/?LinkId=89203) and [Create, remove, or change a trusted location for your files](https://support.office.com/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
3131

3232
## Security considerations for Office solutions
3333
There are several security concerns when you consider which folders to add to the trusted locations:

docs/vsto/how-to-create-office-projects-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ ms.workload:
151151

152152
- You are creating a Word Template project that is based on a *.dotx* file. You must add the project folder to the list of trusted locations so that you can run and debug the project.
153153

154-
For more information on how to add a document to the trusted locations, see the Microsoft Office Online web site [Create, remove, or change a trusted location for your files](https://support.office.com/en-au/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
154+
For more information on how to add a document to the trusted locations, see the Microsoft Office Online web site [Create, remove, or change a trusted location for your files](https://support.office.com/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
155155

156156
## See also
157157
[Office project templates overview](../vsto/office-project-templates-overview.md)

docs/vsto/securing-office-solutions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ ms.workload:
6363

6464
- Document-level solutions for Word that use *.doc* or *.docm* files.
6565

66-
Include the subdirectories when you add the document location to the trusted locations list, or specifically include the debug and build folders. For more information, see the Microsoft Office Online Help article [Create, remove, or change a trusted location for your files](https://support.office.com/en-au/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
66+
Include the subdirectories when you add the document location to the trusted locations list, or specifically include the debug and build folders. For more information, see the Microsoft Office Online Help article [Create, remove, or change a trusted location for your files](https://support.office.com/article/Create-remove-or-change-a-trusted-location-for-your-files-f5151879-25ea-4998-80a5-4208b3540a62).
6767

6868
### Temporary certificates
6969
Visual Studio creates a temporary certificate if a signing certificate does not already exist. You should use this temporary certificate only during development, and purchase an official certificate for deployment.

0 commit comments

Comments
 (0)