Update dependencies from https://github.com/dotnet/arcade build 20200914.13 (#8590)
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade
This commit is contained in:
parent
7e7de71fc4
commit
25792f69e7
5 changed files with 27 additions and 18 deletions
|
@ -140,13 +140,13 @@
|
|||
</Dependency>
|
||||
</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.Build.Tasks.Installers" Version="5.0.0-beta.20459.8">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20464.13">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
||||
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20459.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20464.13</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
@ -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++
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
@ -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++
|
||||
}
|
||||
}
|
||||
|
@ -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."
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue