From 6da2dda7687ec3d9eba04d2bf97d6ddfdbe3129f Mon Sep 17 00:00:00 2001 From: Sathvik Kumar Date: Tue, 14 Apr 2026 11:21:23 +1000 Subject: [PATCH 1/5] Update to Nuke fork --- NuGet.Config | 2 ++ build/Build.cs | 2 +- build/GlobalUsings.cs | 1 + build/_build.csproj | 3 ++- credits/credits.md | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index aac9575c70..d1be0a0f2e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -22,6 +22,8 @@ + + diff --git a/build/Build.cs b/build/Build.cs index 83ac683419..7cda59f378 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -13,7 +13,7 @@ partial class Build : NukeBuild { [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release; - [Required] readonly Solution Solution = SolutionModelTasks.ParseSolution(KnownPaths.SourceDirectory / "Calamari.sln"); + [Solution] readonly Solution Solution = null!; [Parameter] readonly DotNetVerbosity BuildVerbosity = DotNetVerbosity.minimal; diff --git a/build/GlobalUsings.cs b/build/GlobalUsings.cs index 595f5ca621..b6923270eb 100644 --- a/build/GlobalUsings.cs +++ b/build/GlobalUsings.cs @@ -4,6 +4,7 @@ global using System.Threading.Tasks; global using Nuke.Common; global using Nuke.Common.IO; +global using Nuke.Common.ProjectModel; global using Nuke.Common.Tools.DotNet; global using Nuke.Common.CI.TeamCity; global using Serilog; diff --git a/build/_build.csproj b/build/_build.csproj index 055e60b9fe..01902949d1 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -6,6 +6,7 @@ win-x64;linux-x64 Calamari.Build CS0649;CS0169 + true .. .. 1 @@ -28,7 +29,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/credits/credits.md b/credits/credits.md index de4981be08..472438fe44 100644 --- a/credits/credits.md +++ b/credits/credits.md @@ -47,7 +47,7 @@ Calamari is made possible thanks to the following great third-party products. | NuGet.Commands | Microsoft | [https://aka.ms/nugetprj](https://aka.ms/nugetprj) | [Apache-2.0](https://www.nuget.org/packages/NuGet.Commands/5.11.5/license) | | NuGet.Core | Outercurve Foundation | [https://github.com/NuGet/NuGet2](https://github.com/NuGet/NuGet2) | [Apache-2.0](https://raw.githubusercontent.com/NuGet/NuGet2/master/LICENSE.txt) | | NuGet.Versioning | Microsoft | [https://aka.ms/nugetprj](https://aka.ms/nugetprj) | [Apache-2.0](https://www.nuget.org/packages/NuGet.Versioning/5.11.6/license) | -| Nuke.Common | Matthias Koch, Ulrich Buchgraber, Sebastian Karasek | [https://nuke.build/](https://nuke.build/) | [MIT](https://www.nuget.org/packages/Nuke.Common/7.0.6/license) | +| Octopus.Nuke.Common | Fork of Nuke by Matthias Koch, Ulrich Buchgraber, Sebastian Karasek | [https://nuke.build/](https://nuke.build/) | [MIT](https://www.nuget.org/packages/Nuke.Common/7.0.6/license) | | Octopus.CoreUtilities | Octopus Deploy | [https://github.com/OctopusDeploy/CoreUtilities](https://github.com/OctopusDeploy/CoreUtilities) | [Apache-2.0](https://licenses.nuget.org/Apache-2.0) | | Octopus.Data | Octopus Deploy | [https://github.com/OctopusDeploy/Data](https://github.com/OctopusDeploy/Data) | [Apache-2.0](https://licenses.nuget.org/Apache-2.0) | | Octopus.Octodiff | Octopus Deploy | [https://github.com/OctopusDeploy/Octodiff](https://github.com/OctopusDeploy/Octodiff) | [Apache-2.0](https://www.nuget.org/packages/Octopus.Octodiff/2.0.547/license) | From f5e3a845deb172546eeb68be66e451cf86a2afe1 Mon Sep 17 00:00:00 2001 From: Sathvik Kumar Date: Tue, 14 Apr 2026 11:43:13 +1000 Subject: [PATCH 2/5] Add temp nuget logging --- build.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.ps1 b/build.ps1 index a7ae09dc9f..09a981a437 100644 --- a/build.ps1 +++ b/build.ps1 @@ -95,5 +95,14 @@ else { Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)" +Write-Output "=== NuGet Diagnostics ===" +Write-Output "--- NuGet Config Files ---" +& $env:DOTNET_EXE nuget config paths +Write-Output "--- Package Sources ---" +& $env:DOTNET_EXE nuget list source +Write-Output "--- Restore with detailed verbosity ---" +& $env:DOTNET_EXE restore $BuildProjectFile --verbosity detailed 2>&1 | Select-String -Pattern "source|mapping|feedz|Octopus.Nuke|NU1" | ForEach-Object { Write-Output $_ } +Write-Output "=== End NuGet Diagnostics ===" + ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet } ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments } From 098b8486f13e040aa4427747baffdbfcf6208cb2 Mon Sep 17 00:00:00 2001 From: Sathvik Kumar Date: Tue, 14 Apr 2026 11:55:43 +1000 Subject: [PATCH 3/5] Clear package sources --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index d1be0a0f2e..8815d85a30 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,6 +1,7 @@  + From 73f6159b4e5196e0b376c82f76f8482fda3c885c Mon Sep 17 00:00:00 2001 From: Sathvik Kumar Date: Tue, 14 Apr 2026 12:07:38 +1000 Subject: [PATCH 4/5] Remove Nuke only nuget config --- NuGet.Config | 1 - build/NuGet.Config | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 build/NuGet.Config diff --git a/NuGet.Config b/NuGet.Config index 8815d85a30..e4e4038661 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -23,7 +23,6 @@ - diff --git a/build/NuGet.Config b/build/NuGet.Config deleted file mode 100644 index 6c64cb618e..0000000000 --- a/build/NuGet.Config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - From 0d3fa77f74f29be591c54526c243c5c8af13103f Mon Sep 17 00:00:00 2001 From: Sathvik Kumar Date: Tue, 14 Apr 2026 12:55:48 +1000 Subject: [PATCH 5/5] Remove temp logging --- build.ps1 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build.ps1 b/build.ps1 index 09a981a437..a7ae09dc9f 100644 --- a/build.ps1 +++ b/build.ps1 @@ -95,14 +95,5 @@ else { Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)" -Write-Output "=== NuGet Diagnostics ===" -Write-Output "--- NuGet Config Files ---" -& $env:DOTNET_EXE nuget config paths -Write-Output "--- Package Sources ---" -& $env:DOTNET_EXE nuget list source -Write-Output "--- Restore with detailed verbosity ---" -& $env:DOTNET_EXE restore $BuildProjectFile --verbosity detailed 2>&1 | Select-String -Pattern "source|mapping|feedz|Octopus.Nuke|NU1" | ForEach-Object { Write-Output $_ } -Write-Output "=== End NuGet Diagnostics ===" - ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet } ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }