diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs index 4bbb667154..b0047b1f37 100644 --- a/nukebuild/Build.cs +++ b/nukebuild/Build.cs @@ -39,6 +39,7 @@ 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, @@ -143,6 +144,7 @@ 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()) @@ -163,7 +165,7 @@ partial class Build : NukeBuild .EnableNoBuild() .EnableNoRestore() .When(Parameters.PublishTestResults, _ => _ - .SetLogger("trx") + .SetLoggers("trx") .SetResultsDirectory(Parameters.TestResultsRoot))); } } @@ -229,7 +231,7 @@ partial class Build : NukeBuild $"{XunitPath.DoubleQuoteIfNeeded()} --propagate-exit-code -- {testAssembly}", timeout: 120_000); } - ControlFlow.ExecuteWithRetry(DoMemoryTest, waitInSeconds: 3); + ControlFlow.ExecuteWithRetry(DoMemoryTest, delay: TimeSpan.FromSeconds(3)); }); Target ZipFiles => _ => _ diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs index 1826623674..c5fed21136 100644 --- a/nukebuild/BuildParameters.cs +++ b/nukebuild/BuildParameters.cs @@ -74,11 +74,11 @@ public partial class Build MSBuildSolution = RootDirectory / "dirs.proj"; // PARAMETERS - IsLocalBuild = Host == HostType.Console; + IsLocalBuild = NukeBuild.IsLocalBuild; IsRunningOnUnix = Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX; IsRunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); - IsRunningOnAzure = Host == HostType.AzurePipelines || + IsRunningOnAzure = NukeBuild.IsServerBuild || Environment.GetEnvironmentVariable("LOGNAME") == "vsts"; if (IsRunningOnAzure) diff --git a/nukebuild/DotNetConfigHelper.cs b/nukebuild/DotNetConfigHelper.cs index 932525288c..eca1e2684d 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?.SetVerbostiy(verbosity); + Pack = Pack?.SetVerbosity(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 b2c58e2292..73c716cdd3 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false False @@ -10,7 +10,7 @@ - +