From 55848942e817d5ba55474c4b1850c4392cea9540 Mon Sep 17 00:00:00 2001 From: mnbuhl Date: Tue, 5 May 2026 17:13:43 +0200 Subject: [PATCH] build: add csharpier tooling --- .config/dotnet-tools.json | 10 +++++++ .csharpierignore | 2 ++ .github/workflows/verify.yml | 26 ++++++++++++++++--- .../Storage/EntityFrameworkCoreStorage.cs | 3 +-- .../EntityFrameworkCoreStorageTests.cs | 5 +++- 5 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 .config/dotnet-tools.json create mode 100644 .csharpierignore diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..eddf8a0 --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,10 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "csharpier": { + "version": "1.2.6", + "commands": ["csharpier"] + } + } +} diff --git a/.csharpierignore b/.csharpierignore new file mode 100644 index 0000000..2d5cd8c --- /dev/null +++ b/.csharpierignore @@ -0,0 +1,2 @@ +# EF Core generated migrations and model snapshots. +**/Migrations/** diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index c0464c4..defe2f3 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -2,10 +2,24 @@ on: push: branches: [ main ] - paths: [ 'src/**', 'tests/**' ] + paths: + - 'src/**' + - 'tests/**' + - 'samples/**' + - '.config/dotnet-tools.json' + - '.csharpierrc' + - '.csharpierignore' + - '.github/workflows/verify.yml' pull_request: branches: [ main ] - paths: [ 'src/**', 'tests/**' ] + paths: + - 'src/**' + - 'tests/**' + - 'samples/**' + - '.config/dotnet-tools.json' + - '.csharpierrc' + - '.csharpierignore' + - '.github/workflows/verify.yml' workflow_dispatch: workflow_call: @@ -27,6 +41,12 @@ jobs: cache: true cache-dependency-path: '**/packages.lock.json' + - name: Restore .NET tools + run: dotnet tool restore + + - name: Check formatting + run: dotnet csharpier check . + - name: Restore dependencies run: dotnet restore --locked-mode @@ -60,4 +80,4 @@ jobs: if: github.event_name == 'pull_request' with: recreate: true - path: code-coverage-results.md \ No newline at end of file + path: code-coverage-results.md diff --git a/src/Atomizer.EntityFrameworkCore/Storage/EntityFrameworkCoreStorage.cs b/src/Atomizer.EntityFrameworkCore/Storage/EntityFrameworkCoreStorage.cs index 011f9f6..816c44d 100644 --- a/src/Atomizer.EntityFrameworkCore/Storage/EntityFrameworkCoreStorage.cs +++ b/src/Atomizer.EntityFrameworkCore/Storage/EntityFrameworkCoreStorage.cs @@ -195,8 +195,7 @@ public async Task UpdateJobsAsync(IEnumerable jobs, CancellationTok _dbContext.ChangeTracker.Clear(); var newErrors = new List(); - var jobEntities = jobs - .Select(j => + var jobEntities = jobs.Select(j => { var entity = j.ToEntity(); // Errors loaded via GetDueJobsAsync are always empty (no .Include); any errors diff --git a/tests/Atomizer.EntityFrameworkCore.Tests/Storage/EntityFrameworkCoreStorageTests.cs b/tests/Atomizer.EntityFrameworkCore.Tests/Storage/EntityFrameworkCoreStorageTests.cs index e05c48e..8a9b96b 100644 --- a/tests/Atomizer.EntityFrameworkCore.Tests/Storage/EntityFrameworkCoreStorageTests.cs +++ b/tests/Atomizer.EntityFrameworkCore.Tests/Storage/EntityFrameworkCoreStorageTests.cs @@ -182,7 +182,10 @@ public async Task UpdateJobsAsync_WhenJobHasNewErrors_ShouldPersistErrorsWithout await act.Should().NotThrowAsync(); // Assert — error was persisted - var errors = await dbContext.Set().Where(e => e.JobId == job.Id).ToListAsync(TestContext.Current.CancellationToken); + var errors = await dbContext + .Set() + .Where(e => e.JobId == job.Id) + .ToListAsync(TestContext.Current.CancellationToken); errors.Should().ContainSingle(); errors[0].ErrorMessage.Should().Contain("boom"); }