**TEMP** Squashed commits from #1095

Author: Bart Koelman

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.1.4",
+      "version": "2021.2.2",
       "commands": [
         "jb"
       ]

Build.ps1

@@ -8,7 +8,7 @@ function CheckLastExitCode {
 
 function RunInspectCode {
     $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
-    dotnet jb inspectcode JsonApiDotNetCore.sln --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
+    dotnet jb inspectcode JsonApiDotNetCore.sln --no-build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
     CheckLastExitCode
 
     [xml]$xml = Get-Content "$outputPath"

CSharpGuidelinesAnalyzer.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <cSharpGuidelinesAnalyzerSettings>
   <setting rule="AV1561" name="MaxParameterCount" value="6" />
-  <setting rule="AV1561" name="MaxConstructorParameterCount" value="12" />
+  <setting rule="AV1561" name="MaxConstructorParameterCount" value="13" />
 </cSharpGuidelinesAnalyzerSettings>

Directory.Build.props

@@ -6,10 +6,11 @@
     <NpgsqlPostgreSQLVersion>5.0.*</NpgsqlPostgreSQLVersion>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>9999</WarningLevel>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
     <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
@@ -24,9 +25,9 @@
   <PropertyGroup>
     <BogusVersion>33.1.1</BogusVersion>
     <CoverletVersion>3.1.0</CoverletVersion>
-    <FluentAssertionsVersion>6.1.0</FluentAssertionsVersion>
+    <FluentAssertionsVersion>6.2.0</FluentAssertionsVersion>
     <MoqVersion>4.16.1</MoqVersion>
     <XUnitVersion>2.4.*</XUnitVersion>
-    <TestSdkVersion>16.11.0</TestSdkVersion>
+    <TestSdkVersion>17.0.0</TestSdkVersion>
   </PropertyGroup>
 </Project>

ROADMAP.md

@@ -21,7 +21,7 @@ The need for breaking changes has blocked several efforts in the v4.x release, s
 - [x] Optimized delete to-many [#1030](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1030)
 - [x] Support System.Text.Json [#664](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/664) [#999](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/999) [1077](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1077) [1078](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1078)
 - [x] Optimize IIdentifiable to ResourceObject conversion [#1028](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1028) [#1024](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1024) [#233](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/233)
-- [ ] Nullable reference types [#1029](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1029)
+- [x] Nullable reference types [#1029](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1029)
 
 Aside from the list above, we have interest in the following topics. It's too soon yet to decide whether they'll make it into v5.x or in a later major version.
 

benchmarks/BenchmarkResource.cs

@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
 </Project>

benchmarks/BenchmarkResourcePublicNames.cs

@@ -21,7 +21,7 @@ public abstract class DeserializationBenchmarkBase
         protected DeserializationBenchmarkBase()
         {
             var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<ResourceA>().Build();
+            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource>().Build();
             options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
             SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
 
@@ -30,7 +30,9 @@ protected DeserializationBenchmarkBase()
             var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
 
             serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
-            serviceContainer.AddService(typeof(IResourceDefinition<ResourceA, int>), new JsonApiResourceDefinition<ResourceA, int>(resourceGraph));
+
+            serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>),
+                new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
 
             // ReSharper disable once VirtualMemberCallInConstructor
             JsonApiRequest request = CreateJsonApiRequest(resourceGraph);
@@ -56,7 +58,7 @@ protected DeserializationBenchmarkBase()
         protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
 
         [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class ResourceA : Identifiable<int>
+        public sealed class IncomingResource : Identifiable<int>
         {
             [Attr]
             public bool Attribute01 { get; set; }
@@ -74,7 +76,7 @@ public sealed class ResourceA : Identifiable<int>
             public float? Attribute05 { get; set; }
 
             [Attr]
-            public string Attribute06 { get; set; }
+            public string Attribute06 { get; set; } = null!;
 
             [Attr]
             public DateTime? Attribute07 { get; set; }
@@ -89,34 +91,34 @@ public sealed class ResourceA : Identifiable<int>
             public DayOfWeek Attribute10 { get; set; }
 
             [HasOne]
-            public ResourceA Single1 { get; set; }
+            public IncomingResource Single1 { get; set; } = null!;
 
             [HasOne]
-            public ResourceA Single2 { get; set; }
+            public IncomingResource Single2 { get; set; } = null!;
 
             [HasOne]
-            public ResourceA Single3 { get; set; }
+            public IncomingResource Single3 { get; set; } = null!;
 
             [HasOne]
-            public ResourceA Single4 { get; set; }
+            public IncomingResource Single4 { get; set; } = null!;
 
             [HasOne]
-            public ResourceA Single5 { get; set; }
+            public IncomingResource Single5 { get; set; } = null!;
 
             [HasMany]
-            public ISet<ResourceA> Multi1 { get; set; }
+            public ISet<IncomingResource> Multi1 { get; set; } = null!;
 
             [HasMany]
-            public ISet<ResourceA> Multi2 { get; set; }
+            public ISet<IncomingResource> Multi2 { get; set; } = null!;
 
             [HasMany]
-            public ISet<ResourceA> Multi3 { get; set; }
+            public ISet<IncomingResource> Multi3 { get; set; } = null!;
 
             [HasMany]
-            public ISet<ResourceA> Multi4 { get; set; }
+            public ISet<IncomingResource> Multi4 { get; set; } = null!;
 
             [HasMany]
-            public ISet<ResourceA> Multi5 { get; set; }
+            public ISet<IncomingResource> Multi5 { get; set; } = null!;
         }
     }
 }