Merge pull request #46 from stricq/dev

Lots of code cleanup; Roslyn and Resharper fixes

Author: stricq

.editorconfig

@@ -84,11 +84,11 @@ csharp_prefer_simple_default_expression= false:suggestion
 #Style - implicit and explicit types
 
 #prefer explicit type over var in all cases, unless overridden by another code style rule
-csharp_style_var_elsewhere=false:suggestion
+csharp_style_var_elsewhere= false:suggestion
 #prefer explicit type over var to declare variables with built-in system types such as int
-csharp_style_var_for_built_in_types=false:suggestion
+csharp_style_var_for_built_in_types= false:suggestion
 #prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
-csharp_style_var_when_type_is_apparent=false:suggestion
+csharp_style_var_when_type_is_apparent= false:suggestion
 
 #Style - language keyword and framework type options
 
@@ -113,7 +113,7 @@ csharp_preferred_modifier_order=public,private,protected,internal,static,overrid
 #Style - Pattern matching
 
 #prefer pattern matching instead of is expression with type casts
-csharp_style_pattern_matching_over_as_with_null_check=true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check= true:suggestion
 
 #Style - qualification options
 
@@ -126,7 +126,7 @@ dotnet_style_qualification_for_method=false:suggestion
 #prefer properties not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_property=false:suggestion
 
-dotnet_remove_unnecessary_suppression_exclusions=category: ReSharper
+dotnet_remove_unnecessary_suppression_exclusions=category: ReSharper,AsyncUsage
 
 # ReSharper properties
 resharper_space_within_single_line_array_initializer_braces=true
@@ -152,18 +152,18 @@ dotnet_naming_symbols.async_method.required_modifiers = async
 
 dotnet_naming_symbols.method.applicable_kinds = method
 dotnet_naming_symbols.method.applicable_accessibilities = public
-dotnet_naming_symbols.method.required_modifiers = 
+dotnet_naming_symbols.method.required_modifiers =
 
 # Naming styles
 
-dotnet_naming_style.pascal_case_async.required_prefix = 
+dotnet_naming_style.pascal_case_async.required_prefix =
 dotnet_naming_style.pascal_case_async.required_suffix = Async
-dotnet_naming_style.pascal_case_async.word_separator = 
+dotnet_naming_style.pascal_case_async.word_separator =
 dotnet_naming_style.pascal_case_async.capitalization = pascal_case
 
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
 dotnet_naming_style.pascal_case.capitalization = pascal_case
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
@@ -188,6 +188,23 @@ csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 csharp_indent_labels = one_less_than_current
 csharp_space_around_binary_operators = before_and_after
+csharp_prefer_system_threading_lock = true:suggestion
+csharp_style_prefer_unbound_generic_type_in_nameof = true:suggestion
+csharp_prefer_static_local_function = true:suggestion
+csharp_prefer_static_anonymous_function = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
 
 [*.{cs,vb}]
 #### Naming styles ####
@@ -210,31 +227,31 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
 dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
+dotnet_naming_symbols.interface.required_modifiers =
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
 dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers = 
+dotnet_naming_symbols.types.required_modifiers =
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
 dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers = 
+dotnet_naming_symbols.non_field_members.required_modifiers =
 
 # Naming styles
 
 dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix = 
-dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.required_suffix =
+dotnet_naming_style.begins_with_i.word_separator =
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
 dotnet_naming_style.pascal_case.capitalization = pascal_case
 
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
 dotnet_naming_style.pascal_case.capitalization = pascal_case
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
@@ -256,3 +273,18 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = false:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+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

.github/workflows/build-publish.yml

@@ -55,7 +55,7 @@ jobs:
 
         printf -v jdate '%(%y%j%H%M)T'
 
-        branch_name=${{github.ref_name}}
+        branch_name=${{ github.ref_name }}
 
         values=(${branch_name//_/ })
 

Str.Common.Tests/LockingObservableCollectionTests.cs

@@ -134,25 +134,24 @@ public void OnCollectionChangedMoveEventSameIndexTest() {
         Assert.AreEqual(0, changedCount);
     }
 
-    [TestMethod, ExpectedException(typeof(ArgumentOutOfRangeException)), TestCategory("Unit")]
+    [TestMethod, TestCategory("Unit")]
     public void OnCollectionChangedMoveSourceOutOfRangeTest() {
         TestClass tester1 = new();
         TestClass tester2 = new();
 
         LockingObservableCollection<TestClass> testCollection = [tester1, tester2];
 
-
-        testCollection.Move(2, 1);
+        Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => testCollection.Move(2, 1));
     }
 
-    [TestMethod, ExpectedException(typeof(ArgumentOutOfRangeException)), TestCategory("Unit")]
+    [TestMethod, TestCategory("Unit")]
     public void OnCollectionChangedMoveDestinationOutOfRangeTest() {
         TestClass tester1 = new();
         TestClass tester2 = new();
 
         LockingObservableCollection<TestClass> testCollection = [tester1, tester2];
 
-        testCollection.Move(1, 2);
+        Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => testCollection.Move(1, 2));
     }
 
     #endregion OnCollectionChanged Tests

Str.Common.Tests/LockingReadOnlyCollectionTests.cs

@@ -6,82 +6,83 @@
 
 namespace Str.Common.Tests;
 
+
 [TestClass]
 public class LockingReadOnlyCollectionTests {
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionCount() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionCount() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    Assert.AreEqual(source.Count, tester.Count);
-  }
+        Assert.AreEqual(source.Count, tester.Count);
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionContains() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionContains() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    Assert.IsTrue(tester.Contains(2));
-  }
+        Assert.IsTrue(tester.Contains(2));
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionCopyTo() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionCopyTo() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    int[] array = new int[3];
+        int[] array = new int[3];
 
-    tester.CopyTo(array, 0);
+        tester.CopyTo(array, 0);
 
-    Assert.AreEqual(source[0], array[0]);
-    Assert.AreEqual(source[1], array[1]);
-    Assert.AreEqual(source[2], array[2]);
-  }
+        Assert.AreEqual(source[0], array[0]);
+        Assert.AreEqual(source[1], array[1]);
+        Assert.AreEqual(source[2], array[2]);
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionIsReadOnly() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionIsReadOnly() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    Assert.IsTrue(tester.IsReadOnly);
-  }
+        Assert.IsTrue(tester.IsReadOnly);
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionIsEnumerable() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionIsEnumerable() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    int total = tester.Sum();
+        int total = tester.Sum();
 
-    Assert.AreEqual(6, total);
-  }
+        Assert.AreEqual(6, total);
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionIndexOf() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionIndexOf() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    int index = tester.IndexOf(3);
+        int index = tester.IndexOf(3);
 
-    Assert.AreEqual(2, index);
-  }
+        Assert.AreEqual(2, index);
+    }
 
-  [TestMethod, TestCategory("Unit")]
-  public void LockingReadOnlyCollectionIndexer() {
-    List<int> source = [1, 2, 3];
+    [TestMethod, TestCategory("Unit")]
+    public void LockingReadOnlyCollectionIndexer() {
+        List<int> source = [1, 2, 3];
 
-    LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
+        LockingReadOnlyCollection<int> tester = source.ToLockingReadOnlyCollection();
 
-    Assert.AreEqual(source[0], tester[0]);
-    Assert.AreEqual(source[1], tester[1]);
-    Assert.AreEqual(source[2], tester[2]);
-  }
+        Assert.AreEqual(source[0], tester[0]);
+        Assert.AreEqual(source[1], tester[1]);
+        Assert.AreEqual(source[2], tester[2]);
+    }
 
-}
+}

Str.Common.Tests/TaskExtensionTests.cs

@@ -5,6 +5,7 @@
 
 namespace Str.Common.Tests;
 
+
 [TestClass]
 public class TaskExtensionTests {