Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/corlib/System.Diagnostics/Debugger.cs

@@ -104,15 +104,11 @@ namespace System.Diagnostics
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public static extern void Log(int level, string category, string message);
 
-#if NET_4_0
 		public static void NotifyOfCrossThreadDependency ()
 		{
 		}
-#endif
 
-#if NET_4_0
 		[ObsoleteAttribute("Call the static methods directly on this type", true)]
-#endif
 		public Debugger()
 		{
 		}

mcs/class/corlib/System.Diagnostics/StackFrame.cs

@@ -49,6 +49,7 @@ namespace System.Diagnostics {
 		#region Keep in sync with object-internals.h
 		private int ilOffset = OFFSET_UNKNOWN;
 		private int nativeOffset = OFFSET_UNKNOWN;
+		private long methodAddress;
 		private MethodBase methodBase;
 		private string fileName;
 		private int lineNumber;
@@ -165,6 +166,11 @@ namespace System.Diagnostics {
                         return nativeOffset;                        
                 }
 
+		internal long GetMethodAddress ()
+		{
+			return methodAddress;
+		}
+
 		internal string GetInternalMethodName ()
 		{
 			return internalMethodName;

mcs/class/corlib/System.Diagnostics/StackTrace.cs

@@ -45,6 +45,15 @@ namespace System.Diagnostics {
 	[MonoTODO ("Serialized objects are not compatible with .NET")]
 	public class StackTrace {
 
+        // TraceFormat is Used to specify options for how the 
+        // string-representation of a StackTrace should be generated.
+        internal enum TraceFormat 
+        {
+            Normal,
+            TrailingNewLine,        // include a trailing new line character
+            NoResourceLookup    // to prevent infinite resource recusion
+        }
+
 		public const int METHODS_TO_SKIP = 0;
 
 		private StackFrame[] frames;
@@ -148,9 +157,7 @@ namespace System.Diagnostics {
 		}
 
 		[MonoLimitation ("Not possible to create StackTraces from other threads")]
-#if NET_4_5
 		[Obsolete]
-#endif
 		public StackTrace (Thread targetThread, bool needFileInfo)
 		{
 			if (targetThread == Thread.CurrentThread){
@@ -234,5 +241,11 @@ namespace System.Diagnostics {
 			}
 			return sb.ToString ();
 		}
+
+		internal String ToString (TraceFormat traceFormat)
+		{
+			// TODO:
+			return ToString ();
+		}
 	}
 }