From b41347b9f479d2e7a507ecf72d5cc97bdc6d3daa Mon Sep 17 00:00:00 2001
From: Ludovic Henry <ludovic@xamarin.com>
Date: Fri, 3 Mar 2017 08:59:38 -0500
Subject: [PATCH] [corert] Import System.Diagnostics.Debug

---
 external/corefx                     |  2 +-
 external/corert                     |  2 +-
 mcs/class/corlib/corert/Debug.cs    | 20 ++++++++++++--------
 mcs/class/corlib/corlib.dll.sources |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/external/corefx b/external/corefx
index c718457f054..40cd85c64d1 160000
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit c718457f0540c9b19be7f866dddb153e17ea3026
+Subproject commit 40cd85c64d17dea363e5bca731077eb1d6007463
diff --git a/external/corert b/external/corert
index d87c966d80c..ba1a79e89b6 160000
--- 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 7a7b21675c7..3eaf922d134 100644
--- 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 dd7ac01ff3f..aaa112e9142 100644
--- 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
-- 
2.25.1