Skip to content

Addressed PR feedback - part 2. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ravimeda merged 12 commits into from
Aug 4, 2017
Merged

Addressed PR feedback - part 2. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ae7678f
Get latest version info in build leg.
ravimeda Aug 3, 2017
029027b
Specify UseBasicParsing parameter in Invoke-WebRequest.
ravimeda Aug 3, 2017
292d348
Display environment variables.
ravimeda Aug 3, 2017
9aa6d75
Remove $ before variable name.
ravimeda Aug 3, 2017
46cc9c5
Rename variables.
ravimeda Aug 3, 2017
e352fbd
Switch to master branch.
ravimeda Aug 3, 2017
204a62e
Consistent variable names.
ravimeda Aug 3, 2017
8181d77
Addressed PR feedback.
ravimeda Aug 3, 2017
bd8f1c0
Switch to test branch.
ravimeda Aug 3, 2017
bdfbd01
PR feedback.
ravimeda Aug 4, 2017
4fc03af
Switch to master.
ravimeda Aug 4, 2017
afcdafa
Merge branch 'sec_trigger' into sec_trigger_pr
ravimeda Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/buildpipeline/security/DotNet-CLI-Security-Windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"scriptType": "filePath",
"scriptName": "$(Build.SourcesDirectory)\\build\\buildpipeline\\security\\Get-LatestVersion.ps1",
"arguments": "-Branch \"$(CodeBase)\"",
"workingFolder": "$(Build.SourcesDirectory)\\$(PB_Repo)\\build\\buildpipeline\\security\\",
"workingFolder": "",
"failOnStandardError": "true"
}
},
Expand Down
7 changes: 4 additions & 3 deletions build/buildpipeline/security/Get-LatestVersion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ function Get-VersionInfo
$retryCount = 1
$oldEap = $ErrorActionPreference

while ($retryCount -le 3)
while ($retryCount -le $retries)
{
$ErrorActionPreference = "Stop"

try
{
return (Invoke-WebRequest -Uri "$latestVersionUrl" -UseBasicParsing).Content.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries)
$content = (Invoke-WebRequest -Uri "$latestVersionUrl" -UseBasicParsing).Content
return $content.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries)
}
catch
{
Expand All @@ -53,7 +54,7 @@ function Get-VersionInfo
$latestVersionUrl = "$UrlPrefix/$Branch/$Filename"
$latestVersionContent = Get-VersionInfo

if (-not [string]::IsNullOrWhiteSpace($latestVersionContent) -and $latestVersionContent.Length -eq 2)
if ($latestVersionContent -ne $null -and $latestVersionContent.Length -eq 2)
{
$CliLatestCommitSha = $latestVersionContent[0]
$CliLatestPackageId = $latestVersionContent[1]
Expand Down