Skip to content

Commit 4364dbd

Browse files
author
Bart Koelman
authored
Package updates (#1013)
* Fixed broken benchmark * Package updates * .NET tools update * Fixed new warnings
1 parent ea44cf0 commit 4364dbd

File tree

16 files changed

+45
-21
lines changed

16 files changed

+45
-21
lines changed

‎.config/dotnet-tools.json

+3-3
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,7 +21,7 @@
2121
]
2222
},
2323
"dotnet-reportgenerator-globaltool": {
24-
"version": "4.8.7",
24+
"version": "4.8.9",
2525
"commands": [
2626
"reportgenerator"
2727
]

‎Directory.Build.props

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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="$(MSBuildThisFileDirectory)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>

‎benchmarks/Benchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
1313
<PackageReference Include="Moq" Version="$(MoqVersion)" />
1414
</ItemGroup>
1515
</Project>

‎benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@ public JsonApiDeserializerBenchmarks()
3636
{
3737
var options = new JsonApiOptions();
3838
IResourceGraph resourceGraph = _dependencyFactory.CreateResourceGraph(options);
39+
40+
var serviceContainer = new ServiceContainer();
41+
serviceContainer.AddService(typeof(IResourceDefinitionAccessor), new ResourceDefinitionAccessor(resourceGraph, serviceContainer));
42+
serviceContainer.AddService(typeof(IResourceDefinition<BenchmarkResource>), new JsonApiResourceDefinition<BenchmarkResource>(resourceGraph));
43+
3944
var targetedFields = new TargetedFields();
4045
var request = new JsonApiRequest();
41-
var resourceFactory = new ResourceFactory(new ServiceContainer());
46+
var resourceFactory = new ResourceFactory(serviceContainer);
4247
var httpContextAccessor = new HttpContextAccessor();
4348

4449
_jsonApiDeserializer = new RequestDeserializer(resourceGraph, resourceFactory, targetedFields, httpContextAccessor, request, options);

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapper" Version="2.0.78" />
11+
<PackageReference Include="Dapper" Version="2.0.90" />
1212
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
1313
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
1414
</ItemGroup>

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Ben.Demystifier" Version="0.3.0" />
25-
<PackageReference Include="Humanizer" Version="2.8.26" />
24+
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
25+
<PackageReference Include="Humanizer" Version="2.11.10" />
2626
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
2727
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
2828
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
29-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
30-
<PackageReference Include="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
29+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
30+
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
3131
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3232
</ItemGroup>
3333
</Project>

‎test/DiscoveryTests/DiscoveryTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1920
<PackageReference Include="Moq" Version="$(MoqVersion)" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
2121
</ItemGroup>
2222
</Project>

‎test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public async Task Can_create_user_with_password()
7777
User responseUser = GetResponseDeserializer().DeserializeSingle<User>(responseDocument).Data;
7878
var document = JsonConvert.DeserializeObject<Document>(responseDocument);
7979

80-
document.SingleData.Attributes.Should().NotContainKey("password");
80+
document.Should().NotBeNull();
81+
document!.SingleData.Attributes.Should().NotContainKey("password");
8182
document.SingleData.Attributes["userName"].Should().Be(newUser.UserName);
8283

8384
await _testContext.RunOnDatabaseAsync(async dbContext =>

‎test/JsonApiDotNetCoreExampleTests/IntegrationTests/Serialization/SerializationTests.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ public async Task Cannot_get_unknown_primary_resource_by_ID()
283283
httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
284284

285285
var jObject = JsonConvert.DeserializeObject<JObject>(responseDocument);
286-
string errorId = jObject["errors"].Should().NotBeNull().And.Subject.Select(element => (string)element["id"]).Single();
286+
jObject.Should().NotBeNull();
287+
288+
string errorId = jObject!["errors"].Should().NotBeNull().And.Subject.Select(element => (string)element["id"]).Single();
287289

288290
responseDocument.Should().BeJson(@"{
289291
""errors"": [

‎test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<ItemGroup>
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
1919
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
2121
</ItemGroup>
2222
</Project>

‎test/MultiDbContextTests/MultiDbContextTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
1919
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
2021
<PackageReference Include="Moq" Version="$(MoqVersion)" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
2222
</ItemGroup>
2323
</Project>

‎test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1415
<PackageReference Include="Moq" Version="$(MoqVersion)" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
1616
</ItemGroup>
1717
</Project>

‎test/TestBuildingBlocks/DummyTest.cs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using Xunit;
2+
3+
namespace TestBuildingBlocks
4+
{
5+
public sealed class DummyTest
6+
{
7+
[Fact]
8+
public void Empty()
9+
{
10+
// This dummy test exists solely to suppress the warning
11+
// during test runs that no tests were found in this project.
12+
}
13+
}
14+
}

‎test/TestBuildingBlocks/HttpResponseMessageExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static async Task<string> GetFormattedContentAsync(HttpResponseMessage r
4747
{
4848
if (text.Length > 0)
4949
{
50-
return JsonConvert.DeserializeObject<JObject>(text).ToString();
50+
return JsonConvert.DeserializeObject<JObject>(text)?.ToString();
5151
}
5252
}
5353
#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException

‎test/TestBuildingBlocks/TestBuildingBlocks.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
1414
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
1515
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetCoreVersion)" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1717
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
1818
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
1920
</ItemGroup>
2021
</Project>

‎test/UnitTests/UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
2122
<PackageReference Include="Moq" Version="$(MoqVersion)" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
2323
</ItemGroup>
2424
</Project>

0 commit comments

Comments
 (0)