diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c3c76071..0fca17302 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -157,32 +157,32 @@ - + https://github.com/dotnet/arcade - 3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e + 809cbb58dea1d1e477ab0e12855d1758d50844a8 - + https://github.com/dotnet/arcade - 3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e + 809cbb58dea1d1e477ab0e12855d1758d50844a8 - + https://github.com/dotnet/arcade - 3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e + 809cbb58dea1d1e477ab0e12855d1758d50844a8 https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - eb501912e5ffca67618ed2c9b72b8555a919ee1d + 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 - + https://github.com/dotnet/xliff-tasks - 1eb796ccdaef78f10078697459329952dd082462 + 370da425b0478879d5f8f407b3e4db495bcdcc11 diff --git a/eng/Versions.props b/eng/Versions.props index 60bccfaef..ea7e6ac5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21424.3 + 6.0.0-beta.21425.3 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 3b6fc9533..e8ab29afe 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/global.json b/global.json index cc2c58504..20602fcc0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21424.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21424.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21425.3" } }