Package updates

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2020.3.3",
+      "version": "2021.1.3",
       "commands": [
         "jb"
       ]
     },
     "regitlint": {
-      "version": "2.1.3",
+      "version": "2.1.4",
       "commands": [
         "regitlint"
       ]
@@ -21,10 +21,10 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.8.7",
+      "version": "4.8.11",
       "commands": [
         "reportgenerator"
       ]
     }
   }
-}
+}

Directory.Build.props

@@ -2,13 +2,13 @@
   <PropertyGroup>
     <NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
     <AspNetCoreVersion>3.1.*</AspNetCoreVersion>
-    <JsonApiDotNetCoreVersion>4.1.*</JsonApiDotNetCoreVersion>
-    <MongoDBDriverVersion>2.11.*</MongoDBDriverVersion>
+    <JsonApiDotNetCoreVersion>4.2.*</JsonApiDotNetCoreVersion>
+    <MongoDBDriverVersion>2.12.*</MongoDBDriverVersion>
     <CodeAnalysisRuleSet>$(SolutionDir)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="All" />
     <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.6.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(SolutionDir)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
@@ -25,6 +25,7 @@
     <CoverletVersion>3.0.3</CoverletVersion>
     <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
     <MoqVersion>4.16.1</MoqVersion>
-    <XUnitVersion>2.4.1</XUnitVersion>
+    <XUnitVersion>2.4.*</XUnitVersion>
+    <TestSdkVersion>16.10.0</TestSdkVersion>
   </PropertyGroup>
 </Project>

src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj

@@ -23,6 +23,6 @@
   <ItemGroup>
     <PackageReference Include="JsonApiDotNetCore" Version="$(JsonApiDotNetCoreVersion)" />
     <PackageReference Include="MongoDB.Driver" Version="$(MongoDBDriverVersion)" />
-    <PackageReference Include="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/JsonApiDotNetCore.MongoDb/Queries/Internal/QueryableBuilding/MongoQueryableBuilder.cs

@@ -18,26 +18,25 @@ public sealed class MongoQueryableBuilder : QueryableBuilder
     {
         private readonly Type _elementType;
         private readonly Type _extensionType;
+        private readonly LambdaParameterNameFactory _nameFactory;
         private readonly LambdaScopeFactory _lambdaScopeFactory;
 
         public MongoQueryableBuilder(Expression source, Type elementType, Type extensionType, LambdaParameterNameFactory nameFactory,
             IResourceFactory resourceFactory, IResourceContextProvider resourceContextProvider, IModel entityModel,
             LambdaScopeFactory lambdaScopeFactory = null)
             : base(source, elementType, extensionType, nameFactory, resourceFactory, resourceContextProvider, entityModel, lambdaScopeFactory)
         {
-            ArgumentGuard.NotNull(elementType, nameof(elementType));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
-
             _elementType = elementType;
             _extensionType = extensionType;
+            _nameFactory = nameFactory;
             _lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(nameFactory);
         }
 
         protected override Expression ApplyFilter(Expression source, FilterExpression filter)
         {
             using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
-            var builder = new MongoWhereClauseBuilder(source, lambdaScope, _extensionType);
+            var builder = new MongoWhereClauseBuilder(source, lambdaScope, _extensionType, _nameFactory);
             return builder.ApplyWhere(filter);
         }
     }

src/JsonApiDotNetCore.MongoDb/Queries/Internal/QueryableBuilding/MongoWhereClauseBuilder.cs

@@ -10,8 +10,8 @@ namespace JsonApiDotNetCore.MongoDb.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public class MongoWhereClauseBuilder : WhereClauseBuilder
     {
-        public MongoWhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
-            : base(source, lambdaScope, extensionType)
+        public MongoWhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType, LambdaParameterNameFactory nameFactory)
+            : base(source, lambdaScope, extensionType, nameFactory)
         {
         }
 

src/JsonApiDotNetCore.MongoDb/Serialization/Building/IgnoreRelationshipsResponseResourceObjectBuilder.cs

@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.MongoDb.Resources;
 using JsonApiDotNetCore.Queries;
+using JsonApiDotNetCore.Queries.Internal;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Building;
@@ -14,8 +15,10 @@ public sealed class IgnoreRelationshipsResponseResourceObjectBuilder : ResponseR
     {
         public IgnoreRelationshipsResponseResourceObjectBuilder(ILinkBuilder linkBuilder, IIncludedResourceObjectBuilder includedBuilder,
             IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceContextProvider resourceContextProvider,
-            IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectBuilderSettingsProvider settingsProvider)
-            : base(linkBuilder, includedBuilder, constraintProviders, resourceContextProvider, resourceDefinitionAccessor, settingsProvider)
+            IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectBuilderSettingsProvider settingsProvider,
+            IEvaluatedIncludeCache evaluatedIncludeCache)
+            : base(linkBuilder, includedBuilder, constraintProviders, resourceContextProvider, resourceDefinitionAccessor, settingsProvider,
+                evaluatedIncludeCache)
         {
         }
 

test/JsonApiDotNetCoreMongoDbExampleTests/JsonApiDotNetCoreMongoDbExampleTests.csproj

@@ -14,16 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="31.0.3" />
+    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.9" />
-    <PackageReference Include="Mongo2Go" Version="2.2.16" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.16" />
+    <PackageReference Include="Mongo2Go" Version="2.*" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>

test/JsonApiDotNetCoreMongoDbExampleTests/TestBuildingBlocks/HttpResponseMessageExtensions.cs

@@ -47,7 +47,12 @@ private static async Task<string> GetFormattedContentAsync(HttpResponseMessage r
                 {
                     if (text.Length > 0)
                     {
-                        return JsonConvert.DeserializeObject<JObject>(text).ToString();
+                        var json = JsonConvert.DeserializeObject<JObject>(text);
+
+                        if (json != null)
+                        {
+                            return json.ToString();
+                        }
                     }
                 }
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException