More code analysis clean up

Author: commonsensesoftware

.editorconfig

@@ -90,6 +90,9 @@ csharp_space_between_method_declaration_parameter_list_parentheses = true
 csharp_space_between_method_call_parameter_list_parentheses = true
 csharp_space_between_parentheses = control_flow_statements, expressions
 
+# primary construcrtors
+csharp_style_prefer_primary_constructors = false:none
+
 # style code suppressions
 dotnet_diagnostic.SA1002.severity = none
 dotnet_diagnostic.SA1003.severity = none

src/Abstractions/src/Asp.Versioning.Abstractions/netstandard2.0/FormatWriter.cs

@@ -45,7 +45,7 @@ internal FormatWriter(
 
     public bool Succeeded { get; private set; }
 
-    public int Written => totalWritten;
+    public readonly int Written => totalWritten;
 
     public void Write( in FormatToken token )
     {

src/Abstractions/test/Asp.Versioning.Abstractions.Tests/ApiVersionTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: DX
+
 namespace Asp.Versioning;
 
 public partial class ApiVersionTest

src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/UsingNamespace/given a versioned ApiController per namespace/when using a url segment and attribute-based routing.cs

@@ -2,6 +2,8 @@
 
 #pragma warning disable IDE1006 // Naming Styles
 
+//// Ignore Spelling: Dbased
+
 namespace given_a_versioned_ApiController_per_namespace;
 
 using Asp.Versioning;

src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/UsingNamespace/given a versioned ApiController per namespace/when using a url segment and convention-based routing.cs

@@ -2,6 +2,8 @@
 
 #pragma warning disable IDE1006 // Naming Styles
 
+//// Ignore Spelling: Dbased
+
 namespace given_a_versioned_ApiController_per_namespace;
 
 using Asp.Versioning;

src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/OData/ODataAcceptanceTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dspecific
+
 namespace Asp.Versioning.OData;
 
 using static System.Net.HttpStatusCode;

src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/Conventions/ODataValidationSettingsConventionTest.cs

@@ -1,5 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dlike
+//// Ignore Spelling: Multipart
+//// Ignore Spelling: nonaction
+//// Ignore Spelling: nonquery
+
 namespace Asp.Versioning.Conventions;
 
 using Asp.Versioning.Description;

src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/Routing/VersionedAttributeRoutingConventionTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning.Routing;
 
 using Microsoft.AspNet.OData;

src/AspNet/WebApi/src/Asp.Versioning.WebApi/Controllers/ActionSelectorCacheItem.cs

@@ -23,7 +23,7 @@ namespace Asp.Versioning.Controllers;
 /// </summary>
 internal sealed class ActionSelectorCacheItem
 {
-    private static readonly HttpMethod[] cacheListMethodKinds = new[] { HttpMethod.Get, HttpMethod.Put, HttpMethod.Post };
+    private static readonly HttpMethod[] cacheListMethodKinds = [HttpMethod.Get, HttpMethod.Put, HttpMethod.Post];
     private readonly HttpControllerDescriptor controllerDescriptor;
     private readonly CandidateAction[] combinedCandidateActions;
     private readonly Dictionary<HttpActionDescriptor, string[]> actionParameterNames = [];

src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/ApiExplorer/VersionedApiExplorerTest.cs

@@ -1,7 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dcase
+//// Ignore Spelling: Dinsensitive
 
 namespace Asp.Versioning.ApiExplorer;
+
 using Asp.Versioning.Models;
 using Asp.Versioning.Routing;
 using Asp.Versioning.Simulators;

src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Description/ApiDescriptionGroupCollectionTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: denormalized
+
 namespace Asp.Versioning.Description;
 
 using System.Collections.ObjectModel;

src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Models/GenericMutableObject{T}.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Foo
+
 namespace Asp.Versioning.Models;
 
 public class GenericMutableObject<T> : List<T>

src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Models/MutableObject.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Foo
+
 namespace Asp.Versioning.Models;
 
 public class MutableObject

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/Controllers/HttpControllerDescriptorGroupTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: eq
+
 namespace Asp.Versioning.Controllers;
 
 using System.Collections.ObjectModel;

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/Dispatcher/ApiVersionControllerSelectorTest.cs

@@ -1,5 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dbased
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning.Dispatcher;
 
 using Asp.Versioning;

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/MediaTypeApiVersionReaderBuilderTest.cs

@@ -125,7 +125,7 @@ public void read_should_retrieve_version_from_content_type_and_accept()
         var versions = reader.Read( request );
 
         // assert
-        versions.Should().BeEquivalentTo( new[] { "1.5", "2.0" } );
+        versions.Should().BeEquivalentTo( ["1.5", "2.0"] );
     }
 
     [Fact]
@@ -246,7 +246,7 @@ public void read_should_only_retrieve_included_media_types()
     [InlineData( "application/vnd-v{v}+json", "v", "application/vnd-v2.1+json", "2.1" )]
     [InlineData( "application/vnd-v{ver}+json", "ver", "application/vnd-v2022-11-01+json", "2022-11-01" )]
     [InlineData( "application/vnd-{version}+xml", "version", "application/vnd-1.1-beta+xml", "1.1-beta" )]
-    public void read_should_retreive_version_from_media_type_template(
+    public void read_should_retrieve_version_from_media_type_template(
         string template,
         string parameterName,
         string mediaType,

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/MediaTypeApiVersionReaderTest.cs

@@ -111,7 +111,7 @@ public void read_should_retrieve_version_from_content_type_and_accept()
         var versions = reader.Read( request );
 
         // assert
-        versions.Should().BeEquivalentTo( new[] { "1.5", "2.0" } );
+        versions.Should().BeEquivalentTo( ["1.5", "2.0"] );
     }
 
     [Fact]

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/QueryStringApiVersionReaderTest.cs

@@ -86,8 +86,8 @@ public void read_should_not_throw_exception_when_duplicate_api_versions_are_requ
     }
 
     [Theory]
-    [InlineData( new object[] { new string[0] } )]
-    [InlineData( new object[] { new[] { "api-version" } } )]
+    [InlineData( [new string[0]] )]
+    [InlineData( [new[] { "api-version" }] )]
     public void add_parameters_should_add_single_parameter_from_query_string( string[] parameterNames )
     {
         // arrange

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/ReportApiVersionsAttributeTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning;
 
 using Asp.Versioning.Simulators;

src/AspNet/WebApi/test/Asp.Versioning.WebApi.Tests/Simulators/AdminController.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Admin
+
 namespace Asp.Versioning.Simulators;
 
 using System.Web.Http;

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/ODataAcceptanceTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dspecific
+
 namespace Asp.Versioning.OData;
 
 using static System.Net.HttpStatusCode;

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Conventions/ODataValidationSettingsConventionTest.cs

@@ -1,5 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dlike
+//// Ignore Spelling: Multipart
+//// Ignore Spelling: nonaction
+//// Ignore Spelling: nonquery
+
 namespace Asp.Versioning.Conventions;
 
 using Asp.Versioning.OData;

src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/Routing/VersionedAttributeRoutingConventionTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning.Routing;
 
 using Asp.Versioning.OData;

src/AspNetCore/WebApi/test/Asp.Versioning.Http.Tests/MediaTypeApiVersionReaderTest.cs

@@ -33,7 +33,9 @@ public void read_should_retrieve_version_from_content_type()
         var request = new Mock<HttpRequest>();
         var headers = new Mock<IHeaderDictionary>();
 
+#pragma warning disable ASP0015 // Suggest using IHeaderDictionary properties
         headers.SetupGet( h => h["Content-Type"] ).Returns( new StringValues( "application/json;v=2.0" ) );
+#pragma warning restore ASP0015 // Suggest using IHeaderDictionary properties
         request.SetupGet( r => r.Headers ).Returns( headers.Object );
         request.SetupProperty( r => r.Body, Null );
         request.SetupProperty( r => r.ContentLength, 0L );

src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.ApiExplorer.Tests/ApiDescriptionExtensionsTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning.ApiExplorer;
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;

src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.Tests/ApiVersioningApplicationModelProviderTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning;
 
 using Asp.Versioning.ApplicationModels;

src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.Tests/ReportApiVersionsAttributeTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dneutral
+
 namespace Asp.Versioning;
 
 using Microsoft.AspNetCore.Http;

src/Common/src/Common/ApiVersionReader.cs

@@ -42,7 +42,7 @@ public static IApiVersionReader Combine(
 
         if ( otherApiVersionReaders is null || ( count = otherApiVersionReaders.Length ) == 0 )
         {
-            apiVersionReaders = new[] { apiVersionReader };
+            apiVersionReaders = [apiVersionReader];
         }
         else
         {

src/Common/src/Common/MediaTypeApiVersionReaderBuilder.cs

@@ -24,7 +24,7 @@ namespace Asp.Versioning;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 #if NETFRAMEWORK
-using FrozenSet = HashSet<String>;
+using FrozenSet = HashSet<string>;
 #else
 using FrozenSet = FrozenSet<StringSegment>;
 #endif

src/Common/test/Common.Mvc.Tests/Conventions/ApiVersionConventionBuilderTest.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+//// Ignore Spelling: Dtime
+
 namespace Asp.Versioning.Conventions
 {
 #if NETFRAMEWORK

src/Common/test/Common.Mvc.Tests/Conventions/ControllerApiVersionConventionBuilderTTest.cs

@@ -74,6 +74,7 @@ private sealed class TestControllerApiVersionConventionBuilder : ControllerApiVe
         internal ActionApiVersionConventionBuilderCollection<ControllerBase> ProtectedActionBuilders => ActionBuilders;
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
 #if !NETFRAMEWORK

src/Common/test/Common.Mvc.Tests/Conventions/DefaultControllerNameConventionTest.cs

@@ -35,14 +35,14 @@ public static IEnumerable<object[]> NormalizeNameData
     {
         get
         {
-            return new[]
+            return new object[][]
             {
 #if NETFRAMEWORK
-                new object[] { "ValuesController" },
-                new object[] { "Values2Controller" },
+                ["ValuesController"],
+                ["Values2Controller"],
 #else
-                new object[] { "Values" },
-                new object[] { "Values2" },
+                ["Values"],
+                ["Values2"],
 #endif
             };
         }

src/Common/test/Common.Mvc.Tests/Conventions/GroupedControllerNameConventionTest.cs

@@ -37,13 +37,13 @@ public static IEnumerable<object[]> NormalizeNameData
     {
         get
         {
-            return new[]
+            return new object[][]
             {
-                new object[] { "Values" },
+                ["Values"],
 #if NETFRAMEWORK
-                new object[] { "ValuesController2" },
+                ["ValuesController2"],
 #else
-                new object[] { "Values2" },
+                ["Values2"],
 #endif
             };
         }

src/Common/test/Common.Mvc.Tests/Conventions/OriginalControllerNameConventionTest.cs

@@ -35,12 +35,12 @@ public static IEnumerable<object[]> NormalizeNameData
     {
         get
         {
-            return new[]
+            return new object[][]
             {
-                new object[] { "Values" },
-                new object[] { "Values2" },
+               ["Values"],
+               ["Values2"],
 #if NETFRAMEWORK
-                new object[] { "ValuesController2" },
+               ["ValuesController2"],
 #endif
             };
         }

src/Common/test/Common.OData.ApiExplorer.Tests/Conventions/ODataActionQueryOptionsConventionBuilderTTest.cs

@@ -239,6 +239,7 @@ public void action_should_call_action_on_controller_builder()
         controllerBuilder.Verify( cb => cb.Action( method ), Once() );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1034 // Nested types should not be visible
 
     public sealed class TestController : ControllerBase

src/Common/test/Common.OData.ApiExplorer.Tests/Conventions/ODataActionQueryOptionsConventionBuilderTest.cs

@@ -239,6 +239,7 @@ public void action_should_call_action_on_controller_builder()
         controllerBuilder.Verify( cb => cb.Action( method ), Once() );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1034 // Nested types should not be visible
 
     public sealed class TestController : ControllerBase

src/Common/test/Common.OData.ApiExplorer.Tests/Conventions/ODataQueryOptionsConventionBuilderTest.cs

@@ -1,7 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
-namespace Asp.Versioning.Conventions;
+//// Ignore Spelling: Dtime
 
+namespace Asp.Versioning.Conventions;
 
 #if NETFRAMEWORK
 using Microsoft.AspNet.OData;
@@ -112,6 +113,7 @@ private sealed class TestODataQueryOptionsConventionBuilder : ODataQueryOptionsC
         internal new IList<IODataQueryOptionsConvention> Conventions => base.Conventions;
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1034 // Nested types should not be visible
 
     public sealed class StubController : ODataController

src/Common/test/Common.OData.ApiExplorer.Tests/OData/Company.cs

@@ -1,5 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1002 // Do not expose generic lists
+#pragma warning disable CA2227 // Collection properties should be read only
+
 namespace Asp.Versioning.OData;
 
 public class Company
@@ -8,11 +12,7 @@ public class Company
 
     public Company ParentCompany { get; set; }
 
-#pragma warning disable CA1002 // Do not expose generic lists
-#pragma warning disable CA2227 // Collection properties should be read only
     public List<Company> Subsidiaries { get; set; }
-#pragma warning restore CA2227 // Collection properties should be read only
-#pragma warning restore CA1002 // Do not expose generic lists
 
     public string Name { get; set; }