Update dependencies from https://github.com/dotnet/arcade build 20210513.5 (#10628)

[main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21261.1 to 1.0.0-beta.21262.1 (parent: Microsoft.DotNet.Arcade.Sdk)
2021-05-14 13:08:05 +00:00 · 2021-05-14 13:08:05 +00:00 · 94d9b1ee65
commit 94d9b1ee65
parent ff7efdb5df
5 changed files with 72 additions and 43 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -136,14 +136,14 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21263.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21263.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha>
+      <Sha>e8d0df4f35cfa23174fe7204ef958cf5d1b8e797</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21263.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21263.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha>
+      <Sha>e8d0df4f35cfa23174fe7204ef958cf5d1b8e797</Sha>
    </Dependency>
    <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@ -153,9 +153,9 @@
      <Uri>https://github.com/dotnet/sourcelink</Uri>
      <Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
    </Dependency>
-    <Dependency Name="XliffTasks" Version="1.0.0-beta.21261.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="XliffTasks" Version="1.0.0-beta.21262.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>1dacaf9f6c80953627314b44b538c3f3c109b41d</Sha>
+      <Sha>ac8cf3454829acf944e4ccb22b97d5abe3cb15ae</Sha>
    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -20,7 +20,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21263.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@ -16,6 +16,8 @@ $global:RepoFiles = @{}
 # Maximum number of jobs to run in parallel
 $MaxParallelJobs = 16

+$MaxRetries = 5
+
 # Wait time between check for system load
 $SecondsBetweenLoadChecks = 10

@ -29,7 +31,10 @@ $ValidatePackage = {
  # Ensure input file exist
  if (!(Test-Path $PackagePath)) {
    Write-Host "Input file does not exist: $PackagePath"
-    return 1
+    return [pscustomobject]@{
+      result = 1
+      packagePath = $PackagePath
+    }
  }

  # Extensions for which we'll look for SourceLink information
@ -59,7 +64,10 @@ $ValidatePackage = {

          # We ignore resource DLLs
          if ($FileName.EndsWith('.resources.dll')) {
-            return
+            return [pscustomobject]@{
+              result = 0
+              packagePath = $PackagePath
+            }
          }

          [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
@ -91,36 +99,49 @@ $ValidatePackage = {
                    $Status = 200
                    $Cache = $using:RepoFiles

-                    if ( !($Cache.ContainsKey($FilePath)) ) {
-                      try {
-                        $Uri = $Link -as [System.URI]
-                      
-                        # Only GitHub links are valid
-                        if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
-                          $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                    $totalRetries = 0
+
+                    while ($totalRetries -lt $using:MaxRetries) {
+                      if ( !($Cache.ContainsKey($FilePath)) ) {
+                        try {
+                          $Uri = $Link -as [System.URI]
+                        
+                          # Only GitHub links are valid
+                          if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+                            $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                          }
+                          else {
+                            # If it's not a github link, we want to break out of the loop and not retry.
+                            $Status = 0
+                            $totalRetries = $using:MaxRetries
+                          }
                        }
-                        else {
+                        catch {
+                          Write-Host $_
                          $Status = 0
                        }
                      }
-                      catch {
-                        write-host $_
-                        $Status = 0
-                      }
-                    }

-                    if ($Status -ne 200) {
-                      if ($NumFailedLinks -eq 0) {
-                        if ($FailedFiles.Value -eq 0) {
-                          Write-Host
+                      if ($Status -ne 200) {
+                        $totalRetries++
+                        
+                        if ($totalRetries -ge $using:MaxRetries) {
+                          if ($NumFailedLinks -eq 0) {
+                            if ($FailedFiles.Value -eq 0) {
+                              Write-Host
+                            }
+  
+                            Write-Host "`tFile $RealPath has broken links:"
+                          }
+  
+                          Write-Host "`t`tFailed to retrieve $Link"
+  
+                          $NumFailedLinks++
                        }
-
-                        Write-Host "`tFile $RealPath has broken links:"
                      }
-
-                      Write-Host "`t`tFailed to retrieve $Link"
-
-                      $NumFailedLinks++
+                      else {
+                        break
+                      }
                    }
                  }
              }
@ -136,7 +157,7 @@ $ValidatePackage = {
        }
  }
  catch {
-  
+    Write-Host $_
  }
  finally {
    $zip.Dispose() 
@ -220,6 +241,7 @@ function ValidateSourceLinkLinks {
  # Process each NuGet package in parallel
  Get-ChildItem "$InputPath\*.symbols.nupkg" |
    ForEach-Object {
+      Write-Host "Starting $($_.FullName)"
      Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null
      $NumJobs = @(Get-Job -State 'Running').Count
      
@ -267,6 +289,10 @@ function InstallSourcelinkCli {
 try {
  InstallSourcelinkCli

+  foreach ($Job in @(Get-Job)) {
+    Remove-Job -Id $Job.Id
+  }
+
  ValidateSourceLinkLinks 
 }
 catch {
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@ -133,27 +133,27 @@ $CountMissingSymbols = {
        elseif (Test-Path $SymbolPath) {
          return 'Module'
        }
-        elseif ($output.Contains("503 Service Unavailable")) {
-          # If we got a 503 error, we should retry.
+        else
+        {
          $totalRetries++
        }
-        else {
-          return $null
-        }
      }
      
      return $null
    }

+    $FileGuid = New-Guid
+    $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
+
    $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
        -FullPath $FileName `
        -TargetServerParam '--microsoft-symbol-server' `
-        -SymbolsPath $SymbolsPath `
+        -SymbolsPath "$ExpandedSymbolsPath-msdl" `
        -WindowsPdbVerificationParam $WindowsPdbVerificationParam
    $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
        -FullPath $FileName `
        -TargetServerParam '--internal-server' `
-        -SymbolsPath $SymbolsPath `
+        -SymbolsPath "$ExpandedSymbolsPath-symweb" `
        -WindowsPdbVerificationParam $WindowsPdbVerificationParam

    Write-Host -NoNewLine "`t Checking file " $FileName "... "
@ -217,6 +217,7 @@ function CheckSymbolsAvailable {
    Remove-Item $ExtractPath -Force  -Recurse -ErrorAction SilentlyContinue
  }

+  $TotalPackages = 0
  $TotalFailures = 0
  $DupedSymbols = 0

@ -239,6 +240,8 @@ function CheckSymbolsAvailable {
        return
      }

+      $TotalPackages++
+
      Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null

      $NumJobs = @(Get-Job -State 'Running').Count
@ -264,11 +267,11 @@ function CheckSymbolsAvailable {

  if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) {
    if ($TotalFailures -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages"
    }

    if ($DupedSymbols -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols packages had duplicated symbol files"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted"
    }
    
    ExitWithExitCode 1
--- a/global.json
+++ b/global.json
@ -11,7 +11,7 @@
    "cmake": "3.16.4"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.5",
    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
  }
 }