Skip to content

Commit ae42852

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210827.6 (#518)
[main] Update dependencies from dotnet/arcade
1 parent 3c2eb0c commit ae42852

File tree

8 files changed

+21
-12
lines changed

8 files changed

+21
-12
lines changed

Diff for: eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
8+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

Diff for: eng/common/build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,10 @@ function InitializeCustomToolset {
187187
}
188188

189189
function Build {
190-
TryLogClientIpAddress
190+
191+
if [[ "$ci" == true ]]; then
192+
TryLogClientIpAddress
193+
fi
191194
InitializeToolset
192195
InitializeCustomToolset
193196

Diff for: eng/common/post-build/sourcelink-validation.ps1

+6-2
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 {

Diff for: eng/common/sdk-task.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ try {
8383
}
8484

8585
if ($restore) {
86-
Try-LogClientIpAddress
86+
if ($ci) {
87+
Try-LogClientIpAddress
88+
}
8789
Build 'Restore'
8890
}
8991

Diff for: eng/common/templates/job/job.yml

+1-1
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)

Diff for: eng/common/tools.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
154154
return $global:_DotNetInstallDir
155155
}
156156

157-
# In case of network error, try to log the current IP for reference
158-
Try-LogClientIpAddress
159-
160157
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161158
$env:DOTNET_MULTILEVEL_LOOKUP=0
162159

@@ -166,6 +163,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
166163
# Disable telemetry on CI.
167164
if ($ci) {
168165
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
166+
167+
# In case of network error, try to log the current IP for reference
168+
Try-LogClientIpAddress
169169
}
170170

171171
# Source Build uses DotNetCoreSdkDir variable

Diff for: eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ function StopProcesses {
402402
function TryLogClientIpAddress () {
403403
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
404404
if command -v curl > /dev/null; then
405-
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
405+
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
406406
fi
407407
}
408408

Diff for: global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "6.0.100-rc.1.21379.2"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4"
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6"
77
}
88
}

0 commit comments

Comments
 (0)