From 0370cb284361b558107358066f1dfa50fb31bcf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 17:30:27 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210827.6 (#25770) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/common/post-build/sourcelink-validation.ps1 | 8 ++++++-- eng/common/templates/job/job.yml | 2 +- global.json | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4129f161114..a01a18e9c25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,13 +47,13 @@ - + https://github.com/dotnet/arcade - 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb + 474307e526160c813c9fd58060eb8356ccca6099 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 3b6fc953337..e8ab29afeb3 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -107,8 +107,12 @@ $ValidatePackage = { 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')) { + if ($Link -match "submodules") { + # Skip submodule links until sourcelink properly handles submodules + $Status = 200 + } + elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { + # Only GitHub links are valid $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode } else { diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 86696793480..37dceb1bab0 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -103,7 +103,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 9ab665a944a..aa183d0c637 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21425.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6" } }