Update code analysis and fix new violations

Author: Chris Martinez

.editorconfig

@@ -86,4 +86,28 @@ csharp_space_after_cast = true
 csharp_space_after_keywords_in_control_flow_statements = true
 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
+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
+dotnet_diagnostic.SA1008.severity = none
+dotnet_diagnostic.SA1009.severity = none
+dotnet_diagnostic.SA1101.severity = none
+dotnet_diagnostic.SA1127.severity = none
+dotnet_diagnostic.SA1128.severity = none
+dotnet_diagnostic.SA1201.severity = none
+dotnet_diagnostic.SA1202.severity = none
+dotnet_diagnostic.SA1204.severity = none
+dotnet_diagnostic.SA1205.severity = none
+dotnet_diagnostic.SA1208.severity = none
+dotnet_diagnostic.SA1217.severity = none
+dotnet_diagnostic.SA1311.severity = none
+dotnet_diagnostic.SA1400.severity = none
+dotnet_diagnostic.SA1502.severity = none
+dotnet_diagnostic.SA1516.severity = none
+dotnet_diagnostic.SA1600.severity = none
+dotnet_diagnostic.SA1633.severity = none

ApiVersioning.sln

@@ -110,7 +110,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808
 	ProjectSection(SolutionItems) = preProject
 		after.apiversioning.sln.targets = after.apiversioning.sln.targets
 		build\code-analysis.props = build\code-analysis.props
-		build\code-analysis.ruleset = build\code-analysis.ruleset
 		build\common.props = build\common.props
 		build\file-version.targets = build\file-version.targets
 		build\icon.png = build\icon.png

build/code-analysis.props

@@ -2,18 +2,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Label="Code Analysis">
-    <Features>IOperation</Features>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)code-analysis.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup Label="Code Analysis">
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" Visible="false" />
   </ItemGroup>
 
   <ItemGroup Label="NuGet">
-   <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="All" />
-   <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="All" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-*" PrivateAssets="All" />
   </ItemGroup>
 

build/code-analysis.ruleset

@@ -118,4 +118,4 @@ void BuildModelPerApiVersion(
             }
         }
     }
-}
+}

src/Common.OData/AspNet.OData/Builder/VersionedODataModelBuilder.cs

@@ -13,6 +13,9 @@ namespace Microsoft.AspNetCore.Mvc
     using System.Diagnostics.CodeAnalysis;
     using static System.AttributeTargets;
 
+#pragma warning disable CA1019
+#pragma warning disable CA1813
+
     /// <summary>
     /// Represents the metadata that describes the advertised <see cref="ApiVersion">API versions</see> for an ASP.NET controllers.
     /// </summary>
@@ -48,9 +51,9 @@ public AdvertiseApiVersionsAttribute( string version ) : base( version ) { }
         [CLSCompliant( false )]
         public AdvertiseApiVersionsAttribute( params string[] versions ) : base( versions ) { }
 
-#pragma warning disable CA1033 // Interface methods should be callable by child types
+#pragma warning disable CA1033
         ApiVersionProviderOptions IApiVersionProvider.Options => options;
-#pragma warning restore CA1033 // Interface methods should be callable by child types
+#pragma warning restore CA1033
 
         /// <summary>
         /// Gets or sets a value indicating whether the specified set of API versions are deprecated.

src/Common/AdvertiseApiVersionsAttribute.cs

@@ -12,10 +12,13 @@ namespace Microsoft.AspNetCore.Mvc
     using System;
     using static System.AttributeTargets;
 
+#pragma warning disable CA1813
+
     /// <summary>
     /// Represents the metadata that describes the <see cref="ApiVersion">API versions</see> associated with a service.
     /// </summary>
     [AttributeUsage( Class | Method, AllowMultiple = true, Inherited = false )]
+
     public class ApiVersionAttribute : ApiVersionsBaseAttribute, IApiVersionProvider
     {
         ApiVersionProviderOptions options = ApiVersionProviderOptions.None;
@@ -30,7 +33,9 @@ protected ApiVersionAttribute( ApiVersion version ) : base( version ) { }
         /// Initializes a new instance of the <see cref="ApiVersionAttribute"/> class.
         /// </summary>
         /// <param name="version">The API version string.</param>
+#pragma warning disable CA1019
         public ApiVersionAttribute( string version ) : base( version ) { }
+#pragma warning restore CA1019
 
 #pragma warning disable CA1033 // Interface methods should be callable by child types
         ApiVersionProviderOptions IApiVersionProvider.Options => options;

src/Common/ApiVersionAttribute.cs

@@ -12,6 +12,9 @@ namespace Microsoft.AspNetCore.Mvc
     using System;
     using static System.AttributeTargets;
 
+#pragma warning disable CA1019
+#pragma warning disable CA1813
+
     /// <summary>
     /// Represents the metadata that describes the <see cref="ApiVersion">API version</see>-specific implementation of a service.
     /// </summary>
@@ -33,8 +36,8 @@ protected MapToApiVersionAttribute( ApiVersion version ) : base( version ) { }
         /// <param name="version">The API version string.</param>
         public MapToApiVersionAttribute( string version ) : base( version ) { }
 
-#pragma warning disable CA1033 // Interface methods should be callable by child types
+#pragma warning disable CA1033
         ApiVersionProviderOptions IApiVersionProvider.Options => ApiVersionProviderOptions.Mapped;
-#pragma warning restore CA1033 // Interface methods should be callable by child types
+#pragma warning restore CA1033
     }
 }

src/Common/MapToApiVersionAttribute.cs

@@ -41,14 +41,14 @@ protected ApiVersionsBaseAttribute( params ApiVersion[] versions )
         /// Initializes a new instance of the <see cref="ApiVersionsBaseAttribute"/> class.
         /// </summary>
         /// <param name="version">The API version string.</param>
-        public ApiVersionsBaseAttribute( string version ) : this( new[] { version } ) { }
+        protected ApiVersionsBaseAttribute( string version ) : this( new[] { version } ) { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiVersionsBaseAttribute"/> class.
         /// </summary>
         /// <param name="versions">An <see cref="Array">array</see> of API version strings.</param>
         [CLSCompliant( false )]
-        public ApiVersionsBaseAttribute( params string[] versions )
+        protected ApiVersionsBaseAttribute( params string[] versions )
         {
             computedHashCode = new Lazy<int>( () => ComputeHashCode( Versions ) );
             this.versions = new Lazy<IReadOnlyList<ApiVersion>>( () => versions.Select( Parse ).Distinct().ToSortedReadOnlyList() );

src/Common/Versioning/ApiVersionsBaseAttribute.cs

@@ -8,7 +8,7 @@
     /// <content>
     /// Provides the implementation for ASP.NET Web API.
     /// </content>
-    public partial class ReportApiVersionsAttribute
+    public sealed partial class ReportApiVersionsAttribute
     {
         /// <summary>
         /// Occurs after the controller action has executed.