diff options
Diffstat (limited to 'src/mscorlib/src/System/TimeSpan.cs')
-rw-r--r-- | src/mscorlib/src/System/TimeSpan.cs | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/mscorlib/src/System/TimeSpan.cs b/src/mscorlib/src/System/TimeSpan.cs index c9cfc084f3..a594da20e7 100644 --- a/src/mscorlib/src/System/TimeSpan.cs +++ b/src/mscorlib/src/System/TimeSpan.cs @@ -28,7 +28,7 @@ namespace System { // details of this type should change, or new fields added, we need to remember to add // an appropriate custom ILMarshaler to keep WInRT interop scenarios enabled. // -[System.Runtime.InteropServices.ComVisible(true)] + [System.Runtime.InteropServices.ComVisible(true)] [Serializable] public struct TimeSpan : IComparable , IComparable<TimeSpan>, IEquatable<TimeSpan>, IFormattable { @@ -289,11 +289,11 @@ namespace System { return TimeSpanParse.ParseExactMultiple(input, formats, formatProvider, TimeSpanStyles.None); } public static TimeSpan ParseExact(String input, String format, IFormatProvider formatProvider, TimeSpanStyles styles) { - TimeSpanParse.ValidateStyles(styles, "styles"); + TimeSpanParse.ValidateStyles(styles, nameof(styles)); return TimeSpanParse.ParseExact(input, format, formatProvider, styles); } public static TimeSpan ParseExact(String input, String[] formats, IFormatProvider formatProvider, TimeSpanStyles styles) { - TimeSpanParse.ValidateStyles(styles, "styles"); + TimeSpanParse.ValidateStyles(styles, nameof(styles)); return TimeSpanParse.ParseExactMultiple(input, formats, formatProvider, styles); } public static Boolean TryParse(String s, out TimeSpan result) { @@ -309,11 +309,11 @@ namespace System { return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, TimeSpanStyles.None, out result); } public static Boolean TryParseExact(String input, String format, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result) { - TimeSpanParse.ValidateStyles(styles, "styles"); + TimeSpanParse.ValidateStyles(styles, nameof(styles)); return TimeSpanParse.TryParseExact(input, format, formatProvider, styles, out result); } public static Boolean TryParseExact(String input, String[] formats, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result) { - TimeSpanParse.ValidateStyles(styles, "styles"); + TimeSpanParse.ValidateStyles(styles, nameof(styles)); return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, styles, out result); } public override String ToString() { @@ -406,26 +406,8 @@ namespace System { // [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework] // "TimeSpan_LegacyFormatMode"=dword:00000001 // -#if !FEATURE_CORECLR - [System.Security.SecurityCritical] - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private static extern bool LegacyFormatMode(); -#endif // !FEATURE_CORECLR - // - // In Silverlight v4, specifying the APP_EARLIER_THAN_SL4.0 quirks mode allows applications to - // run in v2 - v3 legacy behavior. - // -#if !FEATURE_CORECLR - [System.Security.SecuritySafeCritical] -#endif private static bool GetLegacyFormatMode() { -#if !FEATURE_CORECLR - if (LegacyFormatMode()) // FCALL to check COMPlus_TimeSpan_LegacyFormatMode - return true; - return CompatibilitySwitches.IsNetFx40TimeSpanLegacyFormatMode; -#else return false; -#endif // !FEATURE_CORECLR } private static volatile bool _legacyConfigChecked; |