Package updates (#1146)

* Renamed method to avoid clash with built-in method from newer version of FluentAssertions

* Package updates

* Fix cases for AV1130: Return type should be interface to unchangeable collection

* Fix cases for AV1553/AV1554: Optional string/collection/task parameter usage

Author: Bart Koelman

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.3.0",
+      "version": "2021.3.4",
       "commands": [
         "jb"
       ]
     },
     "regitlint": {
-      "version": "6.0.6",
+      "version": "6.0.8",
       "commands": [
         "regitlint"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.0",
+      "version": "5.1.3",
       "commands": [
         "reportgenerator"
       ]

CodingGuidelines.ruleset

@@ -14,14 +14,15 @@
     <Rule Id="AV1555" Action="Warning" />
     <Rule Id="AV1564" Action="Info" />
     <Rule Id="AV1568" Action="Warning" />
+    <Rule Id="AV1580" Action="None" />
     <Rule Id="AV1706" Action="Warning" />
     <Rule Id="AV1710" Action="Info" />
     <Rule Id="AV1711" Action="Info" />
     <Rule Id="AV1738" Action="Warning" />
     <Rule Id="AV1739" Action="Warning" />
     <Rule Id="AV1745" Action="Warning" />
     <Rule Id="AV1755" Action="Warning" />
-    <Rule Id="AV2210" Action="None" />
+    <Rule Id="AV2210" Action="Warning" />
     <Rule Id="AV2220" Action="Warning" />
     <Rule Id="AV2230" Action="Info" />
     <Rule Id="AV2305" Action="None" />

Directory.Build.props

@@ -4,7 +4,7 @@
     <AspNetVersion>6.0.*</AspNetVersion>
     <EFCoreVersion>6.0.*</EFCoreVersion>
     <EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
-    <MicrosoftCodeAnalysisVersion>4.0.*</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.1.*</MicrosoftCodeAnalysisVersion>
     <HumanizerVersion>2.*</HumanizerVersion>
     <JsonApiDotNetCoreVersionPrefix>5.0.0</JsonApiDotNetCoreVersionPrefix>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.1" PrivateAssets="All" />
+    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
 
@@ -27,10 +27,14 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <NoWarn>$(NoWarn);AV2210</NoWarn>
+  </PropertyGroup>
+
   <!-- Test Project Dependencies -->
   <PropertyGroup>
     <CoverletVersion>3.1.2</CoverletVersion>
-    <MoqVersion>4.16.1</MoqVersion>
+    <MoqVersion>4.17.2</MoqVersion>
     <TestSdkVersion>17.1.0</TestSdkVersion>
   </PropertyGroup>
 </Project>

benchmarks/Serialization/SerializationBenchmarkBase.cs

@@ -245,7 +245,7 @@ public RelationshipLinks GetRelationshipLinks(RelationshipAttribute relationship
 
     private sealed class FakeMetaBuilder : IMetaBuilder
     {
-        public void Add(IReadOnlyDictionary<string, object?> values)
+        public void Add(IDictionary<string, object?> values)
         {
         }
 

src/JsonApiDotNetCore.Annotations/ArgumentGuard.cs

@@ -18,13 +18,24 @@ public static void NotNull<T>([NoEnumeration] [SysNotNull] T? value, [InvokerPar
     }
 
     [AssertionMethod]
-    public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [InvokerParameterName] string name, string? collectionName = null)
+    public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [InvokerParameterName] string name)
     {
         NotNull(value, name);
 
         if (!value.Any())
         {
-            throw new ArgumentException($"Must have one or more {collectionName ?? name}.", name);
+            throw new ArgumentException($"Must have one or more {name}.", name);
+        }
+    }
+
+    [AssertionMethod]
+    public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [InvokerParameterName] string name, string collectionName)
+    {
+        NotNull(value, name);
+
+        if (!value.Any())
+        {
+            throw new ArgumentException($"Must have one or more {collectionName}.", name);
         }
     }
 

src/JsonApiDotNetCore.Annotations/CollectionConverter.cs

@@ -66,9 +66,19 @@ private Type ToConcreteCollectionType(Type collectionType)
     /// <summary>
     /// Returns a collection that contains zero, one or multiple resources, depending on the specified value.
     /// </summary>
-    public ICollection<IIdentifiable> ExtractResources(object? value)
+    public IReadOnlyCollection<IIdentifiable> ExtractResources(object? value)
     {
-        if (value is ICollection<IIdentifiable> resourceCollection)
+        if (value is List<IIdentifiable> resourceList)
+        {
+            return resourceList;
+        }
+
+        if (value is HashSet<IIdentifiable> resourceSet)
+        {
+            return resourceSet;
+        }
+
+        if (value is IReadOnlyCollection<IIdentifiable> resourceCollection)
         {
             return resourceCollection;
         }

src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs

@@ -89,8 +89,14 @@ public sealed class ResourceType
     /// </remarks>
     public LinkTypes RelationshipLinks { get; }
 
-    public ResourceType(string publicName, Type clrType, Type identityClrType, IReadOnlyCollection<AttrAttribute>? attributes = null,
-        IReadOnlyCollection<RelationshipAttribute>? relationships = null, IReadOnlyCollection<EagerLoadAttribute>? eagerLoads = null,
+    public ResourceType(string publicName, Type clrType, Type identityClrType, LinkTypes topLevelLinks = LinkTypes.NotConfigured,
+        LinkTypes resourceLinks = LinkTypes.NotConfigured, LinkTypes relationshipLinks = LinkTypes.NotConfigured)
+        : this(publicName, clrType, identityClrType, null, null, null, topLevelLinks, resourceLinks, relationshipLinks)
+    {
+    }
+
+    public ResourceType(string publicName, Type clrType, Type identityClrType, IReadOnlyCollection<AttrAttribute>? attributes,
+        IReadOnlyCollection<RelationshipAttribute>? relationships, IReadOnlyCollection<EagerLoadAttribute>? eagerLoads,
         LinkTypes topLevelLinks = LinkTypes.NotConfigured, LinkTypes resourceLinks = LinkTypes.NotConfigured,
         LinkTypes relationshipLinks = LinkTypes.NotConfigured)
     {

src/JsonApiDotNetCore.Annotations/ObjectExtensions.cs

@@ -1,4 +1,4 @@
-#pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
+#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
 
 namespace JsonApiDotNetCore;
 

src/JsonApiDotNetCore/ArrayFactory.cs

@@ -1,5 +1,5 @@
 #pragma warning disable AV1008 // Class should not be static
-#pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
+#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
 
 namespace JsonApiDotNetCore;
 

src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs

@@ -40,7 +40,7 @@ public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)
 
         if (relationship is HasManyAttribute)
         {
-            ICollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
+            IReadOnlyCollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
             return rightResources.ToHashSet(IdentifiableComparer.Instance);
         }