2010-04-06 Jb Evain <jbevain@novell.com>

	* Debug.cs (Assert, WriteLine): add net_4_0 overloads.

svn path=/trunk/mcs/; revision=154842

diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 28c62cd012157bd6ac38b433f3c0059c5205cbe0..79b81cd9a1a1835bb24fe662a11f64a76b3dd1c7 100644 (file)
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-06  Jb Evain  <jbevain@novell.com>
+
+       * Debug.cs (Assert, WriteLine): add net_4_0 overloads.
+
 2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Debug_2_1.cs: Change type to static to match SL4

diff --git a/mcs/class/System/System.Diagnostics/Debug.cs b/mcs/class/System/System.Diagnostics/Debug.cs
index 34d6b20ff22a506ef102f9b19679f9506f652829..08f7e7c540ce125bab5cb2459ca4daad5d6243dc 100644 (file)
--- a/mcs/class/System/System.Diagnostics/Debug.cs
+++ b/mcs/class/System/System.Diagnostics/Debug.cs
@@ -78,6 +78,17 @@ namespace System.Diagnostics {
                        TraceImpl.Assert (condition, message, detailMessage);
                }
 
+#if NET_4_0
+               [Conditional ("DEBUG")]
+               public static void Assert (bool condition, string message,
+                       string detailMessageFormat, params object [] args)
+               {
+                       TraceImpl.Assert (condition,
+                               message,
+                               string.Format (detailMessageFormat, args));
+               }
+#endif
+
                [Conditional("DEBUG")]
                public static void Close ()
                {
@@ -176,6 +187,14 @@ namespace System.Diagnostics {
                        TraceImpl.WriteLine (message);
                }
 
+#if NET_4_0
+               [Conditional("DEBUG")]
+               public static void WriteLine (string format, params object [] args)
+               {
+                       TraceImpl.WriteLine (string.Format (format, args));
+               }
+#endif
+
                [Conditional("DEBUG")]
                public static void WriteLine (object value, string category)
                {