diff --git a/build/Build.csproj b/build/Build.csproj index ac00e2a..72a73c5 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -6,7 +6,7 @@ - + diff --git a/build/Context.cs b/build/Context.cs index c2c9b9b..a587c33 100644 --- a/build/Context.cs +++ b/build/Context.cs @@ -7,7 +7,7 @@ public class Context : FrostingContext { public string Target { get; set; } - public string Configuration { get; set; } + public string BuildConfiguration { get; set; } public BuildVersion Version { get; set; } public DotNetCoreMSBuildSettings MSBuildSettings { get; set; } diff --git a/build/Lifetime.cs b/build/Lifetime.cs index 332bcf1..6b64416 100644 --- a/build/Lifetime.cs +++ b/build/Lifetime.cs @@ -13,7 +13,7 @@ public override void Setup(Context context) { // Arguments context.Target = context.Argument("target", "Default"); - context.Configuration = context.Argument("configuration", "Release"); + context.BuildConfiguration = context.Argument("configuration", "Release"); context.ForcePublish = context.Argument("forcepublish", false); context.MyGetSource = GetEnvironmentValueOrArgument(context, "FROSTING_MYGET_SOURCE", "mygetsource"); context.MyGetApiKey = GetEnvironmentValueOrArgument(context, "FROSTING_MYGET_API_KEY", "mygetapikey"); @@ -33,7 +33,7 @@ public override void Setup(Context context) // Install tools context.Information("Installing tools..."); - ToolInstaller.Install(context, "GitVersion.CommandLine", "3.6.5"); + ToolInstaller.Install(context, "GitVersion.CommandLine", "4.0.0"); // Calculate semantic version. context.Version = BuildVersion.Calculate(context); @@ -48,7 +48,7 @@ public override void Setup(Context context) context.Information("Version: {0}", context.Version); context.Information("Sem version: {0}", context.Version.SemVersion); - context.Information("Configuration: {0}", context.Configuration); + context.Information("Configuration: {0}", context.BuildConfiguration); context.Information("Target: {0}", context.Target); context.Information("AppVeyor: {0}", context.AppVeyor); } diff --git a/build/Tasks/Build.cs b/build/Tasks/Build.cs index fef1e30..a34cfab 100644 --- a/build/Tasks/Build.cs +++ b/build/Tasks/Build.cs @@ -9,7 +9,7 @@ public class Build : FrostingTask public override void Run(Context context) { context.DotNetCoreBuild("./src/Cake.Frosting.sln", new DotNetCoreBuildSettings { - Configuration = context.Configuration, + Configuration = context.BuildConfiguration, NoRestore = true, MSBuildSettings = context.MSBuildSettings }); diff --git a/build/Tasks/Package.cs b/build/Tasks/Package.cs index 8178022..97ac716 100644 --- a/build/Tasks/Package.cs +++ b/build/Tasks/Package.cs @@ -12,7 +12,7 @@ public override void Run(Context context) { var path = new FilePath("./src/Cake.Frosting/Cake.Frosting.csproj"); context.DotNetCorePack(path.FullPath, new DotNetCorePackSettings { - Configuration = context.Configuration, + Configuration = context.BuildConfiguration, MSBuildSettings = context.MSBuildSettings, NoBuild = true, NoRestore = true, diff --git a/build/Tasks/UnitTests.cs b/build/Tasks/UnitTests.cs index c5e314b..84e2463 100644 --- a/build/Tasks/UnitTests.cs +++ b/build/Tasks/UnitTests.cs @@ -9,7 +9,7 @@ public override void Run(Context context) { var project = "./src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj"; context.DotNetCoreTest(project, new DotNetCoreTestSettings { - Configuration = context.Configuration, + Configuration = context.BuildConfiguration, NoBuild = true }); } diff --git a/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj b/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj index 9e40822..5b9fabe 100644 --- a/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj +++ b/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Cake.Frosting/Cake.Frosting.csproj b/src/Cake.Frosting/Cake.Frosting.csproj index c1350c0..f798ca3 100644 --- a/src/Cake.Frosting/Cake.Frosting.csproj +++ b/src/Cake.Frosting/Cake.Frosting.csproj @@ -23,8 +23,8 @@ portable - - + +