From 9814d63f071ba407dd3464c23e37c6597b84d9bb Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 27 Sep 2022 20:51:12 +0100
Subject: [PATCH] Revert "update nuke."

This reverts commit 3feb132de94c82ce73a8a8977e9ba495008962ae.
---
 nukebuild/Build.cs              | 6 ++----
 nukebuild/BuildParameters.cs    | 4 ++--
 nukebuild/DotNetConfigHelper.cs | 4 ++--
 nukebuild/_build.csproj         | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index b0047b1f37..4bbb667154 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -39,7 +39,6 @@ partial class Build : NukeBuild
     BuildParameters Parameters { get; set; }
     protected override void OnBuildInitialized()
     {
-        Console.WriteLine($"{Solution.Name}");
         Parameters = new BuildParameters(this);
         Information("Building version {0} of Avalonia ({1}) using version {2} of Nuke.",
             Parameters.Version,
@@ -144,7 +143,6 @@ partial class Build : NukeBuild
     void RunCoreTest(string projectName)
     {
         Information($"Running tests from {projectName}");
-        Console.WriteLine(Solution == null);
         var project = Solution.GetProject(projectName).NotNull("project != null");
 
         foreach (var fw in project.GetTargetFrameworks())
@@ -165,7 +163,7 @@ partial class Build : NukeBuild
                 .EnableNoBuild()
                 .EnableNoRestore()
                 .When(Parameters.PublishTestResults, _ => _
-                    .SetLoggers("trx")
+                    .SetLogger("trx")
                     .SetResultsDirectory(Parameters.TestResultsRoot)));
         }
     }
@@ -231,7 +229,7 @@ partial class Build : NukeBuild
                     $"{XunitPath.DoubleQuoteIfNeeded()} --propagate-exit-code -- {testAssembly}",
                     timeout: 120_000);
             }
-            ControlFlow.ExecuteWithRetry(DoMemoryTest, delay: TimeSpan.FromSeconds(3));
+            ControlFlow.ExecuteWithRetry(DoMemoryTest, waitInSeconds: 3);
         });
 
     Target ZipFiles => _ => _
diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
index c5fed21136..1826623674 100644
--- a/nukebuild/BuildParameters.cs
+++ b/nukebuild/BuildParameters.cs
@@ -74,11 +74,11 @@ public partial class Build
             MSBuildSolution = RootDirectory / "dirs.proj";
 
             // PARAMETERS
-            IsLocalBuild = NukeBuild.IsLocalBuild;
+            IsLocalBuild = Host == HostType.Console;
             IsRunningOnUnix = Environment.OSVersion.Platform == PlatformID.Unix ||
                               Environment.OSVersion.Platform == PlatformID.MacOSX;
             IsRunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            IsRunningOnAzure = NukeBuild.IsServerBuild ||
+            IsRunningOnAzure = Host == HostType.AzurePipelines ||
                                Environment.GetEnvironmentVariable("LOGNAME") == "vsts";
 
             if (IsRunningOnAzure)
diff --git a/nukebuild/DotNetConfigHelper.cs b/nukebuild/DotNetConfigHelper.cs
index eca1e2684d..932525288c 100644
--- a/nukebuild/DotNetConfigHelper.cs
+++ b/nukebuild/DotNetConfigHelper.cs
@@ -46,7 +46,7 @@ public class DotNetConfigHelper
     public DotNetConfigHelper SetVerbosity(DotNetVerbosity verbosity)
     {
         Build = Build?.SetVerbosity(verbosity);
-        Pack = Pack?.SetVerbosity(verbosity);
+        Pack = Pack?.SetVerbostiy(verbosity);
         Test = Test?.SetVerbosity(verbosity);
         return this;
     }
@@ -54,4 +54,4 @@ public class DotNetConfigHelper
     public static implicit operator DotNetConfigHelper(DotNetBuildSettings s) => new DotNetConfigHelper(s);
     public static implicit operator DotNetConfigHelper(DotNetPackSettings s) => new DotNetConfigHelper(s);
     public static implicit operator DotNetConfigHelper(DotNetTestSettings s) => new DotNetConfigHelper(s);
-}
+}
\ No newline at end of file
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index b9bb4f24b8..e4ad76de56 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
  <Import Project="..\build\JetBrains.dotMemoryUnit.props" />
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.2.1" />
+    <PackageReference Include="Nuke.Common" Version="5.0.0" />
     <PackageReference Include="xunit.runner.console" Version="2.3.1" />
     <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
     <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />