Skip to content

Commit c4b6647

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210827.6 (#35890)
[release/6.0] Update dependencies from dotnet/arcade
1 parent f7ec71f commit c4b6647

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,22 @@
296296
<Uri>https://github.com/dotnet/runtime</Uri>
297297
<Sha>fedf1bf8db1197925fd04a8534c6dae006fe7114</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21425.1">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
301+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
302302
<SourceBuild RepoName="arcade" ManagedOnly="true" />
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21425.1">
304+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21427.6">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
306+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21425.1">
308+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21427.6">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
310+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21425.1">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>65c6d2fae35c9e7166b3d50aa7061115ebe26cdb</Sha>
314+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
315315
</Dependency>
316316
</ToolsetDependencies>
317317
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
<MicrosoftEntityFrameworkCoreVersion>6.0.0-rc.2.21428.3</MicrosoftEntityFrameworkCoreVersion>
139139
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-rc.2.21428.3</MicrosoftEntityFrameworkCoreDesignVersion>
140140
<!-- Packages from dotnet/arcade -->
141-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21425.1</MicrosoftDotNetBuildTasksInstallersVersion>
142-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21425.1</MicrosoftDotNetBuildTasksTemplatingVersion>
141+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksInstallersVersion>
142+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksTemplatingVersion>
143143
</PropertyGroup>
144144
<!--
145145

eng/common/post-build/sourcelink-validation.ps1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@ $ValidatePackage = {
107107
try {
108108
$Uri = $Link -as [System.URI]
109109

110-
# Only GitHub links are valid
111-
if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
110+
if ($Link -match "submodules") {
111+
# Skip submodule links until sourcelink properly handles submodules
112+
$Status = 200
113+
}
114+
elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
115+
# Only GitHub links are valid
112116
$Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
113117
}
114118
else {

eng/common/templates/job/job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103

104104
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
105105
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
106-
- task: MicroBuildSigningPlugin@2
106+
- task: MicroBuildSigningPlugin@3
107107
displayName: Install MicroBuild plugin
108108
inputs:
109109
signType: $(_SignType)

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.1",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21425.1"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6"
3434
}
3535
}

0 commit comments

Comments
 (0)