Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade dotnet/llvm-project d…
Browse files Browse the repository at this point in the history
…otnet/xharness (#44062)

[master] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/xharness
  • Loading branch information
dotnet-maestro[bot] authored Oct 31, 2020
1 parent 8025436 commit bbd83cd
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.20528.1",
"version": "1.0.0-prerelease.20530.4",
"commands": [
"xharness"
]
Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,61 +10,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20527.10">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20527.10">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20529.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -126,37 +126,37 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20526.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>dcd8213d41770d6371bb806bcae35f2c954e336d</Sha>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -190,13 +190,13 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>57974c1f5790e6fb33f5fce161707be5cd86c4d3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20528.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20530.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cfc0a5212a78054d934cb2ec5cd9bb29e46a9470</Sha>
<Sha>bdad61dfc3d09ae826ba940d92e43a7441ec83b0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20528.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20530.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cfc0a5212a78054d934cb2ec5cd9bb29e46a9470</Sha>
<Sha>bdad61dfc3d09ae826ba940d92e43a7441ec83b0</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
40 changes: 20 additions & 20 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.20513.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20527.10</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20527.10</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20527.10</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20527.10</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20527.10</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20527.10</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20527.10</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20527.10</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20527.10</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20527.10</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20529.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20529.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20529.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20529.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20529.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20529.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20529.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20529.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20529.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20529.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-alpha.1.20501.4</MicrosoftNETCoreDotNetHostVersion>
Expand Down Expand Up @@ -137,8 +137,8 @@
<RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion>
<!-- Testing -->
<MicrosoftNETTestSdkVersion>16.8.0-release-20201022-02</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20528.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20528.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20530.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20530.4</MicrosoftDotNetXHarnessCLIVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand All @@ -153,14 +153,14 @@
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20526.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20526.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20526.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20526.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20526.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20526.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20526.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20526.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20526.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
76 changes: 52 additions & 24 deletions eng/common/post-build/symbols-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -45,7 +57,7 @@ $CountMissingSymbols = {
Write-Host "Something went wrong extracting $PackagePath"
Write-Host $_
return [pscustomobject]@{
result = -1
result = $using:ERROR_BADEXTRACT
packagePath = $PackagePath
}
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit bbd83cd

Please sign in to comment.