Move CreateReplaceConnectionContinuation

Author: benrr101

src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs

@@ -47,34 +47,6 @@ protected static Task<DbConnectionInternal> GetCompletedTask()
             return s_completedTask ?? (s_completedTask = Task.FromResult<DbConnectionInternal>(null));
         }
 
-        protected Task<DbConnectionInternal> CreateReplaceConnectionContinuation(Task<DbConnectionInternal> task, DbConnection owningConnection, TaskCompletionSource<DbConnectionInternal> retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionPoolGroup poolGroup, CancellationTokenSource cancellationTokenSource)
-        {
-            return task.ContinueWith(
-                (_) =>
-                {
-                    System.Transactions.Transaction originalTransaction = ADP.GetCurrentTransaction();
-                    try
-                    {
-                        ADP.SetCurrentTransaction(retry.Task.AsyncState as System.Transactions.Transaction);
-                        var newConnection = CreateNonPooledConnection(owningConnection, poolGroup, userOptions);
-                        if ((oldConnection != null) && (oldConnection.State == ConnectionState.Open))
-                        {
-                            oldConnection.PrepareForReplaceConnection();
-                            oldConnection.Dispose();
-                        }
-                        return newConnection;
-                    }
-                    finally
-                    {
-                        ADP.SetCurrentTransaction(originalTransaction);
-                    }
-                },
-                cancellationTokenSource.Token,
-                TaskContinuationOptions.LongRunning,
-                TaskScheduler.Default
-            );
-        }
-
         protected void TryGetConnectionCompletedContinuation(Task<DbConnectionInternal> task, object state)
         {
             Tuple<CancellationTokenSource, TaskCompletionSource<DbConnectionInternal>> parameters = (Tuple<CancellationTokenSource, TaskCompletionSource<DbConnectionInternal>>)state;

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using System.IO;
@@ -629,6 +630,44 @@ private static SqlInternalConnectionTds CreateConnection(
                 pool,
                 key.AccessTokenCallback);
         }
+
+        private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
+            Task<DbConnectionInternal> task,
+            DbConnection owningConnection,
+            TaskCompletionSource<DbConnectionInternal> retry,
+            DbConnectionOptions userOptions,
+            DbConnectionInternal oldConnection,
+            DbConnectionPoolGroup poolGroup,
+            CancellationTokenSource cancellationTokenSource)
+        {
+            return task.ContinueWith(
+                _ =>
+                {
+                    System.Transactions.Transaction originalTransaction = ADP.GetCurrentTransaction();
+                    try
+                    {
+                        ADP.SetCurrentTransaction(retry.Task.AsyncState as System.Transactions.Transaction);
+                        
+                        DbConnectionInternal newConnection = CreateNonPooledConnection(owningConnection, poolGroup, userOptions);
+                        
+                        if (oldConnection?.State == ConnectionState.Open)
+                        {
+                            oldConnection.PrepareForReplaceConnection();
+                            oldConnection.Dispose();
+                        }
+                        
+                        return newConnection;
+                    }
+                    finally
+                    {
+                        ADP.SetCurrentTransaction(originalTransaction);
+                    }
+                },
+                cancellationTokenSource.Token,
+                TaskContinuationOptions.LongRunning,
+                TaskScheduler.Default
+            );
+        }
 
         #if NET
         private void Unload(object sender, EventArgs e)