Merge pull request MicrosoftDocs#3931 from MicrosoftDocs/master637040126023242926

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: gewarren

docs/debugger/debugger-feature-tour.md

@@ -110,6 +110,16 @@ When you press **Restart**, it saves time versus stopping the app and restarting
 
 If you do want to stop the debugger and get back into the code editor, you can press the red stop ![Stop Debugging](../debugger/media/dbg-tour-stop-debugging.png "Stop Debugging") button instead of **Restart**.
 
+## Edit your code and continue debugging (C#, VB, C++, XAML)
+
+In most languages supported by Visual Studio, you can edit your code in the middle of a debugging session and continue debugging. To use this feature, click into your code with your cursor while paused in the debugger, make edits, and press **F5**, **F10**, or **F11** to continue debugging.
+
+![Edit and continue debugging](../debugger/media/dbg-tips-edit-and-continue.gif "EditAndContinue")
+
+For more information on using the feature and on feature limitations, see [Edit and Continue](../debugger/edit-and-continue.md).
+
+To modify XAML code during a debugging session, see [Write and debug running XAML code with XAML Hot Reload](xaml-hot-reload.md).
+
 ## Inspect variables with data tips
 
 Now that you know your way around a little, you have a good opportunity to start inspecting your app state (variables) with the debugger. Features that allow you to inspect variables are some of the most useful features of the debugger, and there are different ways to do it. Often, when you try to debug an issue, you are attempting to find out whether variables are storing the values that you expect them to have in a particular app state.

docs/debugger/debugger-tips-and-tricks.md

@@ -33,6 +33,10 @@ In most languages supported by Visual Studio, you can edit your code in the midd
 
 For more information on using the feature and on feature limitations, see [Edit and Continue](../debugger/edit-and-continue.md).
 
+## Edit XAML code and continue debugging
+
+To modify XAML code during a debugging session, see [Write and debug running XAML code with XAML Hot Reload](xaml-hot-reload.md).
+
 ## Debug issues that are hard to reproduce
 
 If it is difficult or time-consuming to recreate a particular state in your app, consider whether the use of a conditional breakpoint can help. You can use [conditional breakpoints](../debugger/using-breakpoints.md#BKMK_Specify_a_breakpoint_condition_using_a_code_expression) and filter breakpoints to avoid breaking into your app code until the app enters a desired state (such as a state in which a variable is storing bad data). You can set conditions using expressions, filters, hit counts, and so on.

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

@@ -121,7 +121,7 @@ Disables the JIT optimization of managed code when a module is loaded and JIT is
 Enables the script debugger for ASP.NET apps. On first use in Chrome, you may need to sign into the browser to enable Chrome extensions that you have installed. Disable this option to revert to legacy behavior.
 
 **Enable Edge Developer Tools for UWP JavaScript Apps (Experimental)**:
-Enables developer tools for UWP JavaScript apps in Edge.
+Enables developer tools for UWP JavaScript apps in Microsoft Edge.
 
 **Enable legacy Chrome JavaScript debugger for ASP.NET**:
 Enables the legacy Chrome JavaScript script debugger for ASP.NET apps. On first use in Chrome, you may need to sign into the browser to enable Chrome extensions that you have installed.
@@ -169,7 +169,7 @@ The Live Visual Tree and the Live Property Explore windows will appear when you
     Shows the **Live Visual Tree** commands in a toolbar on the main window of the XAML application that is being debugged. This option was introduced in Visual Studio 2015 Update 2.
 
 - **Enable XAML Hot Reload**:
-    Allows you to use the XAML hot reload feature with XAML code when your app is running. (This feature was previously called "XAML Edit and Continue")
+    Allows you to use the XAML Hot Reload feature with XAML code when your app is running. (This feature was previously called "XAML Edit and Continue")
 
 **Enable Diagnostic Tools while debugging**:
 The **Diagnostic Tools** window appears while you are debugging.

docs/debugger/inspect-xaml-properties-while-debugging.md

@@ -97,3 +97,7 @@ You can use these XAML tools even when you don't have the source code. When you
 3. The application starts running.
 
 4. In the second instance of Visual Studio, open the **Live Visual Tree** (**Debug > Windows > Live Visual Tree**). You should see the **TestXaml** UI elements, and you should be able to manipulate them as you did while debugging the application directly.
+
+## See also
+
+[Write and debug running XAML code with XAML Hot Reload](xaml-hot-reload.md)

docs/debugger/media/xaml-hot-reload-available.png

@@ -126,8 +126,12 @@
         href: edit-and-continue-visual-basic.md
       - name: Apply edits in break mode with Edit and Continue
         href: how-to-apply-edits-in-break-mode-with-edit-and-continue.md
-    - name: Write and debug running XAML code
-      href: xaml-hot-reload.md
+    - name: XAML Hot Reload
+      items:
+      - name: Write and debug running XAML code
+        href: xaml-hot-reload.md
+      - name: Troubleshooting XAML Hot Reload
+        href: xaml-hot-reload-troubleshooting.md
     - name: Edit and Continue not supported for F#
       href: edit-and-continue-not-supported-for-f-hash.md
   - name: View debugger data

docs/debugger/media/xaml-hot-reload-enable.png

@@ -0,0 +1,65 @@
+---
+title: "Troubleshooting XAML Hot Reload"
+description: "Fix problems that you may encounter with XAML Hot Reload."
+ms.date: "09/04/2019"
+ms.topic: troubleshooting
+helpviewer_keywords:
+  - "xaml edit and continue, troubleshooting"
+  - "xaml hot reload, troubleshooting"
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: jillfra
+ms.workload:
+  - "multiple"
+---
+# Troubleshooting XAML Hot Reload
+
+This troubleshooting guide includes detailed instructions that should resolve most issues that prevent XAML Hot Reload from working correctly.
+
+XAML Hot Reload is supported for WPF and UWP apps. For details on operating system and tooling requirements, see [Write and debug running XAML code with XAML Hot Reload](xaml-hot-reload.md).
+
+## Hot Reload is not available
+
+If you see the message "Hot Reload is not available" in the in-app toolbar while debugging your app, follow the instructions described in this article to resolve the issue.
+
+## Verify that XAML Hot Reload is enabled
+
+The feature is enabled by default. When you start debugging your app, make sure you see the in-app toolbar, which confirms that XAML Hot Reload is available:
+
+![XAML Hot Reload available](../debugger/media/xaml-hot-reload-available.png)
+
+If you do not see the in-app toolbar, then open **Debug** > **Options** > **General**. Make sure that both options, **Enable UI Debugging Tools for XAML** and **Enable XAML Hot Reload** are selected.
+
+![Enable XAML Hot Reload](../debugger/media/xaml-hot-reload-enable.png)
+
+If these options are selected, then go to Live Visual Tree (**Debug** > **Windows** > **Live Visual Tree**) and make sure that **Show runtime tools in application** toolbar button (on the far left) is selected.
+
+![Enable XAML Hot Reload](../debugger/media/xaml-hot-reload-show-runtime-tools.png)
+
+## Verify that you use Start Debugging rather than Attach to Process
+
+XAML Hot Reload requires that the environment variable `ENABLE_XAML_DIAGNOSTICS_SOURCE_INFO` is set to 1 at the time application starts. Visual Studio sets this automatically as part of the **Debug** > **Start Debugging** (or **F5**) command. If you want to use XAML Hot Reload with the **Debug** > **Attach to Process** command instead, then set the environment variable yourself.
+
+## Verify that your MSBuild properties are correct
+
+By default, source info is included in a Debug configuration. It is controlled by MSBuild properties in your project files (such as *.csproj). For WPF, the property is `XamlDebuggingInformation`, which must be set to `True`. For UWP, the property is `DisableXbfLineInfo`, which must be set to `False`. For example:
+
+WPF:
+
+`<XamlDebuggingInformation>True</XamlDebuggingInformation>` 
+
+UWP:
+
+`<DisableXbfLineInfo>False</DisableXbfLineInfo>`
+
+## Verify that you are using the correct build configuration name
+
+You must either manually set the correct MSBuild property to support XAML Hot Reload (see previous section), or you must use the default build configuration name (Debug). If you don't set the MSBuild property correctly, a custom build configuration name won't work, nor will a Release build.
+
+## Verify that your XAML file has no errors
+
+If your XAML file shows errors in the **Error List**, then XAML Hot Reload may not work.
+
+## See also
+
+[Write and debug running XAML code with XAML Hot Reload](xaml-hot-reload.md)