From 0dc6aa66a593ff5a3d8b0c12eef6fc7a9433bd40 Mon Sep 17 00:00:00 2001 From: Hao Kung <HaoK@users.noreply.github.com> Date: Thu, 18 Jun 2020 19:00:15 -0700 Subject: [PATCH] Include identical helix script files directly (#23116) --- eng/helix/content/Download.ps1 | 47 ---------------------------------- eng/targets/Helix.targets | 1 + 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 eng/helix/content/Download.ps1 diff --git a/eng/helix/content/Download.ps1 b/eng/helix/content/Download.ps1 deleted file mode 100644 index 1198af6a203..00000000000 --- a/eng/helix/content/Download.ps1 +++ /dev/null @@ -1,47 +0,0 @@ - <# - .SYNOPSIS - Downloads a given URI and saves it to outputFile - .DESCRIPTION - Downloads a given URI and saves it to outputFile - PARAMETER uri - The URI to fetch -.PARAMETER outputFile - The outputh file path to save the URI -#> -param( - [Parameter(Mandatory = $true)] - $uri, - - [Parameter(Mandatory = $true)] - $outputFile -) -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - -$maxRetries = 5 -$retries = 1 - -while($true) { - try { - Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $outputFile - break - } - catch { - Write-Host "Failed to download '$uri'" - $error = $_.Exception.Message - } - - if (++$retries -le $maxRetries) { - Write-Warning $error -ErrorAction Continue - $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff - Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." - Start-Sleep -Seconds $delayInSeconds - } - else { - Write-Error $error -ErrorAction Continue - throw "Unable to download file in $maxRetries attempts." - } - } - -Write-Host "Download of '$uri' complete, saved to $outputFile..." diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index ea437b3d144..0743963a02a 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -27,6 +27,7 @@ <!-- Item group has to be defined here becasue Helix.props is evaluated before xunit.runner.console.props --> <ItemGroup Condition="$(BuildHelixPayload)"> <Content Include="@(HelixContent)" /> + <Content Include="$(RepoRoot)eng\scripts\Download.ps1" /> </ItemGroup> <!-- -- GitLab