Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

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());