tool restore

build.cmd

@@ -1,7 +1,5 @@
 @echo off
 
-dotnet tool restore
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%

build.fsx

@@ -92,6 +92,15 @@ let stable =
     | _ -> release
 
 
+let runDotnet workingDir args =
+    let result =
+        ExecProcess (fun info ->
+            info.FileName <- dotnetExePath
+            info.WorkingDirectory <- workingDir
+            info.Arguments <- args) TimeSpan.MaxValue
+    if result <> 0 then
+        failwithf "dotnet %s failed" args
+
 let testSuiteFilterFlakyTests = getEnvironmentVarAsBoolOrDefault "PAKET_TESTSUITE_FLAKYTESTS" false
 
 let genFSAssemblyInfo (projectPath: string) =
@@ -186,13 +195,14 @@ let runCmdIn workDir exe =
 let dotnet workDir = runCmdIn workDir "dotnet"
 
 Target "DotnetRestore" (fun _ ->
-
     //WORKAROUND dotnet restore with paket doesnt restore the PackageReference of SourceLink
     // ref https://github.com/fsprojects/Paket/issues/2930
     Paket.Restore (fun p ->
         { p with
             Group = "NetCoreTools" })
 
+    runDotnet "." "tool restore"
+
     DotNetCli.Restore (fun c ->
         { c with
             Project = "Paket.sln"
@@ -274,6 +284,7 @@ Target "RunIntegrationTestsNetCore" (fun _ ->
             TimeOut = TimeSpan.FromMinutes 60.
         })
 )
+
 "Clean" ==> "DotnetPublish" ==> "RunIntegrationTestsNetCore"
 
 // --------------------------------------------------------------------------------------
@@ -361,6 +372,7 @@ Target "RunIntegrationTests" (fun _ ->
             Where = if testSuiteFilterFlakyTests then "cat==Flaky" else "cat!=Flaky"
             TimeOut = TimeSpan.FromMinutes 40. })
 )
+
 "Clean" ==> "Build" ==> "RunIntegrationTests"
 
 

build.sh

@@ -1,19 +1,17 @@
 #!/usr/bin/env bash
 if test "$OS" = "Windows_NT"
 then
-  dotnet tool restore
-
   # use .Net
   .paket/paket.exe restore
   exit_code=$?
   if [ $exit_code -ne 0 ]; then
   	exit $exit_code
   fi
-  MSBuild=`pwd -W`/packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
+  MSBuild=`pwd -W`/packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
 else
   mono .paket/paket.exe restore
   exit_code=$?
-  if [ $exit_code -ne 0 ]; then  
+  if [ $exit_code -ne 0 ]; then
     certificate_count=$(certmgr -list -c Trust | grep X.509 | wc -l)
     if [ $certificate_count -le 1 ]; then
       echo "Couldn't download Paket. This might be because your Mono installation"
@@ -30,6 +28,6 @@ else
   fi
   # Note: the bundled MSBuild crashes hard on linux, so we still rely on the system-installed version
   #export MSBuild=packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe
-  mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
+  mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
 fi