* Re-instate requirement to call CloseAsync prior to Dispose for channels and connections.

Author: lukebakken

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

@@ -237,7 +237,7 @@ public void Dispose()
 
             if (IsOpen)
             {
-                this.AbortAsync().GetAwaiter().GetResult();
+                throw new InvalidOperationException("CloseAsync/AbortAsync must be called prior to Dispose");
             }
 
             _recordedConsumerTags.Clear();

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

@@ -546,7 +546,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (IsOpen)
                 {
-                    this.AbortAsync().GetAwaiter().GetResult();
+                    throw new InvalidOperationException("CloseAsync/AbortAsync must be called prior to Dispose");
                 }
 
                 ConsumerDispatcher.Dispose();

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

@@ -484,7 +484,7 @@ public void Dispose()
             {
                 if (IsOpen)
                 {
-                    this.AbortAsync().GetAwaiter().GetResult();
+                    throw new InvalidOperationException("CloseAsync/AbortAsync must be called prior to Dispose");
                 }
 
                 _session0.Dispose();

projects/Test/Common/TestConnectionRecoveryBase.cs

@@ -164,7 +164,7 @@ internal async Task<AutorecoveringConnection> CreateAutorecoveringConnectionWith
             return (AutorecoveringConnection)conn;
         }
 
-        protected Task CloseConnectionAsync(IConnection conn)
+        protected static Task CloseConnectionAsync(IConnection conn)
         {
             return Util.CloseConnectionAsync(conn);
         }
@@ -178,15 +178,15 @@ internal async Task CloseAndWaitForRecoveryAsync(AutorecoveringConnection conn)
         {
             TaskCompletionSource<bool> sl = PrepareForShutdown(conn);
             TaskCompletionSource<bool> rl = PrepareForRecovery(conn);
-            await CloseConnectionAsync(conn);
+            await TestConnectionRecoveryBase.CloseConnectionAsync(conn);
             await WaitAsync(sl, "connection shutdown");
             await WaitAsync(rl, "connection recovery");
         }
 
         internal async Task CloseAndWaitForShutdownAsync(AutorecoveringConnection conn)
         {
             TaskCompletionSource<bool> sl = PrepareForShutdown(conn);
-            await CloseConnectionAsync(conn);
+            await TestConnectionRecoveryBase.CloseConnectionAsync(conn);
             await WaitAsync(sl, "connection shutdown");
         }
 
@@ -208,7 +208,7 @@ protected async Task PublishMessagesWhileClosingConnAsync(QueueName queueName)
                     {
                         if (i == CloseAtCount)
                         {
-                            await CloseConnectionAsync(_conn);
+                            await TestConnectionRecoveryBase.CloseConnectionAsync(_conn);
                         }
 
                         await publishingChannel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, _messageBody);
@@ -217,6 +217,8 @@ protected async Task PublishMessagesWhileClosingConnAsync(QueueName queueName)
 
                     await publishingChannel.CloseAsync();
                 }
+
+                await publishingConn.CloseAsync();
             }
         }
 

projects/Test/Integration/TestChannelAllocation.cs

@@ -88,6 +88,14 @@ public async Task AllocateInOrderOnlyUsingDispose()
                 Assert.Equal(i, ChannelNumber(channel));
             }
 
+            var closeTasks = new List<Task>();
+            foreach (IChannel channel in channels)
+            {
+                closeTasks.Add(channel.CloseAsync());
+            }
+
+            await Task.WhenAll(closeTasks);
+
             foreach (IChannel channel in channels)
             {
                 channel.Dispose();

projects/Test/Integration/TestConnectionShutdown.cs

@@ -104,6 +104,7 @@ public async Task TestDisposedWithSocketClosedOutOfBand()
 
             try
             {
+                await _conn.CloseAsync();
                 _conn.Dispose();
                 await WaitAsync(tcs, WaitSpan, "channel shutdown");
                 await frameHandlerCloseTask.WaitAsync(WaitSpan);
@@ -140,6 +141,7 @@ public async Task TestShutdownSignalPropagationToChannelsUsingDispose()
                 tcs.SetResult(true);
             };
 
+            await _conn.CloseAsync();
             _conn.Dispose();
             _conn = null;