Restore AbortAsync that takes CancellationTokes so as to not break the API

Author: lukebakken

projects/RabbitMQ.Client/IConnectionExtensions.cs

@@ -88,6 +88,21 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st
                 CancellationToken.None);
         }
 
+        /// <summary>
+        /// Asynchronously abort this connection and all its channels.
+        /// </summary>
+        /// <remarks>
+        /// Note that all active channels and sessions will be closed if this method is called.
+        /// In comparison to normal <see cref="CloseAsync(IConnection, CancellationToken)"/> method, <see cref="AbortAsync(IConnection, CancellationToken)"/> will not throw
+        /// <see cref="IOException"/> during closing connection.
+        ///This method waits infinitely for the in-progress close operation to complete.
+        /// </remarks>
+        public static Task AbortAsync(this IConnection connection)
+        {
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced",
+                InternalConstants.DefaultConnectionAbortTimeout, true, default);
+        }
+
         /// <summary>
         /// Asynchronously abort this connection and all its channels.
         /// </summary>
@@ -99,8 +114,27 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st
         /// </remarks>
         public static Task AbortAsync(this IConnection connection, CancellationToken cancellationToken = default)
         {
-            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true,
-                cancellationToken);
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced",
+                InternalConstants.DefaultConnectionAbortTimeout, true, cancellationToken);
+        }
+
+        /// <summary>
+        /// Asynchronously abort this connection and all its channels.
+        /// </summary>
+        /// <remarks>
+        /// The method behaves in the same way as <see cref="AbortAsync(IConnection, CancellationToken)"/>, with the only
+        /// difference that the connection is closed with the given connection close code and message.
+        /// <para>
+        /// The close code (See under "Reply Codes" in the AMQP 0-9-1 specification)
+        /// </para>
+        /// <para>
+        /// A message indicating the reason for closing the connection
+        /// </para>
+        /// </remarks>
+        public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText)
+        {
+            return connection.CloseAsync(reasonCode, reasonText,
+                InternalConstants.DefaultConnectionAbortTimeout, true, default);
         }
 
         /// <summary>
@@ -118,8 +152,8 @@ public static Task AbortAsync(this IConnection connection, CancellationToken can
         /// </remarks>
         public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText, CancellationToken cancellationToken = default)
         {
-            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true,
-                cancellationToken);
+            return connection.CloseAsync(reasonCode, reasonText,
+                InternalConstants.DefaultConnectionAbortTimeout, true, cancellationToken);
         }
 
         /// <summary>

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -12,5 +12,7 @@ RabbitMQ.Client.RabbitMQTracingOptions.UsePublisherAsParent.get -> bool
 RabbitMQ.Client.RabbitMQTracingOptions.UsePublisherAsParent.set -> void
 RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.get -> bool
 RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.set -> void
+static RabbitMQ.Client.IConnectionExtensions.AbortAsync(this RabbitMQ.Client.IConnection! connection) -> System.Threading.Tasks.Task!
+static RabbitMQ.Client.IConnectionExtensions.AbortAsync(this RabbitMQ.Client.IConnection! connection, ushort reasonCode, string! reasonText) -> System.Threading.Tasks.Task!
 static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.get -> RabbitMQ.Client.RabbitMQTracingOptions!
 static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.set -> void