Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20200914.13 (#662)

[master] Update dependencies from dotnet/arcade
finitereality/replica-status-colors
dotnet-maestro[bot] 6 years ago
committed by GitHub
parent
commit
b96619d8fc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 26
      eng/common/post-build/sourcelink-validation.ps1
  3. 7
      eng/common/post-build/symbols-validation.ps1
  4. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20461.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20464.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20461.7"> <Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20464.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="5.0.0-beta.20461.7"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="5.0.0-beta.20464.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

26
eng/common/post-build/sourcelink-validation.ps1

@ -144,11 +144,27 @@ $ValidatePackage = {
if ($FailedFiles -eq 0) { if ($FailedFiles -eq 0) {
Write-Host 'Passed.' Write-Host 'Passed.'
return 0 return [pscustomobject]@{
result = 0
packagePath = $PackagePath
}
} }
else { else {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links." 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')) { foreach ($Job in @(Get-Job -State 'Completed')) {
$jobResult = Receive-Job -Id $Job.Id $jobResult = Wait-Job -Id $Job.Id | Receive-Job
if ($jobResult -ne '0') { CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
$ValidationFailures++
}
Remove-Job -Id $Job.Id Remove-Job -Id $Job.Id
} }
} }

7
eng/common/post-build/symbols-validation.ps1

@ -141,11 +141,6 @@ $CountMissingSymbols = {
if ($using:Clean) { if ($using:Clean) {
Remove-Item $ExtractPath -Recurse -Force 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 Pop-Location
@ -165,6 +160,7 @@ function CheckJobResult(
$DupedSymbols.Value++ $DupedSymbols.Value++
} }
elseif ($jobResult.result -ne '0') { elseif ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
$TotalFailures.Value++ $TotalFailures.Value++
} }
} }
@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count $NumJobs = @(Get-Job -State 'Running').Count
Write-Host $NumJobs
while ($NumJobs -ge $MaxParallelJobs) { while ($NumJobs -ge $MaxParallelJobs) {
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."

2
global.json

@ -11,6 +11,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13"
} }
} }

Loading…
Cancel
Save