updated to latest

ionide · Aug 30, 2017 · 60479d2 · 60479d2
1 parent 4e50b73
commit 60479d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/FsAutoComplete.Core/paket.references b/src/FsAutoComplete.Core/paket.references
@@ -2,4 +2,5 @@ FSharp.Compiler.Service.ProjectCracker
 FSharp.Compiler.Service
 FSharpLint.Core
 Sln
-Dotnet.ProjInfoNewtonsoft.Json
+Dotnet.ProjInfo
+Newtonsoft.Json
diff --git a/test/FsAutoComplete.IntegrationTests/DotNetCore/WorkspacePeekRunner.fsx b/test/FsAutoComplete.IntegrationTests/DotNetCore/WorkspacePeekRunner.fsx
@@ -7,16 +7,23 @@ Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let outputJson = "workspacepeek.json"
 File.Delete outputJson
 
-runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+let doIt () =
+  let sdkDir = DotnetCli.sdk1Dir ()
 
-match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" with
-| NonExitCodeResult data ->
+  use _sdk1 = DotnetCli.useSdk sdkDir
+
+  runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+
+  match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" with
+  | NonExitCodeResult data ->
     data |> processResultLog "failed 'dotnet restore sample1/c1'" |> writeNormalizedOutput outputJson
-| _ ->
+  | _ ->
     let p = new FsAutoCompleteWrapper()
 
     p.workspacepeek (Path.Combine(__SOURCE_DIRECTORY__, "sample1")) 1
 
     p.send "quit\n"
     p.finalOutput ()
     |> writeNormalizedOutput outputJson
+
+doIt ()