Fix failfast stacktrace (dotnet/coreclr#15895)

* attempt to fix stacktrace getting printed twice

* Fix some default parameter issues, and wrong commit from last commit

* Fix build errors, switch call from Debug.Assert to new FailFast FCall

* Fix signature to allow more types of exception title

* cleanup

* Addressing comments from PR

* More PR comments

* remove useless using

* Address comments on GC hole and few naming changes

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>

Author: sywhang

src/Common/src/CoreLib/System/Diagnostics/Debug.Unix.cs

@@ -10,7 +10,7 @@ public static partial class Debug
     {
         private static readonly bool s_shouldWriteToStdErr = Environment.GetEnvironmentVariable("COMPlus_DebugWriteToStdErr") == "1";
 
-        private static void ShowAssertDialog(string stackTrace, string message, string detailMessage)
+        private static void ShowDialog(string stackTrace, string message, string detailMessage, string errorSource)
         {
             if (Debugger.IsAttached)
             {
@@ -22,7 +22,7 @@ private static void ShowAssertDialog(string stackTrace, string message, string d
                 // Fail in order to avoid anyone catching an exception and masking
                 // an assert failure.
                 var ex = new DebugAssertException(message, detailMessage, stackTrace);
-                Environment.FailFast(ex.Message, ex);
+                Environment.FailFast(ex.Message, ex, errorSource);
             }
         }
 

src/Common/src/CoreLib/System/Diagnostics/Debug.cs

@@ -4,6 +4,8 @@
 
 // Do not remove this, it is needed to retain calls to these conditional methods in release builds
 #define DEBUG
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
 
 namespace System.Diagnostics
 {
@@ -91,18 +93,34 @@ public static void Assert(bool condition, string message, string detailMessage)
             if (!condition)
             {
                 string stackTrace;
-
                 try
                 {
-                    stackTrace = Internal.Runtime.Augments.EnvironmentAugments.StackTrace;
+                    stackTrace = new StackTrace(0, true).ToString(System.Diagnostics.StackTrace.TraceFormat.Normal);
                 }
                 catch
                 {
                     stackTrace = "";
                 }
+                WriteLine(FormatAssert(stackTrace, message, detailMessage));
+                s_ShowDialog(stackTrace, message, detailMessage, "Assertion Failed");
+            }
+        }
 
+        internal static void ContractFailure(bool condition, string message, string detailMessage, string failureKindMessage)
+        {
+            if (!condition)
+            {
+                string stackTrace;
+                try
+                {
+                    stackTrace = new StackTrace(0, true).ToString(System.Diagnostics.StackTrace.TraceFormat.Normal);
+                }
+                catch
+                {
+                    stackTrace = "";
+                }
                 WriteLine(FormatAssert(stackTrace, message, detailMessage));
-                s_ShowAssertDialog(stackTrace, message, detailMessage);
+                s_ShowDialog(stackTrace, message, detailMessage, SR.GetResourceString(failureKindMessage));
             }
         }
 
@@ -315,7 +333,8 @@ internal DebugAssertException(string message, string detailMessage, string stack
         }
 
         // internal and not readonly so that the tests can swap this out.
-        internal static Action<string, string, string> s_ShowAssertDialog = ShowAssertDialog;
+        internal static Action<string, string, string, string> s_ShowDialog = ShowDialog;
+
         internal static Action<string> s_WriteCore = WriteCore;
     }
 }