Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20200…
Browse files Browse the repository at this point in the history
…914.13 (dotnet/linker#1495)

[master] Update dependencies from dotnet/arcade


Commit migrated from dotnet/linker@391d76f
  • Loading branch information
dotnet-maestro[bot] committed Sep 16, 2020
1 parent c37ec3c commit 0c2e1df
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 18 deletions.
8 changes: 4 additions & 4 deletions src/tools/illink/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20459.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20464.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20459.8">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20464.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20463.3">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
<MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20459.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20464.13</MicrosoftDotNetApiCompatVersion>
<!-- We depend on (and redistribute) the official Mono.Cecil NuGet package built from https://github.com/jbevain/cecil -->
<MonoCecilVersion>0.11.2</MonoCecilVersion>
</PropertyGroup>
Expand Down
26 changes: 20 additions & 6 deletions src/tools/illink/eng/common/post-build/sourcelink-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,27 @@ $ValidatePackage = {

if ($FailedFiles -eq 0) {
Write-Host 'Passed.'
return 0
return [pscustomobject]@{
result = 0
packagePath = $PackagePath
}
}
else {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
return 1
return [pscustomobject]@{
result = 1
packagePath = $PackagePath
}
}
}

function CheckJobResult(
$result,
$packagePath,
[ref]$ValidationFailures) {
if ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
$ValidationFailures.Value++
}
}

Expand Down Expand Up @@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
}

foreach ($Job in @(Get-Job -State 'Completed')) {
$jobResult = Receive-Job -Id $Job.Id
if ($jobResult -ne '0') {
$ValidationFailures++
}
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
Remove-Job -Id $Job.Id
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@ $CountMissingSymbols = {
if ($using:Clean) {
Remove-Item $ExtractPath -Recurse -Force
}

if ($MissingSymbols -ne 0)
{
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
}

Pop-Location

Expand All @@ -165,6 +160,7 @@ function CheckJobResult(
$DupedSymbols.Value++
}
elseif ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
$TotalFailures.Value++
}
}
Expand Down Expand Up @@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null

$NumJobs = @(Get-Job -State 'Running').Count
Write-Host $NumJobs

while ($NumJobs -ge $MaxParallelJobs) {
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20463.3"
}
Expand Down

0 comments on commit 0c2e1df

Please sign in to comment.