Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Dependencies - Updated Microsoft.NET.Test.Sdk to 18.10.0
- Dependencies - Updated AWSSDK to 4.0.102.6
- Dependencies - Updated Meziantou.Analyzer to 3.0.235
- Upgrade all projects to net11.0
- Update Docker base image to net11.0 preview runtime-deps (fixes CVE-2026-45447)
### Deprecated
### Removed
- Removed NuGet audit suppressions for Scriban 6.2.0 vulnerabilities now that the transitive dependency has been dropped
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# chiseled-extra is needed over chiseled for Discord
#FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble-chiseled-extra
FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-preview-noble-chiseled-extra
FROM mcr.microsoft.com/dotnet/runtime-deps:11.0-preview-resolute-chiseled-extra

WORKDIR /usr/src/app

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.CloudFormation\BuildBot.CloudFormation.csproj" />
<ProjectReference Include="../BuildBot.CloudFormation/BuildBot.CloudFormation.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
using BuildBot.CloudFormation;
Expand All @@ -18,7 +19,7 @@ namespace BuildBot.CloudFormation.Tests.Publishers;

public sealed class CloudFormationMessageReceivedNotificationHandlerTests : TestBase
{
private const string ValidArn = "arn:aws:sns:eu-west-1:123:test";
private const string VALID_ARN = "arn:aws:sns:eu-west-1:123:test";

private (
SnsNotificationOptions options,
Expand All @@ -29,7 +30,7 @@ CloudFormationMessageReceivedNotificationHandler handler
) CreateHandler()
{
SnsNotificationOptions options = new(
TopicArn: ValidArn,
TopicArn: VALID_ARN,
Region: "eu-west-1",
AccessKey: "AKIAIOSFODNN7EXAMPLE",
SecretKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
Expand All @@ -52,6 +53,11 @@ CloudFormationMessageReceivedNotificationHandler handler
return (options, extractor, aws, mediator, handler);
}

[SuppressMessage(
category: "Microsoft.IDE",
checkId: "IDE0028",
Justification = "Roslyn's IDE0028 codefix for Dictionary construction with an explicit IEqualityComparer<string> drops the comparer, which then violates MA0002; see https://github.com/dotnet/roslyn/issues/75894"
)]
private static CloudFormationMessageReceived MakeNotification(string topicArn)
{
return new CloudFormationMessageReceived(
Expand Down Expand Up @@ -99,7 +105,7 @@ CloudFormationMessageReceivedNotificationHandler handler

extractor.ExtractDeploymentProperties(Arg.Any<CloudFormationMessageReceived>()).Returns((Deployment?)null);

CloudFormationMessageReceived notification = MakeNotification(ValidArn);
CloudFormationMessageReceived notification = MakeNotification(VALID_ARN);

await handler.Handle(notification: notification, cancellationToken: this.CancellationToken());

Expand All @@ -121,7 +127,7 @@ CloudFormationMessageReceivedNotificationHandler handler
extractor.ExtractDeploymentProperties(Arg.Any<CloudFormationMessageReceived>()).Returns(deployment);
aws.GetStackDetailsAsync(Arg.Any<Deployment>(), Arg.Any<CancellationToken>()).Returns((StackDetails?)null);

CloudFormationMessageReceived notification = MakeNotification(ValidArn);
CloudFormationMessageReceived notification = MakeNotification(VALID_ARN);

await handler.Handle(notification: notification, cancellationToken: this.CancellationToken());

Expand All @@ -144,7 +150,7 @@ CloudFormationMessageReceivedNotificationHandler handler
aws.GetStackDetailsAsync(Arg.Any<Deployment>(), Arg.Any<CancellationToken>())
.Returns(new StackDetails(Description: "A deployment", Version: "1.0.0"));

CloudFormationMessageReceived notification = MakeNotification(ValidArn);
CloudFormationMessageReceived notification = MakeNotification(VALID_ARN);

await handler.Handle(notification: notification, cancellationToken: this.CancellationToken());

Expand Down Expand Up @@ -173,7 +179,7 @@ CloudFormationMessageReceivedNotificationHandler handler
extractor.ExtractDeploymentProperties(Arg.Any<CloudFormationMessageReceived>()).Returns(deployment);
aws.GetStackDetailsAsync(Arg.Any<Deployment>(), Arg.Any<CancellationToken>()).Returns((StackDetails?)null);

CloudFormationMessageReceived notification = MakeNotification(ValidArn);
CloudFormationMessageReceived notification = MakeNotification(VALID_ARN);

await handler.Handle(notification: notification, cancellationToken: this.CancellationToken());

Expand Down Expand Up @@ -203,7 +209,7 @@ CloudFormationMessageReceivedNotificationHandler handler
aws.GetStackDetailsAsync(Arg.Any<Deployment>(), Arg.Any<CancellationToken>())
.Returns(new StackDetails(Description: "A deployment", Version: "2.0.0"));

CloudFormationMessageReceived notification = MakeNotification(ValidArn);
CloudFormationMessageReceived notification = MakeNotification(VALID_ARN);

await handler.Handle(notification: notification, cancellationToken: this.CancellationToken());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace BuildBot.CloudFormation.Tests.Publishers;

public sealed class CloudFormationSubscriptionConfirmationNotificationHandlerTests : TestBase
{
private const string ValidArn = "arn:aws:sns:eu-west-1:123:test";
private const string VALID_ARN = "arn:aws:sns:eu-west-1:123:test";

private (
SnsNotificationOptions options,
Expand All @@ -26,7 +26,7 @@ CloudFormationSubscriptionConfirmationNotificationHandler handler
) CreateHandler()
{
SnsNotificationOptions options = new(
TopicArn: ValidArn,
TopicArn: VALID_ARN,
Region: "eu-west-1",
AccessKey: "AKIAIOSFODNN7EXAMPLE",
SecretKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
Expand Down Expand Up @@ -99,7 +99,7 @@ CloudFormationSubscriptionConfirmationNotificationHandler handler
.Returns(httpClient);

CloudFormationSubscriptionConfirmation notification = new(
TopicArn: ValidArn,
TopicArn: VALID_ARN,
SubscribeUrl: new Uri("https://test.example.com/subscribe")
);

Expand Down Expand Up @@ -137,7 +137,7 @@ CloudFormationSubscriptionConfirmationNotificationHandler handler
.Returns(httpClient);

CloudFormationSubscriptionConfirmation notification = new(
TopicArn: ValidArn,
TopicArn: VALID_ARN,
SubscribeUrl: new Uri("https://test.example.com/subscribe")
);

Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand All @@ -38,7 +38,7 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BuildBot.Discord\BuildBot.Discord.csproj" />
<ProjectReference Include="../BuildBot.Discord/BuildBot.Discord.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.CloudFormation" Version="4.0.102.6" IncludeAssets="compile;runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.Discord\BuildBot.Discord.csproj" />
<ProjectReference Include="../BuildBot.Discord/BuildBot.Discord.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
5 changes: 2 additions & 3 deletions src/BuildBot.Discord/BuildBot.Discord.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand All @@ -38,12 +38,11 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BuildBot.ServiceModel\BuildBot.ServiceModel.csproj" />
<ProjectReference Include="../BuildBot.ServiceModel/BuildBot.ServiceModel.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Discord.Net" Version="3.20.1" IncludeAssets="compile;runtime" />
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" IncludeAssets="compile;runtime" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" IncludeAssets="compile;runtime" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" ExcludeAssets="runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.GitHub\BuildBot.GitHub.csproj" />
<ProjectReference Include="../BuildBot.GitHub/BuildBot.GitHub.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.GitHub/BuildBot.GitHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand All @@ -38,7 +38,7 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BuildBot.Discord\BuildBot.Discord.csproj" />
<ProjectReference Include="../BuildBot.Discord/BuildBot.Discord.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" ExcludeAssets="runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.Health\BuildBot.Health.csproj" />
<ProjectReference Include="../BuildBot.Health/BuildBot.Health.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Health/BuildBot.Health.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand All @@ -38,7 +38,7 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BuildBot.ServiceModel\BuildBot.ServiceModel.csproj" />
<ProjectReference Include="../BuildBot.ServiceModel/BuildBot.ServiceModel.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" IncludeAssets="compile;runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.Json\BuildBot.Json.csproj" />
<ProjectReference Include="../BuildBot.Json/BuildBot.Json.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Json/BuildBot.Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand All @@ -38,7 +38,7 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BuildBot.ServiceModel\BuildBot.ServiceModel.csproj" />
<ProjectReference Include="../BuildBot.ServiceModel/BuildBot.ServiceModel.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" ExcludeAssets="runtime" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.ServiceModel\BuildBot.ServiceModel.csproj" />
<ProjectReference Include="../BuildBot.ServiceModel/BuildBot.ServiceModel.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
2 changes: 1 addition & 1 deletion src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Library</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
<TreatSpecificWarningsAsErrors />
Expand Down
4 changes: 2 additions & 2 deletions src/BuildBot.Tests/BuildBot.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.Json\BuildBot.Json.csproj" />
<ProjectReference Include="../BuildBot.Json/BuildBot.Json.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<RunAOTCompilation>false</RunAOTCompilation>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
<TieredCompilation>true</TieredCompilation>
<TieredPGO>true</TieredPGO>
Expand All @@ -41,7 +41,7 @@
</PropertyGroup>
<Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')" />
<ItemGroup>
<ProjectReference Include="..\BuildBot.Watchtower\BuildBot.Watchtower.csproj" />
<ProjectReference Include="../BuildBot.Watchtower/BuildBot.Watchtower.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FunFair.Test.Common" Version="6.4.5.2739" IncludeAssets="compile;runtime" />
Expand Down
Loading
Loading