From cfd0413fcc2aebe2e3bf206eb4ffcc625c356c11 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 31 Oct 2020 12:51:30 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20201029.1 (#4419)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 +++---
eng/Versions.props | 10 +--
eng/common/post-build/symbols-validation.ps1 | 76 +++++++++++++-------
global.json | 4 +-
4 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cfc64f5bece..85a0fed0ef7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,25 +4,25 @@
-
+
https://github.com/dotnet/arcade
- 51f14c7da74e5c3d2ce0bab077461da399333896
+ 19e7e769f7ca2ece42221f7ff951e7ec705498ec
-
+
https://github.com/dotnet/arcade
- 51f14c7da74e5c3d2ce0bab077461da399333896
+ 19e7e769f7ca2ece42221f7ff951e7ec705498ec
-
+
https://github.com/dotnet/arcade
- 51f14c7da74e5c3d2ce0bab077461da399333896
+ 19e7e769f7ca2ece42221f7ff951e7ec705498ec
-
+
https://github.com/dotnet/arcade
- 51f14c7da74e5c3d2ce0bab077461da399333896
+ 19e7e769f7ca2ece42221f7ff951e7ec705498ec
-
+
https://github.com/dotnet/arcade
- 51f14c7da74e5c3d2ce0bab077461da399333896
+ 19e7e769f7ca2ece42221f7ff951e7ec705498ec
diff --git a/eng/Versions.props b/eng/Versions.props
index a207a55cdc2..31737aa163b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,11 +27,11 @@
- 6.0.0-beta.20527.10
- 6.0.0-beta.20527.10
- 6.0.0-beta.20527.10
- 6.0.0-beta.20527.10
- 6.0.0-beta.20527.10
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index fcc6019b495..99bf28cd5c1 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -9,9 +9,16 @@ param(
# Maximum number of jobs to run in parallel
$MaxParallelJobs = 6
+# Max number of retries
+$MaxRetry = 5
+
# Wait time between check for system load
$SecondsBetweenLoadChecks = 10
+# Set error codes
+Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1
+Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2
+
$CountMissingSymbols = {
param(
[string] $PackagePath # Path to a NuGet package
@@ -21,10 +28,15 @@ $CountMissingSymbols = {
Add-Type -AssemblyName System.IO.Compression.FileSystem
+ Write-Host "Validating $PackagePath "
+
# Ensure input file exist
if (!(Test-Path $PackagePath)) {
Write-PipelineTaskError "Input file does not exist: $PackagePath"
- return -2
+ return [pscustomobject]@{
+ result = $using:ERROR_FILEDOESNOTEXIST
+ packagePath = $PackagePath
+ }
}
# Extensions for which we'll look for symbols
@@ -45,7 +57,7 @@ $CountMissingSymbols = {
Write-Host "Something went wrong extracting $PackagePath"
Write-Host $_
return [pscustomobject]@{
- result = -1
+ result = $using:ERROR_BADEXTRACT
packagePath = $PackagePath
}
}
@@ -91,26 +103,37 @@ $CountMissingSymbols = {
$dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
$dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
- & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
+ $totalRetries = 0
- if (Test-Path $PdbPath) {
- return 'PDB'
- }
- elseif (Test-Path $NGenPdb) {
- return 'NGen PDB'
- }
- elseif (Test-Path $SODbg) {
- return 'DBG for SO'
- }
- elseif (Test-Path $DylibDwarf) {
- return 'Dwarf for Dylib'
- }
- elseif (Test-Path $SymbolPath) {
- return 'Module'
- }
- else {
- return $null
+ while ($totalRetries -lt $using:MaxRetry) {
+ # Save the output and get diagnostic output
+ $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
+
+ if (Test-Path $PdbPath) {
+ return 'PDB'
+ }
+ elseif (Test-Path $NGenPdb) {
+ return 'NGen PDB'
+ }
+ elseif (Test-Path $SODbg) {
+ return 'DBG for SO'
+ }
+ elseif (Test-Path $DylibDwarf) {
+ return 'Dwarf for Dylib'
+ }
+ elseif (Test-Path $SymbolPath) {
+ return 'Module'
+ }
+ elseif ($output.Contains("503 Service Unavailable")) {
+ # If we got a 503 error, we should retry.
+ $totalRetries++
+ }
+ else {
+ return $null
+ }
}
+
+ return $null
}
$SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath
@@ -155,14 +178,21 @@ function CheckJobResult(
$packagePath,
[ref]$DupedSymbols,
[ref]$TotalFailures) {
- if ($result -eq '-1') {
+ if ($result -eq $ERROR_BADEXTRACT) {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files"
$DupedSymbols.Value++
}
- elseif ($jobResult.result -ne '0') {
+ elseif ($result -eq $ERROR_FILEDOESNOTEXIST) {
+ Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath does not exist"
+ $TotalFailures.Value++
+ }
+ elseif ($result -gt '0') {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
$TotalFailures.Value++
}
+ else {
+ Write-Host "All symbols verified for package $packagePath"
+ }
}
function CheckSymbolsAvailable {
@@ -192,8 +222,6 @@ function CheckSymbolsAvailable {
return
}
- Write-Host "Validating $FileName "
-
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count
diff --git a/global.json b/global.json
index 602bad7f025..3f5877872a4 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
"version": "5.0.100-rc.2.20479.15"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20527.10",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20527.10"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20529.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20529.1"
}
}