From 97aa22a2e5fc10533a00cd7663122cfb0551c959 Mon Sep 17 00:00:00 2001 From: Thomas Weston Date: Thu, 16 Jul 2026 18:47:16 +0100 Subject: [PATCH 1/4] updated github actions to latest versions --- .github/workflows/{dotnet.yml => build.yml} | 8 +-- .github/workflows/codeql-analysis.yml | 67 ------------------- .github/workflows/nuget.yml | 28 -------- .github/workflows/release.yml | 30 +++++++++ .../ReSharperToCodeClimate.csproj | 4 +- .../ReSharperToCodeClimateTest.csproj | 1 - 6 files changed, 34 insertions(+), 104 deletions(-) rename .github/workflows/{dotnet.yml => build.yml} (82%) delete mode 100644 .github/workflows/codeql-analysis.yml delete mode 100644 .github/workflows/nuget.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/build.yml similarity index 82% rename from .github/workflows/dotnet.yml rename to .github/workflows/build.yml index e15e9b0..121db34 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: .NET +name: build on: push: @@ -8,13 +8,11 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: 10.0.x - name: Restore dependencies diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index d3441d1..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '20 1 * * 2' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'csharp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml deleted file mode 100644 index e98c4aa..0000000 --- a/.github/workflows/nuget.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Nuget - -on: - workflow_run: - workflows: [".NET"] - branches: [ master ] - types: - - completed - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 10.0.x - - name: Restore dependencies - run: dotnet restore - - name: Pack - run: dotnet pack --no-restore -c Release --output package - - name: Push - env: - NUGET_KEY: ${{ secrets.NUGET_KEY }} - run: dotnet nuget push ./package/*.nupkg --source https://api.nuget.org/v3/index.json --api-key "$NUGET_KEY" --skip-duplicate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..ae6c53b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ +name: release + +on: + release: + types: [ published ] + +jobs: + publish: + runs-on: ubuntu-latest + permissions: + id-token: write + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + - name: Restore dependencies + run: dotnet restore + - name: Pack + run: dotnet pack --no-restore -c Release --output package --version ${{ github.event.release.tag_name:1 }} -P:PackageReleaseNotes="${{ github.event.release.body }}" + - name: NuGet login + uses: NuGet/login@v1 + id: login + with: + user: ${{ secrets.NUGET_USER }} + - name: NuGet Push + env: + NUGET_KEY: ${{ secrets.NUGET_KEY }} + run: dotnet nuget push ./package/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ steps.login.outputs.NUGET_API_KEY }} --skip-duplicate diff --git a/src/ReSharperToCodeClimate/ReSharperToCodeClimate.csproj b/src/ReSharperToCodeClimate/ReSharperToCodeClimate.csproj index d9bd399..06f78bf 100644 --- a/src/ReSharperToCodeClimate/ReSharperToCodeClimate.csproj +++ b/src/ReSharperToCodeClimate/ReSharperToCodeClimate.csproj @@ -2,16 +2,14 @@ Exe - netcoreapp3.1;net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 latest - 1.0.14 ReSharperToCodeClimate resharper-to-codeclimate true resharper-to-codeclimate Thomas Weston Converts a ReSharper inspectcode xml report file to a Code Climate json report file. - Added support for .NET 10.0 https://github.com/moly/resharper-to-codeclimate https://github.com/moly/resharper-to-codeclimate resharper codeclimate gitlab diff --git a/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj b/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj index 9e4aa71..cf31008 100644 --- a/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj +++ b/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj @@ -4,7 +4,6 @@ net10.0 enable enable - false From ac847feb3aaa9eb6f1b3e98f45061b0f2848a09a Mon Sep 17 00:00:00 2001 From: Thomas Weston Date: Thu, 16 Jul 2026 18:56:13 +0100 Subject: [PATCH 2/4] update actions to actual latest version --- .github/workflows/{build.yml => dotnet.yml} | 6 +++--- .github/workflows/{release.yml => nuget.yml} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{build.yml => dotnet.yml} (82%) rename .github/workflows/{release.yml => nuget.yml} (90%) diff --git a/.github/workflows/build.yml b/.github/workflows/dotnet.yml similarity index 82% rename from .github/workflows/build.yml rename to .github/workflows/dotnet.yml index 121db34..c13d98b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/dotnet.yml @@ -1,4 +1,4 @@ -name: build +name: dotnet on: push: @@ -10,9 +10,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x - name: Restore dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/nuget.yml similarity index 90% rename from .github/workflows/release.yml rename to .github/workflows/nuget.yml index ae6c53b..1e12920 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/nuget.yml @@ -1,4 +1,4 @@ -name: release +name: nuget on: release: @@ -10,9 +10,9 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x - name: Restore dependencies From bdd29e4d2db96f22bb5049f7fc84658c6189358d Mon Sep 17 00:00:00 2001 From: Thomas Weston Date: Thu, 16 Jul 2026 19:08:44 +0100 Subject: [PATCH 3/4] updated test packages --- .../ReSharperToCodeClimateTest.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj b/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj index cf31008..a4f8ad7 100644 --- a/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj +++ b/src/ReSharperToCodeClimateTest/ReSharperToCodeClimateTest.csproj @@ -8,10 +8,10 @@ - - - - + + + + From ed2e076e7a7d019fd490c64b68d026f9040053ba Mon Sep 17 00:00:00 2001 From: Thomas Weston Date: Thu, 16 Jul 2026 19:26:27 +0100 Subject: [PATCH 4/4] fixed nuget action --- .github/workflows/nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index 1e12920..3e46fcb 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -18,7 +18,7 @@ jobs: - name: Restore dependencies run: dotnet restore - name: Pack - run: dotnet pack --no-restore -c Release --output package --version ${{ github.event.release.tag_name:1 }} -P:PackageReleaseNotes="${{ github.event.release.body }}" + run: dotnet pack --no-restore -c Release --output package --version ${GITHUB_REF_NAME#v} -p:PackageReleaseNotes="${{ github.event.release.body }}" - name: NuGet login uses: NuGet/login@v1 id: login