Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.Data/System/Data/SqlClient/RowsCopiedEventArgs.cs

@@ -2,8 +2,8 @@
 // <copyright file="RowsCopiedEvent.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlBuffer.cs

@@ -2,9 +2,9 @@
 // <copyright file="SqlDataReader.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlBulkCopy.cs.REMOVED.git-id

@@ -1 +1 @@
-2a4b96c02a36a45bbc09c39c729d107f10314af7
+f538fdfe009ab48cb0769f0ab34c260583c3d0e2

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMapping.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlBulkCopyColumnMapping.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 // Todo: rename the file

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMappingCollection.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlBulkCopyMappingCollection.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 // todo: rename the file

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlCachedBuffer.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlCachedBuffer.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientFactory.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlClientFactory.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 using System;

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlClientMetaDataCollectionNames.cs" company="Microsoft">
 //      Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient{

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientPermission.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlClientPermission.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientSymmetricKey.cs

@@ -35,15 +35,9 @@ namespace System.Data.SqlClient
         }
 
         /// <summary>
-        /// Destructor that cleans up the key material.
-        /// This is a best effort approach since there are no guarantees around GC.
+        /// Empty destructor for binary back compat.
         /// </summary>
         ~SqlClientSymmetricKey() {
-            if (_rootKey != null) {
-                for (int i = 0; i < _rootKey.Length; i++) {
-                    _rootKey[i] = 0;
-                }
-            }
         }
 
         /// <summary>

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStream.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlClientWrapperSmiStream.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace Microsoft.SqlServer.Server {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStreamChars.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlClientWrapperSmiStream.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace Microsoft.SqlServer.Server {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlColumnEncryptionCngProvider.cs

@@ -37,7 +37,7 @@ namespace System.Data.SqlClient
 
         /// <summary>
         /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys using this provider.
-        /// For now, we are keeping all the providers in [....].
+        /// For now, we are keeping all the providers in sync.
         /// </summary>
         private const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP";
 

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlColumnEncryptionCspProvider.cs

@@ -38,7 +38,7 @@ namespace System.Data.SqlClient
 
         /// <summary>
         /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys using this provider.
-        /// For now, we are keeping all the providers in [....].
+        /// For now, we are keeping all the providers in sync.
         /// </summary>
         private const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP";
 

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id

@@ -1 +1 @@
-46a53537089cdd872b7c8964bfc4fc8718f9c782
+5a3c6835c31aa630a1d3463e6b2fbfcabd24bfea

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlCommandBuilder.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlCommandBuilder.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlCommandSet.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlBatchCommand.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient {

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnection.cs.REMOVED.git-id

@@ -1 +1 @@
-306a42079800e4f74776c8f8f967a9df88f0c8f5
+577b5961f99f137eada7b65823f7e0c2a3eb7967

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlConnectionFactory.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient

mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionPoolGroupProviderInfo.cs

@@ -2,8 +2,8 @@
 // <copyright file="SqlConnectionPoolGroupProviderInfo.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
-// <owner current="true" primary="false">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
+// <owner current="true" primary="false">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace System.Data.SqlClient