diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-03-03 11:39:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 11:39:04 +0300 |
| commit | f10b79b5b994c3fe5a309208825f67e7a49047df (patch) | |
| tree | 4e9f0c68bf24774e47c4231c6f3eae110f1cf83c /eng/common/tools.ps1 | |
| parent | 40abde7447c9341cefcaf9243d4784522cc6daa4 (diff) | |
[main] Update dependencies from dotnet/arcade (#1864)
[main] Update dependencies from dotnet/arcade
- Fix arguments passing to dotnet-format to work with net6
Diffstat (limited to 'eng/common/tools.ps1')
| -rw-r--r-- | eng/common/tools.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index be5ce4a2e..d52467eea 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -141,7 +141,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. - if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { + if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { $dotnetRoot = Join-Path $RepoRoot '.dotnet' |