Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -76,16 +76,18 @@ 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)
{
if (condition)
// Return early to avoid the string formatting
return;
TraceImpl.Assert (condition,
message,
string.Format (detailMessageFormat, args));
}
#endif
[Conditional("DEBUG")]
public static void Close ()
@ -185,13 +187,11 @@ 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)