Merge pull request dotnet/corert#4918 from dotnet/nmirror

Merge nmirror to master

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

diff --git a/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs b/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs
index 28593d3..a8b7a18 100644 (file)
--- a/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs
+++ b/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs
@@ -19,11 +19,11 @@ namespace System.Collections
     ///    will be smaller and faster than a Hashtable if the number of elements is 10 or less.
     ///    This should not be used if performance is important for large numbers of elements.
     [Serializable]
-    [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] 
-#if CORECLR
-    internal
-#else
+    [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+#if CORERT
     public
+#else
+    internal
 #endif
     class ListDictionaryInternal : IDictionary
     {

diff --git a/src/mscorlib/shared/System/DefaultBinder.cs b/src/mscorlib/shared/System/DefaultBinder.cs
index b6c12b1..f8d8c0c 100644 (file)
--- a/src/mscorlib/shared/System/DefaultBinder.cs
+++ b/src/mscorlib/shared/System/DefaultBinder.cs
@@ -8,10 +8,10 @@ using CultureInfo = System.Globalization.CultureInfo;
 
 namespace System
 {
-#if CORECLR
-    internal
-#else
+#if CORERT
     public sealed
+#else
+    internal
 #endif
     partial class DefaultBinder : Binder
     {

diff --git a/src/mscorlib/shared/System/ReadOnlySpan.cs b/src/mscorlib/shared/System/ReadOnlySpan.cs
index 9f491f6..28fb2e3 100644 (file)
--- a/src/mscorlib/shared/System/ReadOnlySpan.cs
+++ b/src/mscorlib/shared/System/ReadOnlySpan.cs
@@ -173,9 +173,7 @@ namespace System
                 return Unsafe.Add(ref _pointer.Value, index);
             }
 #else
-#if CORERT
             [Intrinsic]
-#endif
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             [NonVersionable]
             get

diff --git a/src/mscorlib/shared/System/Reflection/MethodInfo.Internal.cs b/src/mscorlib/shared/System/Reflection/MethodInfo.Internal.cs
index a36ef90..2806be6 100644 (file)
--- a/src/mscorlib/shared/System/Reflection/MethodInfo.Internal.cs
+++ b/src/mscorlib/shared/System/Reflection/MethodInfo.Internal.cs
@@ -6,11 +6,10 @@ namespace System.Reflection
 {
     public abstract partial class MethodInfo : MethodBase
     {
-#if CORECLR
-        internal
+#if CORERT        
+        public // Needs to be public so that Reflection.Core can see it.
 #else
-        // Not an api but needs to be public so that Reflection.Core can access it.
-        public
+        internal
 #endif
         virtual int GenericParameterCount => GetGenericArguments().Length;
     }

diff --git a/src/mscorlib/shared/System/Reflection/SignatureTypeExtensions.cs b/src/mscorlib/shared/System/Reflection/SignatureTypeExtensions.cs
index f0a33d0..5847944 100644 (file)
--- a/src/mscorlib/shared/System/Reflection/SignatureTypeExtensions.cs
+++ b/src/mscorlib/shared/System/Reflection/SignatureTypeExtensions.cs
@@ -8,10 +8,10 @@ using System.Diagnostics;
 
 namespace System.Reflection
 {
-#if CORECLR
-    internal
-#else
+#if CORERT
     public // Needs to be public so that Reflection.Core can see it.
+#else
+    internal
 #endif
     static class SignatureTypeExtensions
     {

diff --git a/src/mscorlib/shared/System/Resources/RuntimeResourceSet.cs b/src/mscorlib/shared/System/Resources/RuntimeResourceSet.cs
index eadc92c..a63e68c 100644 (file)
--- a/src/mscorlib/shared/System/Resources/RuntimeResourceSet.cs
+++ b/src/mscorlib/shared/System/Resources/RuntimeResourceSet.cs
@@ -160,10 +160,10 @@ namespace System.Resources
     // into smaller chunks, each of size sqrt(n), would be substantially better for
     // resource files containing thousands of resources.
     // 
-#if CORECLR
-    internal
-#else
+#if CORERT
     public  // On CoreRT, this must be public because of need to whitelist past the ReflectionBlock.
+#else
+    internal
 #endif
     sealed class RuntimeResourceSet : ResourceSet, IEnumerable
     {
@@ -431,4 +431,4 @@ namespace System.Resources
             return value;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/mscorlib/shared/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs b/src/mscorlib/shared/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs
index 813d9e5..b5ecd79 100644 (file)
--- a/src/mscorlib/shared/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs
+++ b/src/mscorlib/shared/System/Runtime/CompilerServices/AsyncValueTaskMethodBuilder.cs
@@ -25,14 +25,14 @@ namespace System.Runtime.CompilerServices
         /// <summary>Creates an instance of the <see cref="AsyncValueTaskMethodBuilder{TResult}"/> struct.</summary>
         /// <returns>The initialized instance.</returns>
         public static AsyncValueTaskMethodBuilder<TResult> Create() =>
-#if CORECLR
-            // _methodBuilder should be initialized to AsyncTaskMethodBuilder<TResult>.Create(), but on coreclr
-            // that Create() is a nop, so we can just return the default here.
-            default(AsyncValueTaskMethodBuilder<TResult>);
-#else
+#if CORERT
             // corert's AsyncTaskMethodBuilder<TResult>.Create() currently does additional debugger-related
             // work, so we need to delegate to it.
             new AsyncValueTaskMethodBuilder<TResult>() { _methodBuilder = AsyncTaskMethodBuilder<TResult>.Create() };
+#else
+            // _methodBuilder should be initialized to AsyncTaskMethodBuilder<TResult>.Create(), but on coreclr
+            // that Create() is a nop, so we can just return the default here.
+            default(AsyncValueTaskMethodBuilder<TResult>);
 #endif
 
         /// <summary>Begins running the builder with the associated state machine.</summary>

diff --git a/src/mscorlib/shared/System/Span.cs b/src/mscorlib/shared/System/Span.cs
index aec83de..90ef2fc 100644 (file)
--- a/src/mscorlib/shared/System/Span.cs
+++ b/src/mscorlib/shared/System/Span.cs
@@ -185,9 +185,7 @@ namespace System
                 return ref Unsafe.Add(ref _pointer.Value, index);
             }
 #else
-#if CORERT
             [Intrinsic]
-#endif
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             [NonVersionable]
             get

diff --git a/src/mscorlib/shared/System/UnitySerializationHolder.cs b/src/mscorlib/shared/System/UnitySerializationHolder.cs
index bbfebff..2f30356 100644 (file)
--- a/src/mscorlib/shared/System/UnitySerializationHolder.cs
+++ b/src/mscorlib/shared/System/UnitySerializationHolder.cs
@@ -11,10 +11,10 @@ namespace System
     /// This only exists for compatibility with .NET Framework.
     /// </summary>
     [Serializable]
-#if CORECLR
-    internal
+#if CORERT
+    public
 #else
-    public  // On CoreRT this must be public.
+    internal
 #endif
     sealed class UnitySerializationHolder : ISerializable, IObjectReference
     {