Clean up code analysis

Author: commonsensesoftware

.editorconfig

@@ -90,9 +90,6 @@ 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
 
-# ide code suppressions
-# dotnet_diagnostic.IDE0079.severity = none
-
 # style code suppressions
 dotnet_diagnostic.SA1002.severity = none
 dotnet_diagnostic.SA1003.severity = none

src/Common/src/Common.Backport/NullableAttributes.cs

@@ -1,6 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
-#pragma warning disable SA1402, SA1649
+#pragma warning disable IDE0060
+#pragma warning disable IDE0079
+#pragma warning disable SA1402
+#pragma warning disable SA1649
 
 // REF: https://github.com/dotnet/runtime/blob/1c8d37af80667daffb3cb80ce0fe915621e8f039/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
 //

src/Common/src/Common.OData.ApiExplorer/Conventions/ODataActionQueryOptionsConventionBuilder{T}.cs

@@ -32,9 +32,11 @@ public class ODataActionQueryOptionsConventionBuilder<T> :
     IODataActionQueryOptionsConventionBuilder<T>
     where T : notnull
 #if NETFRAMEWORK
+#pragma warning disable IDE0079
 #pragma warning disable SA1001 // Commas should be spaced correctly
     , IHttpController
 #pragma warning restore SA1001 // Commas should be spaced correctly
+#pragma warning restore IDE0079
 #endif
 {
     /// <summary>

src/Common/src/Common.OData.ApiExplorer/Conventions/ODataControllerQueryOptionsConventionBuilder{T}.cs

@@ -20,9 +20,11 @@ public class ODataControllerQueryOptionsConventionBuilder<T> :
     IODataActionQueryOptionsConventionBuilder<T>
     where T : notnull
 #if NETFRAMEWORK
+#pragma warning disable IDE0079
 #pragma warning disable SA1001 // Commas should be spaced correctly
     , IHttpController
 #pragma warning restore SA1001 // Commas should be spaced correctly
+#pragma warning restore IDE0079
 #endif
 {
     private ODataActionQueryOptionsConventionBuilderCollection<T>? actionBuilders;

src/Common/src/Common.OData.ApiExplorer/Conventions/ODataQueryOptionsConventionBuilder.cs

@@ -59,9 +59,11 @@ public IODataQueryOptionDescriptionProvider DescriptionProvider
     public virtual ODataControllerQueryOptionsConventionBuilder<TController> Controller<TController>()
         where TController : notnull
 #if NETFRAMEWORK
+#pragma warning disable IDE0079
 #pragma warning disable SA1001 // Commas should be spaced correctly
        , IHttpController
 #pragma warning restore SA1001 // Commas should be spaced correctly
+#pragma warning restore IDE0079
 #endif
     {
         var key = typeof( TController );

src/Common/src/Common/MediaTypeApiVersionReaderBuilder.cs

@@ -11,30 +11,34 @@
 using MediaTypeHeaderValue = System.Net.Http.Headers.MediaTypeWithQualityHeaderValue;
 #else
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
+using System.Collections.Frozen;
 #endif
 
 namespace Asp.Versioning;
 
 #if !NETFRAMEWORK
 using System.Buffers;
-using System.Collections.Frozen;
 #endif
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 #if NETFRAMEWORK
-using FrozenSet = System.Collections.Generic.HashSet<System.String>;
-using Str = string;
-using StrComparer = System.StringComparer;
+using FrozenSet = HashSet<String>;
 #else
-using FrozenSet = System.Collections.Frozen.FrozenSet<Microsoft.Extensions.Primitives.StringSegment>;
-using Str = Microsoft.Extensions.Primitives.StringSegment;
-using StrComparer = Microsoft.Extensions.Primitives.StringSegmentComparer;
+using FrozenSet = FrozenSet<StringSegment>;
 #endif
-using static Asp.Versioning.ApiVersionParameterLocation;
-using static System.StringComparison;
 using ReaderCallback = Func<IReadOnlyList<MediaTypeHeaderValue>, IReadOnlyList<string>>;
 using SelectorCallback = Func<HttpRequest, IReadOnlyList<string>, IReadOnlyList<string>>;
+#if NETFRAMEWORK
+using Str = String;
+using StrComparer = StringComparer;
+#else
+using Str = StringSegment;
+using StrComparer = StringSegmentComparer;
+#endif
+using static Asp.Versioning.ApiVersionParameterLocation;
+using static System.StringComparison;
 
 /// <summary>
 /// Represents a builder for an API version reader that reads the value from a media type HTTP header in the request.