Update dependencies from https://github.com/dotnet/arcade build 20200914.13 (#2971)
[master] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
456c76aa38
Коммит
c3ee118a4e
|
@ -3,17 +3,17 @@
|
|||
<ProductDependencies>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20461.7">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20464.13">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
|
||||
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20461.7">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20464.13">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
|
||||
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20461.7">
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20464.13">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
|
||||
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -18,6 +18,6 @@
|
|||
<SnVersion>1.0.0</SnVersion>
|
||||
<VSWhereVersion>2.5.2</VSWhereVersion>
|
||||
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20461.7</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20464.13</MicrosoftDotNetGenAPIVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -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."
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7",
|
||||
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13",
|
||||
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20464.13"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче