From 75f69a4d5c9b25049354950eae855453f0b6518e Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Thu, 25 May 2023 16:05:40 +0000 Subject: [PATCH 1/3] [Dependencies] Updating SonarAnalyzer.CSharp (Code analysis) to 9.1.0.70676 --- CHANGELOG.md | 1 + src/BuildBot.Discord/BuildBot.Discord.csproj | 2 +- src/BuildBot.Json/BuildBot.Json.csproj | 2 +- src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj | 2 +- src/BuildBot.Tests/BuildBot.Tests.csproj | 2 +- src/BuildBot/BuildBot.csproj | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb440ed..36feac76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release ### Fixed ### Changed - Dependencies - Updated Meziantou.Analyzer to 2.0.55 +- Dependencies - Updated SonarAnalyzer.CSharp to 9.1.0.70676 ### Removed ### Deployment Changes diff --git a/src/BuildBot.Discord/BuildBot.Discord.csproj b/src/BuildBot.Discord/BuildBot.Discord.csproj index 76a6d12e..7f8983c3 100644 --- a/src/BuildBot.Discord/BuildBot.Discord.csproj +++ b/src/BuildBot.Discord/BuildBot.Discord.csproj @@ -57,7 +57,7 @@ - + diff --git a/src/BuildBot.Json/BuildBot.Json.csproj b/src/BuildBot.Json/BuildBot.Json.csproj index daff21ae..ecce277c 100644 --- a/src/BuildBot.Json/BuildBot.Json.csproj +++ b/src/BuildBot.Json/BuildBot.Json.csproj @@ -52,7 +52,7 @@ - + diff --git a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj index 7430a689..41b3e0b4 100644 --- a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj +++ b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj @@ -49,7 +49,7 @@ - + diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj index 97ecab79..6597b457 100644 --- a/src/BuildBot.Tests/BuildBot.Tests.csproj +++ b/src/BuildBot.Tests/BuildBot.Tests.csproj @@ -63,7 +63,7 @@ - + diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index cfd3b9f7..45d7056f 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -89,7 +89,7 @@ - + From d86f5d5b2f809e7d101a91f439d09bfc5b4c59d1 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Tue, 30 May 2023 15:14:25 +0100 Subject: [PATCH 2/3] Fixed code analysis issues --- .../Publishers/GitHub/StatusPublisher.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/BuildBot.Discord/Publishers/GitHub/StatusPublisher.cs b/src/BuildBot.Discord/Publishers/GitHub/StatusPublisher.cs index 72b4befc..7ef67594 100644 --- a/src/BuildBot.Discord/Publishers/GitHub/StatusPublisher.cs +++ b/src/BuildBot.Discord/Publishers/GitHub/StatusPublisher.cs @@ -23,13 +23,18 @@ public async Task PublishAsync(Status message, CancellationToken cancellationTok return; } - EmbedBuilder builder = new EmbedBuilder().WithTitle($"{message.Description} for {message.Context} from {message.Repository.Name} ({message.Branches.Last().Name})") - .WithUrl(message.TargetUrl) - .WithDescription($"Built at {message.StatusCommit.Sha}") - .WithColor(GetEmbedColor(message)) - .WithFields(GetFields(message)); + await this._bot.PublishAsync(BuildStatusMessage(message)); + } + + private static EmbedBuilder BuildStatusMessage(Status message) + { + Branch lastBranch = message.Branches[^1]; - await this._bot.PublishAsync(builder); + return new EmbedBuilder().WithTitle($"{message.Description} for {message.Context} from {message.Repository.Name} ({lastBranch.Name})") + .WithUrl(message.TargetUrl) + .WithDescription($"Built at {message.StatusCommit.Sha}") + .WithColor(GetEmbedColor(message)) + .WithFields(GetFields(message)); } private static EmbedFieldBuilder[] GetFields(Status message) From 1906c2853037bf3613eeeb582b9facad6cfee34d Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Tue, 30 May 2023 15:22:14 +0100 Subject: [PATCH 3/3] Removed redundant test --- src/BuildBot.Tests/DecodesOctopusPush.cs | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/BuildBot.Tests/DecodesOctopusPush.cs b/src/BuildBot.Tests/DecodesOctopusPush.cs index 083c3412..ef100063 100644 --- a/src/BuildBot.Tests/DecodesOctopusPush.cs +++ b/src/BuildBot.Tests/DecodesOctopusPush.cs @@ -131,29 +131,6 @@ public DecodesOctopusPush(ITestOutputHelper output) private static JsonSerializerOptions SerializerOptionsWithContext { get; } = JsonSerialiser.Configure(new()); - [Fact] - [SuppressMessage(category: "Philips.CodeAnalysis.DuplicateCodeAnalyzer", checkId: "PH2071:DuplicateCodeDetection", Justification = "Test code")] - public void Decode() - { - Deploy packet = AssertReallyNotNull(JsonSerializer.Deserialize(json: OCTOPUS_PUSH, options: SerializerOptions)); - - Assert.Equal(expected: "SubscriptionPayload", actual: packet.EventType); - Assert.Equal(expected: "https://octopus.funfair.io", actual: packet.Payload?.ServerUri); - Assert.Equal(expected: "Spaces-1", actual: packet.Payload?.Event?.SpaceId); - Assert.Equal(new[] - { - "Deployments-84781", - "Projects-825", - "Releases-81092", - "Environments-2", - "ServerTasks-197738", - "Channels-1070" - }, - actual: packet.Payload?.Event?.RelatedDocumentIds); - - Assert.Equal(expected: "DeploymentSucceeded", actual: packet.Payload?.Event?.Category); - } - [Fact] [SuppressMessage(category: "Philips.CodeAnalysis.DuplicateCodeAnalyzer", checkId: "PH2071:DuplicateCodeDetection", Justification = "Test code")] public void DecodeOpt()