Fix StyleCop warning SA1121 (use built-in types)

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

44 files changed, 61 insertions, 35 deletions

diff --git a/netcore/System.Private.CoreLib/shared/Internal/Runtime/CompilerServices/Unsafe.cs b/netcore/System.Private.CoreLib/shared/Internal/Runtime/CompilerServices/Unsafe.cs
index 2e4cb906831..0450093377b 100644
--- a/netcore/System.Private.CoreLib/shared/Internal/Runtime/CompilerServices/Unsafe.cs
+++ b/netcore/System.Private.CoreLib/shared/Internal/Runtime/CompilerServices/Unsafe.cs
@@ -7,6 +7,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 using nint = System.Int64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Buffer.Unix.cs b/netcore/System.Private.CoreLib/shared/System/Buffer.Unix.cs
index 372cf92557d..036ebddd724 100644
--- a/netcore/System.Private.CoreLib/shared/System/Buffer.Unix.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Buffer.Unix.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Buffer.Windows.cs b/netcore/System.Private.CoreLib/shared/System/Buffer.Windows.cs
index ccb577a7e1b..35c627c04b5 100644
--- a/netcore/System.Private.CoreLib/shared/System/Buffer.Windows.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Buffer.Windows.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Buffer.cs b/netcore/System.Private.CoreLib/shared/System/Buffer.cs
index 4d2409cdcb5..3188d06c580 100644
--- a/netcore/System.Private.CoreLib/shared/System/Buffer.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Buffer.cs
@@ -13,6 +13,7 @@ using System.Runtime.InteropServices;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Collections/ArrayList.cs b/netcore/System.Private.CoreLib/shared/System/Collections/ArrayList.cs
index 6966b297004..3f1cba08514 100644
--- a/netcore/System.Private.CoreLib/shared/System/Collections/ArrayList.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Collections/ArrayList.cs
@@ -47,7 +47,7 @@ namespace System.Collections
         // increased to _defaultCapacity, and then increased in multiples of two as required.
         public ArrayList()
         {
-            _items = Array.Empty<Object>();
+            _items = Array.Empty<object>();
         }
 
         // Constructs a ArrayList with a given initial capacity. The list is
@@ -59,7 +59,7 @@ namespace System.Collections
             if (capacity < 0) throw new ArgumentOutOfRangeException(nameof(capacity), SR.Format(SR.ArgumentOutOfRange_MustBeNonNegNum, nameof(capacity)));
 
             if (capacity == 0)
-                _items = Array.Empty<Object>();
+                _items = Array.Empty<object>();
             else
                 _items = new object[capacity];
         }
@@ -76,7 +76,7 @@ namespace System.Collections
             int count = c.Count;
             if (count == 0)
             {
-                _items = Array.Empty<Object>();
+                _items = Array.Empty<object>();
             }
             else
             {
@@ -731,7 +731,7 @@ namespace System.Collections
         public virtual object?[] ToArray()
         {
             if (_size == 0)
-                return Array.Empty<Object>();
+                return Array.Empty<object>();
 
             object?[] array = new object[_size];
             Array.Copy(_items, 0, array, 0, _size);
diff --git a/netcore/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs b/netcore/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs
index 2bc366d1d0e..423436e34c8 100644
--- a/netcore/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs
+++ b/netcore/System.Private.CoreLib/shared/System/ComponentModel/DefaultValueAttribute.cs
@@ -157,7 +157,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.Boolean'/> value.
+        /// class using a <see cref='bool'/> value.
         /// </summary>
         public DefaultValueAttribute(bool value)
         {
@@ -166,7 +166,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.String'/>.
+        /// class using a <see cref='string'/>.
         /// </summary>
         public DefaultValueAttribute(string? value)
         {
@@ -184,7 +184,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.SByte'/> value.
+        /// class using a <see cref='sbyte'/> value.
         /// </summary>
         [CLSCompliant(false)]
         public DefaultValueAttribute(sbyte value)
@@ -194,7 +194,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.UInt16'/> value.
+        /// class using a <see cref='ushort'/> value.
         /// </summary>
         [CLSCompliant(false)]
         public DefaultValueAttribute(ushort value)
@@ -204,7 +204,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.UInt32'/> value.
+        /// class using a <see cref='uint'/> value.
         /// </summary>
         [CLSCompliant(false)]
         public DefaultValueAttribute(uint value)
@@ -214,7 +214,7 @@ namespace System.ComponentModel
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.DefaultValueAttribute'/>
-        /// class using a <see cref='System.UInt64'/> value.
+        /// class using a <see cref='ulong'/> value.
         /// </summary>
         [CLSCompliant(false)]
         public DefaultValueAttribute(ulong value)
diff --git a/netcore/System.Private.CoreLib/shared/System/DateTime.Windows.cs b/netcore/System.Private.CoreLib/shared/System/DateTime.Windows.cs
index ba9df5c4536..468c3691ccd 100644
--- a/netcore/System.Private.CoreLib/shared/System/DateTime.Windows.cs
+++ b/netcore/System.Private.CoreLib/shared/System/DateTime.Windows.cs
@@ -71,7 +71,7 @@ namespace System
             ticks += TimeToTicks(time.systemTime.Hour, time.systemTime.Minute, time.systemTime.Second);
             ticks += time.systemTime.Milliseconds * TicksPerMillisecond;
             ticks += time.hundredNanoSecond;
-            return new DateTime( ((UInt64)(ticks)) | KindUtc);
+            return new DateTime( ((ulong)(ticks)) | KindUtc);
         }
 
         // FullSystemTime struct is the SYSTEMTIME struct with extra hundredNanoSecond field to store more precise time.
diff --git a/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.Unix.cs b/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.Unix.cs
index 05a69e23059..f6ca669d618 100644
--- a/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.Unix.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.Unix.cs
@@ -771,7 +771,7 @@ namespace System.Globalization
             byte [] keyData;
             if (source.Length == 0)
             {
-                keyData = Array.Empty<Byte>();
+                keyData = Array.Empty<byte>();
             }
             else
             {
diff --git a/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs b/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
index e5553f7bc4a..702d96ff1a4 100644
--- a/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Text.Unicode;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 using nint = System.Int64;
diff --git a/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStream.cs b/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStream.cs
index 9f25d41c6ac..173e23d5b85 100644
--- a/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStream.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStream.cs
@@ -474,7 +474,7 @@ namespace System.IO
             {
                 int n = Read(buffer, offset, count);
                 Task<int>? t = _lastReadTask;
-                return (t != null && t.Result == n) ? t : (_lastReadTask = Task.FromResult<Int32>(n));
+                return (t != null && t.Result == n) ? t : (_lastReadTask = Task.FromResult<int>(n));
             }
             catch (Exception ex)
             {
diff --git a/netcore/System.Private.CoreLib/shared/System/IntPtr.cs b/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
index 8915ac2ac06..187be03243d 100644
--- a/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 using System.Runtime.Versioning;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Lazy.cs b/netcore/System.Private.CoreLib/shared/System/Lazy.cs
index 39165e938a4..a167980cb8a 100644
--- a/netcore/System.Private.CoreLib/shared/System/Lazy.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Lazy.cs
@@ -433,7 +433,7 @@ namespace System
         }
 
         /// <summary>Creates and returns a string representation of this instance.</summary>
-        /// <returns>The result of calling <see cref="System.Object.ToString"/> on the <see
+        /// <returns>The result of calling <see cref="object.ToString"/> on the <see
         /// cref="Value"/>.</returns>
         /// <exception cref="System.NullReferenceException">
         /// The <see cref="Value"/> is null.
diff --git a/netcore/System.Private.CoreLib/shared/System/Marvin.OrdinalIgnoreCase.cs b/netcore/System.Private.CoreLib/shared/System/Marvin.OrdinalIgnoreCase.cs
index 71f10b5e978..61477800452 100644
--- a/netcore/System.Private.CoreLib/shared/System/Marvin.OrdinalIgnoreCase.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Marvin.OrdinalIgnoreCase.cs
@@ -8,6 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text.Unicode;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Marvin.cs b/netcore/System.Private.CoreLib/shared/System/Marvin.cs
index 266dcabe994..67123a77067 100644
--- a/netcore/System.Private.CoreLib/shared/System/Marvin.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Marvin.cs
@@ -8,6 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Memory.cs b/netcore/System.Private.CoreLib/shared/System/Memory.cs
index 6d63973a45b..beeb0251996 100644
--- a/netcore/System.Private.CoreLib/shared/System/Memory.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Memory.cs
@@ -12,6 +12,7 @@ using EditorBrowsableState = System.ComponentModel.EditorBrowsableState;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/MemoryExtensions.cs b/netcore/System.Private.CoreLib/shared/System/MemoryExtensions.cs
index c7f6d5f213e..45ee6bc673f 100644
--- a/netcore/System.Private.CoreLib/shared/System/MemoryExtensions.cs
+++ b/netcore/System.Private.CoreLib/shared/System/MemoryExtensions.cs
@@ -9,6 +9,7 @@ using System.Text;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/ReadOnlyMemory.cs b/netcore/System.Private.CoreLib/shared/System/ReadOnlyMemory.cs
index 4a22075bd0d..3b290efe4e8 100644
--- a/netcore/System.Private.CoreLib/shared/System/ReadOnlyMemory.cs
+++ b/netcore/System.Private.CoreLib/shared/System/ReadOnlyMemory.cs
@@ -12,6 +12,7 @@ using EditorBrowsableState = System.ComponentModel.EditorBrowsableState;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/ReadOnlySpan.Fast.cs b/netcore/System.Private.CoreLib/shared/System/ReadOnlySpan.Fast.cs
index a1d554bdcdb..187d89cb671 100644
--- a/netcore/System.Private.CoreLib/shared/System/ReadOnlySpan.Fast.cs
+++ b/netcore/System.Private.CoreLib/shared/System/ReadOnlySpan.Fast.cs
@@ -12,6 +12,7 @@ using Internal.Runtime.CompilerServices;
 
 #pragma warning disable 0809  //warning CS0809: Obsolete member 'Span<T>.Equals(object)' overrides non-obsolete member 'object.Equals(object)'
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Resources/ManifestBasedResourceGroveler.cs b/netcore/System.Private.CoreLib/shared/System/Resources/ManifestBasedResourceGroveler.cs
index 740429974f0..e23fc138db8 100644
--- a/netcore/System.Private.CoreLib/shared/System/Resources/ManifestBasedResourceGroveler.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Resources/ManifestBasedResourceGroveler.cs
@@ -478,7 +478,7 @@ namespace System.Resources
                     resourceSetNames = resourceSetNames[..10];
                     postfix = "\", ...";
                 }
-                return "\"" + String.Join("\", \"", resourceSetNames) + postfix;
+                return "\"" + string.Join("\", \"", resourceSetNames) + postfix;
             }
             catch
             {
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/ArrayWithOffset.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/ArrayWithOffset.cs
index 7b5cd877abb..600b7748589 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/ArrayWithOffset.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/ArrayWithOffset.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/GCHandle.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/GCHandle.cs
index 15fa3e92348..b39bc98ef37 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/GCHandle.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/GCHandle.cs
@@ -6,6 +6,8 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Internal.Runtime.CompilerServices;
+
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/Marshal.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/Marshal.cs
index 730f21e9e9b..4c67ca55b22 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/Marshal.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/InteropServices/Marshal.cs
@@ -10,6 +10,7 @@ using System.Text;
 using Internal.Runtime.CompilerServices;
 using System.Diagnostics.CodeAnalysis;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/Serialization/SerializationInfo.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/Serialization/SerializationInfo.cs
index b632078c275..999bcfb9936 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/Serialization/SerializationInfo.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/Serialization/SerializationInfo.cs
@@ -92,7 +92,7 @@ namespace System.Runtime.Serialization
             {
                 throw new ArgumentNullException(nameof(switchSuffix));
             }
-            if (String.IsNullOrWhiteSpace(switchSuffix))
+            if (string.IsNullOrWhiteSpace(switchSuffix))
             {
                 throw new ArgumentException(SR.Argument_EmptyName, nameof(switchSuffix));
             }
diff --git a/netcore/System.Private.CoreLib/shared/System/Span.Fast.cs b/netcore/System.Private.CoreLib/shared/System/Span.Fast.cs
index bff8d4cf559..9e6aaf19273 100644
--- a/netcore/System.Private.CoreLib/shared/System/Span.Fast.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Span.Fast.cs
@@ -12,6 +12,7 @@ using Internal.Runtime.CompilerServices;
 
 #pragma warning disable 0809  //warning CS0809: Obsolete member 'Span<T>.Equals(object)' overrides non-obsolete member 'object.Equals(object)'
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Byte.cs b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Byte.cs
index 871990aff0f..7b0de7d82a0 100644
--- a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Byte.cs
+++ b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Byte.cs
@@ -10,6 +10,7 @@ using System.Runtime.Intrinsics.X86;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs
index 6b8aa81f285..a628538b791 100644
--- a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs
+++ b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs
@@ -10,6 +10,7 @@ using System.Runtime.Intrinsics.X86;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 using nint = System.Int64;
diff --git a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.cs b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.cs
index 10b77c57f2e..220f79e2859 100644
--- a/netcore/System.Private.CoreLib/shared/System/SpanHelpers.cs
+++ b/netcore/System.Private.CoreLib/shared/System/SpanHelpers.cs
@@ -7,6 +7,7 @@ using System.Runtime;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/String.Comparison.cs b/netcore/System.Private.CoreLib/shared/System/String.Comparison.cs
index 93267b7467c..1b984910940 100644
--- a/netcore/System.Private.CoreLib/shared/System/String.Comparison.cs
+++ b/netcore/System.Private.CoreLib/shared/System/String.Comparison.cs
@@ -10,6 +10,7 @@ using System.Runtime.InteropServices;
 
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/ASCIIUtility.cs b/netcore/System.Private.CoreLib/shared/System/Text/ASCIIUtility.cs
index b37b01779de..4843619b214 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/ASCIIUtility.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/ASCIIUtility.cs
@@ -9,6 +9,7 @@ using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/Rune.cs b/netcore/System.Private.CoreLib/shared/System/Text/Rune.cs
index da640969c00..cafc68bf578 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/Rune.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/Rune.cs
@@ -153,7 +153,7 @@ namespace System.Text
         public static Rune ReplacementChar => UnsafeCreate(UnicodeUtility.ReplacementChar);
 
         /// <summary>
-        /// Returns the length in code units (<see cref="Char"/>) of the
+        /// Returns the length in code units (<see cref="char"/>) of the
         /// UTF-16 sequence required to represent this scalar value.
         /// </summary>
         /// <remarks>
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf16Utility.Validation.cs b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf16Utility.Validation.cs
index 6711ab4c7f8..0909c22bafe 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf16Utility.Validation.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf16Utility.Validation.cs
@@ -8,6 +8,7 @@ using System.Runtime.Intrinsics.X86;
 using System.Numerics;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Transcoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Transcoding.cs
index 126974c892d..79265909aba 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Transcoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Transcoding.cs
@@ -10,6 +10,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics.X86;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Validation.cs b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Validation.cs
index 96e231082e8..14dc98ed776 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Validation.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/Unicode/Utf8Utility.Validation.cs
@@ -7,6 +7,7 @@ using System.Numerics;
 using System.Runtime.Intrinsics.X86;
 using Internal.Runtime.CompilerServices;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nint = System.Int64;
 using nuint = System.UInt64;
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/CancellationToken.cs b/netcore/System.Private.CoreLib/shared/System/Threading/CancellationToken.cs
index a9c4452ff14..793c8636243 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/CancellationToken.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/CancellationToken.cs
@@ -291,7 +291,7 @@ namespace System.Threading
 
         /// <summary>
         /// Determines whether the current <see cref="System.Threading.CancellationToken">CancellationToken</see> instance is equal to the
-        /// specified <see cref="System.Object"/>.
+        /// specified <see cref="object"/>.
         /// </summary>
         /// <param name="other">The other object to which to compare this instance.</param>
         /// <returns>True if <paramref name="other"/> is a <see cref="System.Threading.CancellationToken">CancellationToken</see>
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs b/netcore/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs
index 0fbe176f676..101ec1dd98e 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs
@@ -139,7 +139,7 @@ namespace System.Threading
 
         /// <summary>
         /// Determines whether the current <see cref="System.Threading.CancellationTokenRegistration">CancellationTokenRegistration</see> instance is equal to the
-        /// specified <see cref="System.Object"/>.
+        /// specified <see cref="object"/>.
         /// </summary>
         /// <param name="obj">The other object to which to compare this instance.</param>
         /// <returns>True, if both this and <paramref name="obj"/> are equal. False, otherwise.
@@ -151,7 +151,7 @@ namespace System.Threading
 
         /// <summary>
         /// Determines whether the current <see cref="System.Threading.CancellationToken">CancellationToken</see> instance is equal to the
-        /// specified <see cref="System.Object"/>.
+        /// specified <see cref="object"/>.
         /// </summary>
         /// <param name="other">The other <see cref="System.Threading.CancellationTokenRegistration">CancellationTokenRegistration</see> to which to compare this instance.</param>
         /// <returns>True, if both this and <paramref name="other"/> are equal. False, otherwise.
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/ManualResetEventSlim.cs b/netcore/System.Private.CoreLib/shared/System/Threading/ManualResetEventSlim.cs
index 234107fec4b..b9a1c095e90 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/ManualResetEventSlim.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/ManualResetEventSlim.cs
@@ -429,7 +429,7 @@ namespace System.Threading
         /// false.</returns>
         /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="timeout"/> is a negative
         /// number other than -1 milliseconds, which represents an infinite time-out -or- timeout is greater
-        /// than <see cref="System.Int32.MaxValue"/>.</exception>
+        /// than <see cref="int.MaxValue"/>.</exception>
         /// <exception cref="System.InvalidOperationException">
         /// The maximum number of waiters has been exceeded.
         /// </exception>
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/SemaphoreSlim.cs b/netcore/System.Private.CoreLib/shared/System/Threading/SemaphoreSlim.cs
index 7edea9ab2f1..6d65aa1f029 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/SemaphoreSlim.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/SemaphoreSlim.cs
@@ -216,7 +216,7 @@ namespace System.Threading
         /// otherwise, false.</returns>
         /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="timeout"/> is a negative
         /// number other than -1 milliseconds, which represents an infinite time-out -or- timeout is greater
-        /// than <see cref="System.Int32.MaxValue"/>.</exception>
+        /// than <see cref="int.MaxValue"/>.</exception>
         public bool Wait(TimeSpan timeout)
         {
             // Validate the timeout
@@ -245,7 +245,7 @@ namespace System.Threading
         /// otherwise, false.</returns>
         /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="timeout"/> is a negative
         /// number other than -1 milliseconds, which represents an infinite time-out -or- timeout is greater
-        /// than <see cref="System.Int32.MaxValue"/>.</exception>
+        /// than <see cref="int.MaxValue"/>.</exception>
         /// <exception cref="System.OperationCanceledException"><paramref name="cancellationToken"/> was canceled.</exception>
         public bool Wait(TimeSpan timeout, CancellationToken cancellationToken)
         {
@@ -550,7 +550,7 @@ namespace System.Threading
         /// </exception>
         /// <exception cref="System.ArgumentOutOfRangeException">
         /// <paramref name="timeout"/> is a negative number other than -1 milliseconds, which represents
-        /// an infinite time-out -or- timeout is greater than <see cref="System.Int32.MaxValue"/>.
+        /// an infinite time-out -or- timeout is greater than <see cref="int.MaxValue"/>.
         /// </exception>
         public Task<bool> WaitAsync(TimeSpan timeout)
         {
@@ -574,7 +574,7 @@ namespace System.Threading
         /// </returns>
         /// <exception cref="System.ArgumentOutOfRangeException">
         /// <paramref name="timeout"/> is a negative number other than -1 milliseconds, which represents
-        /// an infinite time-out -or- timeout is greater than <see cref="System.Int32.MaxValue"/>.
+        /// an infinite time-out -or- timeout is greater than <see cref="int.MaxValue"/>.
         /// </exception>
         public Task<bool> WaitAsync(TimeSpan timeout, CancellationToken cancellationToken)
         {
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/SpinLock.cs b/netcore/System.Private.CoreLib/shared/System/Threading/SpinLock.cs
index 843635e7e8e..f64bc01e8cd 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/SpinLock.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/SpinLock.cs
@@ -218,7 +218,7 @@ namespace System.Threading
         /// </exception>
         /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="timeout"/> is a negative
         /// number other than -1 milliseconds, which represents an infinite time-out -or- timeout is greater
-        /// than <see cref="System.Int32.MaxValue"/> milliseconds.
+        /// than <see cref="int.MaxValue"/> milliseconds.
         /// </exception>
         public void TryEnter(TimeSpan timeout, ref bool lockTaken)
         {
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/SpinWait.cs b/netcore/System.Private.CoreLib/shared/System/Threading/SpinWait.cs
index acdad540e74..56ee7c4df7f 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/SpinWait.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/SpinWait.cs
@@ -283,7 +283,7 @@ namespace System.Threading
         /// <exception cref="ArgumentNullException">The <paramref name="condition"/> argument is null.</exception>
         /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="timeout"/> is a negative number
         /// other than -1 milliseconds, which represents an infinite time-out -or- timeout is greater than
-        /// <see cref="System.Int32.MaxValue"/>.</exception>
+        /// <see cref="int.MaxValue"/>.</exception>
         public static bool SpinUntil(Func<bool> condition, TimeSpan timeout)
         {
             // Validate the timeout
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/Tasks/Task.cs b/netcore/System.Private.CoreLib/shared/System/Threading/Tasks/Task.cs
index 17e964d85f5..7792c116b49 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/Tasks/Task.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/Tasks/Task.cs
@@ -2676,7 +2676,7 @@ namespace System.Threading.Tasks
         /// <exception cref="System.ArgumentOutOfRangeException">
         /// <paramref name="timeout"/> is a negative number other than -1 milliseconds, which represents an
         /// infinite time-out -or- timeout is greater than
-        /// <see cref="System.Int32.MaxValue"/>.
+        /// <see cref="int.MaxValue"/>.
         /// </exception>
         public bool Wait(TimeSpan timeout)
         {
@@ -4598,7 +4598,7 @@ namespace System.Threading.Tasks
         /// <exception cref="System.ArgumentOutOfRangeException">
         /// <paramref name="timeout"/> is a negative number other than -1 milliseconds, which represents an
         /// infinite time-out -or- timeout is greater than
-        /// <see cref="System.Int32.MaxValue"/>.
+        /// <see cref="int.MaxValue"/>.
         /// </exception>
         [MethodImpl(MethodImplOptions.NoOptimization)]  // this is needed for the parallel debugger
         public static bool WaitAll(Task[] tasks, TimeSpan timeout)
@@ -4985,7 +4985,7 @@ namespace System.Threading.Tasks
         /// <exception cref="System.ArgumentOutOfRangeException">
         /// <paramref name="timeout"/> is a negative number other than -1 milliseconds, which represents an
         /// infinite time-out -or- timeout is greater than
-        /// <see cref="System.Int32.MaxValue"/>.
+        /// <see cref="int.MaxValue"/>.
         /// </exception>
         [MethodImpl(MethodImplOptions.NoOptimization)]  // this is needed for the parallel debugger
         public static int WaitAny(Task[] tasks, TimeSpan timeout)
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/ThreadLocal.cs b/netcore/System.Private.CoreLib/shared/System/Threading/ThreadLocal.cs
index 3bffba18d41..68c58977468 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/ThreadLocal.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/ThreadLocal.cs
@@ -213,7 +213,7 @@ namespace System.Threading
         #endregion
 
         /// <summary>Creates and returns a string representation of this instance for the current thread.</summary>
-        /// <returns>The result of calling <see cref="System.Object.ToString"/> on the <see cref="Value"/>.</returns>
+        /// <returns>The result of calling <see cref="object.ToString"/> on the <see cref="Value"/>.</returns>
         /// <exception cref="System.NullReferenceException">
         /// The <see cref="Value"/> for the current thread is a null reference (Nothing in Visual Basic).
         /// </exception>
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/TimeoutHelper.cs b/netcore/System.Private.CoreLib/shared/System/Threading/TimeoutHelper.cs
index dd3291281eb..80552a4ff6a 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/TimeoutHelper.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/TimeoutHelper.cs
@@ -13,9 +13,9 @@ namespace System.Threading
     internal static class TimeoutHelper
     {
         /// <summary>
-        /// Returns <see cref="Environment.TickCount"/> as a start time in milliseconds as a <see cref="UInt32"/>.
+        /// Returns <see cref="Environment.TickCount"/> as a start time in milliseconds as a <see cref="uint"/>.
         /// <see cref="Environment.TickCount"/> rolls over from positive to negative every ~25 days, then ~25 days to back to positive again.
-        /// <see cref="UInt32"/> is used to ignore the sign and double the range to 50 days.
+        /// <see cref="uint"/> is used to ignore the sign and double the range to 50 days.
         /// </summary>
         public static uint GetTime()
         {
diff --git a/netcore/System.Private.CoreLib/shared/System/Threading/Volatile.cs b/netcore/System.Private.CoreLib/shared/System/Threading/Volatile.cs
index 5c1df6374c8..23046bbe25e 100644
--- a/netcore/System.Private.CoreLib/shared/System/Threading/Volatile.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Threading/Volatile.cs
@@ -91,7 +91,7 @@ namespace System.Threading
         [NonVersionable]
         public static long Read(ref long location) =>
 #if BIT64
-            (Int64)Unsafe.As<Int64, VolatileIntPtr>(ref location).Value;
+            (long)Unsafe.As<long, VolatileIntPtr>(ref location).Value;
 #else
             // On 32-bit machines, we use Interlocked, since an ordinary volatile read would not be atomic.
             Interlocked.CompareExchange(ref location, 0, 0);
@@ -101,7 +101,7 @@ namespace System.Threading
         [NonVersionable]
         public static void Write(ref long location, long value) =>
 #if BIT64
-            Unsafe.As<Int64, VolatileIntPtr>(ref location).Value = (IntPtr)value;
+            Unsafe.As<long, VolatileIntPtr>(ref location).Value = (IntPtr)value;
 #else
             // On 32-bit, we use Interlocked, since an ordinary volatile write would not be atomic.
             Interlocked.Exchange(ref location, value);
diff --git a/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs b/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
index 4d33029c1d6..8818733858d 100644
--- a/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
+++ b/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 using System.Runtime.Versioning;
 
+#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types
 #if BIT64
 using nuint = System.UInt64;
 #else