Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Avoid multiple dotnet cli downloads
  • Loading branch information
KevinRansom committed Feb 22, 2019
commit ba56217d96b5e9f29a8d4e59d6a444e6d02f479b
9 changes: 8 additions & 1 deletion fcs/build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ let isMono = false
// Utilities
// --------------------------------------------------------------------------------------

let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.403"
let dotnetExePath =
// Build.cmd normally downloads a dotnet cli to: <repo-root>\artifacts\toolset\dotnet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does build.sh do this as well?

Also when @brettfo finishes up the arcade work it won't be build.cmd/build.sh anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cartermp build.sh in fcs calls build.fsx :-)
and build.sh in root builds a makefile.

// check if there is one there to avoid downloading an additional one here
let pathToCli = Path.Combine(__SOURCE_DIRECTORY__, @"..\artifacts\toolset\dotnet\dotnet.exe")
if File.Exists(pathToCli) then
pathToCli
else
DotNetCli.InstallDotNetSDK "2.1.403"

let runDotnet workingDir args =
let result =
Expand Down