From 2e2698a6e3b9ee50f1e8610303e3c405f03e22f7 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sat, 8 Apr 2017 10:52:26 +0200
Subject: [PATCH] Bump corert

---
 external/corert                                |  2 +-
 mcs/class/corlib/corert/Debug.cs               | 37 ++++++++++++--------------
 mcs/class/corlib/corert/EnvironmentAugments.cs |  9 +++++++
 mcs/class/corlib/corlib.dll.sources            |  5 ++--
 4 files changed, 30 insertions(+), 23 deletions(-)
 rewrite mcs/class/corlib/corert/Debug.cs (75%)
 create mode 100644 mcs/class/corlib/corert/EnvironmentAugments.cs

diff --git a/external/corert b/external/corert
index f9066eefa76..93a72f3aea6 160000
--- a/external/corert
+++ b/external/corert
@@ -1 +1 @@
-Subproject commit f9066eefa76d961b11dfb89faa612762cc214ef4
+Subproject commit 93a72f3aea6f7d2f088cacd4b325baed669821ee
diff --git a/mcs/class/corlib/corert/Debug.cs b/mcs/class/corlib/corert/Debug.cs
dissimilarity index 75%
index 4d2446c5eca..eda79f7927d 100644
--- a/mcs/class/corlib/corert/Debug.cs
+++ b/mcs/class/corlib/corert/Debug.cs
@@ -1,20 +1,17 @@
-namespace System.Diagnostics.Private
-{
-	static partial class Debug
-	{
-		internal static IDebugLogger s_logger = new MonoDebugLogger();
-
-		internal sealed class MonoDebugLogger : IDebugLogger
-		{
-			public void ShowAssertDialog(string stackTrace, string message, string detailMessage)
-			{
-				// FIXME should we g_error in this case?
-			}
-
-			public void WriteCore(string message)
-			{
-				// FIXME should we g_debug in this case?
-			}
-		}
-	}
-}
+namespace System.Diagnostics.Private
+{
+	static partial class Debug
+	{
+		static readonly string NewLine = Environment.NewLine;
+
+		static void ShowAssertDialog (string stackTrace, string message, string detailMessage)
+		{
+			// FIXME should we g_error in this case?
+		}
+
+		static void WriteCore (string message)
+		{
+			// FIXME should we g_debug in this case?
+		}
+	}
+}
diff --git a/mcs/class/corlib/corert/EnvironmentAugments.cs b/mcs/class/corlib/corert/EnvironmentAugments.cs
new file mode 100644
index 00000000000..cb0617202e6
--- /dev/null
+++ b/mcs/class/corlib/corert/EnvironmentAugments.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Internal.Runtime.Augments
+{
+	static class EnvironmentAugments
+	{
+		public static readonly string StackTrace = "";
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 8859e1f1cb5..34ee9a0c715 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1640,6 +1640,7 @@ coreclr/SorterArray.cs
 
 corert/AddrofIntrinsics.cs
 corert/Debug.cs
+corert/EnvironmentAugments.cs
 corert/Interop.cs
 corert/Interop.MemAllocFree.cs
 corert/RelocatedTypeAttribute.cs
@@ -1666,6 +1667,8 @@ corert/RuntimeThread.cs
 
 ../../../external/corert/src/System.Private.CoreLib/shared/System/TupleExtensions.cs
 
+../../../external/corert/src/System.Private.CoreLib/shared/System/Diagnostics/Debug.cs
+
 ../../../external/corert/src/System.Private.CoreLib/shared/System/IO/Win32Marshal.cs
 
 ../../../external/corert/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/ITuple.cs
@@ -1687,8 +1690,6 @@ corert/RuntimeThread.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/IDictionaryDebugView.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs
 
-../../../external/corert/src/System.Private.CoreLib/src/System/Diagnostics/Debug.cs
-
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolBoundHandle.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.cs
 ../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.ExecutionContextCallbackArgs.cs
-- 
2.11.4.GIT