Skip to content

Commit d982322

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
[master] Update dependencies from dotnet/arcade (#7452)
* Update dependencies from https://github.com/dotnet/arcade build 20190825.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19425.1 * Update dependencies from https://github.com/dotnet/arcade build 20190826.12 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19426.12 * Update dependencies from https://github.com/dotnet/arcade build 20190827.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19427.8 * Update dependencies from https://github.com/dotnet/arcade build 20190828.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19428.9 * Update dependencies from https://github.com/dotnet/arcade build 20190829.16 - Microsoft.DotNet.Arcade.Sdk - 1.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
1 parent 589bbbb commit d982322

16 files changed

Lines changed: 66 additions & 43 deletions

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19424.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19430.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>a7b5eb8de300b6a30bd797c4ecc8769f7028aeec</Sha>
8+
<Sha>316c80d0c373be63f991cc4d586db85273c1c553</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/darc-init.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4+
$verbosity = "m"
45
)
56

6-
$verbosity = "m"
77
. $PSScriptRoot\tools.ps1
88

99
function InstallDarcCli ($darcVersion) {

‎eng/common/darc-init.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
1823
*)
1924
echo "Invalid argument: $1"
2025
usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
3439
[[ $source != /* ]] && source="$scriptroot/$source"
3540
done
3641
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3842

3943
. "$scriptroot/tools.sh"
4044

‎eng/common/native/CommonLibrary.psm1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ function Get-File {
152152
}
153153
else {
154154
Write-Verbose "Downloading $Uri"
155+
# Don't display the console progress UI - it's a huge perf hit
156+
$ProgressPreference = 'SilentlyContinue'
155157
while($Attempt -Lt $DownloadRetries)
156158
{
157159
try {

‎eng/common/performance/perfhelixpublish.proj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
8484
<HelixWorkItem Include="@(Partition)">
8585
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
86-
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(BaselineArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
87-
<Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
86+
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
87+
<Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
8888
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
8989
<Timeout>4:00</Timeout>
9090
</HelixWorkItem>
@@ -93,8 +93,8 @@
9393
<ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
9494
<HelixWorkItem Include="$(BuildConfig).WorkItem">
9595
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
96-
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(ArtifactsDirectory)"</PreCommands>
97-
<Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)"</Command>
96+
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
97+
<Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
9898
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>
9999
<Timeout>4:00</Timeout>
100100
</HelixWorkItem>

‎eng/common/post-build/symbols-validation.ps1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault {
3737
# DWARF file for a .dylib
3838
$DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
3939

40-
$dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools"
41-
$dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe"
40+
$dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
41+
$dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
4242

43-
& $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
43+
& $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
4444

4545
if (Test-Path $PdbPath) {
4646
return "PDB"
@@ -159,25 +159,25 @@ function CheckSymbolsAvailable {
159159
}
160160
}
161161

162-
function Installdotnetsymbol {
163-
$dotnetsymbolPackageName = "dotnet-symbol"
162+
function InstallDotnetSymbol {
163+
$dotnetSymbolPackageName = "dotnet-symbol"
164164

165165
$dotnetRoot = InitializeDotNetCli -install:$true
166166
$dotnet = "$dotnetRoot\dotnet.exe"
167167
$toolList = & "$dotnet" tool list --global
168168

169-
if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) {
170-
Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed."
169+
if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) {
170+
Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed."
171171
}
172172
else {
173-
Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..."
173+
Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..."
174174
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
175-
& "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global
175+
& "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global
176176
}
177177
}
178178

179179
try {
180-
Installdotnetsymbol
180+
InstallDotnetSymbol
181181

182182
CheckSymbolsAvailable
183183
}

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if ($ValidPath -eq $False)
5353
exit 1
5454
}
5555

56-
& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
57-
$gdnFolder = Join-Path $ArtifactsDirectory ".gdn"
56+
& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory (Split-Path $SourceDirectory -Parent) -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
57+
$gdnFolder = Join-Path (Split-Path $SourceDirectory -Parent) ".gdn"
5858

5959
if ($TsaOnboard) {
6060
if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {

‎eng/common/sdl/init-sdl.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop"
1111
Set-StrictMode -Version 2.0
1212
$LASTEXITCODE = 0
1313

14+
# Don't display the console progress UI - it's a huge perf hit
15+
$ProgressPreference = 'SilentlyContinue'
16+
1417
# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
1518
$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
1619
$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")

‎eng/common/sdl/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.7.1"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.7.2"/>
44
</packages>

‎eng/common/sdl/run-sdl.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ foreach ($tool in $ToolsList) {
3232
Write-Host $tool
3333
# We have to manually configure tools that run on source to look at the source directory only
3434
if ($tool -eq "credscan") {
35-
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})"
36-
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
35+
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})"
36+
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
3737
if ($LASTEXITCODE -ne 0) {
3838
Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
3939
exit $LASTEXITCODE
4040
}
4141
}
4242
if ($tool -eq "policheck") {
43-
Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
44-
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
43+
Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
44+
& $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
4545
if ($LASTEXITCODE -ne 0) {
4646
Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
4747
exit $LASTEXITCODE
@@ -56,4 +56,4 @@ Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --bas
5656
if ($LASTEXITCODE -ne 0) {
5757
Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
5858
exit $LASTEXITCODE
59-
}
59+
}

0 commit comments

Comments
 (0)