Minor ruleset adjustments.

Author: tillig

build/Source.ruleset

@@ -32,25 +32,33 @@
     <Rule Id="CA2263" Action="None" />
   </Rules>
   <Rules AnalyzerId="SonarAnalyzer.CSharp" RuleNamespace="SonarAnalyzer.CSharp">
-    <!-- "Sonar Way" rules to match SonarQube scans. -->
+    <!-- Methods should not have too many parameters. -->
     <Rule Id="S107" Action="Warning" />
     <!-- Do not use obsolete members - Autofac maintains deprecated APIs for backward compat. -->
     <Rule Id="S1133" Action="None" />
+    <!-- String literals should not be duplicated. -->
     <Rule Id="S1192" Action="Warning" />
+    <!-- IP addresses should not be hardcoded. -->
     <Rule Id="S1313" Action="Warning" />
+    <!-- Null pointers should not be dereferenced. -->
     <Rule Id="S2259" Action="Warning" />
+    <!-- Conditionally executed code should be reachable. -->
     <Rule Id="S2583" Action="Warning" />
+    <!-- Boolean expressions should not be gratuitous. -->
     <Rule Id="S2589" Action="Warning" />
     <!-- Verify reflection accessibility bypass - DI containers do extensive reflection by design. -->
     <Rule Id="S3011" Action="None" />
     <!-- Loops should use LINQ - DI container hot paths intentionally avoid LINQ allocations. -->
     <Rule Id="S3267" Action="None" />
+    <!-- Cognitive complexity (must be explicitly enabled). -->
     <Rule Id="S3776" Action="Warning" />
     <!-- IDisposable pattern - Autofac uses non-standard dispose patterns for container lifecycle. -->
     <Rule Id="S3881" Action="None" />
     <!-- Split method for params check + iterator - overly prescriptive for our patterns. -->
     <Rule Id="S4456" Action="None" />
+    <!-- Collection contents should not be updated while being enumerated. -->
     <Rule Id="S6418" Action="Warning" />
+    <!-- Private fields should be initialized before use. -->
     <Rule Id="S6444" Action="Warning" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">

build/Test.ruleset

@@ -22,11 +22,11 @@
     <Rule Id="CA1515" Action="None" />
     <!-- Remove underscores from member name - test naming conventions use underscore. -->
     <Rule Id="CA1707" Action="None" />
-    <!-- Internal class that appears to never be instantiated - false positives from DI. -->
     <!-- Identifiers should not have incorrect suffix - test classes use Impl, Handler, etc. -->
     <Rule Id="CA1711" Action="None" />
     <!-- Property names should not match get methods - aggregate service tests intentionally test both. -->
     <Rule Id="CA1721" Action="None" />
+    <!-- Internal class that appears to never be instantiated - false positives from DI. -->
     <Rule Id="CA1812" Action="None" />
     <!-- Change Dispose() to call GC.SuppressFinalize - unimportant in tests. -->
     <Rule Id="CA1816" Action="None" />
@@ -42,9 +42,9 @@
     <Rule Id="CA1863" Action="None" />
     <!-- Call ConfigureAwait - shouldn't in test libraries; XUnit has opposing analyzer. -->
     <Rule Id="CA2007" Action="None" />
-    <!-- Implement serialization constructors - false positive in .NET Core. -->
     <!-- Do not raise reserved exception types - tests use generic exceptions for simulation. -->
     <Rule Id="CA2201" Action="None" />
+    <!-- Implement serialization constructors - false positive in .NET Core. -->
     <Rule Id="CA2229" Action="None" />
     <!-- Use Uri instead of string parameters - strings are easier for testing. -->
     <Rule Id="CA2234" Action="None" />
@@ -58,9 +58,9 @@
   <Rules AnalyzerId="SonarAnalyzer.CSharp" RuleNamespace="SonarAnalyzer.CSharp">
     <!-- Don't use hardcoded paths or URIs - needed in several test cases. -->
     <Rule Id="S1075" Action="None" />
-    <!-- Utility class should not be instantiated - test fixture classes with nested tests can't be static. -->
     <!-- Sections of code should not be commented out - test files may retain commented examples. -->
     <Rule Id="S125" Action="None" />
+    <!-- Utility class should not be instantiated - test fixture classes with nested tests can't be static. -->
     <Rule Id="S1118" Action="None" />
     <!-- Don't call GC.Collect - required for weak reference and disposal tests. -->
     <Rule Id="S1215" Action="None" />
@@ -137,11 +137,6 @@
     <!-- Don't copy/paste documentation. -->
     <Rule Id="SA1625" Action="None" />
   </Rules>
-  <Rules AnalyzerId="xUnit" RuleNamespace="xUnit">
-    <!-- Use Assert.Single when there's only one collection entry. -->
-    <Rule Id="xUnit2023" Action="Warning" />
-  </Rules>
-  <!-- IDE rules for test assemblies. -->
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
     <!-- Private member is unused - tests for reflection require members that may not get used. -->
     <Rule Id="IDE0051" Action="None" />