Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Look for dotnet on path if it is not in the default install directory #1813

Merged
merged 3 commits into from
Mar 9, 2018
+9 −1
Merged

Look for dotnet on path if it is not in the default install directory #1813

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf23db5
Look for dotnet on path
severisv Mar 7, 2018
0514e40
Merge branch 'beta_024' into b_dotnet_cli_find_dotnet_on_path
matthid Mar 9, 2018
90de2aa
Fix previous merge
matthid Mar 9, 2018
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
10 changes: 9 additions & 1 deletion src/app/Fake.DotNet.Cli/DotNet.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@ module DotNet =
/// ## Parameters
///
/// - 'dotnetCliDir' - dotnet cli install directory
let private dotnetCliPath dotnetCliDir = dotnetCliDir @@ (if Environment.isUnix then "dotnet" else "dotnet.exe")
let private dotnetCliPath dotnetCliDir =
let defaultCliPath = dotnetCliDir @@ (if Environment.isUnix then "dotnet" else "dotnet.exe")
match File.Exists defaultCliPath with
| true -> defaultCliPath
| _ ->
Process.tryFindFileOnPath "dotnet"
|> function
| Some dotnet when File.Exists dotnet -> dotnet
| _ -> failwithf "Can't find dotnet CLI. Looked in %s and on PATH" defaultCliPath

/// Get .NET Core SDK download uri
let private getGenericDotNetCliInstallerUrl branch installerName =
Expand Down