diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index de5a0b2ff..650e308d1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "jetbrains.resharper.globaltools": { - "version": "2025.3.0.2", + "version": "2025.3.0.3", "commands": [ "jb" ], diff --git a/.github/dependabot.yml b/.github/dependabot.yml index beb6e779e..6f20b495a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,3 +22,5 @@ updates: # Block major updates of packages that require a matching .NET version. - dependency-name: "Microsoft.AspNetCore*" update-types: ["version-update:semver-major"] + - dependency-name: "Microsoft.Extensions*" + update-types: ["version-update:semver-major"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4ed24394..4b123d5fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,7 +178,7 @@ 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 --version - dotnet jb inspectcode $env:SOLUTION_FILE --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 + dotnet jb inspectcode $env:SOLUTION_FILE --build --no-updates --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --properties:NuGetAudit=false --severity=WARNING --verbosity=WARN --disable-settings-layers=GlobalAll --disable-settings-layers=GlobalPerProduct --disable-settings-layers=SolutionPersonal --disable-settings-layers=ProjectPersonal - name: Upload output to artifacts uses: actions/upload-artifact@v5 with: @@ -199,7 +199,7 @@ jobs: $issueType = $xml.report.IssueTypes.SelectSingleNode("IssueType[@Id='$($_.TypeId)']") $severity = $_.Severity ?? $issueType.Severity - Write-Output "[$severity] $($_.File):$($_.Line) $($_.TypeId): $($_.Message)" + Write-Output "[$severity] ($($_.TargetFramework)) $($_.File):$($_.Line) $($_.TypeId): $($_.Message)" }) }) } @@ -211,7 +211,7 @@ jobs: } cleanup-code: - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: @@ -237,7 +237,9 @@ jobs: - name: Restore tools run: dotnet tool restore - name: Restore packages - run: dotnet restore + run: dotnet restore /p:NuGetAudit=false + - name: Build + run: dotnet build --no-restore --configuration Release /p:RunAnalyzers=false - name: CleanupCode (on PR diff) if: ${{ github.event_name == 'pull_request' }} shell: pwsh @@ -249,14 +251,14 @@ jobs: Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request." dotnet jb cleanupcode --version - dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff + dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff - name: CleanupCode (on branch) if: ${{ github.event_name == 'push' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }} shell: pwsh run: | Write-Output 'Running code cleanup on all files.' dotnet jb cleanupcode --version - dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN --fail-on-diff --print-diff + dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN --fail-on-diff --print-diff publish: timeout-minutes: 60 diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 8b4aabe28..4871e6399 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -37,7 +37,7 @@ jobs: - name: Restore tools run: dotnet tool restore - name: Restore packages - run: dotnet restore + run: dotnet restore /p:NuGetAudit=false - name: Build run: dotnet build --no-restore --configuration Release - name: Qodana scan diff --git a/JetBrainsInspectCodeTransform.xslt b/JetBrainsInspectCodeTransform.xslt index 28fa772b0..6e38c3b18 100644 --- a/JetBrainsInspectCodeTransform.xslt +++ b/JetBrainsInspectCodeTransform.xslt @@ -24,6 +24,7 @@ + @@ -33,6 +34,9 @@ + diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1ad145583..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,12 +0,0 @@ -image: Visual Studio 2022 - -version: '{build}' - -branches: - only: - - master - - /release\/.+/ - -build: off -test: off -deploy: off diff --git a/cleanupcode.ps1 b/cleanupcode.ps1 index 9890b85e6..72a59ea02 100644 --- a/cleanupcode.ps1 +++ b/cleanupcode.ps1 @@ -11,7 +11,8 @@ $ErrorActionPreference = "Stop" $PSNativeCommandUseErrorActionPreference = $true dotnet tool restore -dotnet restore +dotnet restore /p:NuGetAudit=false +dotnet build --no-restore --configuration Release /p:RunAnalyzers=false $solutionFile = 'JsonApiDotNetCore.sln' @@ -22,16 +23,16 @@ if ($revision) { if ($baseCommitHash -eq $headCommitHash) { Write-Output "Running code cleanup on staged/unstaged files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f staged,modified + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified } else { Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash } } else { Write-Output "Running code cleanup on all files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN } diff --git a/inspectcode.ps1 b/inspectcode.ps1 index d9be980b7..2b48c4615 100644 --- a/inspectcode.ps1 +++ b/inspectcode.ps1 @@ -11,7 +11,7 @@ $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbra $resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html') dotnet jb inspectcode --version -dotnet jb inspectcode $solutionFile --dotnetcoresdk=$(dotnet --version) --build --output="$outputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal +dotnet jb inspectcode $solutionFile --build --no-updates --dotnetcoresdk=$(dotnet --version) --output="$outputPath" --format="xml" --settings=WarningSeverities.DotSettings --properties:Configuration=Release --properties:RunAnalyzers=false --properties:NuGetAudit=false --severity=WARNING --verbosity=WARN --disable-settings-layers=GlobalAll --disable-settings-layers=GlobalPerProduct --disable-settings-layers=SolutionPersonal --disable-settings-layers=ProjectPersonal [xml]$xml = Get-Content "$outputPath" if ($xml.report.Issues -and $xml.report.Issues.Project) {
FileTarget Framework Line Number Type Message + +