diff options
author | Jan Kotas <jkotas@microsoft.com> | 2017-08-07 05:56:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-07 05:56:05 -0700 |
commit | eb1d52cc2e2a32ccbead0dac01c99a073640ee13 (patch) | |
tree | c07f323f26603f0813fe335b4f5b939a0a3506ca | |
parent | 02e7bc11c1276bdcefd97672c124cdff2cf3e9c0 (diff) | |
download | coreclr-eb1d52cc2e2a32ccbead0dac01c99a073640ee13.tar.gz coreclr-eb1d52cc2e2a32ccbead0dac01c99a073640ee13.tar.bz2 coreclr-eb1d52cc2e2a32ccbead0dac01c99a073640ee13.zip |
Move files to shared partition (#13244)
-rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 9 | ||||
-rw-r--r-- | src/mscorlib/shared/System.Private.CoreLib.Shared.projitems | 9 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Boolean.cs (renamed from src/mscorlib/src/System/Boolean.cs) | 19 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Byte.cs (renamed from src/mscorlib/src/System/Byte.cs) | 18 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Double.cs | 4 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Int16.cs (renamed from src/mscorlib/src/System/Int16.cs) | 15 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Int32.cs (renamed from src/mscorlib/src/System/Int32.cs) | 30 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Int64.cs (renamed from src/mscorlib/src/System/Int64.cs) | 12 | ||||
-rw-r--r-- | src/mscorlib/shared/System/SByte.cs (renamed from src/mscorlib/src/System/SByte.cs) | 24 | ||||
-rw-r--r-- | src/mscorlib/shared/System/Single.cs | 2 | ||||
-rw-r--r-- | src/mscorlib/shared/System/UInt16.cs (renamed from src/mscorlib/src/System/UInt16.cs) | 14 | ||||
-rw-r--r-- | src/mscorlib/shared/System/UInt32.cs (renamed from src/mscorlib/src/System/UInt32.cs) | 15 | ||||
-rw-r--r-- | src/mscorlib/shared/System/UInt64.cs (renamed from src/mscorlib/src/System/UInt64.cs) | 14 |
13 files changed, 81 insertions, 104 deletions
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 5e1e3c03cd..f0fc90fff7 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -313,9 +313,7 @@ <Compile Include="$(BclSourcesRoot)\System\ArgIterator.cs" /> <Compile Include="$(BclSourcesRoot)\System\Attribute.cs" /> <Compile Include="$(BclSourcesRoot)\System\BadImageFormatException.CoreCLR.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Boolean.cs" /> <Compile Include="$(BclSourcesRoot)\System\Buffer.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Byte.cs" /> <Compile Include="$(BclSourcesRoot)\System\CompatibilitySwitches.cs" /> <Compile Include="$(BclSourcesRoot)\System\Currency.cs" /> <Compile Include="$(BclSourcesRoot)\System\Decimal.cs" /> @@ -326,9 +324,6 @@ <Compile Include="$(BclSourcesRoot)\System\GC.cs" /> <Compile Include="$(BclSourcesRoot)\System\Guid.cs" /> <Compile Include="$(BclSourcesRoot)\System\InsufficientMemoryException.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Int16.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Int32.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Int64.cs" /> <Compile Include="$(BclSourcesRoot)\System\IntPtr.cs" /> <Compile Include="$(BclSourcesRoot)\System\Internal.cs" /> <Compile Include="$(BclSourcesRoot)\System\Math.cs" /> @@ -343,7 +338,6 @@ <Compile Include="$(BclSourcesRoot)\System\RtType.cs" /> <Compile Include="$(BclSourcesRoot)\System\RuntimeArgumentHandle.cs" /> <Compile Include="$(BclSourcesRoot)\System\RuntimeHandles.cs" /> - <Compile Include="$(BclSourcesRoot)\System\SByte.cs" /> <Compile Include="$(BclSourcesRoot)\System\SerializableAttribute.cs" /> <Compile Include="$(BclSourcesRoot)\System\SharedStatics.cs" /> <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" /> @@ -355,9 +349,6 @@ <Compile Include="$(BclSourcesRoot)\System\TypeNameParser.cs" /> <Compile Include="$(BclSourcesRoot)\System\TypedReference.cs" /> <Compile Include="$(BclSourcesRoot)\System\TypeLoadException.cs" /> - <Compile Include="$(BclSourcesRoot)\System\UInt16.cs" /> - <Compile Include="$(BclSourcesRoot)\System\UInt32.cs" /> - <Compile Include="$(BclSourcesRoot)\System\UInt64.cs" /> <Compile Include="$(BclSourcesRoot)\System\UIntPtr.cs" /> <Compile Include="$(BclSourcesRoot)\System\ValueType.cs" /> <Compile Include="$(BclSourcesRoot)\System\WeakReference.cs" /> diff --git a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems index 09e8bec068..9c108eee27 100644 --- a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems @@ -32,11 +32,13 @@ <Compile Include="$(MSBuildThisFileDirectory)System\AttributeUsageAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\BadImageFormatException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\BitConverter.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Boolean.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Buffers\ArrayPool.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Buffers\ArrayPoolEventSource.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Buffers\ConfigurableArrayPool.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Buffers\TlsOverPerCoreLockedStacksArrayPool.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Buffers\Utilities.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Byte.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Char.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\CharEnumerator.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\CLSCompliantAttribute.cs" /> @@ -170,6 +172,9 @@ <Compile Include="$(MSBuildThisFileDirectory)System\IObservable.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\IObserver.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\IProgress.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Int16.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Int32.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Int64.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Lazy.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\MarshalByRefObject.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\MemberAccessException.cs" /> @@ -353,6 +358,7 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Serialization\StreamingContext.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Versioning\NonVersionableAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Versioning\TargetFrameworkAttribute.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\SByte.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Security\AllowPartiallyTrustedCallersAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Security\CryptographicException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Security\PartialTrustVisibilityLevel.cs" /> @@ -444,6 +450,9 @@ <Compile Include="$(MSBuildThisFileDirectory)System\TypeCode.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\TypeInitializationException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\TypeUnloadedException.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\UInt16.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\UInt32.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\UInt64.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\UnauthorizedAccessException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\UnhandledExceptionEventArgs.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\UnhandledExceptionEventHandler.cs" /> diff --git a/src/mscorlib/src/System/Boolean.cs b/src/mscorlib/shared/System/Boolean.cs index a1f5064964..b41c6baeb2 100644 --- a/src/mscorlib/src/System/Boolean.cs +++ b/src/mscorlib/shared/System/Boolean.cs @@ -12,16 +12,15 @@ ** ===========================================================*/ -using System; -using System.Globalization; using System.Diagnostics.Contracts; +using System.Globalization; +using System.Runtime.CompilerServices; +using System.Runtime.Versioning; namespace System { - // The Boolean class provides the - // object representation of the boolean primitive type. [Serializable] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public struct Boolean : IComparable, IConvertible, IComparable<Boolean>, IEquatable<Boolean> { // @@ -34,7 +33,7 @@ namespace System internal const int True = 1; // The false value. - // + // internal const int False = 0; @@ -95,11 +94,7 @@ namespace System public String ToString(IFormatProvider provider) { - if (false == m_value) - { - return FalseLiteral; - } - return TrueLiteral; + return ToString(); } // Determines whether two Boolean objects are equal. @@ -114,7 +109,7 @@ namespace System return (m_value == ((Boolean)obj).m_value); } - [System.Runtime.Versioning.NonVersionable] + [NonVersionable] public bool Equals(Boolean obj) { return m_value == obj; diff --git a/src/mscorlib/src/System/Byte.cs b/src/mscorlib/shared/System/Byte.cs index fafdcbb535..14bbf7bf3c 100644 --- a/src/mscorlib/src/System/Byte.cs +++ b/src/mscorlib/shared/System/Byte.cs @@ -12,22 +12,18 @@ ** ===========================================================*/ - -using System; +using System.Diagnostics.Contracts; using System.Globalization; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { - // The Byte class extends the Value class and - // provides object representation of the byte primitive type. - // [Serializable] - [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Byte : IComparable, IFormattable, IConvertible - , IComparable<Byte>, IEquatable<Byte> + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct Byte : IComparable, IConvertible, IFormattable, IComparable<Byte>, IEquatable<Byte> { private byte m_value; // Do not rename (binary serialization) @@ -73,7 +69,7 @@ namespace System return m_value == ((Byte)obj).m_value; } - [System.Runtime.Versioning.NonVersionable] + [NonVersionable] public bool Equals(Byte obj) { return m_value == obj; diff --git a/src/mscorlib/shared/System/Double.cs b/src/mscorlib/shared/System/Double.cs index f12886fe14..3babf22a4c 100644 --- a/src/mscorlib/shared/System/Double.cs +++ b/src/mscorlib/shared/System/Double.cs @@ -12,11 +12,9 @@ ** ===========================================================*/ -using System; using System.Diagnostics.Contracts; using System.Globalization; using System.Runtime.CompilerServices; -using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; using System.Runtime.Versioning; @@ -25,7 +23,7 @@ namespace System [Serializable] [StructLayout(LayoutKind.Sequential)] [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Double :IComparable, IConvertible, IFormattable, IComparable<Double>, IEquatable<Double> + public struct Double : IComparable, IConvertible, IFormattable, IComparable<Double>, IEquatable<Double> { private double m_value; // Do not rename (binary serialization) diff --git a/src/mscorlib/src/System/Int16.cs b/src/mscorlib/shared/System/Int16.cs index 82e5dd5a38..b5899f7e3b 100644 --- a/src/mscorlib/src/System/Int16.cs +++ b/src/mscorlib/shared/System/Int16.cs @@ -12,19 +12,18 @@ ** ===========================================================*/ - -using System; +using System.Diagnostics.Contracts; using System.Globalization; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { [Serializable] - [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Int16 : IComparable, IFormattable, IConvertible - , IComparable<Int16>, IEquatable<Int16> + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct Int16 : IComparable, IConvertible, IFormattable, IComparable<Int16>, IEquatable<Int16> { private short m_value; // Do not rename (binary serialization) @@ -66,7 +65,7 @@ namespace System return m_value == ((Int16)obj).m_value; } - [System.Runtime.Versioning.NonVersionable] + [NonVersionable] public bool Equals(Int16 obj) { return m_value == obj; diff --git a/src/mscorlib/src/System/Int32.cs b/src/mscorlib/shared/System/Int32.cs index 503552117d..543e89118d 100644 --- a/src/mscorlib/src/System/Int32.cs +++ b/src/mscorlib/shared/System/Int32.cs @@ -12,19 +12,18 @@ ** ===========================================================*/ -using System; +using System.Diagnostics.Contracts; using System.Globalization; -using System.Runtime; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { [Serializable] - [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Int32 : IComparable, IFormattable, IConvertible - , IComparable<Int32>, IEquatable<Int32> + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct Int32 : IComparable, IConvertible, IFormattable, IComparable<Int32>, IEquatable<Int32> { private int m_value; // Do not rename (binary serialization) @@ -33,8 +32,11 @@ namespace System // Compares this object to another object, returning an integer that // indicates the relationship. - // Returns a value less than zero if this object - // null is considered to be less than any instance. + // Returns : + // 0 if the values are equal + // Negative number if _value is less than value + // Positive number if _value is more than value + // null is considered to be less than any instance, hence returns positive number // If object is not of type Int32, this method throws an ArgumentException. // public int CompareTo(Object value) @@ -45,8 +47,8 @@ namespace System } if (value is Int32) { - // Need to use compare because subtraction will wrap - // to positive for very large neg numbers, etc. + // NOTE: Cannot use return (_value - value) as this causes a wrap + // around in cases where _value - value > MaxValue. int i = (int)value; if (m_value < i) return -1; if (m_value > i) return 1; @@ -57,8 +59,8 @@ namespace System public int CompareTo(int value) { - // Need to use compare because subtraction will wrap - // to positive for very large neg numbers, etc. + // NOTE: Cannot use return (_value - value) as this causes a wrap + // around in cases where _value - value > MaxValue. if (m_value < value) return -1; if (m_value > value) return 1; return 0; @@ -73,7 +75,7 @@ namespace System return m_value == ((Int32)obj).m_value; } - [System.Runtime.Versioning.NonVersionable] + [NonVersionable] public bool Equals(Int32 obj) { return m_value == obj; diff --git a/src/mscorlib/src/System/Int64.cs b/src/mscorlib/shared/System/Int64.cs index 015387233c..caa46551f7 100644 --- a/src/mscorlib/src/System/Int64.cs +++ b/src/mscorlib/shared/System/Int64.cs @@ -12,18 +12,18 @@ ** ===========================================================*/ -using System; +using System.Diagnostics.Contracts; using System.Globalization; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { [Serializable] - [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct Int64 : IComparable, IFormattable, IConvertible - , IComparable<Int64>, IEquatable<Int64> + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct Int64 : IComparable, IConvertible, IFormattable, IComparable<Int64>, IEquatable<Int64> { private long m_value; // Do not rename (binary serialization) diff --git a/src/mscorlib/src/System/SByte.cs b/src/mscorlib/shared/System/SByte.cs index 8a0ab3e129..89c91e1032 100644 --- a/src/mscorlib/src/System/SByte.cs +++ b/src/mscorlib/shared/System/SByte.cs @@ -2,28 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -/*============================================================ -** -** -** -** Purpose: -** -** -===========================================================*/ - +using System.Diagnostics.Contracts; using System.Globalization; -using System; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { - // A place holder class for signed bytes. [Serializable] - [CLSCompliant(false), System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct SByte : IComparable, IFormattable, IConvertible - , IComparable<SByte>, IEquatable<SByte> + [CLSCompliant(false)] [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct SByte : IComparable, IConvertible, IFormattable, IComparable<SByte>, IEquatable<SByte> { private sbyte m_value; // Do not rename (binary serialization) @@ -68,7 +58,7 @@ namespace System return m_value == ((SByte)obj).m_value; } - [System.Runtime.Versioning.NonVersionable] + [NonVersionable] public bool Equals(SByte obj) { return m_value == obj; diff --git a/src/mscorlib/shared/System/Single.cs b/src/mscorlib/shared/System/Single.cs index 676c654822..e9a69aad83 100644 --- a/src/mscorlib/shared/System/Single.cs +++ b/src/mscorlib/shared/System/Single.cs @@ -11,11 +11,9 @@ ** ===========================================================*/ -using System; using System.Diagnostics.Contracts; using System.Globalization; using System.Runtime.CompilerServices; -using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; using System.Runtime.Versioning; diff --git a/src/mscorlib/src/System/UInt16.cs b/src/mscorlib/shared/System/UInt16.cs index 746ed7ba49..6b02386cb7 100644 --- a/src/mscorlib/src/System/UInt16.cs +++ b/src/mscorlib/shared/System/UInt16.cs @@ -11,19 +11,19 @@ ** ===========================================================*/ +using System.Diagnostics.Contracts; using System.Globalization; -using System; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { - // Wrapper for unsigned 16 bit integers. [Serializable] - [CLSCompliant(false), System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct UInt16 : IComparable, IFormattable, IConvertible - , IComparable<UInt16>, IEquatable<UInt16> + [CLSCompliant(false)] + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct UInt16 : IComparable, IConvertible, IFormattable, IComparable<UInt16>, IEquatable<UInt16> { private ushort m_value; // Do not rename (binary serialization) diff --git a/src/mscorlib/src/System/UInt32.cs b/src/mscorlib/shared/System/UInt32.cs index f696816b98..8fc361b303 100644 --- a/src/mscorlib/src/System/UInt32.cs +++ b/src/mscorlib/shared/System/UInt32.cs @@ -12,20 +12,19 @@ ** ===========================================================*/ +using System.Diagnostics.Contracts; using System.Globalization; -using System; -using System.Runtime; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { - // * Wrapper for unsigned 32 bit integers. [Serializable] - [CLSCompliant(false), System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct UInt32 : IComparable, IFormattable, IConvertible - , IComparable<UInt32>, IEquatable<UInt32> + [CLSCompliant(false)] + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct UInt32 : IComparable, IConvertible, IFormattable, IComparable<UInt32>, IEquatable<UInt32> { private uint m_value; // Do not rename (binary serialization) diff --git a/src/mscorlib/src/System/UInt64.cs b/src/mscorlib/shared/System/UInt64.cs index 03cdcc5f40..d83f94ddeb 100644 --- a/src/mscorlib/src/System/UInt64.cs +++ b/src/mscorlib/shared/System/UInt64.cs @@ -11,19 +11,19 @@ ** ===========================================================*/ +using System.Diagnostics.Contracts; using System.Globalization; -using System; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.Contracts; +using System.Runtime.Versioning; namespace System { - // Wrapper for unsigned 64 bit integers. [Serializable] - [CLSCompliant(false), System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] - [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - public struct UInt64 : IComparable, IFormattable, IConvertible - , IComparable<UInt64>, IEquatable<UInt64> + [CLSCompliant(false)] + [StructLayout(LayoutKind.Sequential)] + [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + public struct UInt64 : IComparable, IConvertible, IFormattable, IComparable<UInt64>, IEquatable<UInt64> { private ulong m_value; // Do not rename (binary serialization) |