Update dependencies from https://github.com/dotnet/arcade build 20210…

…827.6 (#25770) [release/6.0] Update dependencies from dotnet/arcade
dotnet · Aug 28, 2021 · 0370cb2 · 0370cb2
1 parent 7c007a2
commit 0370cb2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,13 +47,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21425.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
+      <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21425.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
+      <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git 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
@@ -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
@@ -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"
   }
 }