Skip to content

Commit f11b070

Browse files
author
Bart Koelman
authored
Package updates (#12)
Build against [JsonApiDotNetCore v4.2](https://github.com/json-api-dotnet/JsonApiDotNetCore/releases/tag/v4.2.0).
1 parent 390a05f commit f11b070

File tree

8 files changed

+32
-26
lines changed

8 files changed

+32
-26
lines changed

Diff for: ‎.config/dotnet-tools.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2020.3.3",
6+
"version": "2021.1.3",
77
"commands": [
88
"jb"
99
]
1010
},
1111
"regitlint": {
12-
"version": "2.1.3",
12+
"version": "2.1.4",
1313
"commands": [
1414
"regitlint"
1515
]
@@ -21,10 +21,10 @@
2121
]
2222
},
2323
"dotnet-reportgenerator-globaltool": {
24-
"version": "4.8.7",
24+
"version": "4.8.11",
2525
"commands": [
2626
"reportgenerator"
2727
]
2828
}
2929
}
30-
}
30+
}

Diff for: ‎Directory.Build.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<PropertyGroup>
33
<NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
44
<AspNetCoreVersion>3.1.*</AspNetCoreVersion>
5-
<JsonApiDotNetCoreVersion>4.1.*</JsonApiDotNetCoreVersion>
6-
<MongoDBDriverVersion>2.11.*</MongoDBDriverVersion>
5+
<JsonApiDotNetCoreVersion>4.2.*</JsonApiDotNetCoreVersion>
6+
<MongoDBDriverVersion>2.12.*</MongoDBDriverVersion>
77
<CodeAnalysisRuleSet>$(SolutionDir)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="All" />
1212
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.6.0" PrivateAssets="All" />
1313
<AdditionalFiles Include="$(SolutionDir)CSharpGuidelinesAnalyzer.config" Visible="False" />
1414
</ItemGroup>
@@ -25,6 +25,7 @@
2525
<CoverletVersion>3.0.3</CoverletVersion>
2626
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
2727
<MoqVersion>4.16.1</MoqVersion>
28-
<XUnitVersion>2.4.1</XUnitVersion>
28+
<XUnitVersion>2.4.*</XUnitVersion>
29+
<TestSdkVersion>16.10.0</TestSdkVersion>
2930
</PropertyGroup>
3031
</Project>

Diff for: ‎src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<ItemGroup>
2424
<PackageReference Include="JsonApiDotNetCore" Version="$(JsonApiDotNetCoreVersion)" />
2525
<PackageReference Include="MongoDB.Driver" Version="$(MongoDBDriverVersion)" />
26-
<PackageReference Include="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
26+
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
2727
</ItemGroup>
2828
</Project>

Diff for: ‎src/JsonApiDotNetCore.MongoDb/Queries/Internal/QueryableBuilding/MongoQueryableBuilder.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,25 @@ public sealed class MongoQueryableBuilder : QueryableBuilder
1818
{
1919
private readonly Type _elementType;
2020
private readonly Type _extensionType;
21+
private readonly LambdaParameterNameFactory _nameFactory;
2122
private readonly LambdaScopeFactory _lambdaScopeFactory;
2223

2324
public MongoQueryableBuilder(Expression source, Type elementType, Type extensionType, LambdaParameterNameFactory nameFactory,
2425
IResourceFactory resourceFactory, IResourceContextProvider resourceContextProvider, IModel entityModel,
2526
LambdaScopeFactory lambdaScopeFactory = null)
2627
: base(source, elementType, extensionType, nameFactory, resourceFactory, resourceContextProvider, entityModel, lambdaScopeFactory)
2728
{
28-
ArgumentGuard.NotNull(elementType, nameof(elementType));
29-
ArgumentGuard.NotNull(extensionType, nameof(extensionType));
30-
3129
_elementType = elementType;
3230
_extensionType = extensionType;
31+
_nameFactory = nameFactory;
3332
_lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(nameFactory);
3433
}
3534

3635
protected override Expression ApplyFilter(Expression source, FilterExpression filter)
3736
{
3837
using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
3938

40-
var builder = new MongoWhereClauseBuilder(source, lambdaScope, _extensionType);
39+
var builder = new MongoWhereClauseBuilder(source, lambdaScope, _extensionType, _nameFactory);
4140
return builder.ApplyWhere(filter);
4241
}
4342
}

Diff for: ‎src/JsonApiDotNetCore.MongoDb/Queries/Internal/QueryableBuilding/MongoWhereClauseBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace JsonApiDotNetCore.MongoDb.Queries.Internal.QueryableBuilding
1010
[PublicAPI]
1111
public class MongoWhereClauseBuilder : WhereClauseBuilder
1212
{
13-
public MongoWhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
14-
: base(source, lambdaScope, extensionType)
13+
public MongoWhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType, LambdaParameterNameFactory nameFactory)
14+
: base(source, lambdaScope, extensionType, nameFactory)
1515
{
1616
}
1717

Diff for: ‎src/JsonApiDotNetCore.MongoDb/Serialization/Building/IgnoreRelationshipsResponseResourceObjectBuilder.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using JsonApiDotNetCore.Configuration;
33
using JsonApiDotNetCore.MongoDb.Resources;
44
using JsonApiDotNetCore.Queries;
5+
using JsonApiDotNetCore.Queries.Internal;
56
using JsonApiDotNetCore.Resources;
67
using JsonApiDotNetCore.Resources.Annotations;
78
using JsonApiDotNetCore.Serialization.Building;
@@ -14,8 +15,10 @@ public sealed class IgnoreRelationshipsResponseResourceObjectBuilder : ResponseR
1415
{
1516
public IgnoreRelationshipsResponseResourceObjectBuilder(ILinkBuilder linkBuilder, IIncludedResourceObjectBuilder includedBuilder,
1617
IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceContextProvider resourceContextProvider,
17-
IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectBuilderSettingsProvider settingsProvider)
18-
: base(linkBuilder, includedBuilder, constraintProviders, resourceContextProvider, resourceDefinitionAccessor, settingsProvider)
18+
IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectBuilderSettingsProvider settingsProvider,
19+
IEvaluatedIncludeCache evaluatedIncludeCache)
20+
: base(linkBuilder, includedBuilder, constraintProviders, resourceContextProvider, resourceDefinitionAccessor, settingsProvider,
21+
evaluatedIncludeCache)
1922
{
2023
}
2124

Diff for: ‎test/JsonApiDotNetCoreMongoDbExampleTests/JsonApiDotNetCoreMongoDbExampleTests.csproj

+5-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Bogus" Version="31.0.3" />
17+
<PackageReference Include="Bogus" Version="$(BogusVersion)" />
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1920
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.9" />
21-
<PackageReference Include="Mongo2Go" Version="2.2.16" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.16" />
22+
<PackageReference Include="Mongo2Go" Version="2.*" />
2223
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2324
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
24-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)">
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
<PrivateAssets>all</PrivateAssets>
27-
</PackageReference>
25+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
2826
</ItemGroup>
2927
</Project>

Diff for: ‎test/JsonApiDotNetCoreMongoDbExampleTests/TestBuildingBlocks/HttpResponseMessageExtensions.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ private static async Task<string> GetFormattedContentAsync(HttpResponseMessage r
4747
{
4848
if (text.Length > 0)
4949
{
50-
return JsonConvert.DeserializeObject<JObject>(text).ToString();
50+
var json = JsonConvert.DeserializeObject<JObject>(text);
51+
52+
if (json != null)
53+
{
54+
return json.ToString();
55+
}
5156
}
5257
}
5358
#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException

0 commit comments

Comments
 (0)