Merge pull request #1274 from json-api-dotnet/package-updates

Package updates

Author: bkoelman

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.1.0",
+      "version": "2023.1.2",
       "commands": [
         "jb"
       ]
     },
     "regitlint": {
-      "version": "6.3.10",
+      "version": "6.3.11",
       "commands": [
         "regitlint"
       ]
@@ -21,13 +21,13 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.19",
+      "version": "5.1.20",
       "commands": [
         "reportgenerator"
       ]
     },
     "docfx": {
-      "version": "2.62.2",
+      "version": "2.67.1",
       "commands": [
         "docfx"
       ]

Directory.Build.props

@@ -35,6 +35,6 @@
   <PropertyGroup>
     <CoverletVersion>3.2.*</CoverletVersion>
     <MoqVersion>4.18.*</MoqVersion>
-    <TestSdkVersion>17.5.*</TestSdkVersion>
+    <TestSdkVersion>17.6.*</TestSdkVersion>
   </PropertyGroup>
 </Project>

docs/build-dev.ps1

@@ -37,6 +37,9 @@ if (-Not $NoBuild -Or -Not (Test-Path -Path _site)) {
     Invoke-Expression ./generate-examples.ps1
 }
 
+dotnet tool restore
+VerifySuccessExitCode
+
 dotnet docfx ./docfx.json
 VerifySuccessExitCode
 

docs/docfx.json

@@ -40,7 +40,7 @@
         "dest": "_site",
         "globalMetadataFiles": [],
         "fileMetadataFiles": [],
-        "template": [ "default" ],
+        "template": [ "default", "modern" ],
         "postProcessors": [],
         "noLangKeyword": false,
         "keepFileLink": false,

docs/internals/queries.md

@@ -4,8 +4,9 @@ _since v4.0_
 
 The query pipeline roughly looks like this:
 
-```
-HTTP --[ASP.NET]--> QueryString --[JADNC:QueryStringParameterReader]--> QueryExpression[] --[JADNC:ResourceService]--> QueryLayer --[JADNC:Repository]--> IQueryable --[Entity Framework Core]--> SQL
+```mermaid
+flowchart TB
+A[HTTP] -->|ASP.NET| B(QueryString) -->|JADNC:QueryStringParameterReader| C("QueryExpression[]") -->|JADNC:ResourceService| D(QueryLayer) -->|JADNC:Repository| E(IQueryable) -->|Entity Framework Core| F[(SQL)]
 ```
 
 Processing a request involves the following steps:

docs/usage/extensibility/services.md

@@ -81,42 +81,34 @@ In some cases it may be necessary to only expose a few actions on a resource. Fo
 
 This interface hierarchy is defined by this tree structure.
 
-```
-IResourceService
-|
-+-- IResourceQueryService
-|   |
-|   +-- IGetAllService
-|   |   GET /
-|   |
-|   +-- IGetByIdService
-|   |   GET /{id}
-|   |
-|   +-- IGetSecondaryService
-|   |   GET /{id}/{relationship}
-|   |
-|   +-- IGetRelationshipService
-|       GET /{id}/relationships/{relationship}
-|
-+-- IResourceCommandService
-    |
-    +-- ICreateService
-    |   POST /
-    |
-    +-- IUpdateService
-    |   PATCH /{id}
-    |
-    +-- IDeleteService
-    |   DELETE /{id}
-    |
-    +-- IAddToRelationshipService
-    |   POST /{id}/relationships/{relationship}
-    |
-    +-- ISetRelationshipService
-    |   PATCH /{id}/relationships/{relationship}
-    |
-    +-- IRemoveFromRelationshipService
-        DELETE /{id}/relationships/{relationship}
+```mermaid
+classDiagram
+direction LR
+class IResourceService
+class IResourceQueryService
+class IGetAllService ["IGetAllService\nGET /"]
+class IGetByIdService ["IGetByIdService\nGET /{id}"]
+class IGetSecondaryService ["IGetSecondaryService\nGET /{id}/{relationship}"]
+class IGetRelationshipService ["IGetRelationshipService\nGET /{id}/relationships/{relationship}"]
+class IResourceCommandService
+class ICreateService ["ICreateService\nPOST /"]
+class IUpdateService ["IUpdateService\nPATCH /{id}"]
+class IDeleteService ["IDeleteService\nDELETE /{id}"]
+class IAddToRelationshipService ["IAddToRelationshipService\nPOST /{id}/relationships/{relationship}"]
+class ISetRelationshipService ["ISetRelationshipService\nPATCH /{id}/relationships/{relationship}"]
+class IRemoveFromRelationshipService ["IRemoveFromRelationshipService\nDELETE /{id}/relationships/{relationship}"]
+IResourceService <|-- IResourceQueryService
+IResourceQueryService<|-- IGetAllService
+IResourceQueryService<|-- IGetByIdService
+IResourceQueryService<|-- IGetSecondaryService
+IResourceQueryService<|-- IGetRelationshipService
+IResourceService <|-- IResourceCommandService
+IResourceCommandService <|-- ICreateService
+IResourceCommandService <|-- IUpdateService
+IResourceCommandService <|-- IDeleteService
+IResourceCommandService <|-- IAddToRelationshipService
+IResourceCommandService <|-- ISetRelationshipService
+IResourceCommandService <|-- IRemoveFromRelationshipService
 ```
 
 In order to take advantage of these interfaces you first need to register the service for each implemented interface.

test/TestBuildingBlocks/TestBuildingBlocks.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="34.0.2" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />