Fix all code analysis issues generated by the .NET 7.0.101 SDK

Author: commonsensesoftware

src/Abstractions/src/Asp.Versioning.Abstractions/AdvertiseApiVersionsAttribute.cs

@@ -1,5 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1019
+#pragma warning disable CA1033
+#pragma warning disable CA1813
+
 namespace Asp.Versioning;
 
 using static System.AttributeTargets;

src/Abstractions/src/Asp.Versioning.Abstractions/ApiVersion.cs

@@ -341,7 +341,11 @@ public virtual int CompareTo( ApiVersion? other )
     public virtual string ToString( string? format, IFormatProvider? formatProvider )
     {
         var provider = ApiVersionFormatProvider.GetInstance( formatProvider );
+#pragma warning disable IDE0079
+#pragma warning disable CA1062 // Validate arguments of public methods
         return provider.Format( format, this, formatProvider );
+#pragma warning restore CA1062 // Validate arguments of public methods
+#pragma warning restore IDE0079
     }
 
     private static string? ValidateStatus( string? status, Func<string?, bool> isValid )

src/Abstractions/src/Asp.Versioning.Abstractions/ApiVersionAttribute.cs

@@ -1,5 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1019
+#pragma warning disable CA1033
+#pragma warning disable CA1813
+
 namespace Asp.Versioning;
 
 using static System.AttributeTargets;

src/Abstractions/src/Asp.Versioning.Abstractions/IApiVersionNeutral.cs

@@ -1,5 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1040
+
 namespace Asp.Versioning;
 
 /// <summary>

src/Abstractions/src/Asp.Versioning.Abstractions/LinkHeaderValue.cs

@@ -572,11 +572,13 @@ public IEnumerator<KeyValuePair<StringSegment, StringSegment>> GetEnumerator()
                 }
 
                 // REF: https://datatracker.ietf.org/doc/html/rfc8288#appendix-B.3 #9
+#pragma warning disable CA1308 // Normalize strings to uppercase (all ascii and should normalize to lowercase)
 #if NETSTANDARD1_0
                 var key = remaining.Substring( start, end - start ).ToLowerInvariant();
 #else
                 var key = new StringSegment( remaining.Substring( start, end - start ).ToLowerInvariant() );
 #endif
+#pragma warning restore CA1308 // Normalize strings to uppercase
 
                 start = end;
                 ConsumeWhitespace();

src/Abstractions/src/Asp.Versioning.Abstractions/MapToApiVersionAttribute.cs

@@ -1,5 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1019
+#pragma warning disable CA1033
+#pragma warning disable CA1813
+
 namespace Asp.Versioning;
 
 using static System.AttributeTargets;

src/Abstractions/src/Asp.Versioning.Abstractions/net7.0/ApiVersion.cs

@@ -11,6 +11,10 @@ public partial class ApiVersion : ISpanFormattable
     public virtual bool TryFormat( Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider )
     {
         var instance = ApiVersionFormatProvider.GetInstance( provider );
+#pragma warning disable IDE0079
+#pragma warning disable CA1062 // Validate arguments of public methods
         return instance.TryFormat( destination, out charsWritten, format, this, provider );
+#pragma warning restore CA1062 // Validate arguments of public methods
+#pragma warning restore IDE0079
     }
 }

src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/Simulators/V3/SuppliersController.cs

@@ -1,9 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
 #pragma warning disable IDE0060 // Remove unused parameter
+#pragma warning disable IDE0079 // Remove unnecessary suppression
 #pragma warning disable SA1625 // Element documentation should not be copied and pasted
 
 namespace Asp.Versioning.Simulators.V3;
+#pragma warning restore IDE0079 // Remove unnecessary suppression
 
 using Asp.Versioning.OData;
 using Asp.Versioning.Simulators.Models;

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/HttpServerFixture.cs

@@ -18,7 +18,7 @@ public abstract partial class HttpServerFixture
 {
     private string visualizationUrl;
 
-    public string DirectedGraphVisualizationUrl =>
+    internal string DirectedGraphVisualizationUrl =>
         visualizationUrl ??= GenerateEndpointDirectedGraph( Server.Services );
 
     protected virtual void OnConfigurePartManager( ApplicationPartManager partManager ) =>

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/Controllers/WeatherForecastsController.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
 #pragma warning disable IDE0060 // Remove unused parameter
+#pragma warning disable IDE0079
 #pragma warning disable CA1822 // Mark members as static
 
 namespace Asp.Versioning.OData.Basic.Controllers;

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/given versioned batch middleware/when using a query string.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable CA2000 // Dispose objects before losing scope
 
 namespace given_versioned_batch_middleware;
 

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/given versioned batch middleware/when using a url segment.cs

@@ -1,5 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
+#pragma warning disable CA2000 // Dispose objects before losing scope
 
 namespace given_versioned_batch_middleware;
 

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Configuration/CustomerModelConfiguration.cs

@@ -25,6 +25,16 @@ private static EntityTypeConfiguration<Customer> ConfigureCurrent( ODataModelBui
 
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
+        if ( apiVersion == null )
+        {
+            throw new ArgumentNullException( nameof( apiVersion ) );
+        }
+
         switch ( apiVersion.MajorVersion )
         {
             case 1:

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Configuration/OrderModelConfiguration.cs

@@ -22,6 +22,11 @@ private static EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilde
 
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         if ( supportedApiVersion == null || supportedApiVersion == apiVersion )
         {
             ConfigureCurrent( builder );

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Configuration/PersonModelConfiguration.cs

@@ -25,6 +25,16 @@ private static EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuild
 
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
+        if ( apiVersion == null )
+        {
+            throw new ArgumentNullException( nameof( apiVersion ) );
+        }
+
         switch ( apiVersion.MajorVersion )
         {
             case 1:

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Configuration/WeatherForecastModelConfiguration.cs

@@ -22,6 +22,11 @@ private static EntityTypeConfiguration<WeatherForecast> ConfigureCurrent( ODataM
 
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         if ( supportedApiVersion == null || supportedApiVersion == apiVersion )
         {
             ConfigureCurrent( builder );

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/PartialODataDescriptionProvider.cs

@@ -87,6 +87,11 @@ protected ODataApiExplorerOptions Options
     /// <inheritdoc />
     public virtual void OnProvidersExecuting( ApiDescriptionProviderContext context )
     {
+        if ( context == null )
+        {
+            throw new ArgumentNullException( nameof( context ) );
+        }
+
         var results = FilterResults( context.Results, Conventions );
 
         if ( results.Count == 0 )
@@ -120,6 +125,11 @@ public virtual void OnProvidersExecuting( ApiDescriptionProviderContext context
     /// <inheritdoc />
     public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
     {
+        if ( context == null )
+        {
+            throw new ArgumentNullException( nameof( context ) );
+        }
+
         var actions = context.Actions;
 
         for ( var i = 0; i < actions.Count; i++ )

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/SubstitutedModelMetadata.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
 namespace Asp.Versioning.ApiExplorer;

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/DependencyInjection/IApiVersioningBuilderExtensions.cs

@@ -65,6 +65,7 @@ private static void AddApiExplorerServices( IApiVersioningBuilder builder )
         services.Replace( Singleton<IOptionsFactory<ApiExplorerOptions>, ODataApiExplorerOptionsAdapter>() );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
     private sealed class ODataApiExplorerOptionsAdapter : IOptionsFactory<ApiExplorerOptions>

src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataApiVersionCollectionProvider.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
 namespace Asp.Versioning.OData;

src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataMultiModelApplicationModelProvider.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
 namespace Asp.Versioning.OData;

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

@@ -637,6 +637,7 @@ private static ApiDescription NewApiDescription( Type controllerType, Type respo
     }
 
 #pragma warning disable IDE0060 // Remove unused parameter
+#pragma warning disable CA1034 // Nested types should not be visible
 
     public class SinglePartController : ODataController
     {

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Configuration/AllConfigurations.cs

@@ -13,6 +13,11 @@ public class AllConfigurations : IModelConfiguration
     /// <inheritdoc />
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         builder.Function( "GetSalesTaxRate" ).Returns<double>().Parameter<int>( "PostalCode" );
     }
 }

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Configuration/OrderModelConfiguration.cs

@@ -14,6 +14,11 @@ public class OrderModelConfiguration : IModelConfiguration
     /// <inheritdoc />
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         var order = builder.EntitySet<Order>( "Orders" ).EntityType.HasKey( o => o.Id );
 
         if ( apiVersion < ApiVersions.V2 )

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Configuration/PersonModelConfiguration.cs

@@ -14,6 +14,11 @@ public class PersonModelConfiguration : IModelConfiguration
     /// <inheritdoc />
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         var person = builder.EntitySet<Person>( "People" ).EntityType.HasKey( p => p.Id );
 
         if ( apiVersion < ApiVersions.V3 )

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Configuration/ProductConfiguration.cs

@@ -14,6 +14,11 @@ public class ProductConfiguration : IModelConfiguration
     /// <inheritdoc />
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         if ( apiVersion < ApiVersions.V3 )
         {
             return;

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Configuration/SupplierConfiguration.cs

@@ -14,6 +14,11 @@ public class SupplierConfiguration : IModelConfiguration
     /// <inheritdoc />
     public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix )
     {
+        if ( builder == null )
+        {
+            throw new ArgumentNullException( nameof( builder ) );
+        }
+
         if ( apiVersion < ApiVersions.V3 )
         {
             return;

src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/Models/Supplier.cs

@@ -8,5 +8,7 @@ public class Supplier
 
     public string Name { get; set; }
 
+#pragma warning disable CA2227 // Collection properties should be read only
     public ICollection<Product> Products { get; set; }
+#pragma warning restore CA2227 // Collection properties should be read only
 }

src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/ApplicationModels/ODataControllerSpecificationTest.cs

@@ -29,6 +29,7 @@ public void is_satisfied_by_should_return_expected_value( Type controllerType, b
         result.Should().Be( expected );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
     private sealed class NormalODataController : ODataController

src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/Controllers/VersionedMetadataControllerTest.cs

@@ -34,6 +34,7 @@ public async Task options_should_return_expected_headers()
         response.Content.Headers.Allow.Should().BeEquivalentTo( "GET", "OPTIONS" );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 #pragma warning disable CA1822 // Mark members as static
 

src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/OData/ModelConfigurationFeatureProviderTest.cs

@@ -32,6 +32,7 @@ public void populate_feature_should_discover_valid_model_configurations()
         }
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 #pragma warning disable SA1402 // File may only contain a single type
 #pragma warning disable SA1403 // File may only contain a single namespace
@@ -43,7 +44,7 @@ internal struct ValueTypeModelConfiguration : IModelConfiguration
             public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix ) { }
         }
 
-        internal class PrivateModelConfiguration : IModelConfiguration
+        internal sealed class PrivateModelConfiguration : IModelConfiguration
         {
             public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix ) { }
         }
@@ -53,12 +54,12 @@ public abstract class AbstractModelConfiguration : IModelConfiguration
             public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix ) { }
         }
 
-        public class GenericModelConfiguration<T> : IModelConfiguration
+        public sealed class GenericModelConfiguration<T> : IModelConfiguration
         {
             public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix ) { }
         }
 
-        public class PublicModelConfiguration : IModelConfiguration
+        public sealed class PublicModelConfiguration : IModelConfiguration
         {
             public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string routePrefix ) { }
         }

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

@@ -52,6 +52,7 @@ public void applied_to_action_should_return_true()
         action.Selectors.Should().HaveCount( 1 );
     }
 
+#pragma warning disable IDE0079
 #pragma warning disable CA1812
 
     private sealed class AnotherVersionedMetadataController : VersionedMetadataController

src/AspNetCore/WebApi/src/Asp.Versioning.Http/ApiExplorer/ApiVersionMetadataCollationCollection.cs

@@ -47,7 +47,11 @@ ApiVersionMetadata IList<ApiVersionMetadata>.this[int index]
     /// <inheritdoc />
     public int Count => items.Count;
 
+#pragma warning disable IDE0079
+#pragma warning disable CA1033 // Interface methods should be callable by child types
     bool ICollection<ApiVersionMetadata>.IsReadOnly => ( (ICollection<ApiVersionMetadata>) items ).IsReadOnly;
+#pragma warning restore CA1033 // Interface methods should be callable by child types
+#pragma warning restore IDE0079
 
     /// <inheritdoc />
     public void Add( ApiVersionMetadata item ) => Insert( Count, item, default );

src/AspNetCore/WebApi/src/Asp.Versioning.Http/ApiVersioningFeature.cs

@@ -58,7 +58,11 @@ public string? RawRequestedApiVersion
             {
                 0 => default,
                 1 => values[0],
+#pragma warning disable IDE0079
+#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations
                 _ => throw NewAmbiguousApiVersionException( values ),
+#pragma warning restore CA1065 // Do not raise exceptions in unexpected locations
+#pragma warning restore IDE0079
             };
         }
         set