Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs
@@ -9,7 +9,9 @@ namespace System.Runtime.Serialization.Diagnostics
    using System.Globalization;
    using System.Runtime;
    using System.Runtime.Diagnostics;
+#if !MONO
    using System.ServiceModel.Diagnostics;
+#endif

    static class TraceUtility
    {