From f61654a74b4bee3bba59dce3b76dbe1bfd255f35 Mon Sep 17 00:00:00 2001
From: Mattias Karlsson <matkar@wcom.se>
Date: Wed, 30 Oct 2019 21:08:10 +0100
Subject: [PATCH] (build) Update to Cake 0.35.0, update dependencies and
 improve dotnet-format execution. (#2039)

* (build) Update to Cake 0.35.0
* Cake.Frosting 0.35.0
* Cake.Coverlet 2.3.4
* Cake.Codecov 0.7.0
* Codecov 1.7.2
* Make dotnet-format execution more robust (fails if not installed globally)

* Fix codecov.exe path
---
 build/Build.csproj          | 8 ++++----
 build/Tasks/CodeCoverage.cs | 2 +-
 build/Tasks/FormatCode.cs   | 9 +++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build/Build.csproj b/build/Build.csproj
index ba936c2b..35db67cc 100644
--- a/build/Build.csproj
+++ b/build/Build.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Coverlet" Version="1.3.1" />
-    <PackageReference Include="Cake.Frosting" Version="0.34.1" />
-    <PackageReference Include="Cake.Codecov" Version="0.4.0" />
-    <PackageReference Include="Codecov" Version="1.1.0" />
+    <PackageReference Include="Cake.Coverlet" Version="2.3.4" />
+    <PackageReference Include="Cake.Frosting" Version="0.35.0" />
+    <PackageReference Include="Cake.Codecov" Version="0.7.0" />
+    <PackageReference Include="Codecov" Version="1.7.2" />
   </ItemGroup>
 
 </Project>
diff --git a/build/Tasks/CodeCoverage.cs b/build/Tasks/CodeCoverage.cs
index fcec4c98..82c7e889 100644
--- a/build/Tasks/CodeCoverage.cs
+++ b/build/Tasks/CodeCoverage.cs
@@ -51,7 +51,7 @@ public sealed class CodeCoverage : FrostingTask<Context>
 
                 var userProfilePath = context.EnvironmentVariable("USERPROFILE");
                 var codecovPath = new DirectoryPath(userProfilePath)
-                    .CombineWithFilePath(".nuget\\packages\\codecov\\1.1.0\\tools\\codecov.exe");
+                    .CombineWithFilePath(".nuget\\packages\\codecov\\1.7.2\\tools\\codecov.exe");
 
                 context.Tools.RegisterFile(codecovPath);
 
diff --git a/build/Tasks/FormatCode.cs b/build/Tasks/FormatCode.cs
index 2057b343..09e94a1b 100644
--- a/build/Tasks/FormatCode.cs
+++ b/build/Tasks/FormatCode.cs
@@ -1,11 +1,16 @@
-using Cake.Common.Tools.DotNetCore;
+using System;
+using Cake.Common;
 using Cake.Frosting;
 
 public sealed class FormatCode : FrostingTask<Context>
 {
     public override void Run(Context context)
     {
-        context.DotNetCoreTool("format");
+        int result  = context.StartProcess(context.DotNetFormatToolPath);
+        if (result != 0)
+        {
+            throw new Exception($"Failed to execute {context.DotNetFormatToolPath} ({result})");
+        }
     }
 
     public override bool ShouldRun(Context context)