Package updates

Author: bkoelman

Directory.Build.props

@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.1" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
 

src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs

@@ -6,8 +6,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
-
 namespace JsonApiDotNetCore.Configuration;
 
 [PublicAPI]

src/JsonApiDotNetCore/Queries/Expressions/QueryableHandlerExpression.cs

@@ -21,10 +21,8 @@ public QueryableHandlerExpression(object queryableHandler, StringValues paramete
         _parameterValue = parameterValue;
     }
 
-#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
     public IQueryable<TResource> Apply<TResource>(IQueryable<TResource> query)
         where TResource : class, IIdentifiable
-#pragma warning restore AV1130 // Return type in method signature should be an interface to an unchangeable collection
     {
         var handler = (Func<IQueryable<TResource>, StringValues, IQueryable<TResource>>)_queryableHandler;
         return handler(query, _parameterValue);

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs

@@ -105,9 +105,7 @@ public virtual async Task<int> CountAsync(FilterExpression? filter, Cancellation
         }
     }
 
-#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
     protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
-#pragma warning restore AV1130 // Return type in method signature should be an interface to an unchangeable collection
     {
         _traceWriter.LogMethodStart(new
         {
@@ -151,9 +149,7 @@ protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
         }
     }
 
-#pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
     protected virtual IQueryable<TResource> GetAll()
-#pragma warning restore AV1130 // Return type in method signature should be an interface to an unchangeable collection
     {
         return _dbContext.Set<TResource>();
     }

test/TestBuildingBlocks/TestBuildingBlocks.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="34.0.2" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetVersion)" />