Package updates (#1013)

Bart Koelman · web-flow · commit 4364dbdd83e8 · 2021-06-15T11:57:08.000+02:00
* Fixed broken benchmark

* Package updates

* .NET tools update

* Fixed new warnings
diff --git a/.config/dotnet-tools.json b/.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,7 +21,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.8.7",
+      "version": "4.8.9",
       "commands": [
         "reportgenerator"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
   </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="$(MSBuildThisFileDirectory)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>
diff --git a/benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
 </Project>
diff --git a/benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs b/benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs
@@ -36,9 +36,14 @@ public JsonApiDeserializerBenchmarks()
         {
             var options = new JsonApiOptions();
             IResourceGraph resourceGraph = _dependencyFactory.CreateResourceGraph(options);
+
+            var serviceContainer = new ServiceContainer();
+            serviceContainer.AddService(typeof(IResourceDefinitionAccessor), new ResourceDefinitionAccessor(resourceGraph, serviceContainer));
+            serviceContainer.AddService(typeof(IResourceDefinition<BenchmarkResource>), new JsonApiResourceDefinition<BenchmarkResource>(resourceGraph));
+
             var targetedFields = new TargetedFields();
             var request = new JsonApiRequest();
-            var resourceFactory = new ResourceFactory(new ServiceContainer());
+            var resourceFactory = new ResourceFactory(serviceContainer);
             var httpContextAccessor = new HttpContextAccessor();
 
             _jsonApiDeserializer = new RequestDeserializer(resourceGraph, resourceFactory, targetedFields, httpContextAccessor, request, options);
diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
@@ -8,7 +8,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.78" />
+    <PackageReference Include="Dapper" Version="2.0.90" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
   </ItemGroup>
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -21,13 +21,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ben.Demystifier" Version="0.3.0" />
-    <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
+    <PackageReference Include="Humanizer" Version="2.11.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs
@@ -77,7 +77,8 @@ public async Task Can_create_user_with_password()
             User responseUser = GetResponseDeserializer().DeserializeSingle<User>(responseDocument).Data;
             var document = JsonConvert.DeserializeObject<Document>(responseDocument);
 
-            document.SingleData.Attributes.Should().NotContainKey("password");
+            document.Should().NotBeNull();
+            document!.SingleData.Attributes.Should().NotContainKey("password");
             document.SingleData.Attributes["userName"].Should().Be(newUser.UserName);
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Serialization/SerializationTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Serialization/SerializationTests.cs
@@ -283,7 +283,9 @@ public async Task Cannot_get_unknown_primary_resource_by_ID()
             httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
             var jObject = JsonConvert.DeserializeObject<JObject>(responseDocument);
-            string errorId = jObject["errors"].Should().NotBeNull().And.Subject.Select(element => (string)element["id"]).Single();
+            jObject.Should().NotBeNull();
+
+            string errorId = jObject!["errors"].Should().NotBeNull().And.Subject.Select(element => (string)element["id"]).Single();
 
             responseDocument.Should().BeJson(@"{
   ""errors"": [
diff --git a/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj b/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
@@ -17,6 +17,6 @@
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/MultiDbContextTests/MultiDbContextTests.csproj b/test/MultiDbContextTests/MultiDbContextTests.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/TestBuildingBlocks/DummyTest.cs b/test/TestBuildingBlocks/DummyTest.cs
@@ -0,0 +1,14 @@
+using Xunit;
+
+namespace TestBuildingBlocks
+{
+    public sealed class DummyTest
+    {
+        [Fact]
+        public void Empty()
+        {
+            // This dummy test exists solely to suppress the warning
+            // during test runs that no tests were found in this project.
+        }
+    }
+}
diff --git a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
@@ -47,7 +47,7 @@ private static async Task<string> GetFormattedContentAsync(HttpResponseMessage r
                 {
                     if (text.Length > 0)
                     {
-                        return JsonConvert.DeserializeObject<JObject>(text).ToString();
+                        return JsonConvert.DeserializeObject<JObject>(text)?.ToString();
                     }
                 }
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -13,8 +13,9 @@
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"jetbrains.resharper.globaltools": {`
`6`		`- "version": "2020.3.3",`
	`6`	`+ "version": "2021.1.3",`
`7`	`7`	`"commands": [`
`8`	`8`	`"jb"`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"regitlint": {`
`12`		`- "version": "2.1.3",`
	`12`	`+ "version": "2.1.4",`
`13`	`13`	`"commands": [`
`14`	`14`	`"regitlint"`
`15`	`15`	`]`
`@@ -21,7 +21,7 @@`
`21`	`21`	`]`
`22`	`22`	`},`
`23`	`23`	`"dotnet-reportgenerator-globaltool": {`
`24`		`- "version": "4.8.7",`
	`24`	`+ "version": "4.8.9",`
`25`	`25`	`"commands": [`
`26`	`26`	`"reportgenerator"`
`27`	`27`	`]`