Skip to content

Commit e80d7da

Browse files
authored
Package updates (#1753)
* Package updates * Upload InspectCode output to artefacts
1 parent 7601fe4 commit e80d7da

File tree

6 files changed

+17
-6
lines changed

6 files changed

+17
-6
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2025.1.4",
6+
"version": "2025.1.5",
77
"commands": [
88
"jb"
99
],
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"dotnet-reportgenerator-globaltool": {
20-
"version": "5.4.7",
20+
"version": "5.4.11",
2121
"commands": [
2222
"reportgenerator"
2323
],

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ jobs:
169169
$inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
170170
Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
171171
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
172+
- name: Upload output to artifacts
173+
uses: actions/upload-artifact@v4
174+
with:
175+
name: InspectCode-${{ matrix.os }}
176+
path: ${{ env.INSPECT_CODE_OUTPUT_PATH }}
172177
- name: Verify outcome
173178
shell: pwsh
174179
run: |

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</PropertyGroup>
5555

5656
<ItemGroup>
57-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.*" PrivateAssets="All" />
57+
<PackageReference Include="JetBrains.Annotations" Version="2025.2.*" PrivateAssets="All" />
5858
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
5959
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
6060
</ItemGroup>

package-versions.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
55
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
66
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
7-
<SwashbuckleFrozenVersion>9.0.1</SwashbuckleFrozenVersion>
87
<NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
8+
<SwashbuckleFrozenVersion>9.0.3</SwashbuckleFrozenVersion>
9+
<SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>
910

1011
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
1112
<BenchmarkDotNetVersion>0.15.*</BenchmarkDotNetVersion>
@@ -21,10 +22,10 @@
2122
<MicrosoftApiClientVersion>9.0.*</MicrosoftApiClientVersion>
2223
<MicrosoftApiServerVersion>9.0.*</MicrosoftApiServerVersion>
2324
<MiniValidationVersion>0.9.*</MiniValidationVersion>
24-
<NSwagApiClientVersion>14.4.*</NSwagApiClientVersion>
25+
<NSwagApiClientVersion>14.5.*</NSwagApiClientVersion>
2526
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
2627
<ReadableExpressionsVersion>4.1.*</ReadableExpressionsVersion>
27-
<ScalarAspNetCoreVersion>2.4.*</ScalarAspNetCoreVersion>
28+
<ScalarAspNetCoreVersion>2.6.*</ScalarAspNetCoreVersion>
2829
<SwashbuckleVersion>9.*-*</SwashbuckleVersion>
2930
<SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
3031
<TestSdkVersion>17.14.*</TestSdkVersion>

src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,7 @@
4646

4747
<ItemGroup>
4848
<PackageReference Include="SauceControl.InheritDoc" Version="$(InheritDocVersion)" PrivateAssets="All" />
49+
<PackageReference Include="System.Text.RegularExpressions" Condition="'$(TargetFramework)' == 'netstandard1.0'"
50+
Version="$(SystemTextRegularExpressionsFrozenVersion)" />
4951
</ItemGroup>
5052
</Project>

src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
using JetBrains.Annotations;
2+
13
namespace JsonApiDotNetCore.SourceGenerators;
24

35
// IMPORTANT: A copy of this type exists in the JsonApiDotNetCore project. Keep these in sync when making changes.
6+
[PublicAPI]
47
[Flags]
58
public enum JsonApiEndpointsCopy
69
{

0 commit comments

Comments
 (0)