diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-09-04 18:09:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-04 18:09:06 +0000 |
commit | 1b8f295da822f5152126bcf0c54df4a0ed737020 (patch) | |
tree | a1e22219bcb0765583caccdd57daf772143ae050 /eng/common/sdl | |
parent | 310bca38ada0cc03b403ebd6b4eec8cfa4925027 (diff) | |
download | coreclr-1b8f295da822f5152126bcf0c54df4a0ed737020.tar.gz coreclr-1b8f295da822f5152126bcf0c54df4a0ed737020.tar.bz2 coreclr-1b8f295da822f5152126bcf0c54df4a0ed737020.zip |
[release/3.0] Update dependencies from dotnet/arcade (#26448)
* Update dependencies from https://github.com/dotnet/arcade build 20190829.16
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19429.16
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19429.16
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19429.16
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19429.16
* Update dependencies from https://github.com/dotnet/arcade build 20190830.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19430.3
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19430.3
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19430.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19430.3
* Update dependencies from https://github.com/dotnet/arcade build 20190903.5
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19453.5
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19453.5
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19453.5
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19453.5
Diffstat (limited to 'eng/common/sdl')
-rw-r--r-- | eng/common/sdl/execute-all-sdl-tools.ps1 | 4 | ||||
-rw-r--r-- | eng/common/sdl/packages.config | 4 | ||||
-rw-r--r-- | eng/common/sdl/run-sdl.ps1 | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 6d9bdcf72b..fa239484f2 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -53,8 +53,8 @@ if ($ValidPath -eq $False) exit 1 } -& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel -$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory (Split-Path $SourceDirectory -Parent) -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +$gdnFolder = Join-Path (Split-Path $SourceDirectory -Parent) ".gdn" if ($TsaOnboard) { if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3f97ac2f16..256ffbfb93 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Guardian.Cli" version="0.7.1"/> + <package id="Microsoft.Guardian.Cli" version="0.7.2"/> </packages> diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index b90c4399ba..9bc25314ae 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -32,16 +32,16 @@ foreach ($tool in $ToolsList) { Write-Host $tool # We have to manually configure tools that run on source to look at the source directory only if ($tool -eq "credscan") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" `" OutputType : pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE } } if ($tool -eq "policheck") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -56,4 +56,4 @@ Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --bas if ($LASTEXITCODE -ne 0) { Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE." exit $LASTEXITCODE -}
\ No newline at end of file +} |