From ecce847e591560fc7ca70ff8fbffd06533e47898 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Sat, 19 Sep 2026 01:42:14 +0000 Subject: [PATCH 1/2] [Dependencies] Updating Microsoft.Sbom.Targets (Software Bill Of Materials) to 4.1.12 --- CHANGELOG.md | 2 +- src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj | 2 +- src/BuildBot.Discord/BuildBot.Discord.csproj | 2 +- src/BuildBot.GitHub/BuildBot.GitHub.csproj | 2 +- src/BuildBot.Health/BuildBot.Health.csproj | 2 +- src/BuildBot.Json/BuildBot.Json.csproj | 2 +- src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj | 2 +- src/BuildBot.Watchtower/BuildBot.Watchtower.csproj | 2 +- src/BuildBot/BuildBot.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e21d7b8b..a1820066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Dependencies - Updated CSharpier.MSBuild to 1.0.0 - Dependencies - Updated Serilog.Sinks.Console to 6.1.1 - Dependencies - Updated Serilog.Extensions.Logging to 10.0.0 -- Dependencies - Updated Microsoft.Sbom.Targets to 4.1.5 - Dependencies - Updated AsyncFixer to 2.1.0 - Dependencies - Updated Figgle to 0.6.6 - Dependencies - Updated Discord.Net to 3.19.1 @@ -77,6 +76,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Dependencies - Updated AWSSDK to 4.0.102.7 - Dependencies - Updated Meziantou.Analyzer to 3.0.259 - Dependencies - Updated Microsoft.NET.Test.Sdk to 18.10.1 +- Dependencies - Updated Microsoft.Sbom.Targets to 4.1.12 ### Deprecated ### Removed - Removed NuGet audit suppressions for Scriban 6.2.0 vulnerabilities now that the transitive dependency has been dropped diff --git a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj index d485d9f8..125422dd 100644 --- a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj +++ b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj @@ -51,7 +51,7 @@ - + diff --git a/src/BuildBot.Discord/BuildBot.Discord.csproj b/src/BuildBot.Discord/BuildBot.Discord.csproj index 239b5897..dddc6691 100644 --- a/src/BuildBot.Discord/BuildBot.Discord.csproj +++ b/src/BuildBot.Discord/BuildBot.Discord.csproj @@ -51,7 +51,7 @@ - + diff --git a/src/BuildBot.GitHub/BuildBot.GitHub.csproj b/src/BuildBot.GitHub/BuildBot.GitHub.csproj index 15d3c77a..4d8f2bc2 100644 --- a/src/BuildBot.GitHub/BuildBot.GitHub.csproj +++ b/src/BuildBot.GitHub/BuildBot.GitHub.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/BuildBot.Health/BuildBot.Health.csproj b/src/BuildBot.Health/BuildBot.Health.csproj index 2a398e66..b2f1c609 100644 --- a/src/BuildBot.Health/BuildBot.Health.csproj +++ b/src/BuildBot.Health/BuildBot.Health.csproj @@ -50,7 +50,7 @@ - + diff --git a/src/BuildBot.Json/BuildBot.Json.csproj b/src/BuildBot.Json/BuildBot.Json.csproj index b6e52369..4d83369b 100644 --- a/src/BuildBot.Json/BuildBot.Json.csproj +++ b/src/BuildBot.Json/BuildBot.Json.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj index 03298d96..5319eddb 100644 --- a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj +++ b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj index 15d3c77a..4d8f2bc2 100644 --- a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj +++ b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index aa53ac3f..d59d514f 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -102,7 +102,7 @@ - + From 24beee4cd59f18e9102dbc637073df6f32bef9b9 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell <273118822+dnyw4l3n13@users.noreply.github.com> Date: Sat, 19 Sep 2026 05:58:03 +0000 Subject: [PATCH 2/2] fix: correct Serilog IncludeAssets to include build and buildTransitive The buildcheck step failed because the Serilog PackageReference was missing build;buildTransitive in IncludeAssets, which the package requires. Prompt: Work on pull request #412 in funfair-tech/BuildBot. --- CHANGELOG.md | 1 + src/BuildBot/BuildBot.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1820066..c3eead44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - 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 - Resolved cfn-lint W1030 warning on the TaskRoleArn CloudFormation property by only setting it when a TaskRole is provided +- Corrected Serilog package reference to include build and buildTransitive assets ### Changed - Dependencies - Updated NSubstitute.Analyzers.CSharp to 1.0.17 - Switched to use minimal APIs diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index d59d514f..9f62851f 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -84,7 +84,7 @@ - +