Merge branch 'release/0.34.1'

* release/0.34.1: (GH-64) Update Cake to 0.34.1 * Update to Cake.Core 0.34.1 * Update to Cake.Common 0.34.1 * Fixes #64 (build) Updated Cake.Frosting to 0.33.0 and GitVersion to 4.0
cake-archive · Jul 30, 2019 · aba300b · aba300b
2 parents bacdcb0 + acceaaf
commit aba300b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/build/Build.csproj b/build/Build.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="0.32.1" />
+    <PackageReference Include="Cake.Frosting" Version="0.33.0" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -13,7 +13,7 @@ public override void Setup(Context context)
     {
         // Arguments
         context.Target = context.Argument<string>("target", "Default");
-        context.Configuration = context.Argument<string>("configuration", "Release");
+        context.BuildConfiguration = context.Argument<string>("configuration", "Release");
         context.ForcePublish = context.Argument<bool>("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
@@ -9,7 +9,7 @@ public class Build : FrostingTask<Context>
     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
@@ -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
@@ -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
@@ -26,7 +26,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
-    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Cake.Testing" Version="0.34.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake.Frosting/Cake.Frosting.csproj b/src/Cake.Frosting/Cake.Frosting.csproj
@@ -23,8 +23,8 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Common" Version="0.33.0" />
+    <PackageReference Include="Cake.Core" Version="0.34.1" />
+    <PackageReference Include="Cake.Common" Version="0.34.1" />
     <None Include="../../LICENSE" Pack="true" PackagePath="$(PackageLicenseFile)"/>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">