[main] Update dependencies from dotnet/arcade (#1623)

* Update dependencies from https://github.com/dotnet/arcade build 20210819.2

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21418.12 -> To Version 6.0.0-beta.21419.2

* Update dependencies from https://github.com/dotnet/arcade build 20210820.4

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21418.12 -> To Version 6.0.0-beta.21420.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2021-08-24 11:33:05 -07:00 коммит произвёл GitHub
Родитель 1a9dd21ac2
Коммит c07c79e3d0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21418.12">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

Просмотреть файл

@ -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

Просмотреть файл

@ -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'

Просмотреть файл

@ -3,7 +3,7 @@
"dotnet": "6.0.100-rc.1.21379.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4"
},
"sdk": {
"version": "6.0.100-rc.1.21379.2",