diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-07-05 18:03:09 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-05 18:03:09 +0300 |
commit | 3b3829e33c1fa977a00fa88e80ea97de05151df0 (patch) | |
tree | 73b58eaebc721b18bc9daba0ecabfd50ae7c8f87 /eng | |
parent | 3a7afab91c2a7feb210aedc1053bbc44f80f6d25 (diff) |
[master] Update dependencies from dotnet/arcade (#15550)
* Update dependencies from https://github.com/dotnet/arcade build 20190703.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19353.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19353.1
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/corefx build 20190703.3
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview8.19353.3
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.05
- Microsoft.NETCore.App - 3.0.0-preview8-27903-05
* Update dependencies from https://github.com/dotnet/core-setup build 20190703.08
- Microsoft.NETCore.App - 3.0.0-preview8-27903-08
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 16 | ||||
-rw-r--r-- | eng/Versions.props | 4 | ||||
-rw-r--r-- | eng/common/sdl/execute-all-sdl-tools.ps1 | 8 | ||||
-rw-r--r-- | eng/common/sdl/run-sdl.ps1 | 12 |
4 files changed, 22 insertions, 18 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7d359eae82..7cc0623ce24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview8.19327.9"> + <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview8.19353.3"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>b8761d4848d42040c81ec25c8b51fd386b97f5f4</Sha> + <Sha>a9594f72540034902e2bcb2a5187fcdba584cf36</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27826-03"> + <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-27903-08"> <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>e1d780539e85f4d8de263957715f9d08db2ceef4</Sha> + <Sha>868f90184001e8e6c09b3bf58a40024d7497a9eb</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19330.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19353.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>89fab80685c91024c8f9e21f1c37f62580f648f8</Sha> + <Sha>a301900ead1e87a7feb29e55e14321fb85e57280</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19330.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19353.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>89fab80685c91024c8f9e21f1c37f62580f648f8</Sha> + <Sha>a301900ead1e87a7feb29e55e14321fb85e57280</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 15cf4ce935a..bf603032957 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel> <!-- Package versions --> <!-- corefx --> - <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview8.19327.9</MicrosoftPrivateCoreFxNETCoreAppVersion> + <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview8.19353.3</MicrosoftPrivateCoreFxNETCoreAppVersion> <!-- core-setup --> - <MicrosoftNETCoreAppVersion>3.0.0-preview7-27826-04</MicrosoftNETCoreAppVersion> + <MicrosoftNETCoreAppVersion>3.0.0-preview8-27903-08</MicrosoftNETCoreAppVersion> </PropertyGroup> </Project> diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 0635f26fb63..aab7589f2cc 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -22,7 +22,9 @@ Param( [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string] $GuardianLoggerLevel="Standard", # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") + [string[]] $PoliCheckAdditionalRunConfigParams # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") ) $ErrorActionPreference = "Stop" @@ -69,10 +71,10 @@ if ($TsaOnboard) { } if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($UpdateBaseline) { diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index e6a86d03a21..d7b85644581 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -5,7 +5,9 @@ Param( [string] $GdnFolder, [string[]] $ToolsList, [string] $UpdateBaseline, - [string] $GuardianLoggerLevel="Standard" + [string] $GuardianLoggerLevel="Standard", + [string[]] $CrScanAdditionalRunConfigParams, + [string[]] $PoliCheckAdditionalRunConfigParams ) $ErrorActionPreference = "Stop" @@ -29,8 +31,8 @@ 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 `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -38,8 +40,8 @@ foreach ($tool in $ToolsList) { $config = $True } if ($tool -eq "policheck") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " + 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 |