diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-24 16:35:17 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-24 16:35:17 -0700 |
| commit | 14d9d0d60777146803892f7c9908c92b85867869 (patch) | |
| tree | 016584b0da33fe56c094cf4171c40d4737fcf731 /scripts | |
| parent | 81fe73d02061866c2188fc8d9e13f9990a20d64d (diff) | |
| parent | b98e0dbae930bb99c064b7098d95453b666c7f36 (diff) | |
| download | vcpkg-14d9d0d60777146803892f7c9908c92b85867869.tar.gz vcpkg-14d9d0d60777146803892f7c9908c92b85867869.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetchDependency.ps1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 6c2e85b60..b6144d581 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -9,7 +9,7 @@ $downloadPromptOverride_NO_OVERRIDE= 0 $downloadPromptOverride_DO_NOT_PROMPT = 1 $downloadPromptOverride_ALWAYS_PROMPT = 2 -if ($PSVersionTable.PSEdition -eq "Desktop") { +if ($PSVersionTable.PSEdition -ne "Core") { Import-Module BitsTransfer -Verbose:$false } @@ -82,7 +82,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) New-Item -ItemType directory -Path $downloadDir | Out-Null } - if (($PSVersionTable.PSEdition -eq "Desktop") -and ($Dependency -ne "git")) # git fails with BITS + if (($PSVersionTable.PSEdition -ne "Core") -and ($Dependency -ne "git")) # git fails with BITS { try { $WC = New-Object System.Net.WebClient @@ -197,7 +197,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) performDownload $Dependency $url $downloadsDir $downloadPath $downloadVersion $requiredVersion #calculating the hash - if ($PSVersionTable.PSEdition -eq "Desktop") + if ($PSVersionTable.PSEdition -ne "Core") { $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256") $fileAsByteArray = [io.File]::ReadAllBytes($downloadPath) |