Imported Upstream version 5.12.0.220

Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions
--- a/mcs/class/referencesource/mscorlib/system/timespan.cs
+++ b/mcs/class/referencesource/mscorlib/system/timespan.cs
@@ -412,10 +412,16 @@ namespace System {
        //        "TimeSpan_LegacyFormatMode"=dword:00000001
        //
 #if !FEATURE_CORECLR
+#if MONO
+        private static bool LegacyFormatMode() {
+			return false;
+		}
+#else
        [System.Security.SecurityCritical]
        [ResourceExposure(ResourceScope.None)]
        [MethodImplAttribute(MethodImplOptions.InternalCall)]
        private static extern bool LegacyFormatMode();
+#endif
 #endif // !FEATURE_CORECLR
        //
        // In Silverlight v4, specifying the APP_EARLIER_THAN_SL4.0 quirks mode allows applications to