Try another hack, I mean, tack.

SteveGilham · Jun 3, 2018 · d2a8b8e · d2a8b8e
1 parent 08d8de7
commit d2a8b8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Build/actions.fsx b/Build/actions.fsx
@@ -217,7 +217,11 @@ open System.Runtime.CompilerServices
     |> (HandleResults msg)
 
   let RunRaw (f:Fake.Core.ProcStartInfo -> Fake.Core.ProcStartInfo) msg =
-    Fake.Core.Process.execWithResult f (TimeSpan.FromMinutes 10.0)
+    // C:\Users\appveyor\AppData\Local\Microsoft\dotnet
+    let prep = if Environment.isWindows && Directory.Exists "C:/Users/appveyor/AppData/Local/Microsoft\dotnet"
+               then f >> (Fake.Core.Process.setEnvironmentVariable "DOTNET_HOME" "C:/Users/appveyor/AppData/Local/Microsoft\dotnet")
+               else f
+    Fake.Core.Process.execWithResult prep (TimeSpan.FromMinutes 10.0)
     |> (HandleResults msg)
 
   let RunDotnet (o:DotNet.Options -> DotNet.Options) cmd args msg =

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,14 +9,11 @@ environment:
   COVERALLS_REPO_TOKEN:
     secure: qgIIfE76i59qTVO64mT7QwKcAUUYCQLie4XdUdlnt7MXLhrwqTbcfGUsCss/TmLg
     PATH: '%PATH%;%USERPROFILE%\.dotnet\tools'
-    DOTNET_ROOT: '%USERPROFILE%\AppData\Local\Microsoft\dotnet'
 install:
 - ps: >-
 
     $s = & dotnet --version | out-String
 
-    dir env:\
-
     if ([Version]$s -lt [Version]"2.1.300") {
 
       Write-Host "Found version $s"
@@ -30,11 +27,6 @@ install:
       & "C:/projects/altcover/dotnet-install.ps1" -Version "2.1.300"
 
     }
-
-    dir "C:\Users\appveyor\dotnet"
-
-    dir "C:\Users\appveyor\AppData\Local\Microsoft\dotnet"
-
 cache: 
   - packages -> **\packages.config
   - Demo\Service\packages -> Demo\Service\Service\packages.config