Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs

@@ -33,7 +33,6 @@ namespace System
             }
         }
 
-#if NETSTANDARD
         public static string TargetFrameworkName
         {
             get
@@ -46,10 +45,8 @@ namespace System
         {
             throw new NotImplementedException();
         }
-#endif
 
         #region Switch APIs
-
         static AppContext()
         {
             // populate the AppContext with the default set of values

mcs/class/referencesource/mscorlib/system/reflection/typedelegator.cs

@@ -261,5 +261,9 @@ namespace System.Reflection {
         {
             return typeImpl.GetInterfaceMap(interfaceType);
         }
+
+#if MONO
+        public override bool IsSZArray { get { return typeImpl.IsSZArray; } }
+#endif
     }
 }

mcs/class/referencesource/mscorlib/system/type.cs

@@ -1891,6 +1891,10 @@ namespace System {
         // private convenience data
         private const BindingFlags DefaultLookup = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
         internal const BindingFlags DeclaredOnlyLookup = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+#if MONO
+        public virtual bool IsSZArray { get { throw new NotImplementedException (); } }
+#endif
 }
 
 #if CONTRACTS_FULL