Merge pull request #1197 from rabbitmq/rabbitmq-dotnet-client-1192

Run "dotnet format"

Author: lukebakken

.editorconfig

@@ -1,21 +1,12 @@
-# editorconfig.org
-
-# top-most EditorConfig file
 root = true
 
-# Default settings:
-# A newline ending every file
-# Use 4 spaces as indentation
+trim_trailing_whitespace = true
+
 [*]
 insert_final_newline = true
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
 
-[project.json]
-indent_size = 2
-
-# C# files
 [*.cs]
 # New line preferences
 csharp_new_line_before_open_brace = all
@@ -178,12 +169,13 @@ indent_size = 2
 [*.{props,targets,config,nuspec}]
 indent_size = 2
 
-# Shell scripts
 [*.sh]
 end_of_line = lf
 [*.{cmd, bat}]
 end_of_line = crlf
 
-# YAML files
+[*.json]
+indent_size = 2
+
 [*.yml]
 indent_size = 2

.github/workflows/main.yaml

@@ -86,3 +86,5 @@ jobs:
         run: dotnet test --no-restore --no-build --logger "console;verbosity=detailed" --framework "net6.0"
         env:
           RABBITMQ_RABBITMQCTL_PATH: DOCKER:${{job.services.rabbitmq.id}}
+      - name: Verify Formatting
+        run: dotnet format --verbosity normal --no-restore --verify-no-changes

projects/Benchmarks/Networking/Networking_BasicDeliver_ConnectionChurn.cs

@@ -1,8 +1,8 @@
-using System.Text;
+using System;
+using System.Text;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
-using System;
 
 namespace Benchmarks.Networking
 {
@@ -17,7 +17,7 @@ public class Networking_BasicDeliver
         [GlobalSetup]
         public void GlobalSetup()
         {
-            _container = RabbitMQBroker.Start(); 
+            _container = RabbitMQBroker.Start();
         }
 
         [GlobalCleanup]

projects/Benchmarks/Networking/Networking_BasicDeliver_LongLivedConnection.cs

@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System;
+using System.Text;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
-using System;
-using System.Text;
 
 namespace Benchmarks.Networking
 {

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

@@ -36,7 +36,7 @@
 
 namespace RabbitMQ.Client
 {
-    #nullable enable
+#nullable enable
     /// <summary>
     /// The configuration of a connection.
     /// </summary>

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

@@ -40,9 +40,9 @@ public class DefaultEndpointResolver : IEndpointResolver
         private readonly List<AmqpTcpEndpoint> _endpoints;
         private readonly Random _rnd = new Random();
 
-        public DefaultEndpointResolver (IEnumerable<AmqpTcpEndpoint> tcpEndpoints)
+        public DefaultEndpointResolver(IEnumerable<AmqpTcpEndpoint> tcpEndpoints)
         {
-           _endpoints = tcpEndpoints.ToList();
+            _endpoints = tcpEndpoints.ToList();
         }
 
         public IEnumerable<AmqpTcpEndpoint> All()

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

@@ -64,7 +64,7 @@ public static class ExchangeType
         /// </summary>
         public const string Topic = "topic";
 
-        private static readonly string[] s_all = {Fanout, Direct, Topic, Headers};
+        private static readonly string[] s_all = { Fanout, Direct, Topic, Headers };
 
         /// <summary>
         /// Retrieve a collection containing all standard exchange types.

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

@@ -56,12 +56,12 @@ public static class Headers
         /// x-max-length-bytes header
         /// </summary>
         public const string XMaxLengthInBytes = "x-max-length-bytes";
-        
+
         /// <summary>
         /// x-dead-letter-exchange header
         /// </summary>
         public const string XDeadLetterExchange = "x-dead-letter-exchange";
-        
+
         /// <summary>
         /// x-dead-letter-routing-key header
         /// </summary>

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

@@ -40,4 +40,4 @@ public interface IEndpointResolver
         /// </summary>
         IEnumerable<AmqpTcpEndpoint> All();
     }
-}
+}

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

@@ -46,9 +46,9 @@ public static string BasicConsume(this IModel model,
             bool noLocal = false,
             bool exclusive = false,
             IDictionary<string, object> arguments = null)
-            {
-                return model.BasicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
-            }
+        {
+            return model.BasicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
+        }
 
         /// <summary>Start a Basic content-class consumer.</summary>
         public static string BasicConsume(this IModel model, string queue, bool autoAck, IBasicConsumer consumer)
@@ -100,9 +100,9 @@ public static void BasicPublish(this IModel model, CachedString exchange, Cached
         /// </summary>
         public static QueueDeclareOk QueueDeclare(this IModel model, string queue = "", bool durable = false, bool exclusive = true,
             bool autoDelete = true, IDictionary<string, object> arguments = null)
-            {
-                return model.QueueDeclare(queue, durable, exclusive, autoDelete, arguments);
-            }
+        {
+            return model.QueueDeclare(queue, durable, exclusive, autoDelete, arguments);
+        }
 
         /// <summary>
         /// (Extension method) Bind an exchange to an exchange.
@@ -125,18 +125,18 @@ public static void ExchangeBindNoWait(this IModel model, string destination, str
         /// </summary>
         public static void ExchangeDeclare(this IModel model, string exchange, string type, bool durable = false, bool autoDelete = false,
             IDictionary<string, object> arguments = null)
-            {
-                model.ExchangeDeclare(exchange, type, durable, autoDelete, arguments);
-            }
+        {
+            model.ExchangeDeclare(exchange, type, durable, autoDelete, arguments);
+        }
 
         /// <summary>
         /// (Extension method) Like ExchangeDeclare but sets nowait to true. 
         /// </summary>
         public static void ExchangeDeclareNoWait(this IModel model, string exchange, string type, bool durable = false, bool autoDelete = false,
             IDictionary<string, object> arguments = null)
-            {
-                model.ExchangeDeclareNoWait(exchange, type, durable, autoDelete, arguments);
-            }
+        {
+            model.ExchangeDeclareNoWait(exchange, type, durable, autoDelete, arguments);
+        }
 
         /// <summary>
         /// (Spec method) Unbinds an exchange.
@@ -145,9 +145,9 @@ public static void ExchangeUnbind(this IModel model, string destination,
             string source,
             string routingKey,
             IDictionary<string, object> arguments = null)
-            {
-                model.ExchangeUnbind(destination, source, routingKey, arguments);
-            }
+        {
+            model.ExchangeUnbind(destination, source, routingKey, arguments);
+        }
 
         /// <summary>
         /// (Spec method) Deletes an exchange.

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

@@ -98,8 +98,8 @@ public ShutdownEventArgs(ShutdownInitiator initiator, ushort replyCode, string r
         /// Override ToString to be useful for debugging.
         /// </summary>
         public override string ToString()
-        { 
-            return $"AMQP close-reason, initiated by {Initiator}" 
+        {
+            return $"AMQP close-reason, initiated by {Initiator}"
                 + $", code={ReplyCode}"
                 + (ReplyText != null ? $", text='{ReplyText}'" : string.Empty)
                 + $", classId={ClassId}"