Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
This commit is contained in:
Jo Shields
2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions

View File

@@ -59,15 +59,11 @@ namespace System.Diagnostics
{
switch (eventType) {
case TraceEventType.Critical:
return (Level & SourceLevels.Critical) != 0;
case TraceEventType.Error:
return (Level & SourceLevels.Error) != 0;
case TraceEventType.Warning:
return (Level & SourceLevels.Warning) != 0;
case TraceEventType.Information:
return (Level & SourceLevels.Information) != 0;
case TraceEventType.Verbose:
return (Level & SourceLevels.Verbose) != 0;
return (Level & (SourceLevels)eventType) != 0;
case TraceEventType.Start:
case TraceEventType.Stop:
case TraceEventType.Suspend:
@@ -78,6 +74,7 @@ namespace System.Diagnostics
}
}
protected override void OnValueChanged ()
{
SwitchSetting = (int) Enum.Parse (typeof (SourceLevels),