Merge branch 'master' into merge-v5.1-into-openapi

Author: maurei

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.2.3",
+      "version": "2022.2.4",
       "commands": [
         "jb"
       ]
     },
     "regitlint": {
-      "version": "6.1.1",
+      "version": "6.2.1",
       "commands": [
         "regitlint"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.3",
+      "version": "5.1.11",
       "commands": [
         "reportgenerator"
       ]

Build.ps1

@@ -51,7 +51,7 @@ function RunCleanupCode {
 
         if ($baseCommitHash -ne $headCommitHash) {
             Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
-            dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
+            dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
             CheckLastExitCode
         }
     }

Directory.Build.props

@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
     <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
@@ -37,8 +37,8 @@
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <CoverletVersion>3.1.2</CoverletVersion>
+    <CoverletVersion>3.2.0</CoverletVersion>
     <MoqVersion>4.18.2</MoqVersion>
-    <TestSdkVersion>17.3.1</TestSdkVersion>
+    <TestSdkVersion>17.4.0</TestSdkVersion>
   </PropertyGroup>
 </Project>

appveyor.yml

@@ -4,7 +4,7 @@ image:
 
 version: '{build}'
 
-stack: postgresql 13.4
+stack: postgresql 15
 
 environment:
   PGUSER: postgres
@@ -35,7 +35,10 @@ for:
     only:
     - image: Visual Studio 2022
   services:
-  - postgresql13
+  - postgresql15
+  install:
+  # Temporary workaround for https://help.appveyor.com/discussions/questions/60488-postgresql-version
+  - net start postgresql-x64-15
   # REF: https://github.com/docascode/docfx-seed/blob/master/appveyor.yml
   before_build:
     - pwsh: |
@@ -102,7 +105,7 @@ build_script:
 
     Write-Output "PostgreSQL version:"
     if ($IsWindows) {
-        . "${env:ProgramFiles}\PostgreSQL\13\bin\psql" --version
+        . "${env:ProgramFiles}\PostgreSQL\15\bin\psql" --version
     }
     else {
         psql --version

cleanupcode.ps1

@@ -28,17 +28,17 @@ if ($revision) {
 
     if ($baseCommitHash -eq $headCommitHash) {
         Write-Output "Running code cleanup on staged/unstaged files."
-        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
+        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
         VerifySuccessExitCode
     }
     else {
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
-        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
+        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
         VerifySuccessExitCode
     }
 }
 else {
     Write-Output "Running code cleanup on all files."
-    dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
+    dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
     VerifySuccessExitCode
 }

run-docker-postgres.ps1

@@ -9,4 +9,4 @@ docker run --rm --name jsonapi-dotnet-core-testing       `
  -e POSTGRES_USER=postgres                               `
  -e POSTGRES_PASSWORD=postgres                           `
  -p 5432:5432                                            `
- postgres:13.4
+ postgres:15

src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs

@@ -36,7 +36,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     private string GetConnectionString()
     {
         string? tenantName = GetTenantName();
-        string connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];
+        string? connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];
 
         if (connectionString == null)
         {

src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs

@@ -11,12 +11,12 @@ namespace NoEntityFrameworkExample.Services;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class WorkItemService : IResourceService<WorkItem, int>
 {
-    private readonly string _connectionString;
+    private readonly string? _connectionString;
 
     public WorkItemService(IConfiguration configuration)
     {
         string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-        _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
+        _connectionString = configuration["Data:DefaultConnection"]?.Replace("###", postgresPassword);
     }
 
     public async Task<IReadOnlyCollection<WorkItem>> GetAsync(CancellationToken cancellationToken)

src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs

@@ -77,18 +77,21 @@ public virtual void Read(string parameterName, StringValues parameterValue)
         }
     }
 
-    private IEnumerable<string> ExtractParameterValue(string parameterValue)
+    private IEnumerable<string> ExtractParameterValue(string? parameterValue)
     {
-        if (_options.EnableLegacyFilterNotation)
+        if (parameterValue != null)
         {
-            foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
+            if (_options.EnableLegacyFilterNotation)
             {
-                yield return condition;
+                foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
+                {
+                    yield return condition;
+                }
+            }
+            else
+            {
+                yield return parameterValue;
             }
-        }
-        else
-        {
-            yield return parameterValue;
         }
     }
 

src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs

@@ -48,7 +48,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
     {
         try
         {
-            _includeExpression = GetInclude(parameterValue);
+            _includeExpression = GetInclude(parameterValue.ToString());
         }
         catch (QueryParseException exception)
         {