Post-merge tirying-up.

Author: paulmedynski

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs

@@ -3119,19 +3119,11 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio
 
                         // No need to cancel timer since SqlBulkCopy creates specific task source for reconnection.
                         AsyncHelper.SetTimeoutExceptionWithState(
-<<<<<<< HEAD
                             taskCompletionSource: cancellableReconnectTS,
                             timeoutInSeconds: BulkCopyTimeout,
                             state: _destinationTableName,
                             onTimeout: static state =>
                                 SQL.BulkLoadInvalidDestinationTable((string)state, SQL.CR_ReconnectTimeout()),
-=======
-                            completion: cancellableReconnectTS,
-                            timeout: BulkCopyTimeout,
-                            state: _destinationTableName,
-                            onFailure: static state =>
-                                SQL.BulkLoadInvalidDestinationTable((string)state, SQL.CR_ReconnectTimeout()),
->>>>>>> main
                             cancellationToken: CancellationToken.None
                         );
 

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs

@@ -8,6 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using Microsoft.Data.SqlClient.Internal;
+
 #nullable enable
 
 namespace Microsoft.Data.SqlClient.Utilities

src/Microsoft.Data.SqlClient/tests/Directory.Packages.props

@@ -15,6 +15,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.13" />
     <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="181.15.0" />
     <PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="System.Formats.Asn1" Version="10.0.3" />
     <PackageVersion Include="System.Data.Odbc" Version="10.0.3" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />