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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Dependencies - Updated Microsoft.Extensions to 10.0.13
- Dependencies - Updated Microsoft.NET.Test.Sdk to 18.11.0
- Dependencies - Updated Meziantou.Analyzer to 3.0.317
- BuildBot is published trimmed and as a native AOT binary with InvariantGlobalization enabled, and the Docker image uses the plain chiseled runtime-deps base; unused System.Reactive and System.Interactive.Async packages and Serilog.Enrichers.Demystifier are removed, and buildcheck configuration binding generator properties are fixed (#430)
### Deprecated
### Removed
- Removed NuGet audit suppressions for Scriban 6.2.0 vulnerabilities now that the transitive dependency has been dropped
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# chiseled-extra is needed over chiseled for ICU, as globalization invariant mode is disabled
# plain chiseled is sufficient: globalization invariant mode is enabled (no ICU needed) and no timezone APIs are used (no tzdata needed)
#FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble-chiseled-extra
FROM mcr.microsoft.com/dotnet/runtime-deps:11.0-resolute-chiseled-extra
FROM mcr.microsoft.com/dotnet/runtime-deps:11.0-resolute-chiseled

WORKDIR /usr/src/app

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Discord/BuildBot.Discord.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.GitHub/BuildBot.GitHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Health/BuildBot.Health.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Json/BuildBot.Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
5 changes: 0 additions & 5 deletions src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down Expand Up @@ -37,10 +36,6 @@
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Interactive.Async" Version="7.0.1" IncludeAssets="compile;runtime" />
<PackageReference Include="System.Reactive" Version="7.0.0" IncludeAssets="compile;runtime;analyzers" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="codecracker.CSharp" Version="1.1.0" PrivateAssets="All" ExcludeAssets="runtime" />
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Tests/BuildBot.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
1 change: 0 additions & 1 deletion src/BuildBot.Watchtower/BuildBot.Watchtower.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DebuggerSupport>true</DebuggerSupport>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
9 changes: 4 additions & 5 deletions src/BuildBot/BuildBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<DebuggerSupport>true</DebuggerSupport>
<Description>BuildBot</Description>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
Expand All @@ -17,7 +17,7 @@
<IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
<IlcOptimizationPreference>Size</IlcOptimizationPreference>
<ImplicitUsings>disable</ImplicitUsings>
<InvariantGlobalization>false</InvariantGlobalization>
<InvariantGlobalization>true</InvariantGlobalization>
<IsPackable>false</IsPackable>
<IsPublishable>true</IsPublishable>
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
Expand All @@ -33,8 +33,8 @@
<OptimizationPreference>speed</OptimizationPreference>
<OutputType>Exe</OutputType>
<PackageTags>FunFair BuildBot</PackageTags>
<PublishAot>false</PublishAot>
<PublishTrimmed>false</PublishTrimmed>
<PublishAot>true</PublishAot>
<PublishTrimmed>true</PublishTrimmed>
<RepositoryUrl>https://github.com/funfair-tech/BuildBot</RepositoryUrl>
<RunAOTCompilation>false</RunAOTCompilation>
<RuntimeIdentifiers>win-x64;win-arm64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
Expand Down Expand Up @@ -85,7 +85,6 @@
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="10.0.13" IncludeAssets="compile;runtime" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.13" IncludeAssets="compile;runtime" />
<PackageReference Include="Serilog" Version="4.4.0" IncludeAssets="compile;runtime;build;buildTransitive" />
<PackageReference Include="Serilog.Enrichers.Demystifier" Version="1.0.3" IncludeAssets="compile;runtime" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" IncludeAssets="compile;runtime" />
<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" IncludeAssets="compile;runtime" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" IncludeAssets="compile;runtime" />
Expand Down
6 changes: 0 additions & 6 deletions src/BuildBot/Helpers/ServerStartup.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Net;
using System.Threading;
Expand Down Expand Up @@ -59,10 +58,6 @@ public static WebApplication CreateApp(string[] args)
const int h2Port = 0;
WebApplicationBuilder builder = WebApplication.CreateSlimBuilder(args);

Console.WriteLine("Validating cultures are working....");
CultureInfo culture = CultureInfo.GetCultureInfo("en-US");
Console.WriteLine($"Test Culture: {culture.Name}");

string configPath = ApplicationConfigLocator.ConfigurationFilesPath;

IConfigurationRoot config = LoadConfiguration(configPath);
Expand Down Expand Up @@ -124,7 +119,6 @@ private static void ConfigureLogging(ILoggingBuilder logger)
private static Logger CreateLogger()
{
return new LoggerConfiguration()
.Enrich.WithDemystifiedStackTraces()
.Enrich.FromLogContext()
.Enrich.WithMachineName()
.Enrich.WithProcessId()
Expand Down
1 change: 0 additions & 1 deletion src/publish
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ echo "Clear $OUTFOLDER" \
"-p:IsProduction=True" \
"-p:NoWarn=NETSDK1179" \
"-p:Optimize=true" \
"-p:PublishAot=false" \
"-p:PublishReadyToRun=False" \
"-p:PublishReadyToRunShowWarnings=True" \
"-p:PublishSingleFile=true" \
Expand Down
Loading