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

Author: lukebakken

projects/RabbitMQ.Client/IChannel.cs

@@ -265,6 +265,17 @@ Task CloseAsync(ushort replyCode, string replyText, bool abort,
         /// <returns></returns>
         Task CloseAsync(ShutdownEventArgs reason, bool abort);
 
+        /// <summary>
+        /// Asynchronously close this session.
+        /// </summary>
+        /// <param name="reason">The <see cref="ShutdownEventArgs"/> instance containing the close data.</param>
+        /// <param name="abort">Whether or not the close is an abort (ignoring certain exceptions).</param>
+        /// <param name="cancellationToken">CancellationToken for this operation.</param>
+        /// <returns></returns>
+        [Obsolete("7.2.0 - cancellationToken is ignored")]
+        Task CloseAsync(ShutdownEventArgs reason, bool abort,
+            CancellationToken cancellationToken = default);
+
         /// <summary>Asynchronously declare an exchange.</summary>
         /// <param name="exchange">The name of the exchange.</param>
         /// <param name="type">The type of the exchange.</param>

projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs

@@ -234,6 +234,12 @@ await _connection.DeleteRecordedChannelAsync(this,
             }
         }
 
+        public Task CloseAsync(ShutdownEventArgs args, bool abort,
+            CancellationToken cancellationToken)
+        {
+            return CloseAsync(args, abort);
+        }
+
         public async Task CloseAsync(ShutdownEventArgs args, bool abort)
         {
             ThrowIfDisposed();

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -205,12 +205,18 @@ public Task CloseAsync(ushort replyCode, string replyText, bool abort,
             return CloseAsync(args, abort);
         }
 
+        public Task CloseAsync(ShutdownEventArgs args, bool abort,
+            CancellationToken cancellationToken)
+        {
+            return CloseAsync(args, abort);
+        }
+
         public async Task CloseAsync(ShutdownEventArgs args, bool abort)
         {
             CancellationToken cancellationToken = args.CancellationToken;
 
             bool enqueued = false;
-            // We should really try to clsoe the connection and therefore we don't allow this to be canceled by the user
+            // We should really try to close the channel and therefore we don't allow this to be canceled by the user
             var k = new ChannelCloseAsyncRpcContinuation(ContinuationTimeout, IsOpen ? CancellationToken.None : cancellationToken);
 
             await _rpcSemaphore.WaitAsync(k.CancellationToken)

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -5,6 +5,7 @@ RabbitMQ.Client.Exceptions.PublishReturnException.PublishReturnException(ulong p
 RabbitMQ.Client.Exceptions.PublishReturnException.ReplyCode.get -> ushort
 RabbitMQ.Client.Exceptions.PublishReturnException.ReplyText.get -> string!
 RabbitMQ.Client.Exceptions.PublishReturnException.RoutingKey.get -> string!
+RabbitMQ.Client.IChannel.CloseAsync(RabbitMQ.Client.Events.ShutdownEventArgs! reason, bool abort, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
 RabbitMQ.Client.RabbitMQTracingOptions
 RabbitMQ.Client.RabbitMQTracingOptions.RabbitMQTracingOptions() -> void
 RabbitMQ.Client.RabbitMQTracingOptions.UsePublisherAsParent.get -> bool