diff --git a/.build/definitions.cake b/.build/definitions.cake
index 02bec40..15247df 100644
--- a/.build/definitions.cake
+++ b/.build/definitions.cake
@@ -1,14 +1,14 @@
 // ADDINS
 #addin nuget:?package=Cake.Coveralls&version=1.1.0
-#addin nuget:?package=Cake.FileHelpers&version=4.0.1
-#addin nuget:?package=Cake.AppVeyor&version=5.0.1
+#addin nuget:?package=Cake.FileHelpers&version=7.0.0
+#addin nuget:?package=Cake.AppVeyor&version=6.0.0
 
 // TOOLS
-#tool nuget:?package=GitReleaseManager&version=0.12.1
-#tool nuget:?package=GitVersion.CommandLine&version=5.7.0
+#tool nuget:?package=GitReleaseManager&version=0.16.0
+#tool nuget:?package=GitVersion.CommandLine&version=5.12.0
 #tool nuget:?package=coveralls.net&version=4.0.1
 #tool nuget:?package=OpenCover&version=4.7.1221
-#tool nuget:?package=ReportGenerator&version=4.8.13
+#tool nuget:?package=ReportGenerator&version=5.2.1
 
 
 public class CodeCoverageSettings
diff --git a/.build/tasks.cake b/.build/tasks.cake
index 8d683a9..782233e 100644
--- a/.build/tasks.cake
+++ b/.build/tasks.cake
@@ -32,7 +32,7 @@ Task("UpdateAppVeyorBuildNumber")
 Task("Restore")
     .Does<BuildInfo>(build =>
     {
-        DotNetCoreRestore(build.Paths.SrcDir);
+        DotNetRestore(build.Paths.SrcDir);
     });
 
 
@@ -83,7 +83,7 @@ Task("RunXunitTests")
                 
                 // run open cover for debug build configuration
                 OpenCover(
-                    tool => tool.DotNetCoreTool(
+                    tool => tool.DotNetTool(
                         projectPath.ToString(),
                         "test",
                         buildProcessArgs("Debug", targetFw.Key)
@@ -95,7 +95,7 @@ Task("RunXunitTests")
             {
                 var solutionFullPath = build.Paths.RootDir.Combine(build.Paths.SrcDir).Combine(build.Settings.SolutionName) + ".sln";
                 Information("Running Debug mode tests for {0} ({1})", projectFilename, targetFw.Key);
-                DotNetCoreTool(
+                DotNetTool(
                     solutionFullPath,
                     "test",
                     buildProcessArgs("Debug", targetFw.Key)
@@ -108,7 +108,7 @@ Task("RunXunitTests")
             {
                 var solutionFullPath = build.Paths.RootDir.Combine(build.Paths.SrcDir).Combine(build.Settings.SolutionName) + ".sln";
                 Information("Running Release mode tests for {0} ({1})", projectFilename, targetFw.Key);
-                DotNetCoreTool(
+                DotNetTool(
                     solutionFullPath,
                     "test",
                     buildProcessArgs("Release", targetFw.Key)
@@ -183,13 +183,13 @@ Task("Build")
         if (build.IsRelease) {
             Information("Running {0} build to calculate code coverage", "Debug");
             // need Debug build for code coverage
-            DotNetCoreBuild(build.Paths.SrcDir, new DotNetCoreBuildSettings {
+            DotNetBuild(build.Paths.SrcDir, new DotNetBuildSettings {
                 NoRestore = true,
                 Configuration = "Debug",
             });
         }
         Information("Running {0} build", build.Config);
-        DotNetCoreBuild(build.Paths.SrcDir, new DotNetCoreBuildSettings {
+        DotNetBuild(build.Paths.SrcDir, new DotNetBuildSettings {
             NoRestore = true,
             Configuration = build.Config,
         });
@@ -199,7 +199,7 @@ Task("Build")
 Task("CreateNugetPackages")
     .Does<BuildInfo>(build =>
     {
-        DotNetCorePack(build.Paths.SrcDir, new DotNetCorePackSettings {
+        DotNetPack(build.Paths.SrcDir, new DotNetPackSettings {
             Configuration = build.Config,
             NoRestore = true,
             NoBuild = true,
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..334b374
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "4.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    },
+    "coveralls.net": {
+      "version": "4.0.1",
+      "commands": [
+        "csmacnz.Coveralls"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 09e9d70..9a0da2c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,8 +21,8 @@ environment:
     secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED
 
 install:
-  - ps: dotnet tool install Cake.Tool --version 1.3.0 --global
   - ps: dotnet tool install coveralls.net --version 4.0.1 --global
+  - ps: dotnet tool restore
 
 build_script:
   - ps: dotnet cake