mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2020-09-16 13:03:16 +00:00 • committed by GitHub
parent 7e7de71fc4
commit 25792f69e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eng/Version.Details.xml
View file

@ -140,13 +140,13 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha> <Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
</Dependency> </Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1"> <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -17,7 +17,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- 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>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

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

@ -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
View file

@ -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
View file

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