Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.cs

@@ -612,6 +612,30 @@ namespace System.Data.SqlClient {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		public Task WriteToServerAsync (DataRow[] rows)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (DataRow[] rows, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (IDataReader reader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (IDataReader reader, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
 		[MonoTODO]
 		public Task WriteToServerAsync (DbDataReader reader)
 		{
@@ -624,6 +648,30 @@ namespace System.Data.SqlClient {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		public Task WriteToServerAsync (DataTable table)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (DataTable table, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (DataTable table, DataRowState rowState)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Task WriteToServerAsync (DataTable table, DataRowState rowState, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
 		private void RowsCopied (long rowsCopied)
 		{
 			SqlRowsCopiedEventArgs e = new SqlRowsCopiedEventArgs (rowsCopied);

mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.platformnotsupported.cs

@@ -112,6 +112,26 @@ namespace System.Data.SqlClient {
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
+		public Task WriteToServerAsync (DataRow[] rows)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (DataRow[] rows, CancellationToken cancellationToken)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (IDataReader reader)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (IDataReader reader, CancellationToken cancellationToken)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		public Task WriteToServerAsync (DbDataReader reader)
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
@@ -122,6 +142,26 @@ namespace System.Data.SqlClient {
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
+		public Task WriteToServerAsync (DataTable table)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (DataTable table, CancellationToken cancellationToken)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (DataTable table, DataRowState rowState)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public Task WriteToServerAsync (DataTable table, DataRowState rowState, CancellationToken cancellationToken)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		private void RowsCopied (long rowsCopied)
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs

@@ -126,10 +126,10 @@ namespace System.Data.SqlClient
 			ConnectionString = connectionString;
 		}
 
-		public SqlConnection (string connectionString, SqlCredential cred)
+		public SqlConnection (string connectionString, SqlCredential credential)
 		{
 			ConnectionString = connectionString;
-			Credentials = cred;
+			Credentials = credential;
 		}
 
 		#endregion // Constructors

mcs/class/System.Data/System.Data.SqlClient/SqlCredential.cs

@@ -49,13 +49,13 @@ namespace System.Data.SqlClient {
 
 		#region Constructors
 
-		public SqlCredential (string user, SecureString password)
+		public SqlCredential (string userId, SecureString password)
 		{
-			if (user == null)
-				throw new ArgumentNullException("UserID");
+			if (userId == null)
+				throw new ArgumentNullException("userId");
 			if (password == null)
-				throw new ArgumentNullException("Password");
-			this.uid = user;
+				throw new ArgumentNullException("password");
+			this.uid = userId;
 			this.pwd = password;
 		}