From 3dacf1b93f0d6e63ab2d8a6a5b545ff7a7fb6b3b Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Thu, 3 Sep 2026 18:41:49 +0100 Subject: [PATCH 1/2] fix: add missing IncludeAssets to NuGet package references FunFair.BuildCheck's MustHaveIncludeAssetsOnPackageReference policy requires every direct PackageReference to declare IncludeAssets. Pre-existing on main; found while running the mandatory pre-work buildcheck as part of #352. Claude-Session: https://claude.ai/code/session_01MbBmudQ42gXgD9n3xVTYsJ --- CHANGELOG.md | 3 +++ .../BuildBot.CloudFormation.Tests.csproj | 6 ++--- .../BuildBot.CloudFormation.csproj | 4 ++-- .../BuildBot.Discord.Tests.csproj | 8 +++---- src/BuildBot.Discord/BuildBot.Discord.csproj | 6 ++--- .../BuildBot.GitHub.Tests.csproj | 8 +++---- .../BuildBot.Health.Tests.csproj | 6 ++--- src/BuildBot.Health/BuildBot.Health.csproj | 2 +- .../BuildBot.Json.Tests.csproj | 6 ++--- .../BuildBot.ServiceModel.Tests.csproj | 6 ++--- .../BuildBot.ServiceModel.csproj | 4 ++-- src/BuildBot.Tests/BuildBot.Tests.csproj | 8 +++---- .../BuildBot.Watchtower.Tests.csproj | 6 ++--- src/BuildBot/BuildBot.csproj | 22 +++++++++---------- 14 files changed, 49 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529e4348..cbe2d9d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Made DiscordChannelAdapter testable by accepting ITextChannel instead of the sealed SocketTextChannel, and added unit tests - Guard against IndexOutOfRangeException when Branches list is empty in GithubStatusNotificationHandler - Fixed CS0433 ambiguous xunit type conflict in test projects caused by FunFair.Test.Common now depending on the AOT-flavoured xunit v3 packages, by switching test projects to the matching xunit.v3.aot.mtp-v2 runner package +- Added missing IncludeAssets on NuGet package references required by FunFair.BuildCheck ### Changed - Dependencies - Updated NSubstitute.Analyzers.CSharp to 1.0.17 - Switched to use minimal APIs @@ -76,9 +77,11 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release ### Deprecated ### Removed ### Deployment Changes + + ## [1.4.48] - 2023-12-22 ### Changed - Dependencies - Updated SmartAnalyzers.CSharpExtensions.Annotations to 4.2.9 diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj index 91bdb13b..666ab386 100644 --- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj +++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj @@ -44,9 +44,9 @@ - - - + + + diff --git a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj index 21c6a656..047d3f2b 100644 --- a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj +++ b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj @@ -41,8 +41,8 @@ - - + + diff --git a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj index beaee730..6e88b400 100644 --- a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj +++ b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj @@ -44,10 +44,10 @@ - - - - + + + + diff --git a/src/BuildBot.Discord/BuildBot.Discord.csproj b/src/BuildBot.Discord/BuildBot.Discord.csproj index 3424be68..94241d01 100644 --- a/src/BuildBot.Discord/BuildBot.Discord.csproj +++ b/src/BuildBot.Discord/BuildBot.Discord.csproj @@ -49,9 +49,9 @@ - - - + + + diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj index a37524c4..643b3522 100644 --- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj +++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj @@ -44,10 +44,10 @@ - - - - + + + + diff --git a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj index d98bfc62..a9f43dab 100644 --- a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj +++ b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj @@ -44,9 +44,9 @@ - - - + + + diff --git a/src/BuildBot.Health/BuildBot.Health.csproj b/src/BuildBot.Health/BuildBot.Health.csproj index dbc8532a..a059f52e 100644 --- a/src/BuildBot.Health/BuildBot.Health.csproj +++ b/src/BuildBot.Health/BuildBot.Health.csproj @@ -41,7 +41,7 @@ - + diff --git a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj index dffaa595..5b4e741a 100644 --- a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj +++ b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj @@ -44,9 +44,9 @@ - - - + + + diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj index 07c93e55..612eee32 100644 --- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj +++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj @@ -44,9 +44,9 @@ - - - + + + diff --git a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj index 5788dd80..db9a66b7 100644 --- a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj +++ b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj @@ -38,8 +38,8 @@ - - + + diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj index 79257b1d..c717fba7 100644 --- a/src/BuildBot.Tests/BuildBot.Tests.csproj +++ b/src/BuildBot.Tests/BuildBot.Tests.csproj @@ -44,10 +44,10 @@ - - - - + + + + diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj index 739ea505..33547211 100644 --- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj +++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj @@ -44,9 +44,9 @@ - - - + + + diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index 4e788a0d..36fc7ad3 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -81,17 +81,17 @@ - - - - - - - - - - - + + + + + + + + + + + From aa86bdd1efd9f2deef5e362efcc76d7fa5af1fc2 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Thu, 3 Sep 2026 18:45:56 +0100 Subject: [PATCH 2/2] fix: remove Scriban 6.2.0 NuGet audit suppressions Mediator.SourceGenerator was bumped to 3.0.2, whose nuspec no longer depends on Scriban, so the transitive dependency that triggered the NU1902/NU1903 audit warnings is gone. Verified with a clean restore and build: 0 warnings/errors, and Scriban does not appear in any project's restored project.assets.json. Closes funfair-tech/BuildBot#352 Claude-Session: https://claude.ai/code/session_01MbBmudQ42gXgD9n3xVTYsJ --- CHANGELOG.md | 2 +- src/BuildBot.Discord/BuildBot.Discord.csproj | 8 -------- src/BuildBot/BuildBot.csproj | 16 ---------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbe2d9d8..88b5ccda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - BuildBot.Discord.Tests: Added unit tests to increase code coverage to 100% - BotService null-guard branch coverage test ### Fixed -- Suppress known Scriban 6.2.0 vulnerabilities pending upgrade - SnsMessage: Token property was never populated from the constructor argument - Added null guards for botMessageChannel and botReleaseMessageChannel parameters in BotService constructor - Pass ILogger to HealthCheckClient.ExecuteAsync to match new API in Credfeto.Docker.HealthCheck.Http.Client 0.0.72.928 @@ -76,6 +75,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Dependencies - Updated Meziantou.Analyzer to 3.0.203 ### Deprecated ### Removed +- Removed NuGet audit suppressions for Scriban 6.2.0 vulnerabilities now that the transitive dependency has been dropped ### Deployment Changes - - - - - - diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index 36fc7ad3..d956c89b 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -115,20 +115,4 @@ - - - - - - - - - - - - - - - -