diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b71df741dc2..803d5169594 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 23372e950114fb772652f79d9990129db55edff8 + fe787bd48ed72e51a98eb5e4e5e5af74edb531e5 - + https://github.com/dotnet/arcade - 23372e950114fb772652f79d9990129db55edff8 + fe787bd48ed72e51a98eb5e4e5e5af74edb531e5 - + https://github.com/dotnet/arcade - 23372e950114fb772652f79d9990129db55edff8 + fe787bd48ed72e51a98eb5e4e5e5af74edb531e5 - + https://github.com/dotnet/arcade - 23372e950114fb772652f79d9990129db55edff8 + fe787bd48ed72e51a98eb5e4e5e5af74edb531e5 - + https://github.com/dotnet/arcade - 23372e950114fb772652f79d9990129db55edff8 + fe787bd48ed72e51a98eb5e4e5e5af74edb531e5 diff --git a/eng/Versions.props b/eng/Versions.props index c5955f4867e..0c374b1f116 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ - 6.0.0-beta.21419.2 - 6.0.0-beta.21419.2 - 6.0.0-beta.21419.2 + 6.0.0-beta.21420.4 + 6.0.0-beta.21420.4 + 6.0.0-beta.21420.4 diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 5bd205b5da3..3e6a8d6acf2 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 bf272dcf55a..080c2c283ae 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/global.json b/global.json index 26685fe57e8..afde6d2bee9 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21419.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21419.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21420.4" }, "sdk": { "version": "6.0.100-rc.1.21416.15"