Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -186,7 +186,6 @@ namespace System.Diagnostics
// them
private void AddSwitchesNode (IDictionary d, XmlNode node)
{
#if !TARGET_JVM
// There are no attributes on <switch/>
ValidateInvalidAttributes (node.Attributes, node);
@ -224,7 +223,6 @@ namespace System.Diagnostics
}
d [node.Name] = newNodes;
#endif
}
private static object GetSwitchValue (string name, string value)
@ -367,7 +365,6 @@ namespace System.Diagnostics
// for add, "name" is required; initializeData is optional; "type" is required in 1.x, optional in 2.0.
private void AddTraceListeners (IDictionary d, XmlNode listenersNode, TraceListenerCollection listeners)
{
#if !TARGET_JVM
// There are no attributes on <listeners/>
ValidateInvalidAttributes (listenersNode.Attributes, listenersNode);
@ -398,7 +395,6 @@ namespace System.Diagnostics
else
ThrowUnrecognizedNode (child);
}
#endif
}
private void AddTraceListener (IDictionary d, XmlNode child, XmlAttributeCollection attributes, TraceListenerCollection listeners)