diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-03-04 01:06:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 01:06:36 +0300 |
| commit | ba8ce9e1a00b57aba6ab7384c16f4594be6754e2 (patch) | |
| tree | 7b6c34beb800291c30a8f15549cff533b4ed4fef /eng/common/tools.ps1 | |
| parent | f7de865465532de372f65b55e00a8ec2be1e5274 (diff) | |
[main] Update dependencies from dotnet/arcade dotnet/xharness (#49056)
[main] Update dependencies from dotnet/arcade dotnet/xharness
- re-add workaround for publishing disk space issues
- Just revert all changes to the publish-using-darc script
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 be5ce4a2ed5..d52467eea11 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' |