Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs

@@ -139,12 +139,10 @@ namespace System.Linq.Expressions {
             return LambdaCompiler.Compile(this, debugInfoGenerator);
         }
 
-#if NETSTANDARD
         public Delegate Compile(bool preferInterpretation) {
             // TODO: add logic for preferInterpretation
             return Compile();
         }
-#endif
 
         /// <summary>
         /// Compiles the lambda into a method definition.
@@ -207,12 +205,10 @@ namespace System.Linq.Expressions {
             return (TDelegate)(object)LambdaCompiler.Compile(this, debugInfoGenerator);
         }
 
-#if NETSTANDARD
         public new TDelegate Compile(bool preferInterpretation) {
             // TODO: add logic for preferInterpretation
             return Compile();
         }
-#endif
 
         /// <summary>
         /// Creates a new expression that is like this one, but using the

mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs.REMOVED.git-id

@@ -1 +1 @@
-373609195c25680febccfacc678a393fa3cfeb06
+d1dc03000a9f0b6357a67dd3f7b9c72da5e9be1a

mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs

@@ -242,7 +242,6 @@ namespace System.Security.Cryptography {
             }
         }
 
-#if NETSTANDARD
         public static CngAlgorithm ECDiffieHellman {
             get {
                 throw new NotImplementedException ();
@@ -254,6 +253,5 @@ namespace System.Security.Cryptography {
                 throw new NotImplementedException ();
             }
         }
-#endif
     }
 }

mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs

@@ -119,7 +119,6 @@ namespace System.Security.Cryptography {
             }
         }
 
-#if NETSTANDARD
         public static CngKeyBlobFormat EccFullPrivateBlob {
             get {
                 throw new NotImplementedException ();
@@ -131,7 +130,6 @@ namespace System.Security.Cryptography {
                 throw new NotImplementedException ();
             }
         }
-#endif
 
         public static CngKeyBlobFormat GenericPrivateBlob {
             get {

mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs

@@ -41,7 +41,6 @@ namespace System.Security.Cryptography {
             return CryptoConfig.CreateFromName(algorithm) as ECDsa;
         }
 
-#if NETSTANDARD
         public static ECDsa Create (ECCurve curve)
         {
             throw new NotImplementedException ();
@@ -71,7 +70,6 @@ namespace System.Security.Cryptography {
         {
             throw new NotImplementedException ();
         }
-#endif
 
         //
         // Signature operations

mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs

@@ -31,11 +31,9 @@ namespace System.Security.Cryptography {
             throw new NotImplementedException ();
         }
 
-#if NETSTANDARD
         public ECDsaCng(ECCurve curve) {
             throw new NotImplementedException ();
         }
-#endif
 
         public CngKey Key {
             get {

mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs

@@ -18,12 +18,10 @@ namespace System.Security.Cryptography
             throw new NotImplementedException ();
         }
 
-#if NETSTANDARD
         public RSACng(CngKey key)
         {
             throw new NotImplementedException ();
         }
-#endif
 
         public CngKey Key
         {

mcs/class/referencesource/System.Data/System/Data/CodeGen/StrongTypingException.cs

@@ -13,6 +13,7 @@ namespace System.Data {
     using System.Data;
     using System.Runtime.Serialization;
 
+#if !COREFX
     /// <devdoc>
     ///    <para>DEV: The exception that is throwing from strong typed DataSet when user access to DBNull value.</para>
     /// </devdoc>
@@ -39,7 +40,7 @@ namespace System.Data {
             HResult = HResults.StrongTyping;
         }
     }
-
+#endif
 
     /// <devdoc>
     ///    <para>DEV: The exception that is throwing in generating strong typed DataSet when name conflict happens.</para>

mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs.REMOVED.git-id

@@ -1 +1 @@
-1e5ea43e2710b9e2f6698d8b679b66e4c28040a4
+1ba61d95a6a06b14afc98732a9b396cbc23e3cfb

mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs

@@ -86,7 +86,7 @@ namespace System.Data.Common {
             _encryptedUsersConnectionString = connectionOptions.UsersConnectionString(false);
             _hasPassword = connectionOptions.HasPasswordKeyword;
             _parsetable = connectionOptions.Parsetable;
-            _keychain = connectionOptions.KeyChain;
+            _keychain = connectionOptions._keyChain;
 
             // we do not want to serialize out user password unless directed so by "persist security info=true"
             // otherwise all instances of user's password will be replaced with "*"

mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs

@@ -107,7 +107,7 @@ namespace System.Data.Common {
 
         private readonly string        _usersConnectionString;
         private readonly Hashtable     _parsetable;
-        internal readonly NameValuePair KeyChain;
+        internal readonly NameValuePair _keyChain;
         internal readonly bool HasPasswordKeyword;
         internal readonly bool HasUserIdKeyword;
 
@@ -143,7 +143,7 @@ namespace System.Data.Common {
 
             // first pass on parsing, initial syntax check
             if (0 < _usersConnectionString.Length) {
-                KeyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, UseOdbcRules);
+                _keyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, UseOdbcRules);
                 HasPasswordKeyword = (_parsetable.ContainsKey(KEY.Password) || _parsetable.ContainsKey(SYNONYM.Pwd));
                 HasUserIdKeyword = (_parsetable.ContainsKey(KEY.User_ID) || _parsetable.ContainsKey(SYNONYM.UID));
             }
@@ -155,7 +155,7 @@ namespace System.Data.Common {
             HasUserIdKeyword = connectionOptions.HasUserIdKeyword;
             UseOdbcRules = connectionOptions.UseOdbcRules;
             _parsetable = connectionOptions._parsetable;
-            KeyChain = connectionOptions.KeyChain;
+            _keyChain = connectionOptions._keyChain;
         }
 
 
@@ -201,7 +201,7 @@ namespace System.Data.Common {
         }
 
         public bool IsEmpty {
-            get { return (null == KeyChain); }
+            get { return (null == _keyChain); }
         }
 
         internal Hashtable Parsetable {
@@ -439,7 +439,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
             bool expanded = false;
 
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 value = current.Value;
 
                 // remove duplicate keyswords from connectionstring
@@ -517,7 +517,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
 
             StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 if ((current.Name == keyword) && (current.Value == this[keyword])) {
                     // only replace the parse end-result value instead of all values
                     // so that when duplicate-keywords occur other original values remain in place
@@ -929,7 +929,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
             NameValuePair head = null, tail = null, next = null;
             StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 if ((KEY.Password != current.Name) && (SYNONYM.Pwd != current.Name)) {
                     builder.Append(_usersConnectionString, copyPosition, current.Length);
                     if (fakePassword) {

mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs

@@ -262,7 +262,7 @@ internal static partial class Bid
     [BidMethod]
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1) {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, actId.ToString());
@@ -273,7 +273,7 @@ internal static partial class Bid
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW)
     {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, actId.ToString());
@@ -283,7 +283,7 @@ internal static partial class Bid
     [BidMethod]
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1, System.Int32 a2) {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, a2, actId.ToString());

mcs/class/referencesource/System/compmod/system/collections/generic/stack.cs

@@ -227,6 +227,22 @@ namespace System.Collections.Generic {
             _array[_size] = default(T);     // Free memory quicker.
             return item;
         }
+
+#if MONO
+        public bool TryPop(out T result)
+        {
+            if (_size == 0)
+            {
+                result = default(T);
+                return false;
+            }
+
+            _version++;
+            result = _array[--_size];
+            _array[_size] = default(T);     // Free memory quicker.
+            return true;
+        }
+#endif
     
         // Pushes an item to the top of the stack.
         // 

mcs/class/referencesource/System/compmod/system/componentmodel/EditorAttribute.cs

@@ -10,8 +10,7 @@ namespace System.ComponentModel {
     
     using System.Diagnostics;
     using System.Globalization;
-    using System.Security.Permissions;
-                                
+
     /// <devdoc>
     ///    <para>Specifies the editor to use to change a property. This class cannot be inherited.</para>
     /// </devdoc>
@@ -36,7 +35,7 @@ namespace System.ComponentModel {
         ///    name of the editor.</para>
         /// </devdoc>
         public EditorAttribute(string typeName, string baseTypeName) {
-            string temp = typeName.ToUpper(CultureInfo.InvariantCulture);
+            string temp = typeName.ToUpperInvariant ();
             Debug.Assert(temp.IndexOf(".DLL") == -1, "Came across: " + typeName + " . Please remove the .dll extension");
             this.typeName = typeName;
             this.baseTypeName = baseTypeName;
@@ -46,7 +45,7 @@ namespace System.ComponentModel {
         /// <para>Initializes a new instance of the <see cref='System.ComponentModel.EditorAttribute'/> class.</para>
         /// </devdoc>
         public EditorAttribute(string typeName, Type baseType) {
-            string temp = typeName.ToUpper(CultureInfo.InvariantCulture);
+            string temp = typeName.ToUpperInvariant ();
             Debug.Assert(temp.IndexOf(".DLL") == -1, "Came across: " + typeName + " . Please remove the .dll extension");
             this.typeName = typeName;
             this.baseTypeName = baseType.AssemblyQualifiedName;

mcs/class/referencesource/System/compmod/system/componentmodel/ExpandableObjectConverter.cs

@@ -9,14 +9,18 @@ namespace System.ComponentModel {
     using System.Collections;
     using System.ComponentModel.Design;
     using System.Diagnostics;
+#if MONO_FEATURE_CAS
     using System.Security.Permissions;
+#endif
 
     /// <devdoc>
     ///    <para>Provides
     ///       a type converter to convert expandable objects to and from various
     ///       other representations.</para>
     /// </devdoc>
+#if MONO_FEATURE_CAS
     [HostProtection(SharedState = true)]
+#endif
     public class ExpandableObjectConverter : TypeConverter {
     
         /// <devdoc>

mcs/class/referencesource/System/compmod/system/componentmodel/InvalidEnumArgumentException.cs

@@ -10,12 +10,16 @@ namespace System.ComponentModel {
     using System.Diagnostics;
     using System.Globalization;
     using System.Runtime.Serialization;
+#if MONO_FEATURE_CAS
     using System.Security.Permissions;
+#endif
     
     /// <devdoc>
     ///    <para>The exception that is thrown when using invalid arguments that are enumerators.</para>
     /// </devdoc>
+#if MONO_FEATURE_CAS
     [HostProtection(SharedState = true)]
+#endif
     [Serializable]
     public class InvalidEnumArgumentException : ArgumentException {
 

mcs/class/referencesource/System/compmod/system/componentmodel/design/serialization/InstanceDescriptor.cs

@@ -10,15 +10,19 @@ namespace System.ComponentModel.Design.Serialization {
     using System.Collections;
     using System.Diagnostics;
     using System.Reflection;
+#if MONO_FEATURE_CAS 
     using System.Security.Permissions;
+#endif
 
     /// <devdoc>
     ///     EventArgs for the ResolveNameEventHandler.  This event is used
     ///     by the serialization process to match a name to an object
     ///     instance.
     /// </devdoc>
-    [HostProtection(SharedState = true)]
+#if MONO_FEATURE_CAS 
+    [HostProtection(SharedState = true)]		
     [System.Security.Permissions.PermissionSetAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Name = "FullTrust")]
+#endif
     public sealed class InstanceDescriptor {
         private MemberInfo  member;
         private ICollection arguments;

mcs/class/referencesource/System/net/System/Net/webproxy.cs

@@ -504,7 +504,7 @@ namespace System.Net {
 #if MONO
         public static IWebProxy CreateDefaultProxy ()
         {
-#if FEATURE_NO_BSD_SOCKETS
+#if FEATURE_NO_BSD_SOCKETS || ORBIS
             throw new PlatformNotSupportedException ();
 #elif MONOTOUCH
             return Mono.Net.CFNetwork.GetDefaultProxy ();

mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs

@@ -472,7 +472,6 @@ namespace System.Text.RegularExpressions {
             }
         }
 
-#if NETSTANDARD
         [CLSCompliant (false)]
         protected IDictionary Caps
         {
@@ -527,7 +526,6 @@ namespace System.Text.RegularExpressions {
                 }
             }
         }
-#endif
 
         /// <devdoc>
         ///    <para>

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