merge bug26208 into default (again, to fix build)

Author: michaelklishin

projects/client/Apigen/src/apigen/Apigen.cs

@@ -832,6 +832,8 @@ public void MaybeEmitModelMethod(MethodInfo method) {
             if (method.IsSpecialName) {
                 // It's some kind of event- or property-related method.
                 // It shouldn't be autogenerated.
+            } else if (method.Name.EndsWith("Nowait")) {
+                // Skip *Nowait versions
             } else if (Attribute(method, typeof(AmqpMethodDoNotImplementAttribute)) != null) {
                 // Skip this method, by request (AmqpMethodDoNotImplement)
             } else if (Attribute(method, typeof(AmqpContentHeaderFactoryAttribute)) != null) {

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -272,6 +272,13 @@ void QueueBind(string queue,
                        string exchange,
                        string routingKey);
 
+        ///<summary>Same as QueueBind but sets nowait parameter to true and returns void (as there
+        ///will be no response from the server).</summary>
+        void QueueBindNowait(string queue,
+                             string exchange,
+                             string routingKey,
+                             IDictionary<string, object> arguments);
+
         ///<summary>(Spec method) Unbind a queue from an exchange.</summary>
         ///<remarks>
         ///Note: This operation is only supported when communicating

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -935,6 +935,14 @@ public void QueueBind(string queue,
             QueueBind(queue, exchange, routingKey, null);
         }
 
+        public void QueueBindNowait(string queue,
+                                    string exchange,
+                                    string routingKey,
+                                    IDictionary<string, object> arguments)
+        {
+            _Private_QueueBind(queue, exchange, routingKey, true, arguments);
+        }
+
         public abstract void _Private_QueueBind(string queue,
                                                 string exchange,
                                                 string routingKey,

projects/client/Unit/src/unit/TestQueueDeclare.cs

@@ -89,7 +89,7 @@ public void TestConcurrentQueueDeclare()
         [Test]
         public void TestQueueDeclareNowait()
         {
-            string q = GenerateQueueName ();
+            string q = GenerateQueueName();
             Model.QueueDeclareNowait(q, false, true, false, null);
             Model.QueueDeclarePassive(q);
         }