mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 14:59:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix regression on Windows 7/8 introduced with Powershell Core support

Browse Source
This commit is contained in:
Robert Schumacher 2017-05-24 03:33:20 -07:00
parent e9b561fa48
commit 2b944c21e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/fetchDependency.ps1
View File

@ -9,7 +9,7 @@ $downloadPromptOverride_NO_OVERRIDE= 0
$downloadPromptOverride_DO_NOT_PROMPT = 1 $downloadPromptOverride_DO_NOT_PROMPT = 1
$downloadPromptOverride_ALWAYS_PROMPT = 2 $downloadPromptOverride_ALWAYS_PROMPT = 2
if ($PSVersionTable.PSEdition -eq "Desktop") { if ($PSVersionTable.PSEdition -ne "Core") {
Import-Module BitsTransfer -Verbose:$false Import-Module BitsTransfer -Verbose:$false
} }
@ -82,7 +82,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
New-Item -ItemType directory -Path $downloadDir | Out-Null 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 { try {
$WC = New-Object System.Net.WebClient $WC = New-Object System.Net.WebClient
@ -197,7 +197,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
performDownload $Dependency $url $downloadsDir $downloadPath $downloadVersion $requiredVersion performDownload $Dependency $url $downloadsDir $downloadPath $downloadVersion $requiredVersion
#calculating the hash #calculating the hash
if ($PSVersionTable.PSEdition -eq "Desktop") if ($PSVersionTable.PSEdition -ne "Core")
{ {
$hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256") $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256")
$fileAsByteArray = [io.File]::ReadAllBytes($downloadPath) $fileAsByteArray = [io.File]::ReadAllBytes($downloadPath)