Browse Source

Merge branch 'master' into fix-black-area-inside-window-hi-dpi

pull/2221/head
Steven Kirk 8 years ago
committed by GitHub
parent
commit
ebeb0c2407
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      nukebuild/BuildParameters.cs

12
nukebuild/BuildParameters.cs

@ -14,13 +14,13 @@ using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
public partial class Build public partial class Build
{ {
[Parameter("configuration")] [Parameter("configuration")]
public string NukeArgConfiguration { get; set; } public string Configuration { get; set; }
[Parameter("skip-tests")] [Parameter("skip-tests")]
public bool NukeArgSkipTests { get; set; } public bool SkipTests { get; set; }
[Parameter("force-nuget-version")] [Parameter("force-nuget-version")]
public string NukeArgForceNugetVersion { get; set; } public string ForceNugetVersion { get; set; }
public class BuildParameters public class BuildParameters
{ {
@ -64,8 +64,8 @@ public partial class Build
public BuildParameters(Build b) public BuildParameters(Build b)
{ {
// ARGUMENTS // ARGUMENTS
Configuration = b.NukeArgConfiguration ?? "Release"; Configuration = b.Configuration ?? "Release";
SkipTests = b.NukeArgSkipTests; SkipTests = b.SkipTests;
// CONFIGURATION // CONFIGURATION
MainRepo = "https://github.com/AvaloniaUI/Avalonia"; MainRepo = "https://github.com/AvaloniaUI/Avalonia";
@ -102,7 +102,7 @@ public partial class Build
IsNuGetRelease = IsMainRepo && IsReleasable && IsReleaseBranch; IsNuGetRelease = IsMainRepo && IsReleasable && IsReleaseBranch;
// VERSION // VERSION
Version = b.NukeArgForceNugetVersion ?? GetVersion(); Version = b.ForceNugetVersion ?? GetVersion();
if (IsRunningOnAzure) if (IsRunningOnAzure)
{ {

Loading…
Cancel
Save