Merge pull request #131 from Microsoft/master

Merge master to live

Author: Greg Van Liew

docs/TOC.md

@@ -11,6 +11,6 @@
 # [Data Access](data-tools/TOC.md)
 # [Cross-Platform Mobile Development](cross-platform/TOC.md)
 # [Port, Migrate, and Upgrade Your Code](porting\port-migrate-and-upgrade-visual-studio-projects.md)
-# [Extensibility](extensibility/TOC.md)
+# [Extensibility](extensibility/extensibility-in-visual-studio.md)
 # [Talk to Us](ide/talk-to-us.md)
 ## [How to Report a Problem with Visual Studio 2017 RC](ide/how-to-report-a-problem-with-visual-studio-2017.md)

docs/code-quality/ca2001-avoid-calling-problematic-methods.md

@@ -54,7 +54,7 @@ translation.priority.mt:
 |Method|Description|  
 |------------|-----------------|  
 |<xref:System.GC.Collect%2A?displayProperty=fullName>|Calling GC.Collect can significantly affect application performance and is rarely necessary. For more information, see the [Rico Mariani's Performance Tidbits](http://go.microsoft.com/fwlink/?LinkId=169256) blog entry on MSDN.|  
-|<xref:System.Threading.Thread.Resume%2A?displayProperty=fullName><br /><br /> <xref:System.Threading.Thread.Suspend%2A?displayProperty=fullName>|Thread.Suspend and Thread.Resume have been deprecated because of their unpredictable behavior.  Use other classes in the <xref:System.Threading> namespace, such as <xref:System.Threading.Monitor>, <xref:System.Threading.Mutex%2C><xref:System.Threading.Mutex>, and <xref:System.Threading.Semaphore> to synchronize threads or protect resources.|  
+|<xref:System.Threading.Thread.Resume%2A?displayProperty=fullName><br /><br /> <xref:System.Threading.Thread.Suspend%2A?displayProperty=fullName>|Thread.Suspend and Thread.Resume have been deprecated because of their unpredictable behavior.  Use other classes in the <xref:System.Threading> namespace, such as <xref:System.Threading.Monitor>, <xref:System.Threading.Mutex>, <xref:System.Threading.Mutex>, and <xref:System.Threading.Semaphore> to synchronize threads or protect resources.|  
 |<xref:System.Runtime.InteropServices.SafeHandle.DangerousGetHandle%2A?displayProperty=fullName>|The DangerousGetHandle method poses a security risk because it can return a handle that is not valid. See the <xref:System.Runtime.InteropServices.SafeHandle.DangerousAddRef%2A> and the <xref:System.Runtime.InteropServices.SafeHandle.DangerousRelease%2A> methods for more information about how to use the DangerousGetHandle method safely.|  
 |<xref:System.Reflection.Assembly.LoadFrom%2A?displayProperty=fullName><br /><br /> <xref:System.Reflection.Assembly.LoadFile%2A?displayProperty=fullName><br /><br /> <xref:System.Reflection.Assembly.LoadWithPartialName%2A?displayProperty=fullName>|These methods can load assemblies from unexpected locations. For example, see Suzanne Cook's .NET CLR Notes blog posts [LoadFile vs. LoadFrom](http://go.microsoft.com/fwlink/?LinkId=164450) and [Choosing a Binding Context](http://go.microsoft.com/fwlink/?LinkId=164451) on the MSDN Web site for information about methods that load assemblies.|  
 |[CoSetProxyBlanket](http://go.microsoft.com/fwlink/?LinkID=169250) (Ole32)<br /><br /> [CoInitializeSecurity](http://go.microsoft.com/fwlink/?LinkId=169255) (Ole32)|By the time the user code starts executing in a managed process, it is too late to reliably call CoSetProxyBlanket. The common language runtime (CLR) takes initialization actions that may prevent the users P/Invoke from succeeding.<br /><br /> If you do have to call CoSetProxyBlanket for a managed application, we recommend that you start the process by using a native code (C++) executable, call CoSetProxyBlanket in the native code, and then start your managed code application in process. (Be sure to specify a runtime version number.)|  

docs/data-tools/read-xml-data-into-a-dataset.md

@@ -158,7 +158,7 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 
     -   One button reads the XML file into the dataset and displays it in the <xref:System.Windows.Forms.DataGridView> control.  
 
-    -   A second button extracts the schema from the dataset, and through a <xref:System.IO.StringWriter%2C> displays it in the <xref:System.Windows.Forms.TextBox> control.  
+    -   A second button extracts the schema from the dataset, and through a <xref:System.IO.StringWriter> displays it in the <xref:System.Windows.Forms.TextBox> control.  
 
 #### To add controls to the form  
 

docs/debugger/assertions-in-managed-code.md

@@ -173,7 +173,7 @@ Debug.Assert ( temp != 0 );
  C++ does not support the <xref:System.Diagnostics.Debug> class methods. You can achieve the same effect by using the <xref:System.Diagnostics.Trace> class with conditional compilation, such as `#ifdef DEBUG`... `#endif`. You can define these symbols in the **\<Project> Property Pages** dialog box. For more information, see [Changing Project Settings for a Visual Basic Debug Configuration](../debugger/project-settings-for-a-visual-basic-debug-configuration.md) or [Changing Project Settings for a C or C++ Debug Configuration](../debugger/project-settings-for-a-cpp-debug-configuration.md).  
 
 ##  <a name="BKMK_Assert_arguments"></a> Assert arguments  
- <xref:System.Diagnostics.Trace.Assert%2A?displayProperty=fullName> and <xref:System.Diagnostics.Debug.Assert%2A?displayProperty=fullName> take up to three arguments. The first argument, which is mandatory, is the condition you want to check. If you call <xref:System.Diagnostics.Trace.Assert%28System.Boolean%29?displayProperty=fullName> or <xref:System.Diagnostics.Debug.Assert%28System.Boolean%29?displayProperty=fullName> with only one argument, the `Assert` method checks the condition and, if the result is false, outputs the contents of the call stack to the **Output** window. The following example shows <xref:System.Diagnostics.Trace.Assert%28System.Boolean%29?displayProperty=fullName> and <xref:System.Diagnostics.Debug.Assert%28System.Boolean%29?displayProperty=fullName>:  
+ <xref:System.Diagnostics.Trace.Assert%2A?displayProperty=fullName> and <xref:System.Diagnostics.Debug.Assert%2A?displayProperty=fullName> take up to three arguments. The first argument, which is mandatory, is the condition you want to check. If you call <xref:System.Diagnostics.Trace.Assert(System.Boolean)?displayProperty=fullName> or <xref:System.Diagnostics.Debug.Assert(System.Boolean)?displayProperty=fullName> with only one argument, the `Assert` method checks the condition and, if the result is false, outputs the contents of the call stack to the **Output** window. The following example shows <xref:System.Diagnostics.Trace.Assert(System.Boolean)?displayProperty=fullName> and <xref:System.Diagnostics.Debug.Assert(System.Boolean)?displayProperty=fullName>:  
 
 ```vb  
 Debug.Assert(stacksize > 0)  
@@ -185,7 +185,7 @@ Debug.Assert ( stacksize > 0 );
 Trace.Assert ( stacksize > 0 );   
 ```  
 
- The second and third arguments, if present, must be strings. If you call <xref:System.Diagnostics.Trace.Assert%2A?displayProperty=fullName> or <xref:System.Diagnostics.Debug.Assert%2A?displayProperty=fullName> with two or three arguments, the first argument is a condition. The method checks the condition and, if the result is false, outputs the second string and third strings. The following example shows <xref:System.Diagnostics.Debug.Assert%28System.Boolean%2CSystem.String%29?displayProperty=fullName> and <xref:System.Diagnostics.Trace.Assert%28System.Boolean%2CSystem.String%29?displayProperty=fullName> used with two arguments:  
+ The second and third arguments, if present, must be strings. If you call <xref:System.Diagnostics.Trace.Assert%2A?displayProperty=fullName> or <xref:System.Diagnostics.Debug.Assert%2A?displayProperty=fullName> with two or three arguments, the first argument is a condition. The method checks the condition and, if the result is false, outputs the second string and third strings. The following example shows <xref:System.Diagnostics.Debug.Assert(System.Boolean,System.String)?displayProperty=fullName> and <xref:System.Diagnostics.Trace.Assert(System.Boolean,System.String)?displayProperty=fullName> used with two arguments:  
 
 ```vb  
 Debug.Assert(stacksize > 0, "Out of stack space")  

docs/debugger/managing-exceptions-with-the-debugger.md

@@ -191,6 +191,17 @@ public class GenericException<T> : Exception
  You can add the exception to **Exception Settings** like this:  
 
  ![adding generic exception](../debugger/media/addgenericexception.png "AddGenericException")  
+
+### Adding Conditions to an Exception
+
+You can set conditions on exceptions in the **Exception Settings** dialog box. Currently supported conditions include the module name(s) to include or exclude for the exception. By setting module names as conditions, you can choose to break for the exception only on particular code modules, or you can avoid breaking on particular modules.
+
+> [!NOTE]
+> Adding conditions to an exception is new in [!include[vs_dev15](../misc/includes/vs_dev15_md.md)]
+
+To add conditional exceptions, choose the **Edit condition** icon in the Exception Settings dialog box or right-click the exception and choose **Edit Conditions**.
+
+![Conditions on an Exception](../debugger/media/dbg-conditional-exception.png "DbgConditionalException")
 
 ## See Also  
  [Continuing Execution After an Exception](../debugger/continuing-execution-after-an-exception.md)   

docs/debugger/media/addgenericexception.png

@@ -113,11 +113,20 @@ Get familiar with commands and shortcuts to navigate code in the debugger and th
 
 -   **Run to the cursor location**  
 
-     To run to the cursor location, place the cursor on an executable line of code in a source window. On the editor's context menu (right-click in the editor), choose **Run to Cursor**. This is like setting a temporary breakpoint.  
+     To run to the cursor location, place the cursor on an executable line of code in a source window. On the editor's context menu (right-click in the editor), choose **Run to Cursor**. This is like setting a temporary breakpoint.
+
+-   **Run to Click** 
+
+    To run to a point in your code while paused in the debugger, select the **Run execution to here** green arrow icon (you see the icon while hovering over a line of code). This eliminates the need to set temporary breakpoints.
+
+    ![Debugger's Run to Click](../debugger/media/dbg-run-to-click.png "DbgRunToClick") 
+
+    > [!NOTE]
+    > **Run to Click** is new in [!include[vs_dev15](../misc/includes/vs_dev15_md.md).
 
 -   **Manually break into code**  
 
-     To break into the next available line of code in an executing app, choose **Debug**, **Break All** (keyboard: **Ctrl+Alt+Break**).  
+     To break into the next available line of code in an executing app, choose **Debug**, **Break All** (keyboard: **Ctrl+Alt+Break**). 
 
      If you break while executing code without corresponding source or symbol (.pdb) files), the debugger displays a **Source Files Not Found** or a **Symbols Not Found** page that can help you find the appropriate files. See [Specify Symbol (.pdb) and Source Files](../debugger/specify-symbol-dot-pdb-and-source-files-in-the-visual-studio-debugger.md). If you can't access the supporting files, you can still debug the assembly instructions in the Disassembly window.  
 

docs/debugger/media/dbg-exception-helper.png

@@ -45,7 +45,7 @@ The debugger includes these new features:
 
 - The **Exception Helper** replaces the Exception Assistant and appears in a non-modal dialog box where the error occurred. The **Exception Helper** provides quicker access to any inner exceptions, additional analysis by the debugger (if available), and immediate access to the **Exception Settings** for the exception. The Exception Helper can also be dragged to a floating view if it is blocking something that you need to see.
 
-    For example, a **NullReferenceException** now shows the variable that has the null reference.
+    For example, a **NullReferenceException** now shows the variable that has the null reference (extra information).
 
     ![Debugger's Exception Helper](../debugger/media/dbg-exception-helper.png "DbgExceptionHelper")
 

docs/debugger/media/exceptionsettingscheckaccess.png

@@ -29,7 +29,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # How to: Publish a WPF Application with Visual Styles Enabled
-Visual styles enable the appearance of common controls to change based on the theme chosen by the user. By default, visual styles are not enabled for Windows Presentation Foundation (WPF) applications, so you must enable them manually. However, enabling visual styles for a WPF application and then publishing the solution causes an error. This topic describes how to resolve this error and the process for publishing a WPF application with visual styles enabled. For more information about visual styles, see [Visual Styles Overview](http://msdn.microsoft.com/en-us/5b5d7bb6-684f-478d-bf5f-b8d18bbcff2e). For more information about the error message, see [Troubleshooting Specific Errors in ClickOnce Deployments](../deployment/troubleshooting-specific-errors-in-clickonce-deployments.md).  
+Visual styles enable the appearance of common controls to change based on the theme chosen by the user. By default, visual styles are not enabled for Windows Presentation Foundation (WPF) applications, so you must enable them manually. However, enabling visual styles for a WPF application and then publishing the solution causes an error. This topic describes how to resolve this error and the process for publishing a WPF application with visual styles enabled. For more information about visual styles, see [Visual Styles Overview](http://msdn.microsoft.com/5b5d7bb6-684f-478d-bf5f-b8d18bbcff2e). For more information about the error message, see [Troubleshooting Specific Errors in ClickOnce Deployments](../deployment/troubleshooting-specific-errors-in-clickonce-deployments.md).  
 
  To resolve the error and to publish the solution, you must perform the following tasks:  
 
@@ -174,6 +174,6 @@ Visual styles enable the appearance of common controls to change based on the th
   
 ## See Also  
  [Troubleshooting Specific Errors in ClickOnce Deployments](../deployment/troubleshooting-specific-errors-in-clickonce-deployments.md)   
- [Visual Styles Overview](http://msdn.microsoft.com/en-us/5b5d7bb6-684f-478d-bf5f-b8d18bbcff2e)   
- [Enabling Visual Styles](VS|Controls|~\controls\userex\cookbook.htm)   
+ [Visual Styles Overview](http://msdn.microsoft.com/5b5d7bb6-684f-478d-bf5f-b8d18bbcff2e)   
+ [Enabling Visual Styles](https://msdn.microsoft.com/library/bb773175.aspx)   
  [Command Prompts](http://msdn.microsoft.com/Library/94fcf524-9045-4993-bfb2-e2d8bad44219)

docs/debugger/media/exceptionunhandledbyuser.png

@@ -41,7 +41,7 @@ elem.Descendants[{namespaceName}localName]
  An indexer of the type `IEnumerable<XElement> Item(String expandedName)`. This indexer takes the expanded name of the specified descendant elements and returns the matching child elements in an <xref:System.Collections.IEnumerable>`<`<xref:System.Xml.Linq.XElement>`>` collection.  
 
 ## Remarks  
- This property is equivalent to the <xref:System.Xml.Linq.XContainer.Descendants%28System.Xml.Linq.XName%29?displayProperty=fullName> method of the <xref:System.Xml.Linq.XContainer> class.  
+ This property is equivalent to the <xref:System.Xml.Linq.XContainer.Descendants(System.Xml.Linq.XName)?displayProperty=fullName> method of the <xref:System.Xml.Linq.XContainer> class.  
 
  The elements in the returned collection are in XML source document order.  
 

docs/debugger/media/restoredefaultexceptions.png

@@ -44,7 +44,7 @@ elem.Elements[{namespaceName}localName]
  An indexer of the type `IEnumerable<XElement> Item(String expandedName)`. This indexer takes the expanded name of the desired child elements and returns the matching child elements in an <xref:System.Collections.IEnumerable>`<`<xref:System.Xml.Linq.XElement>`>` collection.  
 
 ## Remarks  
- This property is equivalent to the <xref:System.Xml.Linq.XContainer.Elements%28System.Xml.Linq.XName%29?displayProperty=fullName> method of the <xref:System.Xml.Linq.XContainer> class.  
+ This property is equivalent to the <xref:System.Xml.Linq.XContainer.Elements(System.Xml.Linq.XName)?displayProperty=fullName> method of the <xref:System.Xml.Linq.XContainer> class.  
 
  The elements in the returned collection are in XML source document order.  
 

docs/debugger/navigating-through-code-with-the-debugger.md

@@ -43,7 +43,7 @@ elem.Xml
  A <xref:System.String> that represents the unformatted XML content of the element.  
 
 ## Remarks  
- This property is equivalent to the <xref:System.Xml.Linq.XNode.ToString%28System.Xml.Linq.SaveOptions%29> method of the <xref:System.Xml.Linq.XNode?displayProperty=fullName> class, with the `SaveOptions` parameter set to <xref:System.Xml.Linq.SaveOptions>.  
+ This property is equivalent to the <xref:System.Xml.Linq.XNode.ToString(System.Xml.Linq.SaveOptions)> method of the <xref:System.Xml.Linq.XNode?displayProperty=fullName> class, with the `SaveOptions` parameter set to <xref:System.Xml.Linq.SaveOptions>.  
 
 ## See Also  
  [XElement Class Dynamic Properties](../designers/xelement-class-dynamic-properties.md)   

docs/debugger/what-s-new-for-the-debugger-in-visual-studio.md

@@ -5,7 +5,7 @@
 # [What's New in the Visual Studio 2017 SDK](what-s-new-in-the-visual-studio-2017-sdk.md)
 ## [Breaking Changes in Extensibility](breaking-changes-2017.md)
 ## [Ngen support in VSIX v3](ngen-support.md)
-## [Installing to external directories](set-install-root.md)
+## [Installing outside the extensions folder](set-install-root.md)
 ## [Migrate debugger COM registration](migrate-debugger-com-registration.md)
 ## [Frequently Asked Questions](faq-2017.md)
 # [How to: Migrate Extensibility Projects to Visual Studio 2017](how-to-migrate-extensibility-projects-to-visual-studio-2017.md)
@@ -211,7 +211,7 @@
 ## [How to: Add a Dependency to a VSIX Package](how-to-add-a-dependency-to-a-vsix-package.md)
 ## [Anatomy of a VSIX Package](anatomy-of-a-vsix-package.md)
 ### [VSIX Extension Schema 2.0 Reference](vsix-extension-schema-2-0-reference.md)
-### [The Structure of the Content_types].xml File](the-structure-of-the-content-types-dot-xml-file.md)
+### [The Structure of the [Content_types].xml File](the-structure-of-the-content-types-dot-xml-file.md)
 ### [VSIX Manifest Designer](vsix-manifest-designer.md)
 ## [Localizing VSIX Packages](localizing-vsix-packages.md)
 ### [VSX Language Pack Schema Reference](vsx-language-pack-schema-reference.md)