Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2025.1.4",
"version": "2025.1.5",
"commands": [
"jb"
],
Expand All @@ -17,7 +17,7 @@
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.4.7",
"version": "5.4.11",
"commands": [
"reportgenerator"
],
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ jobs:
$inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
- name: Upload output to artifacts
uses: actions/upload-artifact@v4
with:
name: InspectCode-${{ matrix.os }}
path: ${{ env.INSPECT_CODE_OUTPUT_PATH }}
- name: Verify outcome
shell: pwsh
run: |
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2024.3.*" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.*" PrivateAssets="All" />
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
</ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions package-versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
<SwashbuckleFrozenVersion>9.0.1</SwashbuckleFrozenVersion>
<NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
<SwashbuckleFrozenVersion>9.0.3</SwashbuckleFrozenVersion>
<SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<BenchmarkDotNetVersion>0.15.*</BenchmarkDotNetVersion>
Expand All @@ -21,10 +22,10 @@
<MicrosoftApiClientVersion>9.0.*</MicrosoftApiClientVersion>
<MicrosoftApiServerVersion>9.0.*</MicrosoftApiServerVersion>
<MiniValidationVersion>0.9.*</MiniValidationVersion>
<NSwagApiClientVersion>14.4.*</NSwagApiClientVersion>
<NSwagApiClientVersion>14.5.*</NSwagApiClientVersion>
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
<ReadableExpressionsVersion>4.1.*</ReadableExpressionsVersion>
<ScalarAspNetCoreVersion>2.4.*</ScalarAspNetCoreVersion>
<ScalarAspNetCoreVersion>2.6.*</ScalarAspNetCoreVersion>
<SwashbuckleVersion>9.*-*</SwashbuckleVersion>
<SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
<TestSdkVersion>17.14.*</TestSdkVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@

<ItemGroup>
<PackageReference Include="SauceControl.InheritDoc" Version="$(InheritDocVersion)" PrivateAssets="All" />
<PackageReference Include="System.Text.RegularExpressions" Condition="'$(TargetFramework)' == 'netstandard1.0'"
Version="$(SystemTextRegularExpressionsFrozenVersion)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using JetBrains.Annotations;

namespace JsonApiDotNetCore.SourceGenerators;

// IMPORTANT: A copy of this type exists in the JsonApiDotNetCore project. Keep these in sync when making changes.
[PublicAPI]
[Flags]
public enum JsonApiEndpointsCopy
{
Expand Down
Loading