Move to Shared for SqlConnectionPoolKey.cs

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -256,6 +256,9 @@
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
       <Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
+      <Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
+    </Compile>
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
       <Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
     </Compile>
@@ -547,7 +550,6 @@
     <Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -342,6 +342,9 @@
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
       <Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
+      <Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
+    </Compile>
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
       <Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
     </Compile>
@@ -536,7 +539,6 @@
     <Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionPoolKey.cs → src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionPoolKey.cs

@@ -2,29 +2,53 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics;
 using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient
 {
     // SqlConnectionPoolKey: Implementation of a key to connection pool groups for specifically to be used for SqlConnection
     //  Connection string and SqlCredential are used as a key
-    internal class SqlConnectionPoolKey : DbConnectionPoolKey, ICloneable
+    internal class SqlConnectionPoolKey : DbConnectionPoolKey
     {
-        private SqlCredential _credential;
         private int _hashValue;
+        private readonly SqlCredential _credential;
         private readonly string _accessToken;
-        private ServerCertificateValidationCallback _serverCertificateValidationCallback;
-        private ClientCertificateRetrievalCallback _clientCertificateRetrievalCallback;
-        private SqlClientOriginalNetworkAddressInfo _originalNetworkAddressInfo;
+
+        internal SqlCredential Credential => _credential;
+        internal string AccessToken => _accessToken;
+
+        internal override string ConnectionString
+        {
+            get => base.ConnectionString;
+            set
+            {
+                base.ConnectionString = value;
+                CalculateHashCode();
+            }
+        }
+
+#if NETFRAMEWORK
+        #region NET Framework
+        private readonly ServerCertificateValidationCallback _serverCertificateValidationCallback;
+        private readonly ClientCertificateRetrievalCallback _clientCertificateRetrievalCallback;
+        private readonly SqlClientOriginalNetworkAddressInfo _originalNetworkAddressInfo;
+
+        internal ServerCertificateValidationCallback ServerCertificateValidationCallback
+            => _serverCertificateValidationCallback;
+
+        internal ClientCertificateRetrievalCallback ClientCertificateRetrievalCallback
+            => _clientCertificateRetrievalCallback;
+
+        internal SqlClientOriginalNetworkAddressInfo OriginalNetworkAddressInfo
+            => _originalNetworkAddressInfo;
 
         internal SqlConnectionPoolKey(string connectionString,
-                                            SqlCredential credential,
-                                            string accessToken,
-                                            ServerCertificateValidationCallback serverCertificateValidationCallback,
-                                            ClientCertificateRetrievalCallback clientCertificateRetrievalCallback,
-                                            SqlClientOriginalNetworkAddressInfo originalNetworkAddressInfo) : base(connectionString)
+                            SqlCredential credential,
+                            string accessToken,
+                            ServerCertificateValidationCallback serverCertificateValidationCallback,
+                            ClientCertificateRetrievalCallback clientCertificateRetrievalCallback,
+                            SqlClientOriginalNetworkAddressInfo originalNetworkAddressInfo) : base(connectionString)
         {
             Debug.Assert(_credential == null || _accessToken == null, "Credential and AccessToken can't have the value at the same time.");
             _credential = credential;
@@ -34,86 +58,47 @@ internal SqlConnectionPoolKey(string connectionString,
             _originalNetworkAddressInfo = originalNetworkAddressInfo;
             CalculateHashCode();
         }
+        #endregion
+#else
+        #region NET Core
+        internal SqlConnectionPoolKey(string connectionString, SqlCredential credential, string accessToken) : base(connectionString)
+        {
+            Debug.Assert(_credential == null || _accessToken == null, "Credential and AccessToken can't have the value at the same time.");
+            _credential = credential;
+            _accessToken = accessToken;
+            CalculateHashCode();
+        }
+        #endregion
+#endif
 
         private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key)
         {
             _credential = key.Credential;
             _accessToken = key.AccessToken;
+#if NETFRAMEWORK
             _serverCertificateValidationCallback = key._serverCertificateValidationCallback;
             _clientCertificateRetrievalCallback = key._clientCertificateRetrievalCallback;
+#endif
             CalculateHashCode();
         }
 
-        object ICloneable.Clone()
+        public override object Clone()
         {
             return new SqlConnectionPoolKey(this);
         }
 
-        internal override string ConnectionString
-        {
-            get
-            {
-                return base.ConnectionString;
-            }
-
-            set
-            {
-                base.ConnectionString = value;
-                CalculateHashCode();
-            }
-        }
-
-        internal SqlCredential Credential
-        {
-            get
-            {
-                return _credential;
-            }
-        }
-
-        internal string AccessToken
-        {
-            get
-            {
-                return _accessToken;
-            }
-        }
-
-        internal ServerCertificateValidationCallback ServerCertificateValidationCallback
-        {
-            get
-            {
-                return _serverCertificateValidationCallback;
-            }
-        }
-
-        internal ClientCertificateRetrievalCallback ClientCertificateRetrievalCallback
-        {
-            get
-            {
-                return _clientCertificateRetrievalCallback;
-            }
-        }
-
-        internal SqlClientOriginalNetworkAddressInfo OriginalNetworkAddressInfo
-        {
-            get
-            {
-                return _originalNetworkAddressInfo;
-            }
-        }
-
         public override bool Equals(object obj)
         {
-            SqlConnectionPoolKey key = obj as SqlConnectionPoolKey;
-
-            return (key != null &&
-                    _credential == key._credential &&
-                    ConnectionString == key.ConnectionString &&
-                    string.CompareOrdinal(_accessToken, key._accessToken) == 0 &&
-                    _serverCertificateValidationCallback == key._serverCertificateValidationCallback &&
-                    _clientCertificateRetrievalCallback == key._clientCertificateRetrievalCallback &&
-                    _originalNetworkAddressInfo == key._originalNetworkAddressInfo);
+            return (obj is SqlConnectionPoolKey key
+                && _credential == key._credential
+                && ConnectionString == key.ConnectionString
+                && string.CompareOrdinal(_accessToken, key._accessToken) == 0
+#if NETFRAMEWORK
+                && _serverCertificateValidationCallback == key._serverCertificateValidationCallback
+                && _clientCertificateRetrievalCallback == key._clientCertificateRetrievalCallback
+                && _originalNetworkAddressInfo == key._originalNetworkAddressInfo
+#endif
+                );
         }
 
         public override int GetHashCode()
@@ -140,13 +125,15 @@ private void CalculateHashCode()
                 }
             }
 
+#if NETFRAMEWORK
             if (_originalNetworkAddressInfo != null)
             {
                 unchecked
                 {
                     _hashValue = _hashValue * 17 + _originalNetworkAddressInfo.GetHashCode();
                 }
             }
+#endif
         }
     }
 }