Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Toub <stoub@microsoft.com>2019-08-08 21:35:33 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2019-08-09 17:23:42 +0300
commit442e9ad144dd2da2672cf69ce284ae65068291fa (patch)
treecb1af6afada1693d4e6b42a7f47699d8baaa9b19 /netcore
parent01fa50943f4ae400173eef989122a62b96b6fd88 (diff)
Fix StyleCop warning SA1206 (modifer ordering)
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'netcore')
-rw-r--r--netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs4
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Globalization/CultureData.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/IO/BinaryWriter.cs8
-rw-r--r--netcore/System.Private.CoreLib/shared/System/IO/TextReader.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStreamWrapper.cs4
-rw-r--r--netcore/System.Private.CoreLib/shared/System/IntPtr.cs6
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Security/SafeBSTRHandle.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/ASCIIEncoding.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/DecoderBestFitFallback.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/DecoderFallback.cs4
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs6
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/DecoderReplacementFallback.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/EncoderFallback.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/EncoderNLS.cs4
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/Encoding.cs8
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/EncodingNLS.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/UTF32Encoding.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/UTF7Encoding.cs4
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/UTF8Encoding.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Text/UnicodeEncoding.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Type.cs2
-rw-r--r--netcore/System.Private.CoreLib/shared/System/UIntPtr.cs6
25 files changed, 42 insertions, 42 deletions
diff --git a/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs b/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
index a45c862d44c..0bbae23a182 100644
--- a/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
+++ b/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
@@ -41,7 +41,7 @@ namespace Microsoft.Win32.SafeHandles
internal ThreadPoolBoundHandle? ThreadPoolBinding { get; set; }
- override protected bool ReleaseHandle()
+ protected override bool ReleaseHandle()
{
return Interop.Kernel32.CloseHandle(handle);
}
diff --git a/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs b/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs
index 4ba05409fd9..760ffaf73e3 100644
--- a/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs
+++ b/netcore/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFindHandle.Windows.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Win32.SafeHandles
{
internal SafeFindHandle() : base(true) { }
- override protected bool ReleaseHandle()
+ protected override bool ReleaseHandle()
{
return Interop.Kernel32.FindClose(handle);
}
diff --git a/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs b/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs
index 03e130219b7..940a6ff2bf5 100644
--- a/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs
@@ -902,7 +902,7 @@ namespace System.Globalization
return IndexOf(source, value, startIndex, count, CompareOptions.None);
}
- public unsafe virtual int IndexOf(string source, char value, int startIndex, int count, CompareOptions options)
+ public virtual unsafe int IndexOf(string source, char value, int startIndex, int count, CompareOptions options)
{
if (source == null)
{
@@ -932,7 +932,7 @@ namespace System.Globalization
return IndexOf(source, char.ToString(value), startIndex, count, options, null);
}
- public unsafe virtual int IndexOf(string source, string value, int startIndex, int count, CompareOptions options)
+ public virtual unsafe int IndexOf(string source, string value, int startIndex, int count, CompareOptions options)
{
if (source == null)
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Globalization/CultureData.cs b/netcore/System.Private.CoreLib/shared/System/Globalization/CultureData.cs
index 613f0c5ba63..c42b7c5cbae 100644
--- a/netcore/System.Private.CoreLib/shared/System/Globalization/CultureData.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Globalization/CultureData.cs
@@ -564,7 +564,7 @@ namespace System.Globalization
return s_Invariant;
}
}
- private volatile static CultureData? s_Invariant;
+ private static volatile CultureData? s_Invariant;
// Cache of cultures we've already looked up
private static volatile StringCultureDataDictionary? s_cachedCultures;
diff --git a/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs b/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
index 702d96ff1a4..bf1cbfaab61 100644
--- a/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Globalization/TextInfo.cs
@@ -52,7 +52,7 @@ namespace System.Globalization
get => s_invariant ?? (s_invariant = new TextInfo(CultureData.Invariant));
}
- private volatile static TextInfo? s_invariant;
+ private static volatile TextInfo? s_invariant;
internal TextInfo(CultureData cultureData)
{
diff --git a/netcore/System.Private.CoreLib/shared/System/IO/BinaryWriter.cs b/netcore/System.Private.CoreLib/shared/System/IO/BinaryWriter.cs
index 894959f2441..1f20a5450f1 100644
--- a/netcore/System.Private.CoreLib/shared/System/IO/BinaryWriter.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IO/BinaryWriter.cs
@@ -193,7 +193,7 @@ namespace System.IO
// advanced by two.
// Note this method cannot handle surrogates properly in UTF-8.
//
- public unsafe virtual void Write(char ch)
+ public virtual unsafe void Write(char ch)
{
if (char.IsSurrogate(ch))
throw new ArgumentException(SR.Arg_SurrogatesNotAllowedAsSingleChar);
@@ -236,7 +236,7 @@ namespace System.IO
// Writes a double to this stream. The current position of the stream is
// advanced by eight.
//
- public unsafe virtual void Write(double value)
+ public virtual unsafe void Write(double value)
{
ulong TmpValue = *(ulong*)&value;
_buffer[0] = (byte)TmpValue;
@@ -338,7 +338,7 @@ namespace System.IO
// Writes a float to this stream. The current position of the stream is
// advanced by four.
//
- public unsafe virtual void Write(float value)
+ public virtual unsafe void Write(float value)
{
uint TmpValue = *(uint*)&value;
_buffer[0] = (byte)TmpValue;
@@ -354,7 +354,7 @@ namespace System.IO
// a four-byte unsigned integer, and then writes that many characters
// to the stream.
//
- public unsafe virtual void Write(string value)
+ public virtual unsafe void Write(string value)
{
if (value == null)
throw new ArgumentNullException(nameof(value));
diff --git a/netcore/System.Private.CoreLib/shared/System/IO/TextReader.cs b/netcore/System.Private.CoreLib/shared/System/IO/TextReader.cs
index c43d30d4249..4b01f6e793d 100644
--- a/netcore/System.Private.CoreLib/shared/System/IO/TextReader.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IO/TextReader.cs
@@ -214,7 +214,7 @@ namespace System.IO
this, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);
}
- public async virtual Task<string> ReadToEndAsync()
+ public virtual async Task<string> ReadToEndAsync()
{
var sb = new StringBuilder(4096);
char[] chars = ArrayPool<char>.Shared.Rent(4096);
diff --git a/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStreamWrapper.cs b/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStreamWrapper.cs
index ec2a79528f6..72dcd15b6fa 100644
--- a/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStreamWrapper.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IO/UnmanagedMemoryStreamWrapper.cs
@@ -124,7 +124,7 @@ namespace System.IO
return _unmanagedStream.Seek(offset, loc);
}
- public unsafe override byte[] ToArray()
+ public override unsafe byte[] ToArray()
{
byte[] buffer = new byte[_unmanagedStream.Length];
_unmanagedStream.Read(buffer, 0, (int)_unmanagedStream.Length);
@@ -147,7 +147,7 @@ namespace System.IO
}
// Writes this MemoryStream to another stream.
- public unsafe override void WriteTo(Stream stream)
+ public override unsafe void WriteTo(Stream stream)
{
if (stream == null)
throw new ArgumentNullException(nameof(stream), SR.ArgumentNull_Stream);
diff --git a/netcore/System.Private.CoreLib/shared/System/IntPtr.cs b/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
index 187be03243d..4a5ca1fb271 100644
--- a/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
+++ b/netcore/System.Private.CoreLib/shared/System/IntPtr.cs
@@ -73,7 +73,7 @@ namespace System
info.AddValue("value", ToInt64());
}
- public unsafe override bool Equals(object? obj)
+ public override unsafe bool Equals(object? obj)
{
if (obj is IntPtr)
{
@@ -87,7 +87,7 @@ namespace System
return _value == other._value;
}
- public unsafe override int GetHashCode()
+ public override unsafe int GetHashCode()
{
#if BIT64
long l = (long)_value;
@@ -223,7 +223,7 @@ namespace System
return _value;
}
- public unsafe override string ToString()
+ public override unsafe string ToString()
{
return ((nint)_value).ToString(CultureInfo.InvariantCulture);
}
diff --git a/netcore/System.Private.CoreLib/shared/System/Security/SafeBSTRHandle.cs b/netcore/System.Private.CoreLib/shared/System/Security/SafeBSTRHandle.cs
index dd52f42cf73..ceaf903aa9f 100644
--- a/netcore/System.Private.CoreLib/shared/System/Security/SafeBSTRHandle.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Security/SafeBSTRHandle.cs
@@ -24,7 +24,7 @@ namespace System.Security
return bstr;
}
- override protected bool ReleaseHandle()
+ protected override bool ReleaseHandle()
{
RuntimeImports.RhZeroMemory(handle, (UIntPtr)Marshal.SysStringByteLen(handle));
Interop.OleAut32.SysFreeString(handle);
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/ASCIIEncoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/ASCIIEncoding.cs
index 91868e000c6..55d3adc8617 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/ASCIIEncoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/ASCIIEncoding.cs
@@ -586,7 +586,7 @@ namespace System.Text
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
[CLSCompliant(false)]
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/DecoderBestFitFallback.cs b/netcore/System.Private.CoreLib/shared/System/Text/DecoderBestFitFallback.cs
index 07d085cc0ce..d69d1c7f745 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/DecoderBestFitFallback.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/DecoderBestFitFallback.cs
@@ -158,7 +158,7 @@ namespace System.Text
}
// This version just counts the fallback and doesn't actually copy anything.
- internal unsafe override int InternalFallback(byte[] bytes, byte* pBytes)
+ internal override unsafe int InternalFallback(byte[] bytes, byte* pBytes)
// Right now this has both bytes and bytes[], since we might have extra bytes, hence the
// array, and we might need the index, hence the byte*
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/DecoderFallback.cs b/netcore/System.Private.CoreLib/shared/System/Text/DecoderFallback.cs
index 282baf75907..d4397bc378b 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/DecoderFallback.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/DecoderFallback.cs
@@ -111,7 +111,7 @@ namespace System.Text
// Right now this has both bytes and bytes[], since we might have extra bytes, hence the
// array, and we might need the index, hence the byte*
// Don't touch ref chars unless we succeed
- internal unsafe virtual bool InternalFallback(byte[] bytes, byte* pBytes, ref char* chars)
+ internal virtual unsafe bool InternalFallback(byte[] bytes, byte* pBytes, ref char* chars)
{
Debug.Assert(byteStart != null, "[DecoderFallback.InternalFallback]Used InternalFallback without calling InternalInitialize");
@@ -164,7 +164,7 @@ namespace System.Text
}
// This version just counts the fallback and doesn't actually copy anything.
- internal unsafe virtual int InternalFallback(byte[] bytes, byte* pBytes)
+ internal virtual unsafe int InternalFallback(byte[] bytes, byte* pBytes)
// Right now this has both bytes and bytes[], since we might have extra bytes, hence the
// array, and we might need the index, hence the byte*
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs b/netcore/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs
index 184d59d8684..7ccaead4d20 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/DecoderNLS.cs
@@ -67,7 +67,7 @@ namespace System.Text
return GetCharCount(pBytes + index, count, flush);
}
- public unsafe override int GetCharCount(byte* bytes, int count, bool flush)
+ public override unsafe int GetCharCount(byte* bytes, int count, bool flush)
{
// Validate parameters
if (bytes == null)
@@ -123,7 +123,7 @@ namespace System.Text
pChars + charIndex, charCount, flush);
}
- public unsafe override int GetChars(byte* bytes, int byteCount,
+ public override unsafe int GetChars(byte* bytes, int byteCount,
char* chars, int charCount, bool flush)
{
// Validate parameters
@@ -184,7 +184,7 @@ namespace System.Text
// This is the version that used pointers. We call the base encoding worker function
// after setting our appropriate internal variables. This is getting chars
- public unsafe override void Convert(byte* bytes, int byteCount,
+ public override unsafe void Convert(byte* bytes, int byteCount,
char* chars, int charCount, bool flush,
out int bytesUsed, out int charsUsed, out bool completed)
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/DecoderReplacementFallback.cs b/netcore/System.Private.CoreLib/shared/System/Text/DecoderReplacementFallback.cs
index 8b4f1f2557c..a609b31656a 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/DecoderReplacementFallback.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/DecoderReplacementFallback.cs
@@ -191,7 +191,7 @@ namespace System.Text
}
// This version just counts the fallback and doesn't actually copy anything.
- internal unsafe override int InternalFallback(byte[] bytes, byte* pBytes)
+ internal override unsafe int InternalFallback(byte[] bytes, byte* pBytes)
// Right now this has both bytes and bytes[], since we might have extra bytes, hence the
// array, and we might need the index, hence the byte*
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/EncoderFallback.cs b/netcore/System.Private.CoreLib/shared/System/Text/EncoderFallback.cs
index fd32a19517e..13d1ab59d8b 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/EncoderFallback.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/EncoderFallback.cs
@@ -318,7 +318,7 @@ namespace System.Text
// Note that this could also change the contents of this.encoder, which is the same
// object that the caller is using, so the caller could mess up the encoder for us
// if they aren't careful.
- internal unsafe virtual bool InternalFallback(char ch, ref char* chars)
+ internal virtual unsafe bool InternalFallback(char ch, ref char* chars)
{
// Shouldn't have null charStart
Debug.Assert(charStart != null,
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/EncoderNLS.cs b/netcore/System.Private.CoreLib/shared/System/Text/EncoderNLS.cs
index e71ad05aa5e..12d020c9c6b 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/EncoderNLS.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/EncoderNLS.cs
@@ -67,7 +67,7 @@ namespace System.Text
return result;
}
- public unsafe override int GetByteCount(char* chars, int count, bool flush)
+ public override unsafe int GetByteCount(char* chars, int count, bool flush)
{
// Validate input parameters
if (chars == null)
@@ -115,7 +115,7 @@ namespace System.Text
pBytes + byteIndex, byteCount, flush);
}
- public unsafe override int GetBytes(char* chars, int charCount, byte* bytes, int byteCount, bool flush)
+ public override unsafe int GetBytes(char* chars, int charCount, byte* bytes, int byteCount, bool flush)
{
// Validate parameters
if (chars == null || bytes == null)
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/Encoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/Encoding.cs
index 256602ed2b6..e19aa71852b 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/Encoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/Encoding.cs
@@ -1266,7 +1266,7 @@ namespace System.Text
return _encoding.GetByteCount(chars, index, count);
}
- public unsafe override int GetByteCount(char* chars, int count, bool flush)
+ public override unsafe int GetByteCount(char* chars, int count, bool flush)
{
return _encoding.GetByteCount(chars, count);
}
@@ -1297,7 +1297,7 @@ namespace System.Text
return _encoding.GetBytes(chars, charIndex, charCount, bytes, byteIndex);
}
- public unsafe override int GetBytes(char* chars, int charCount,
+ public override unsafe int GetBytes(char* chars, int charCount,
byte* bytes, int byteCount, bool flush)
{
return _encoding.GetBytes(chars, charCount, bytes, byteCount);
@@ -1335,7 +1335,7 @@ namespace System.Text
return _encoding.GetCharCount(bytes, index, count);
}
- public unsafe override int GetCharCount(byte* bytes, int count, bool flush)
+ public override unsafe int GetCharCount(byte* bytes, int count, bool flush)
{
// By default just call the encoding version, no flush by default
return _encoding.GetCharCount(bytes, count);
@@ -1370,7 +1370,7 @@ namespace System.Text
return _encoding.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
}
- public unsafe override int GetChars(byte* bytes, int byteCount,
+ public override unsafe int GetChars(byte* bytes, int byteCount,
char* chars, int charCount, bool flush)
{
// By default just call the encoding's version
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/EncodingNLS.cs b/netcore/System.Private.CoreLib/shared/System/Text/EncodingNLS.cs
index 62578e305ff..9bcd0ba48b2 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/EncodingNLS.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/EncodingNLS.cs
@@ -248,7 +248,7 @@ namespace System.Text
// All of our public Encodings that don't use EncodingNLS must have this (including EncodingNLS)
// So if you fix this, fix the others. Currently those include:
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
if (bytes == null || chars == null)
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/UTF32Encoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/UTF32Encoding.cs
index 169957da9ff..e1d2115b585 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/UTF32Encoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/UTF32Encoding.cs
@@ -319,7 +319,7 @@ namespace System.Text
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
[CLSCompliant(false)]
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
if (bytes == null || chars == null)
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/UTF7Encoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/UTF7Encoding.cs
index 1524b6f72c7..823a13c83b6 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/UTF7Encoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/UTF7Encoding.cs
@@ -351,7 +351,7 @@ namespace System.Text
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
[CLSCompliant(false)]
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
if (bytes == null || chars == null)
@@ -957,7 +957,7 @@ namespace System.Text
}
// This version just counts the fallback and doesn't actually copy anything.
- internal unsafe override int InternalFallback(byte[] bytes, byte* pBytes)
+ internal override unsafe int InternalFallback(byte[] bytes, byte* pBytes)
// Right now this has both bytes and bytes[], since we might have extra bytes, hence the
// array, and we might need the index, hence the byte*
{
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/UTF8Encoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/UTF8Encoding.cs
index eccf905a009..61f0507f534 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/UTF8Encoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/UTF8Encoding.cs
@@ -532,7 +532,7 @@ namespace System.Text
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
[CLSCompliant(false)]
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
diff --git a/netcore/System.Private.CoreLib/shared/System/Text/UnicodeEncoding.cs b/netcore/System.Private.CoreLib/shared/System/Text/UnicodeEncoding.cs
index dfb55ada743..3cd72921cfb 100644
--- a/netcore/System.Private.CoreLib/shared/System/Text/UnicodeEncoding.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Text/UnicodeEncoding.cs
@@ -310,7 +310,7 @@ namespace System.Text
// EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding
[CLSCompliant(false)]
- public unsafe override int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
+ public override unsafe int GetChars(byte* bytes, int byteCount, char* chars, int charCount)
{
// Validate Parameters
if (bytes == null || chars == null)
diff --git a/netcore/System.Private.CoreLib/shared/System/Type.cs b/netcore/System.Private.CoreLib/shared/System/Type.cs
index f78c762df91..3f48068c042 100644
--- a/netcore/System.Private.CoreLib/shared/System/Type.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Type.cs
@@ -23,7 +23,7 @@ namespace System
public abstract string? FullName { get; }
public abstract Assembly Assembly { get; }
- public abstract new Module Module { get; }
+ public new abstract Module Module { get; }
public bool IsNested => DeclaringType != null;
public override Type? DeclaringType => null;
diff --git a/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs b/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
index 8818733858d..01c4e175f7c 100644
--- a/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
+++ b/netcore/System.Private.CoreLib/shared/System/UIntPtr.cs
@@ -69,7 +69,7 @@ namespace System
info.AddValue("value", ToUInt64());
}
- public unsafe override bool Equals(object? obj)
+ public override unsafe bool Equals(object? obj)
{
if (obj is UIntPtr)
{
@@ -83,7 +83,7 @@ namespace System
return _value == other._value;
}
- public unsafe override int GetHashCode()
+ public override unsafe int GetHashCode()
{
#if BIT64
ulong l = (ulong)_value;
@@ -214,7 +214,7 @@ namespace System
return _value;
}
- public unsafe override string ToString()
+ public override unsafe string ToString()
{
return ((nuint)_value).ToString(CultureInfo.InvariantCulture);
}