Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DataReaderContainer.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbBuffer.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbConnectionClosed.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.ProviderBase {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbConnectionFactory.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.ProviderBase {
@@ -304,11 +304,15 @@ namespace System.Data.ProviderBase {
 #endif
                 }
                 else {
+#if !MONO
+                    // DBConnection::ForceNewConnection is never set
                     if (owningConnection.ForceNewConnection) {
                         Debug.Assert(!(oldConnection is DbConnectionClosed), "Force new connection, but there is no old connection");
                         connection = connectionPool.ReplaceConnection(owningConnection, userOptions, oldConnection);
                     }
-                    else {
+                    else
+#endif
+                    {
                         if (!connectionPool.TryGetConnection(owningConnection, retry, userOptions, out connection)) {
                             return false;
                         }

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbConnectionInternal.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.ProviderBase {
@@ -58,7 +58,7 @@ namespace System.Data.ProviderBase {
         private SysTx.Transaction _enlistedTransactionOriginal;     
 
 #if DEBUG
-        private int                      _activateCount;            // debug only counter to verify activate/deactivates are in [....].
+        private int                      _activateCount;            // debug only counter to verify activate/deactivates are in sync.
 #endif //DEBUG
 
         protected DbConnectionInternal() : this(ConnectionState.Open, true, false) { // V1.1.3300
@@ -323,7 +323,7 @@ namespace System.Data.ProviderBase {
             get;
         }
 
-        // this should be abstract but untill it is added to all the providers virtual will have to do [....]
+        // this should be abstract but untill it is added to all the providers virtual will have to do Microsoft
         virtual public string ServerVersionNormalized {
             get{
                 throw ADP.NotSupported();

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPool.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbConnectionPool.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.ProviderBase {
@@ -758,40 +758,6 @@ namespace System.Data.ProviderBase {
             return (new Timer(new TimerCallback(this.CleanupCallback), null, _cleanupWait, _cleanupWait));
         }
 
-        private static readonly string[] AzureSqlServerEndpoints = {Res.GetString(Res.AZURESQL_GenericEndpoint),
-                                                                    Res.GetString(Res.AZURESQL_GermanEndpoint),
-                                                                    Res.GetString(Res.AZURESQL_UsGovEndpoint),
-                                                                    Res.GetString(Res.AZURESQL_ChinaEndpoint) };
-        private static bool IsAzureSqlServerEndpoint(string dataSource)
-        {
-            // remove server port
-            var i = dataSource.LastIndexOf(',');
-            if (i >= 0)
-            {
-                dataSource = dataSource.Substring(0, i);
-            }
-
-            // check for the instance name
-            i = dataSource.LastIndexOf('\\');
-            if (i >= 0)
-            {
-                dataSource = dataSource.Substring(0, i);
-            }
-
-            // trim redundant whitespaces
-            dataSource = dataSource.Trim();
-
-            // check if servername end with any azure endpoints
-            for (i = 0; i < AzureSqlServerEndpoints.Length; i++)
-            {
-                if (dataSource.EndsWith(AzureSqlServerEndpoints[i], StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         private bool IsBlockingPeriodEnabled()
         {
             var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions as SqlConnectionString;
@@ -806,7 +772,7 @@ namespace System.Data.ProviderBase {
             {
                 case PoolBlockingPeriod.Auto:
                 {
-                    if (IsAzureSqlServerEndpoint(poolGroupConnectionOptions.DataSource))
+                    if (ADP.IsAzureSqlServerEndpoint(poolGroupConnectionOptions.DataSource))
                     {
                         return false; // in Azure it will be Disabled
                     }
@@ -1243,7 +1209,7 @@ namespace System.Data.ProviderBase {
                 return true;
             }
             else if (retry == null) {
-                // timed out on a [....] call
+                // timed out on a sync call
                 return true;
             }
 

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolCounters.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbConnectionPoolGroupProviderInfo.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.ProviderBase {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbMetaDataCollectionNames.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.Common {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbMetaDataColumnNames.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.Common {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs

@@ -2,8 +2,8 @@
 // <copyright file="dbmetadatafactory.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.ProviderBase {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs

@@ -2,7 +2,7 @@
 // <copyright file="DbParameterCollectionBase.cs" company="Microsoft">
 //      Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
-// <owner current="true" primary="true">[....]</owner>
+// <owner current="true" primary="true">Microsoft</owner>
 //------------------------------------------------------------------------------
 
 namespace NAMESPACE

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbParameterHelper.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs

@@ -2,8 +2,8 @@
 // <copyright file="DbReferenceCollection.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.ProviderBase {

mcs/class/referencesource/System.Data/System/Data/ProviderBase/SchemaMapping.cs

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

mcs/class/referencesource/System.Data/System/Data/ProviderBase/TimeoutTimer.cs

@@ -5,8 +5,8 @@
 //
 //  Class used to manage timeouts in complex system operations.
 //
-// <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.ProviderBase