Merge pull request #1273 from json-api-dotnet/merge-master-v5.2.0-into-openapi

Merge master v5.2.0 into openapi

Author: maurei

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
  "jetbrains.resharper.globaltools": {
- "version": "2022.2.4",
+ "version": "2023.1.0",
  "commands": [
  "jb"
  ]
@@ -21,13 +21,13 @@
  ]
  },
  "dotnet-reportgenerator-globaltool": {
- "version": "5.1.15",
+ "version": "5.1.19",
  "commands": [
  "reportgenerator"
  ]
  },
  "docfx": {
- "version": "2.60.2",
+ "version": "2.62.2",
  "commands": [
  "docfx"
  ]

.editorconfig

@@ -66,15 +66,18 @@ csharp_indent_case_contents_when_block = false
 csharp_preserve_single_line_statements = false
 
 # 'var' usage preferences
-csharp_style_var_for_built_in_types = false:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_for_built_in_types = false:none
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_elsewhere = false:none
 
 # Parentheses preferences
 dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:suggestion
 dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:suggestion
 
+# Expression value is never used
+dotnet_diagnostic.IDE0058.severity = none
+
 #### Naming Style ####
 
 dotnet_diagnostic.IDE1006.severity = warning

.github/ISSUE_TEMPLATE/question.md

@@ -7,14 +7,25 @@ assignees: ''
 
 ---
 
+<!--
+Remember that no-one is getting paid to answer your question. You're basically asking other people to give up their time to help you out of the goodness of their heart – it's up to you to do all you can to make that as simple as possible, so read http://tinyurl.com/stack-checklist first.
+-->
+
 #### SUMMARY
-<!-- Explain what you're trying to accomplish, how you encountered the problem you're trying to solve, and any difficulties that have prevented you from solving it yourself. -->
+<!--
+Explain what you're trying to accomplish, how you encountered the problem you're trying to solve, and any difficulties that have prevented you from solving it yourself.
+-->
 
 #### DETAILS
-<!-- What details can you include that will help us identify and solve your problem? -->
+<!--
+What details can you include that will help us identify and solve your problem?
+If your program produces different results from what you expected, state what you expected, why you expected it, and the actual results.
+-->
+
 
 #### STEPS TO REPRODUCE
-<!-- Not all questions benefit from including code, but if your problem is with the code you've written, you should consider including your models, DbContext, controllers, resource services, repositories, resource definitions, etc. Include the request URL with body (if applicable) and the full exception stack trace (set `options.IncludeExceptionStackTraceInErrors` to `true`) in case of errors. It may also be helpful to include the produced SQL, which can be made visible in logs by adding this to appsettings.json:
+<!--
+Not all questions benefit from including code, but if your problem is with the code you've written, you should consider including your models, DbContext, controllers, resource services, repositories, resource definitions, etc. Include the request URL with the response body (if applicable) and the full exception stack trace (set `options.IncludeExceptionStackTraceInErrors` to `true`) in case of errors. It may also be helpful to include the produced SQL, which can be made visible in logs by adding this to appsettings.json:
 
 ```json
 {

Build.ps1

@@ -23,7 +23,7 @@ function RunInspectCode {
  $issueType = $xml.report.IssueTypes.SelectSingleNode("IssueType[@Id='$($_.TypeId)']")
  $severity = $_.Severity ?? $issueType.Severity
 
- Write-Output "[$severity] $($_.File):$($_.Line) $($_.Message)"
+ Write-Output "[$severity] $($_.File):$($_.Line) $($_.TypeId): $($_.Message)"
  })
  })
  }
@@ -113,11 +113,8 @@ CheckLastExitCode
 dotnet build -c Release
 CheckLastExitCode
 
-# https://youtrack.jetbrains.com/issue/RSRP-488628/Breaking-InspectCode-fails-with-Roslyn-Worker-process-exited-unexpectedly-after-update
-if ($IsWindows) {
- RunInspectCode
- RunCleanupCode
-}
+RunInspectCode
+RunCleanupCode
 
 dotnet test -c Release --no-build --collect:"XPlat Code Coverage"
 CheckLastExitCode

Directory.Build.props

@@ -4,13 +4,13 @@
  <AspNetVersion>6.0.*</AspNetVersion>
  <EFCoreVersion>7.0.*</EFCoreVersion>
  <EFCorePostgresVersion>7.0.*</EFCorePostgresVersion>
- <MicrosoftCodeAnalysisVersion>4.4.*</MicrosoftCodeAnalysisVersion>
+ <MicrosoftCodeAnalysisVersion>4.5.*</MicrosoftCodeAnalysisVersion>
  <HumanizerVersion>2.14.1</HumanizerVersion>
  <SwashbuckleVersion>6.4.*</SwashbuckleVersion>
  <NSwagApiClientVersion>13.16.*</NSwagApiClientVersion>
  <MicrosoftApiClientVersion>6.0.*</MicrosoftApiClientVersion>
  <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
- <JsonApiDotNetCoreVersionPrefix>5.1.3</JsonApiDotNetCoreVersionPrefix>
+ <JsonApiDotNetCoreVersionPrefix>5.2.1</JsonApiDotNetCoreVersionPrefix>
  <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
  <WarningLevel>9999</WarningLevel>
  <Nullable>enable</Nullable>
@@ -21,7 +21,7 @@
 
  <ItemGroup>
  <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
- <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.2" PrivateAssets="All" />
+ <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.3" PrivateAssets="All" />
  <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
  </ItemGroup>
 
@@ -39,6 +39,6 @@
  <PropertyGroup>
  <CoverletVersion>3.2.*</CoverletVersion>
  <MoqVersion>4.18.*</MoqVersion>
- <TestSdkVersion>17.4.*</TestSdkVersion>
+ <TestSdkVersion>17.5.*</TestSdkVersion>
  </PropertyGroup>
 </Project>

JetBrainsInspectCodeTransform.xslt

@@ -25,6 +25,7 @@
  <tr>
  <th>File</th>
  <th>Line Number</th>
+ <th>Type</th>
  <th>Message</th>
  </tr>
  <xsl:for-each select="key('ISSUETYPES',@Id)">
@@ -35,6 +36,9 @@
  <td>
  <xsl:value-of select="@Line"/>
  </td>
+ <td>
+ <xsl:value-of select="@TypeId"/>
+ </td>
  <td>
  <xsl:value-of select="@Message"/>
  </td>