aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBen Harper <rogojin@gmail.com>2017-02-06 14:44:59 +0200
committerBen Harper <rogojin@gmail.com>2017-02-06 14:48:30 +0200
commit504545d2c864623ebddf169b1e402326bfe136f4 (patch)
treec6c41cdc5545bdef4259f258d563ccf962644417 /scripts
parentce477bf21998c80afc551de72c6140178de3a114 (diff)
downloadvcpkg-504545d2c864623ebddf169b1e402326bfe136f4.tar.gz
vcpkg-504545d2c864623ebddf169b1e402326bfe136f4.zip
Add a workaround for another BITS code path
The fix from last week (ce9927f7327bc71ade246108a7d984deda6293fd) worked for downloading most dependencies, but there is still one BITS transfer code path, which this fix addresses.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/findVisualStudioInstallationInstances.ps116
1 files changed, 15 insertions, 1 deletions
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index a2ce66522..9d54990a2 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -20,7 +20,21 @@ $downloadPath = "$downloadsDir\$downloadName"
if (!(Test-Path $downloadPath))
{
- Start-BitsTransfer -Source $url -Destination $downloadPath #-ErrorAction SilentlyContinue
+ try {
+ Start-BitsTransfer -Source $url -Destination $downloadPath -ErrorAction Stop
+ }
+ catch [System.Exception] {
+ # If BITS fails for any reason, delete any potentially partially downloaded files and continue
+ if (Test-Path $downloadPath)
+ {
+ Remove-Item $downloadPath
+ }
+ }
+}
+if (!(Test-Path $downloadPath))
+{
+ Write-Host("Downloading $downloadName...")
+ (New-Object System.Net.WebClient).DownloadFile($url, $downloadPath)
}
$nugetOutput = & $nugetexe install Microsoft.VisualStudio.Setup.Configuration.Native -Pre -Source $downloadsDir -OutputDirectory $nugetPackageDir 2>&1