Skip to content

Fix #192 fallout: per-TFM DI.Abstractions alignment + S2077 pragma #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chris-Wolfgang merged 3 commits into from
Jul 5, 2026
Merged

Fix #192 fallout: per-TFM DI.Abstractions alignment + S2077 pragma #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78382f1
Restore per-TFM DI.Abstractions alignment broken by #192
Chris-Wolfgang Jul 5, 2026
e9593dc
Suppress S2077 on the schema-installer DROP statements
Chris-Wolfgang Jul 5, 2026
43a7d62
Suppress S2077 on benchmark reset DELETEs too
Chris-Wolfgang Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...marks/Wolfgang.AuditTrail.EntityFrameworkCore.Benchmarks/ProviderSaveChangesBenchmarks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ private void TruncateAllTables()
BenchmarkProvider.PostgreSQL => "\"AuditHeader\"",
_ => "AuditHeader",
};
#pragma warning disable EF1002 // Static SQL with no user input.
#pragma warning disable EF1002, S2077 // Static SQL, table names are hardcoded provider literals with no user input.
ctx.Database.ExecuteSqlRaw($"DELETE FROM {detailTable}");
ctx.Database.ExecuteSqlRaw($"DELETE FROM {headerTable}");
ctx.Database.ExecuteSqlRaw($"DELETE FROM {customerTable}");
#pragma warning restore EF1002
#pragma warning restore EF1002, S2077
}


Expand Down
4 changes: 2 additions & 2 deletions src/Wolfgang.AuditTrail.EntityFrameworkCore/Schema/AuditSchemaInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ public async Task DropTablesAsync(DbContext context, CancellationToken cancellat
var detailFqn = QuoteIdentifier(context.Database.ProviderName, schema, detailTable);
var headerFqn = QuoteIdentifier(context.Database.ProviderName, schema, headerTable);

#pragma warning disable EF1002 // Identifiers validated + provider-quoted above; values come from AuditOptions, not user input.
#pragma warning disable EF1002, S2077 // Identifiers validated + provider-quoted above; values come from AuditOptions, not user input. DDL identifiers cannot be parameterized.
await context.Database
.ExecuteSqlRawAsync($"DROP TABLE IF EXISTS {detailFqn}", cancellationToken)
.ConfigureAwait(false);

await context.Database
.ExecuteSqlRawAsync($"DROP TABLE IF EXISTS {headerFqn}", cancellationToken)
.ConfigureAwait(false);
#pragma warning restore EF1002
#pragma warning restore EF1002, S2077
}


Expand Down
4 changes: 2 additions & 2 deletions src/Wolfgang.AuditTrail.EntityFrameworkCore/Wolfgang.AuditTrail.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
6.0.x versions transitively pull a vulnerable Microsoft.Extensions.Caching.Memory.
-->
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
Expand Down
Loading