diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96436ad822..514e13b56fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,13 +14,13 @@ - + https://github.com/dotnet/arcade - 3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e + 809cbb58dea1d1e477ab0e12855d1758d50844a8 - + https://github.com/dotnet/arcade - 3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e + 809cbb58dea1d1e477ab0e12855d1758d50844a8 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 9c6377af665..32c1d50fe65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ --> - 6.0.0-beta.21424.3 + 6.0.0-beta.21425.3 6.0.0-rc.2.21425.1 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/global.json b/global.json index b64db5942ed..08e0576d775 100644 --- a/global.json +++ b/global.json @@ -16,6 +16,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21424.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.3" } }