From 01d6d40092403378b04b1f377a33cd1eec945d7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 00:51:49 +0000 Subject: [PATCH] Bump CrispyWaffle and Newtonsoft.Json (#193) * Bump CrispyWaffle and Newtonsoft.Json Bumps [CrispyWaffle](https://github.com/guibranco/CrispyWaffle) and [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json). These dependencies needed to be updated together. Updates `CrispyWaffle` from 9.1.136 to 9.1.165 - [Release notes](https://github.com/guibranco/CrispyWaffle/releases) - [Changelog](https://github.com/guibranco/CrispyWaffle/blob/main/docs/changelog.md) - [Commits](https://github.com/guibranco/CrispyWaffle/compare/v9.1.136...v9.1.165) Updates `Newtonsoft.Json` from 13.0.3 to 13.0.3 - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.3...13.0.3) --- updated-dependencies: - dependency-name: CrispyWaffle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update deep-source.yml * Update and rename csharp-linter.yml to linter.yml * Update build-merge-tool.yml * Update BancosBrasileiros.MergeTool.csproj * Update BancosBrasileiros.MergeTool.Tests.csproj --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Guilherme Branco Stracini --- .github/workflows/build-merge-tool.yml | 7 ++----- .github/workflows/deep-source.yml | 7 +------ .github/workflows/{csharp-linter.yml => linter.yml} | 13 ++++--------- .../BancosBrasileiros.MergeTool.csproj | 4 ++-- .../BancosBrasileiros.MergeTool.Tests.csproj | 2 +- 5 files changed, 10 insertions(+), 23 deletions(-) rename .github/workflows/{csharp-linter.yml => linter.yml} (71%) diff --git a/.github/workflows/build-merge-tool.yml b/.github/workflows/build-merge-tool.yml index 04765db..e515b9e 100644 --- a/.github/workflows/build-merge-tool.yml +++ b/.github/workflows/build-merge-tool.yml @@ -1,4 +1,4 @@ -name: Build MergeTool +name: Build on: push: @@ -7,9 +7,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - -env: - DOTNET_VERSION: '8.0.x' jobs: build: @@ -23,7 +20,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + dotnet-version: '9.0.x' - name: Dotnet restore run: dotnet restore diff --git a/.github/workflows/deep-source.yml b/.github/workflows/deep-source.yml index e422c16..352a7ed 100644 --- a/.github/workflows/deep-source.yml +++ b/.github/workflows/deep-source.yml @@ -6,8 +6,6 @@ on: - main pull_request: types: [opened, synchronize, reopened] - pull_request_target: - types: [opened, synchronize, reopened] jobs: DeepSource: @@ -24,16 +22,13 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build and analyze if: >- ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository - ) || ( - github.event_name == 'pull_request_target' && - github.event.pull_request.head.repo.full_name != github.repository ) || ( github.event_name == 'workflow_dispatch' ) diff --git a/.github/workflows/csharp-linter.yml b/.github/workflows/linter.yml similarity index 71% rename from .github/workflows/csharp-linter.yml rename to .github/workflows/linter.yml index 5255c1a..9aeb30b 100644 --- a/.github/workflows/csharp-linter.yml +++ b/.github/workflows/linter.yml @@ -1,29 +1,24 @@ -name: CSharp Linting +name: Linter check on: - push: workflow_dispatch: - -env: - DOTNET_VERSION: '8.0.x' + pull_request: jobs: linter-check: runs-on: ubuntu-latest steps: - + - name: Checkout repo uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v4 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} - name: Dotnet restore run: dotnet tool restore - - name: Csharpier format check + - name: CSharpier format check run: | dotnet csharpier . --check echo "run 'dotnet build' to fix the formatting of the code automatically" diff --git a/BancosBrasileiros.MergeTool/BancosBrasileiros.MergeTool.csproj b/BancosBrasileiros.MergeTool/BancosBrasileiros.MergeTool.csproj index e3b894c..f7248f8 100644 --- a/BancosBrasileiros.MergeTool/BancosBrasileiros.MergeTool.csproj +++ b/BancosBrasileiros.MergeTool/BancosBrasileiros.MergeTool.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 Guilherme Branco Stracini ME Guilherme Branco Stracini @@ -12,7 +12,7 @@ - + diff --git a/Tests/BancosBrasileiros.MergeTool.Tests/BancosBrasileiros.MergeTool.Tests.csproj b/Tests/BancosBrasileiros.MergeTool.Tests/BancosBrasileiros.MergeTool.Tests.csproj index 88a1db0..a28ffb1 100644 --- a/Tests/BancosBrasileiros.MergeTool.Tests/BancosBrasileiros.MergeTool.Tests.csproj +++ b/Tests/BancosBrasileiros.MergeTool.Tests/BancosBrasileiros.MergeTool.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0