From bbd83cdbc8c7c3d35ad8df5c19cfd82b423417f2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 31 Oct 2020 21:38:38 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/arcade
dotnet/llvm-project dotnet/xharness (#44062)
[master] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/xharness
---
.config/dotnet-tools.json | 2 +-
eng/Version.Details.xml | 96 ++++++++++++++--------------
eng/Versions.props | 40 ++++++------
eng/common/post-build/symbols-validation.ps1 | 76 +++++++++++++++-------
global.json | 8 +--
5 files changed, 125 insertions(+), 97 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 0e6a36d..d706d96 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.20528.1",
+ "version": "1.0.0-prerelease.20530.4",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 04a10fd..a769f55 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -10,61 +10,61 @@
-
+
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
-
+
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
-
+
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://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -126,37 +126,37 @@
https://github.com/dotnet/runtime-assets
edc9df4021be1dff54b8d8be88b4bee7626cb6a5
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
-
+
https://github.com/dotnet/llvm-project
- dcd8213d41770d6371bb806bcae35f2c954e336d
+ 69cf173ab66c68e4282c1da56628b36d4ae2acc2
https://github.com/dotnet/runtime
@@ -190,13 +190,13 @@
https://github.com/mono/linker
57974c1f5790e6fb33f5fce161707be5cd86c4d3
-
+
https://github.com/dotnet/xharness
- cfc0a5212a78054d934cb2ec5cd9bb29e46a9470
+ bdad61dfc3d09ae826ba940d92e43a7441ec83b0
-
+
https://github.com/dotnet/xharness
- cfc0a5212a78054d934cb2ec5cd9bb29e46a9470
+ bdad61dfc3d09ae826ba940d92e43a7441ec83b0
diff --git a/eng/Versions.props b/eng/Versions.props
index 157a13c..bbe08d3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,16 +53,16 @@
6.0.0-preview1.20513.4
3.8.0-4.20503.2
- 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.20527.10
- 2.5.1-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
+ 6.0.0-beta.20529.1
+ 2.5.1-beta.20529.1
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
+ 6.0.0-beta.20529.1
5.0.0-rc.1.20451.14
6.0.0-alpha.1.20501.4
@@ -137,8 +137,8 @@
4.9.4
16.8.0-release-20201022-02
- 1.0.0-prerelease.20528.1
- 1.0.0-prerelease.20528.1
+ 1.0.0-prerelease.20530.4
+ 1.0.0-prerelease.20530.4
2.4.1
2.4.2
1.3.0
@@ -153,14 +153,14 @@
6.0.0-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
- 9.0.1-alpha.1.20526.1
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
+ 9.0.1-alpha.1.20530.2
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index fcc6019..99bf28c 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 baa8dca..5cd421a 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20527.10",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20527.10",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20527.10",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20527.10",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20529.1",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20529.1",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20529.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20529.1",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
"Microsoft.Build.NoTargets": "2.0.1",
--
2.7.4