[corert] Import System.Diagnostics.Debug

diff --git a/external/corefx b/external/corefx
index c718457f0540c9b19be7f866dddb153e17ea3026..40cd85c64d17dea363e5bca731077eb1d6007463 160000 (submodule)
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit c718457f0540c9b19be7f866dddb153e17ea3026
+Subproject commit 40cd85c64d17dea363e5bca731077eb1d6007463

diff --git a/external/corert b/external/corert
index d87c966d80c1274373ddafe3375bf1730cd430ed..ba1a79e89b65fe0c9ea10e3c58b3a49316cf8101 160000 (submodule)
--- a/external/corert
+++ b/external/corert
@@ -1 +1 @@
-Subproject commit d87c966d80c1274373ddafe3375bf1730cd430ed
+Subproject commit ba1a79e89b65fe0c9ea10e3c58b3a49316cf8101

diff --git a/mcs/class/corlib/corert/Debug.cs b/mcs/class/corlib/corert/Debug.cs
index 7a7b21675c78b75258d96c474126e676d3c89a41..3eaf922d1345de6a66c9acf4482ae86c20396cdf 100644 (file)
--- a/mcs/class/corlib/corert/Debug.cs
+++ b/mcs/class/corlib/corert/Debug.cs
@@ -1,17 +1,21 @@
+
 namespace System.Diagnostics.Private
 {
-       static class Debug
+       static partial class Debug
        {
-               public static void Assert (bool condition)
-               {
-               }
+               internal static IDebugLogger s_logger = new MonoDebugLogger();
 
-               public static void Assert (bool condition, string message)
+               internal sealed class MonoDebugLogger : IDebugLogger
                {
-               }
+                       public void ShowAssertDialog(string stackTrace, string message, string detailMessage)
+                       {
+                               // FIXME should we g_error in this case?
+                       }
 
-               public static void Fail (string message)
-               {
+                       public void WriteCore(string message)
+                       {
+                               // FIXME should we g_debug in this case?
+                       }
                }
        }
 }

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index dd7ac01ff3fc438e0e2485ec9bad5c9756e39bf0..aaa112e914210eacf08e474850c4e28eb82fa3c1 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1639,6 +1639,8 @@ ReferenceSources/Type.cs
 
 corert/Debug.cs
 
+../../../external/corert/src/Common/src/System/Diagnostics/Debug.cs
+
 ../../../external/corert/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/LowLevelComparer.cs