Merge pull request #4708 from MicrosoftDocs/master637157673854234619

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

Author: ghogen

docs/containers/docker-compose-properties.md

@@ -104,6 +104,20 @@ Use double quotes around the values, as in the preceding example, and use the ba
 |com.microsoft.visualstudio.debuggee.program|The program launched when starting debugging. For .NET Core apps, this setting is typically **dotnet**.|
 |com.microsoft.visualstudio.debuggee.workingdirectory|The directory used as the starting directory when starting debugging. This setting is typically */app* for Linux containers, or *C:\app* for Windows containers.|
 
+## Customize the app startup process
+
+You can run a command or custom script before launching your app by using the `entrypoint` setting, and making it dependent on the configuration. For example, if you need to set up a certificate only in **Debug** mode by running `update-ca-certificates`, but not in **Release** mode, you could add the following code only in *docker-compose.vs.debug.yml*:
+
+```yml
+services:
+  webapplication1:
+    entrypoint: "sh -c 'update-ca-certificates && tail -f /dev/null'"
+    labels:
+      ...
+```
+
+If you omit the *docker-compose.vs.release.yml* or *docker-compose.vs.debug.yml* then Visual Studio generates one based on default settings.
+
 ## Next steps
 
 For information on MSBuild properties generally, see [MSBuild Properties](../msbuild/msbuild-properties.md).

docs/debugger/exception-helper.md

@@ -0,0 +1,57 @@
+---
+title: "Inspect an exception - Visual Studio | Microsoft Docs"
+ms.date: "1/18/2020"
+ms.topic: "conceptual"
+dev_langs:
+  - "CSharp"
+  - "VB"
+  - "FSharp"
+  - "C++"
+  - "JavaScript"
+helpviewer_keywords:
+  - "exception helper, debugger, exception"
+  - "debugging [Visual Studio], exception helper, Examine an exception"
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: jillfra
+ms.workload:
+  - "multiple"
+---
+# Inspect an exception using the Exception Helper 
+
+Dealing with exceptions is a common problem, no matter your technology or level of expertise. It can be a frustrating experience figuring out why exceptions are causing problems in your code. When you're debugging an exception in Visual Studio, we want to lessen that frustration by providing you with relevant exception information to help you debug your issue faster.
+
+![Exception Helper](media/debugger-exception-helper-default.png)
+
+## Pause on the exception
+When the debugger breaks on an exception, an exception error icon appears to the right of that line of code. A non-modal Exception helper will appear near the exception icon.
+
+![Exception helper next to a line of code](media/debugger-exception-helper-locerror.png)
+
+## Inspect exception info
+You can instantly read the exception type and exception message in the Exception Helper, and whether the exception was thrown or unhandled. You can inspect and view properties of the Exception object by clicking the **View Details** link.
+
+## Analyze null references
+Starting in Visual Studio 2017, for both .Net and C/C++ code, when you hit a `NullReferenceException` or an `AccessViolation`, you see null analysis information in the Exception Helper. The analysis is displayed as text beneath the exception message. In the illustration below, the information is shown as "**s** was null.".
+
+![Exception helper null analysis](media/debugger-exception-helper-default.png)
+
+
+> [!NOTE]
+> Null reference analysis in managed code requires .NET version 4.6.2. Null analysis is currently not supported for Universal Windows Platform (UWP) and any other .NET Core applications. It is only available while debugging code that does not have any Just-In-Time (JIT) code optimizations.
+
+## Configure exception settings 
+You can configure the debugger to break when an exception of the current type is thrown from the **Exception Settings** section of the Exception Helper. If the debugger is paused at a thrown exception, then you can use the checkbox to disable breaking on that exception type when thrown in the future. If you don't want to break on this particular exception when thrown in this particular module, tick the checkbox by the module name under **Except when thrown from:** in the **Exception Settings** window. 
+
+## Inspect inner exceptions 
+If the exception has any inner exceptions ([InnerException](https://docs.microsoft.com/dotnet/api/system.exception.innerexception), you can view them in the Exception Helper. If there are multiple exceptions present, you can navigate between them using the left and right arrows shown above the call stack.
+
+![Exception helper with inner exception](media/debugger-exception-helper-innerexception.png)
+
+## Inspect rethrown exceptions
+In cases where an exception has been `thrown` the Exception Helper shows the call stack from the first time the exception was thrown. If the exception was thrown multiple times, only the call stack from the original exception is shown.
+
+![Exception helper with rethrown exceptions](media/debugger-exception-helper-innerexception.png)
+
+## Share a debug session with Live Share
+From the Exception Helper, you can start a [Live Share](https://docs.microsoft.com/visualstudio/liveshare/) session using the link **Start Live Share session...**. Anyone who joins the Live Share session can see the Exception Helper along with any other debug information.

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

@@ -52,6 +52,8 @@
     items:
     - name: Inspect data in debugger windows
       href: debugger-windows.md
+    - name: Inspect exceptions
+      href: exception-helper.md 
     - name: Inspect variables
       href: autos-and-locals-windows.md
     - name: Watch variables