Cosmetic fixes after move to shared partition

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>

Author: jkotas

src/Common/src/CoreLib/System/ArraySegment.cs

@@ -71,7 +71,7 @@ public T this[int index]
             {
                 if ((uint)index >= (uint)_count)
                 {
-                    ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index);
+                    ThrowHelper.ThrowArgumentOutOfRange_IndexException();
                 }
 
                 return _array[_offset + index];
@@ -80,7 +80,7 @@ public T this[int index]
             {
                 if ((uint)index >= (uint)_count)
                 {
-                    ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index);
+                    ThrowHelper.ThrowArgumentOutOfRange_IndexException();
                 }
 
                 _array[_offset + index] = value;
@@ -150,7 +150,7 @@ public ArraySegment<T> Slice(int index)
 
             if ((uint)index > (uint)_count)
             {
-                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index);
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
             }
 
             return new ArraySegment<T>(_array, _offset + index, _count - index);
@@ -162,7 +162,7 @@ public ArraySegment<T> Slice(int index, int count)
 
             if ((uint)index > (uint)_count || (uint)count > (uint)(_count - index))
             {
-                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index);
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
             }
 
             return new ArraySegment<T>(_array, _offset + index, count);

src/Common/src/CoreLib/System/Empty.cs

@@ -17,9 +17,9 @@ private Empty()
 
         public static readonly Empty Value = new Empty();
 
-        public override String ToString()
+        public override string ToString()
         {
-            return String.Empty;
+            return string.Empty;
         }
     }
 }

src/Common/src/CoreLib/System/IntPtr.cs

@@ -222,12 +222,12 @@ public static int Size
             return _value;
         }
 
-        public unsafe override String ToString()
+        public unsafe override string ToString()
         {
             return ((nint)_value).ToString(CultureInfo.InvariantCulture);
         }
 
-        public unsafe String ToString(String format)
+        public unsafe string ToString(string format)
         {
             return ((nint)_value).ToString(format, CultureInfo.InvariantCulture);
         }

src/Common/src/CoreLib/System/UIntPtr.cs

@@ -65,7 +65,7 @@ unsafe void ISerializable.GetObjectData(SerializationInfo info, StreamingContext
             if (info == null)
                 throw new ArgumentNullException(nameof(info));
 
-            info.AddValue("value", (ulong)_value);
+            info.AddValue("value", ToUInt64());
         }
 
         public unsafe override bool Equals(Object obj)
@@ -213,7 +213,7 @@ public static unsafe int Size
             return _value;
         }
 
-        public unsafe override String ToString()
+        public unsafe override string ToString()
         {
             return ((nuint)_value).ToString(CultureInfo.InvariantCulture);
         }