Reverting interface changes.

Author: stebet

projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs

@@ -96,7 +96,7 @@ public virtual Task HandleBasicConsumeOk(string consumerTag)
         {
             _consumerTags.Add(consumerTag);
             IsRunning = true;
-            return TaskExtensions.CompletedTask;
+            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -118,7 +118,7 @@ public virtual Task HandleBasicDeliver(string consumerTag,
             ReadOnlyMemory<byte> body)
         {
             // Nothing to do here.
-            return TaskExtensions.CompletedTask;
+            return Task.CompletedTask;
         }
 
         /// <summary>

projects/RabbitMQ.Client/client/api/IBasicPublishBatch.cs

@@ -44,7 +44,6 @@ namespace RabbitMQ.Client
     public interface IBasicPublishBatch
     {
         void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, byte[] body);
-        void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body);
         void Publish();
     }
 }

projects/RabbitMQ.Client/client/impl/BasicPublishBatch.cs

@@ -56,11 +56,6 @@ internal BasicPublishBatch (ModelBase model)
         }
 
         public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)
-        {
-            Add(exchange, routingKey, mandatory, basicProperties, body.AsMemory());
-        }
-
-        public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             IBasicProperties bp = basicProperties ?? _model.CreateBasicProperties();
             var method = new BasicPublish

projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs

@@ -54,8 +54,6 @@ namespace RabbitMQ.Client.Impl
 {
     static class TaskExtensions
     {
-        public static Task CompletedTask = Task.FromResult(0);
-
         public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
         {
             if (task == await Task.WhenAny(task, Task.Delay(timeout)).ConfigureAwait(false))

projects/Unit/APIApproval.Approve.verified.txt

@@ -259,7 +259,6 @@ namespace RabbitMQ.Client
     public interface IBasicPublishBatch
     {
         void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, byte[] body);
-        void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body);
         void Publish();
     }
     public interface IConnection : RabbitMQ.Client.INetworkConnection, System.IDisposable