From e02166489d9e4ecee6838d553202728abbc49444 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Mon, 22 Jun 2026 17:46:42 +0000 Subject: [PATCH 1/2] [Dependencies] Updating FunFair.CodeAnalysis (Code analysis) to 7.2.1.2035 --- CHANGELOG.md | 5 +++++ .../BuildBot.CloudFormation.Tests.csproj | 2 +- src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj | 2 +- src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj | 2 +- src/BuildBot.Discord/BuildBot.Discord.csproj | 2 +- src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj | 2 +- src/BuildBot.GitHub/BuildBot.GitHub.csproj | 2 +- src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj | 2 +- src/BuildBot.Health/BuildBot.Health.csproj | 2 +- src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj | 2 +- src/BuildBot.Json/BuildBot.Json.csproj | 2 +- .../BuildBot.ServiceModel.Tests.csproj | 2 +- src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj | 2 +- src/BuildBot.Tests/BuildBot.Tests.csproj | 2 +- .../BuildBot.Watchtower.Tests.csproj | 2 +- src/BuildBot.Watchtower/BuildBot.Watchtower.csproj | 2 +- src/BuildBot/BuildBot.csproj | 2 +- 17 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8710bc81..8d2b0d58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,9 +44,14 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Dependencies - Updated Credfeto.Docker.HealthCheck.Http.Client to 0.0.61.659 - Dependencies - Updated Figgle to 0.6.6 - Dependencies - Updated FunFair.CodeAnalysis to 7.1.35.1745 +- Dependencies - Updated AWSSDK to 4.0.8.11 +- Dependencies - Updated Discord.Net to 3.19.1 +- Dependencies - Updated Microsoft.Extensions to 10.0.5 - SDK - Updated DotNet SDK to 10.0.301 - BuildBot.Discord.Tests: Added branch coverage tests for null-title paths in DiscordBot.PublishCommonAsync - Dependencies - Updated Credfeto.Enumeration to 1.2.148.2012 +- Dependencies - Updated Credfeto.Version.Information.Generator to 1.0.130.1322 +- Dependencies - Updated FunFair.CodeAnalysis to 7.2.1.2035 - Dependencies - Updated Microsoft.VisualStudio.Threading.Analyzers to 18.7.23 - Dependencies - Updated Philips.CodeAnalysis.DuplicateCodeAnalyzer to 2.0.0 - Dependencies - Updated Philips.CodeAnalysis.MaintainabilityAnalyzers to 2.0.0 diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj index eb45892c..1538f481 100644 --- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj +++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj index 117e56a2..e68e460a 100644 --- a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj +++ b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj @@ -49,7 +49,7 @@ - + diff --git a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj index 23150169..c7af82ef 100644 --- a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj +++ b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/BuildBot.Discord/BuildBot.Discord.csproj b/src/BuildBot.Discord/BuildBot.Discord.csproj index 0f054f79..5f8c0223 100644 --- a/src/BuildBot.Discord/BuildBot.Discord.csproj +++ b/src/BuildBot.Discord/BuildBot.Discord.csproj @@ -58,7 +58,7 @@ - + diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj index fe84b28c..920eafeb 100644 --- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj +++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/BuildBot.GitHub/BuildBot.GitHub.csproj b/src/BuildBot.GitHub/BuildBot.GitHub.csproj index a676857d..ba3ac418 100644 --- a/src/BuildBot.GitHub/BuildBot.GitHub.csproj +++ b/src/BuildBot.GitHub/BuildBot.GitHub.csproj @@ -45,7 +45,7 @@ - + diff --git a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj index 943b1fda..fb87e47a 100644 --- a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj +++ b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj @@ -53,7 +53,7 @@ - + diff --git a/src/BuildBot.Health/BuildBot.Health.csproj b/src/BuildBot.Health/BuildBot.Health.csproj index d8dccb57..92884c34 100644 --- a/src/BuildBot.Health/BuildBot.Health.csproj +++ b/src/BuildBot.Health/BuildBot.Health.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj index f468d146..3df7866c 100644 --- a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj +++ b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj @@ -53,7 +53,7 @@ - + diff --git a/src/BuildBot.Json/BuildBot.Json.csproj b/src/BuildBot.Json/BuildBot.Json.csproj index 59cc25c7..5311925d 100644 --- a/src/BuildBot.Json/BuildBot.Json.csproj +++ b/src/BuildBot.Json/BuildBot.Json.csproj @@ -45,7 +45,7 @@ - + diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj index 46795633..bb807c53 100644 --- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj +++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj index db7e16de..067cf9c1 100644 --- a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj +++ b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj index e37ba265..8ba4a902 100644 --- a/src/BuildBot.Tests/BuildBot.Tests.csproj +++ b/src/BuildBot.Tests/BuildBot.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj index 60ee9b04..94e6e307 100644 --- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj +++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj index a676857d..ba3ac418 100644 --- a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj +++ b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj @@ -45,7 +45,7 @@ - + diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index 3f9e5ef8..78b2b602 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -99,7 +99,7 @@ - + From ce301cb7ccd7ae28bf2d09825dd9cf8ee34e22c0 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell <273118822+dnyw4l3n13@users.noreply.github.com> Date: Tue, 23 Jun 2026 11:17:50 +0000 Subject: [PATCH 2/2] fix: remove InternalsVisibleTo and make methods public in CloudformationSetup FFS0051 forbids InternalsVisibleTo. The three methods that needed test visibility are now public, removing the need for InternalsVisibleTo.cs. Prompt: Work on pull request #378 in funfair-tech/BuildBot. --- src/BuildBot.CloudFormation/CloudformationSetup.cs | 6 +++--- src/BuildBot.CloudFormation/InternalsVisibleTo.cs | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 src/BuildBot.CloudFormation/InternalsVisibleTo.cs diff --git a/src/BuildBot.CloudFormation/CloudformationSetup.cs b/src/BuildBot.CloudFormation/CloudformationSetup.cs index 5fbf5294..d6df9083 100644 --- a/src/BuildBot.CloudFormation/CloudformationSetup.cs +++ b/src/BuildBot.CloudFormation/CloudformationSetup.cs @@ -56,7 +56,7 @@ private static IServiceCollection AddSubscriptionConfirmationHttpClient(this ISe .Services; } - internal static Task OnRetryAsync( + public static Task OnRetryAsync( DelegateResult delegateResult, TimeSpan timeSpan, int i, @@ -66,7 +66,7 @@ Context context return Task.CompletedTask; } - internal static TimeSpan HandleRetry(int retryCount, DelegateResult response, Context context) + public static TimeSpan HandleRetry(int retryCount, DelegateResult response, Context context) { if ( response.Result is not null @@ -85,7 +85,7 @@ out int seconds return CalculateRetryDelay(retryCount); } - internal static TimeSpan CalculateRetryDelay(int attempts) + public static TimeSpan CalculateRetryDelay(int attempts) { return attempts <= 1 ? TimeSpan.Zero : TimeSpan.FromSeconds(Math.Pow(x: 2, y: attempts)); } diff --git a/src/BuildBot.CloudFormation/InternalsVisibleTo.cs b/src/BuildBot.CloudFormation/InternalsVisibleTo.cs deleted file mode 100644 index 949682fb..00000000 --- a/src/BuildBot.CloudFormation/InternalsVisibleTo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("BuildBot.CloudFormation.Tests")]