Merge branch 'master' into master

Author: michaelklishin

RUNNING_TESTS.md

@@ -49,7 +49,7 @@ invoked directly without using an absolute file path. Note that this method does
 On Windows, you must run unit tests as follows (replace `X.Y.Z` with your RabbitMQ version):
 
 ```
-set RABBITMQ_RABBITMQCTL_PATH=C:\Program Files\RabbitMQ Server\rabbitmq_server-X.Y.Z\sbin\rabbitmqctl.bat
+set RABBITMQ_RABBITMQCTL_PATH="C:\Program Files\RabbitMQ Server\rabbitmq_server-X.Y.Z\sbin\rabbitmqctl.bat"
 .\run-test.bat
 ```
 

projects/Apigen/apigen/Apigen.cs

@@ -38,6 +38,8 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System;
+
 namespace RabbitMQ.Client
 {
     // time representations in mainstream languages: the horror, the horror
@@ -58,7 +60,7 @@ namespace RabbitMQ.Client
     /// timestamps are signed or unsigned.
     /// </para>
     /// </remarks>
-    public struct AmqpTimestamp
+    public struct AmqpTimestamp : IEquatable<AmqpTimestamp>
     {
         /// <summary>
         /// Construct an <see cref="AmqpTimestamp"/>.
@@ -74,6 +76,16 @@ public AmqpTimestamp(long unixTime) : this()
         /// </summary>
         public long UnixTime { get; private set; }
 
+        public bool Equals(AmqpTimestamp other) => UnixTime == other.UnixTime;
+
+        public override bool Equals(object obj) => obj is AmqpTimestamp other && Equals(other);
+
+        public override int GetHashCode() => UnixTime.GetHashCode();
+
+        public static bool operator ==(AmqpTimestamp left, AmqpTimestamp right) => left.Equals(right);
+
+        public static bool operator !=(AmqpTimestamp left, AmqpTimestamp right) => !left.Equals(right);
+
         /// <summary>
         /// Provides a debugger-friendly display.
         /// </summary>

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

@@ -44,8 +44,7 @@ namespace RabbitMQ.Client
 {
     public interface IBasicPublishBatch
     {
-        [Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
-        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/api/IBasicPublishBatch.cs

@@ -62,12 +62,6 @@ internal BasicPublishBatch (ModelBase model, int sizeHint)
             _commands = new List<Command>(sizeHint);
         }
 
-        public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)
-        {
-            ReadOnlyMemory<byte> bodyAsMemory = body;
-            Add(exchange, routingKey, mandatory, basicProperties, bodyAsMemory);
-        }
-
         public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             var method = new BasicPublish

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

@@ -23,11 +23,16 @@ namespace RabbitMQ.Client
         public static RabbitMQ.Client.AmqpTcpEndpoint Parse(string address) { }
         public static RabbitMQ.Client.AmqpTcpEndpoint[] ParseMultiple(string addresses) { }
     }
-    public struct AmqpTimestamp
+    public struct AmqpTimestamp : System.IEquatable<RabbitMQ.Client.AmqpTimestamp>
     {
         public AmqpTimestamp(long unixTime) { }
         public long UnixTime { get; }
+        public bool Equals(RabbitMQ.Client.AmqpTimestamp other) { }
+        public override bool Equals(object obj) { }
+        public override int GetHashCode() { }
         public override string ToString() { }
+        public static bool !=(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { }
+        public static bool ==(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { }
     }
     public class AsyncDefaultBasicConsumer : RabbitMQ.Client.IAsyncBasicConsumer, RabbitMQ.Client.IBasicConsumer
     {
@@ -56,10 +61,6 @@ namespace RabbitMQ.Client
         public bool Redelivered { get; }
         public string RoutingKey { get; }
     }
-    public static class BasicPublishBatchExtensions
-    {
-        public static void Add(this RabbitMQ.Client.IBasicPublishBatch batch, string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body) { }
-    }
     public class BinaryTableValue
     {
         public BinaryTableValue() { }
@@ -295,9 +296,7 @@ namespace RabbitMQ.Client
     }
     public interface IBasicPublishBatch
     {
-        [System.Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties prop" +
-            "erties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
-        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