Skip to content

Commit

Permalink
Bump CrispyWaffle and Newtonsoft.Json (#193)
Browse files Browse the repository at this point in the history
* 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](guibranco/CrispyWaffle@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](JamesNK/Newtonsoft.Json@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] <support@github.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Guilherme Branco Stracini <guilherme@guilhermebranco.com.br>
  • Loading branch information
dependabot[bot] and guibranco authored Jan 7, 2025
1 parent 3327c41 commit 01d6d40
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 23 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build-merge-tool.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build MergeTool
name: Build

on:
push:
Expand All @@ -7,9 +7,6 @@ on:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
DOTNET_VERSION: '8.0.x'

jobs:
build:
Expand All @@ -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
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/deep-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ on:
- main
pull_request:
types: [opened, synchronize, reopened]
pull_request_target:
types: [opened, synchronize, reopened]

jobs:
DeepSource:
Expand All @@ -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'
)
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Company>Guilherme Branco Stracini ME</Company>
<Authors>Guilherme Branco Stracini</Authors>
</PropertyGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CrispyWaffle" Version="9.1.136" />
<PackageReference Include="CrispyWaffle" Version="9.1.165" />
<PackageReference Include="CrispyWaffle.I18n.PtBr" Version="9.1.136" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="PdfPig" Version="0.1.9" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 01d6d40

Please sign in to comment.