ran dotnet format

FoundatioFx · Mar 27, 2024 · 54915cd · 54915cd
1 parent 204cf95
commit 54915cd
Show file tree

Hide file tree

Showing 9 changed files with 677 additions and 682 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -42,10 +42,10 @@ csharp_indent_labels = one_less_than_current
 csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
 
 # avoid this. unless absolutely necessary
-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:error
+dotnet_style_qualification_for_property = false:error
+dotnet_style_qualification_for_method = false:error
+dotnet_style_qualification_for_event = false:error
 
 # Types: use keywords instead of BCL types, and permit var only when the type is clear
 csharp_style_var_for_built_in_types = false:suggestion
@@ -154,6 +154,10 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+# Custom
+csharp_style_namespace_declarations = file_scoped:error
+dotnet_diagnostic.IDE0005.severity = error # Using directive is unnecessary.
+
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

diff --git a/src/Foundatio.Aliyun/AliyunConnectionStringBuilder.cs b/src/Foundatio.Aliyun/AliyunConnectionStringBuilder.cs
@@ -1,82 +1,81 @@
 using System;
 using System.Linq;
 
-namespace Foundatio
+namespace Foundatio;
+
+public abstract class AliyunConnectionStringBuilder
 {
-    public abstract class AliyunConnectionStringBuilder
-    {
-        public string Endpoint { get; set; }
+    public string Endpoint { get; set; }
 
-        public string AccessKey { get; set; }
+    public string AccessKey { get; set; }
 
-        public string SecretKey { get; set; }
+    public string SecretKey { get; set; }
 
-        protected AliyunConnectionStringBuilder() { }
+    protected AliyunConnectionStringBuilder() { }
 
-        protected AliyunConnectionStringBuilder(string connectionString)
-        {
-            if (String.IsNullOrEmpty(connectionString))
-                throw new ArgumentNullException(nameof(connectionString));
-            Parse(connectionString);
-        }
+    protected AliyunConnectionStringBuilder(string connectionString)
+    {
+        if (String.IsNullOrEmpty(connectionString))
+            throw new ArgumentNullException(nameof(connectionString));
+        Parse(connectionString);
+    }
 
-        private void Parse(string connectionString)
+    private void Parse(string connectionString)
+    {
+        foreach (string[] option in connectionString
+            .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(kvp => kvp.Contains('='))
+            .Select(kvp => kvp.Split(new[] { '=' }, 2)))
         {
-            foreach (string[] option in connectionString
-                .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
-                .Where(kvp => kvp.Contains('='))
-                .Select(kvp => kvp.Split(new[] { '=' }, 2)))
+            string optionKey = option[0].Trim();
+            string optionValue = option[1].Trim();
+            if (!ParseItem(optionKey, optionValue))
             {
-                string optionKey = option[0].Trim();
-                string optionValue = option[1].Trim();
-                if (!ParseItem(optionKey, optionValue))
-                {
-                    throw new ArgumentException($"The option '{optionKey}' cannot be recognized in connection string.", nameof(connectionString));
-                }
+                throw new ArgumentException($"The option '{optionKey}' cannot be recognized in connection string.", nameof(connectionString));
             }
         }
+    }
 
-        protected virtual bool ParseItem(string key, string value)
+    protected virtual bool ParseItem(string key, string value)
+    {
+        if (String.Equals(key, "AccessKey", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Access Key", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "AccessKeyId", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Access Key Id", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Id", StringComparison.OrdinalIgnoreCase))
         {
-            if (String.Equals(key, "AccessKey", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Access Key", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "AccessKeyId", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Access Key Id", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Id", StringComparison.OrdinalIgnoreCase))
-            {
-                AccessKey = value;
-                return true;
-            }
-            if (String.Equals(key, "SecretKey", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Secret Key", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "SecretAccessKey", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Secret Access Key", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "AccessKeySecret", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Access Key Secret", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "Secret", StringComparison.OrdinalIgnoreCase))
-            {
-                SecretKey = value;
-                return true;
-            }
-            if (String.Equals(key, "EndPoint", StringComparison.OrdinalIgnoreCase) ||
-                String.Equals(key, "End Point", StringComparison.OrdinalIgnoreCase))
-            {
-                Endpoint = value;
-                return true;
-            }
-            return false;
+            AccessKey = value;
+            return true;
         }
-
-        public override string ToString()
+        if (String.Equals(key, "SecretKey", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Secret Key", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "SecretAccessKey", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Secret Access Key", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "AccessKeySecret", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Access Key Secret", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "Secret", StringComparison.OrdinalIgnoreCase))
         {
-            string connectionString = String.Empty;
-            if (!String.IsNullOrEmpty(AccessKey))
-                connectionString += "AccessKey=" + AccessKey + ";";
-            if (!String.IsNullOrEmpty(SecretKey))
-                connectionString += "SecretKey=" + SecretKey + ";";
-            if (!String.IsNullOrEmpty(Endpoint))
-                connectionString += "EndPoint=" + Endpoint + ";";
-            return connectionString;
+            SecretKey = value;
+            return true;
         }
+        if (String.Equals(key, "EndPoint", StringComparison.OrdinalIgnoreCase) ||
+            String.Equals(key, "End Point", StringComparison.OrdinalIgnoreCase))
+        {
+            Endpoint = value;
+            return true;
+        }
+        return false;
+    }
+
+    public override string ToString()
+    {
+        string connectionString = String.Empty;
+        if (!String.IsNullOrEmpty(AccessKey))
+            connectionString += "AccessKey=" + AccessKey + ";";
+        if (!String.IsNullOrEmpty(SecretKey))
+            connectionString += "SecretKey=" + SecretKey + ";";
+        if (!String.IsNullOrEmpty(Endpoint))
+            connectionString += "EndPoint=" + Endpoint + ";";
+        return connectionString;
     }
 }
diff --git a/src/Foundatio.Aliyun/Extensions/TaskExtensions.cs b/src/Foundatio.Aliyun/Extensions/TaskExtensions.cs
@@ -1,22 +1,20 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
-namespace Foundatio.Extensions
+namespace Foundatio.Extensions;
+
+internal static class TaskExtensions
 {
-    internal static class TaskExtensions
+    [DebuggerStepThrough]
+    public static ConfiguredTaskAwaitable<TResult> AnyContext<TResult>(this Task<TResult> task)
     {
-        [DebuggerStepThrough]
-        public static ConfiguredTaskAwaitable<TResult> AnyContext<TResult>(this Task<TResult> task)
-        {
-            return task.ConfigureAwait(false);
-        }
+        return task.ConfigureAwait(false);
+    }
 
-        [DebuggerStepThrough]
-        public static ConfiguredTaskAwaitable AnyContext(this Task task)
-        {
-            return task.ConfigureAwait(false);
-        }
+    [DebuggerStepThrough]
+    public static ConfiguredTaskAwaitable AnyContext(this Task task)
+    {
+        return task.ConfigureAwait(false);
     }
 }