Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -249,19 +249,19 @@ namespace System.Runtime
{
case TraceEventType.Error:
case TraceEventType.Warning:
if (TraceCore.ThrowingExceptionIsEnabled(this.diagnosticTrace))
if (TraceCore.ThrowingEtwExceptionIsEnabled(this.diagnosticTrace))
{
TraceCore.ThrowingEtwException(this.diagnosticTrace, this.eventSourceName, exception != null ? exception.ToString() : string.Empty, exception);
}
break;
case TraceEventType.Critical:
if (TraceCore.UnhandledExceptionIsEnabled(this.diagnosticTrace))
if (TraceCore.EtwUnhandledExceptionIsEnabled(this.diagnosticTrace))
{
TraceCore.EtwUnhandledException(this.diagnosticTrace, exception != null ? exception.ToString() : string.Empty, exception);
}
break;
default:
if (TraceCore.ThrowingExceptionVerboseIsEnabled(this.diagnosticTrace))
if (TraceCore.ThrowingEtwExceptionVerboseIsEnabled(this.diagnosticTrace))
{
TraceCore.ThrowingEtwExceptionVerbose(this.diagnosticTrace, this.eventSourceName, exception != null ? exception.ToString() : string.Empty, exception);
}