From a1f528d854ee057290682490a74e59a809fe453f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:26:15 +0000
Subject: [release/6.0] Update dependencies from dotnet/arcade (#2232)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 8 ++++----
eng/Versions.props | 2 +-
eng/common/build.sh | 5 ++++-
eng/common/init-tools-native.sh | 2 +-
eng/common/native/common-library.sh | 8 ++++++--
eng/common/post-build/sourcelink-validation.ps1 | 8 ++++++--
eng/common/sdk-task.ps1 | 4 +++-
eng/common/templates/job/job.yml | 2 +-
eng/common/tools.ps1 | 6 +++---
eng/common/tools.sh | 2 +-
global.json | 2 +-
11 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a5d697987..af1e129b1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,14 +3,14 @@
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 474307e526160c813c9fd58060eb8356ccca6099
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 474307e526160c813c9fd58060eb8356ccca6099
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 3518c2525..a467a25b1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
5.0.0
17.0.0-preview-21267-01
17.0.0-preview-21267-01
- 6.0.0-beta.21418.12
+ 6.0.0-beta.21427.6
6.0.0-beta.21271.1
3.10.0-2.final
3.10.0-2.final
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 9d3042a94..bc07a1c68 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,7 +187,10 @@ function InitializeCustomToolset {
}
function Build {
- TryLogClientIpAddress
+
+ if [[ "$ci" == true ]]; then
+ TryLogClientIpAddress
+ fi
InitializeToolset
InitializeCustomToolset
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index 5bd205b5d..3e6a8d6ac 100755
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -10,7 +10,7 @@ force=false
download_retries=5
retry_wait_time_seconds=30
global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
-declare -A native_assets
+declare -a native_assets
. $scriptroot/pipeline-logging-functions.sh
. $scriptroot/native/common-library.sh
diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh
index bf272dcf5..080c2c283 100755
--- a/eng/common/native/common-library.sh
+++ b/eng/common/native/common-library.sh
@@ -148,8 +148,12 @@ function NewScriptShim {
fi
if [[ ! -f $tool_file_path ]]; then
- Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
- return 1
+ # try to see if the path is lower cased
+ tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")"
+ if [[ ! -f $tool_file_path ]]; then
+ Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
+ return 1
+ fi
fi
local shim_contents=$'#!/usr/bin/env bash\n'
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/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 7ffa3591e..7ab9baac5 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -83,7 +83,9 @@ try {
}
if ($restore) {
- Try-LogClientIpAddress
+ if ($ci) {
+ Try-LogClientIpAddress
+ }
Build 'Restore'
}
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 866967934..37dceb1ba 100644
--- 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/eng/common/tools.ps1 b/eng/common/tools.ps1
index e607aa436..56ee4a577 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir
}
- # In case of network error, try to log the current IP for reference
- Try-LogClientIpAddress
-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0
@@ -166,6 +163,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+ # In case of network error, try to log the current IP for reference
+ Try-LogClientIpAddress
}
# Source Build uses DotNetCoreSdkDir variable
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 3c5f3a12c..41e323104 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -402,7 +402,7 @@ function StopProcesses {
function TryLogClientIpAddress () {
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
if command -v curl > /dev/null; then
- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi
}
diff --git a/global.json b/global.json
index 36d6b4f0f..60bf92bb8 100644
--- a/global.json
+++ b/global.json
@@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
}
--
cgit v1.2.3