Update code analysis packages and fix discovered violations

Chris Martinez · Chris Martinez · commit 934d1db57505 · 2020-09-16T21:04:51.000-07:00
diff --git a/ApiVersioning.sln b/ApiVersioning.sln
@@ -143,13 +143,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OData.
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{0d6519ae-20d2-4c98-97aa-ed3622043936}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{0d6519ae-20d2-4c98-97aa-ed3622043936}*SharedItemsImports = 5
 		src\Common.OData\Common.OData.projitems*{1599a30d-d37f-443c-b935-290144910be3}*SharedItemsImports = 13
+		src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{1b255310-a2b7-437f-804f-6e1d8c940a17}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{1b255310-a2b7-437f-804f-6e1d8c940a17}*SharedItemsImports = 5
+		test\OData.Test.Shared\OData.Test.Shared.projitems*{23bc896b-a4cc-4c82-b98b-ce71239c2eb8}*SharedItemsImports = 5
 		src\Common.ApiExplorer\Common.ApiExplorer.projitems*{26a67334-f6e6-49b8-8c5a-f88f28770966}*SharedItemsImports = 13
+		src\Common\Common.projitems*{3bac97ed-1a8e-4f5a-a716-db5255f51c81}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{3bac97ed-1a8e-4f5a-a716-db5255f51c81}*SharedItemsImports = 5
+		src\Common.OData\Common.OData.projitems*{48a2b488-23ab-4c83-ae30-0b8b735c4562}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{48a2b488-23ab-4c83-ae30-0b8b735c4562}*SharedItemsImports = 5
+		src\Common.OData\Common.OData.projitems*{59d9cec0-f8e5-4a1a-b8dd-5117e6a409d5}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{59d9cec0-f8e5-4a1a-b8dd-5117e6a409d5}*SharedItemsImports = 5
+		test\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems*{5c31964d-ea8b-420b-9297-5adfefe54962}*SharedItemsImports = 5
+		test\Test.Common\Test.Common.projitems*{69c59656-53d1-4acb-92b5-8b34c8e62175}*SharedItemsImports = 5
 		test\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems*{6cdfb878-2642-4f98-ae35-621bac581181}*SharedItemsImports = 13
 		src\Common\Common.projitems*{6d0e834b-6422-44cd-9a85-e3be9dead1be}*SharedItemsImports = 13
+		src\Common.ApiExplorer\Common.ApiExplorer.projitems*{91e1f0b5-905d-446c-a2dd-4c1edabfaf6c}*SharedItemsImports = 5
 		test\OData.Test.Shared\OData.Test.Shared.projitems*{9a635d55-7547-4df6-b7bd-840e16ebde28}*SharedItemsImports = 13
+		test\Test.Common\Test.Common.projitems*{aeb074e1-e57a-4dd3-a972-3625b367ce5d}*SharedItemsImports = 5
 		src\Shared\Shared.projitems*{b7897873-6757-4684-83c0-39575821ae14}*SharedItemsImports = 13
+		test\OData.Test.Shared\OData.Test.Shared.projitems*{ba0c8652-fef6-4004-a779-cd6dcf2996f7}*SharedItemsImports = 5
 		src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{c0c766f3-a2d6-461e-adff-27496600ea9c}*SharedItemsImports = 13
+		src\Common\Common.projitems*{c39cccbc-6b04-406f-96be-ca796eff34c5}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{c39cccbc-6b04-406f-96be-ca796eff34c5}*SharedItemsImports = 5
+		test\OData.Test.Shared\OData.Test.Shared.projitems*{d87e54cc-c2d6-4ae5-806d-ae825b051c66}*SharedItemsImports = 5
+		src\Common.ApiExplorer\Common.ApiExplorer.projitems*{f7784c3a-5569-4590-ae28-b721c0426045}*SharedItemsImports = 5
+		src\Shared\Shared.projitems*{f7784c3a-5569-4590-ae28-b721c0426045}*SharedItemsImports = 5
 		test\Test.Common\Test.Common.projitems*{f9297626-c37c-402b-afd6-712f3e5e4d7c}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/code-analysis.props b/build/code-analysis.props
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup Label="NuGet">
-   <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.8" PrivateAssets="All" />
-   <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+   <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>
 
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/ClassSignature.cs b/src/Common.OData.ApiExplorer/AspNet.OData/ClassSignature.cs
@@ -60,7 +60,7 @@ internal ClassSignature( string name, IEnumerable<ClassProperty> properties, Api
 
         public override bool Equals( object? obj ) => obj is ClassSignature s && Equals( s );
 
-        public bool Equals( ClassSignature other ) => GetHashCode() == other?.GetHashCode();
+        public bool Equals( ClassSignature? other ) => other != null && GetHashCode() == other.GetHashCode();
 
         int ComputeHashCode()
         {
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/Routing/ODataRouteBuilder.cs b/src/Common.OData.ApiExplorer/AspNet.OData/Routing/ODataRouteBuilder.cs
@@ -283,9 +283,9 @@ void ExpandParameterTemplate( StringBuilder template, IEdmTypeReference typeRefe
             var typeDef = typeReference.Definition;
             var offset = template.Length;
 
-            template.Append( "{" );
+            template.Append( '{' );
             template.Append( name );
-            template.Append( "}" );
+            template.Append( '}' );
 
             if ( Context.RouteTemplateGeneration == Server || keyAsSegment )
             {
@@ -655,10 +655,15 @@ static bool IsFunctionParameter( IEdmOperation? operation, ApiParameterDescripti
 
         sealed class TypeComparer : IEqualityComparer<Type>
         {
-            public bool Equals( Type x, Type y ) => x.IsAssignableFrom( y );
+            public bool Equals( Type? x, Type? y ) => x != null && x.IsAssignableFrom( y );
 
             public int GetHashCode( Type obj )
             {
+                if ( obj is null )
+                {
+                    return 0;
+                }
+
                 if ( obj.BaseType == null || obj.BaseType.Equals( typeof( ValueType ) ) || obj.BaseType.Equals( typeof( Array ) ) )
                 {
                     return obj.GetHashCode();
diff --git a/src/Common/Versioning/ApiVersionsBaseAttribute.cs b/src/Common/Versioning/ApiVersionsBaseAttribute.cs
@@ -7,7 +7,11 @@ namespace Microsoft.AspNetCore.Mvc.Versioning
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using static ApiVersion;
+#if WEBAPI
+    using static Microsoft.Web.Http.ApiVersion;
+#else
+    using static Microsoft.AspNetCore.Mvc.ApiVersion;
+#endif
 
     /// <summary>
     /// Represents the base implementation for the metadata that describes the <see cref="ApiVersion">API versions</see> associated with a service.
diff --git a/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderBase.cs b/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderBase.cs
@@ -7,7 +7,11 @@ namespace Microsoft.AspNetCore.Mvc.Versioning.Conventions
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using static ApiVersionProviderOptions;
+#if WEBAPI
+    using static Microsoft.Web.Http.Versioning.ApiVersionProviderOptions;
+#else
+    using static Microsoft.AspNetCore.Mvc.Versioning.ApiVersionProviderOptions;
+#endif
 
     /// <summary>
     /// Represents the base implementation of a builder for API versions applied to a controller action.
diff --git a/src/Common/Versioning/Conventions/ApiVersionConventionBuilderBase.cs b/src/Common/Versioning/Conventions/ApiVersionConventionBuilderBase.cs
@@ -7,7 +7,11 @@ namespace Microsoft.AspNetCore.Mvc.Versioning.Conventions
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using static ApiVersionProviderOptions;
+#if WEBAPI
+    using static Microsoft.Web.Http.Versioning.ApiVersionProviderOptions;
+#else
+    using static Microsoft.AspNetCore.Mvc.Versioning.ApiVersionProviderOptions;
+#endif
 
     /// <summary>
     /// Represents the base implementation of an API version convention builder.
diff --git a/src/Microsoft.AspNet.OData.Versioning.ApiExplorer/System.Web.Http/HttpConfigurationExtensions.cs b/src/Microsoft.AspNet.OData.Versioning.ApiExplorer/System.Web.Http/HttpConfigurationExtensions.cs
@@ -35,6 +35,11 @@ public static class HttpConfigurationExtensions
         /// <remarks>This method always replaces the <see cref="IApiExplorer"/> with a new instance of <see cref="ODataApiExplorer"/>.</remarks>
         public static ODataApiExplorer AddODataApiExplorer( this HttpConfiguration configuration, Action<ODataApiExplorerOptions>? setupAction )
         {
+            if ( configuration == null )
+            {
+                throw new ArgumentNullException( nameof( configuration ) );
+            }
+
             var options = new ODataApiExplorerOptions( configuration );
 
             setupAction?.Invoke( options );
diff --git a/src/Microsoft.AspNet.WebApi.Versioning.ApiExplorer/System.Web.Http/HttpConfigurationExtensions.cs b/src/Microsoft.AspNet.WebApi.Versioning.ApiExplorer/System.Web.Http/HttpConfigurationExtensions.cs
@@ -25,6 +25,11 @@ public static class HttpConfigurationExtensions
         /// <remarks>This method always replaces the <see cref="IApiExplorer"/> with a new instance of <see cref="VersionedApiExplorer"/>.</remarks>
         public static VersionedApiExplorer AddVersionedApiExplorer( this HttpConfiguration configuration, Action<ApiExplorerOptions>? setupAction )
         {
+            if ( configuration == null )
+            {
+                throw new ArgumentNullException( nameof( configuration ) );
+            }
+
             var options = new ApiExplorerOptions( configuration );
 
             setupAction?.Invoke( options );
diff --git a/src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/ApiVersionControllerSelector.cs b/src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/ApiVersionControllerSelector.cs
@@ -12,8 +12,8 @@
     using System.Web.Http;
     using System.Web.Http.Controllers;
     using System.Web.Http.Dispatcher;
+    using static Microsoft.Web.Http.Versioning.ErrorCodes;
     using static System.StringComparer;
-    using static Versioning.ErrorCodes;
 
     /// <summary>
     /// Represents the logic for selecting a versioned controller.
diff --git a/src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/HttpResponseExceptionFactory.cs b/src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/HttpResponseExceptionFactory.cs
@@ -8,10 +8,10 @@
     using System.Web.Http;
     using System.Web.Http.Dispatcher;
     using System.Web.Http.Tracing;
-    using static ApiVersion;
+    using static Microsoft.Web.Http.ApiVersion;
+    using static Microsoft.Web.Http.Versioning.ErrorCodes;
     using static System.Net.HttpStatusCode;
     using static System.String;
-    using static Versioning.ErrorCodes;
 
     sealed class HttpResponseExceptionFactory
     {
diff --git a/src/Microsoft.AspNet.WebApi.Versioning/Routing/ApiVersionRouteConstraint.cs b/src/Microsoft.AspNet.WebApi.Versioning/Routing/ApiVersionRouteConstraint.cs
@@ -5,7 +5,7 @@
     using System.Net.Http;
     using System.Web.Http;
     using System.Web.Http.Routing;
-    using static ApiVersion;
+    using static Microsoft.Web.Http.ApiVersion;
     using static System.String;
     using static System.Web.Http.Routing.HttpRouteDirection;
 
diff --git a/src/Microsoft.AspNet.WebApi.Versioning/System.Web.Http/HttpActionDescriptorExtensions.cs b/src/Microsoft.AspNet.WebApi.Versioning/System.Web.Http/HttpActionDescriptorExtensions.cs
@@ -108,7 +108,7 @@ public static ApiVersionMapping MappingTo( this HttpActionDescriptor action, Api
         internal static bool IsAttributeRouted( this HttpActionDescriptor action ) =>
             action.Properties.TryGetValue( AttributeRoutedPropertyKey, out bool? value ) && ( value ?? false );
 
-        internal static T GetProperty<T>( this HttpActionDescriptor action ) =>
+        internal static T? GetProperty<T>( this HttpActionDescriptor action ) where T : class =>
             action.Properties.TryGetValue( typeof( T ), out T value ) ? value : default;
 
         internal static void SetProperty<T>( this HttpActionDescriptor action, T value ) =>
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionRouteConstraint.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionRouteConstraint.cs
@@ -4,8 +4,8 @@
     using Microsoft.AspNetCore.Mvc.Versioning;
     using Microsoft.AspNetCore.Routing;
     using System;
-    using static ApiVersion;
-    using static AspNetCore.Routing.RouteDirection;
+    using static Microsoft.AspNetCore.Mvc.ApiVersion;
+    using static Microsoft.AspNetCore.Routing.RouteDirection;
     using static System.String;
 
     /// <summary>
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ILoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ILoggerExtensions.cs
@@ -5,8 +5,8 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using static Extensions.Logging.LoggerMessage;
-    using static Extensions.Logging.LogLevel;
+    using static Microsoft.Extensions.Logging.LoggerMessage;
+    using static Microsoft.Extensions.Logging.LogLevel;
     using static System.Globalization.CultureInfo;
 
     static class ILoggerExtensions
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Extensions/IRouteBuilderExtensions.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Extensions/IRouteBuilderExtensions.cs
@@ -220,6 +220,11 @@ public static IReadOnlyList<ODataRoute> MapVersionedODataRoutes(
                 throw new ArgumentNullException( nameof( builder ) );
             }
 
+            if ( IsNullOrEmpty( routeName ) )
+            {
+                throw new ArgumentNullException( nameof( routeName ) );
+            }
+
             if ( models == null )
             {
                 throw new ArgumentNullException( nameof( models ) );
@@ -249,8 +254,8 @@ public static IReadOnlyList<ODataRoute> MapVersionedODataRoutes(
 
                 IEnumerable<IODataRoutingConvention> NewRouteConventions( IServiceProvider services )
                 {
-                    var conventions = new IODataRoutingConvention[routeConventions.Count + 1];
-                    conventions[0] = new VersionedAttributeRoutingConvention( versionedRouteName, serviceProvider, apiVersion );
+                    var conventions = new IODataRoutingConvention[routeConventions!.Count + 1];
+                    conventions[0] = new VersionedAttributeRoutingConvention( versionedRouteName!, serviceProvider!, apiVersion! );
                     routeConventions.CopyTo( conventions, 1 );
                     return conventions;
                 }
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteBindingInfoConvention.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteBindingInfoConvention.cs
@@ -259,7 +259,7 @@ static string TrimTrailingNumbers( string name )
 
         sealed class ODataAttributeRouteInfoComparer : IEqualityComparer<ODataAttributeRouteInfo>
         {
-            public bool Equals( ODataAttributeRouteInfo x, ODataAttributeRouteInfo y )
+            public bool Equals( ODataAttributeRouteInfo? x, ODataAttributeRouteInfo? y )
             {
                 if ( x == null )
                 {
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteCollectionProvider.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteCollectionProvider.cs
@@ -4,6 +4,7 @@
     using System;
     using System.Collections;
     using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
 
     /// <summary>
     /// Represents an object that manages the collection of registered OData routes.
@@ -45,7 +46,7 @@ sealed class ODataRouteCollection : IODataRouteCollection
 
             public int IndexOf( ODataRouteMapping item ) => items.IndexOf( item );
 
-            public bool TryGetValue( ApiVersion key, out IReadOnlyList<ODataRouteMapping>? value )
+            public bool TryGetValue( ApiVersion key, [NotNullWhen( true )] out IReadOnlyList<ODataRouteMapping>? value )
             {
                 if ( dictionary.TryGetValue( key, out var list ) )
                 {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ internal ClassSignature( string name, IEnumerable<ClassProperty> properties, Api`
`60`	`60`
`61`	`61`	`public override bool Equals( object? obj ) => obj is ClassSignature s && Equals( s );`
`62`	`62`
`63`		`- public bool Equals( ClassSignature other ) => GetHashCode() == other?.GetHashCode();`
	`63`	`+ public bool Equals( ClassSignature? other ) => other != null && GetHashCode() == other.GetHashCode();`
`64`	`64`
`65`	`65`	`int ComputeHashCode()`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,9 @@ void ExpandParameterTemplate( StringBuilder template, IEdmTypeReference typeRefe`
`283`	`283`	`var typeDef = typeReference.Definition;`
`284`	`284`	`var offset = template.Length;`
`285`	`285`
`286`		`- template.Append( "{" );`
	`286`	`+ template.Append( '{' );`
`287`	`287`	`template.Append( name );`
`288`		`- template.Append( "}" );`
	`288`	`+ template.Append( '}' );`
`289`	`289`
`290`	`290`	`if ( Context.RouteTemplateGeneration == Server \|\| keyAsSegment )`
`291`	`291`	`{`
`@@ -655,10 +655,15 @@ static bool IsFunctionParameter( IEdmOperation? operation, ApiParameterDescripti`
`655`	`655`
`656`	`656`	`sealed class TypeComparer : IEqualityComparer<Type>`
`657`	`657`	`{`
`658`		`- public bool Equals( Type x, Type y ) => x.IsAssignableFrom( y );`
	`658`	`+ public bool Equals( Type? x, Type? y ) => x != null && x.IsAssignableFrom( y );`
`659`	`659`
`660`	`660`	`public int GetHashCode( Type obj )`
`661`	`661`	`{`
	`662`	`+ if ( obj is null )`
	`663`	`+ {`
	`664`	`+ return 0;`
	`665`	`+ }`
	`666`	`+`
`662`	`667`	`if ( obj.BaseType == null \|\| obj.BaseType.Equals( typeof( ValueType ) ) \|\| obj.BaseType.Equals( typeof( Array ) ) )`
`663`	`668`	`{`
`664`	`669`	`return obj.GetHashCode();`