@@ -216,14 +216,12 @@ Target "GitHubRelease" (fun _ ->
216216// --------------------------------------------------------------------------------------
217217// .NET CLI and .NET Core
218218
219- // TODO: rework next line when workaround is available
220- let isDotnetCliInstalled = ( try buildServer = BuildServer.LocalBuild && Shell.Exec( " dotnet" , " --info" ) = 0 with _ -> false )
219+ let isDotnetCliInstalled = ( try Shell.Exec( " dotnet" , " --info" ) = 0 with _ -> false )
221220let assertExitCodeZero x = if x = 0 then () else failwithf " Command failed with exit code %i " x
222221
223222Target " DotnetCliBuild" ( fun _ ->
224223 let fsLex = @" lib/bootstrap/4.0/fslex.exe"
225224 let fsYacc = @" lib/bootstrap/4.0/fsyacc.exe"
226- let outPath = @" src/fsharp/FSharp.Compiler.Service.netcore/"
227225 let lexArgs = @" --lexlib Internal.Utilities.Text.Lexing"
228226 let yaccArgs = @" --internal --parslib Internal.Utilities.Text.Parsing"
229227 let module1 = @" --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser"
@@ -234,6 +232,7 @@ Target "DotnetCliBuild" (fun _ ->
234232 let open3 = @" --open Microsoft.FSharp.Compiler"
235233 let options = " --configuration Release"
236234
235+ let outPath = @" src/fsharp/FSharp.Compiler.Service.netcore/"
237236 Shell.Exec( " dotnet" , " restore" , outPath) |> ignore //assertExitCodeZero
238237
239238 Shell.Exec( " dotnet" , " fssrgen ../FSComp.txt ./FSComp.fs ./FSComp.resx" , outPath) |> assertExitCodeZero
0 commit comments