Update dependencies from https://github.com/dotnet/arcade build 20200227.9 (#6600)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20127.9
This commit is contained in:
parent
4f0ed43342
commit
c9876465f5
4 changed files with 44 additions and 13 deletions
|
@ -100,9 +100,9 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20126.7">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20127.9">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>cd4164e1f3f7daf2a6f8dbd012210c93521bd82f</Sha>
|
<Sha>9c66925c608f3c0ee3e1f66c05943865b64590e1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
2
eng/common/dotnet-install.sh
vendored
2
eng/common/dotnet-install.sh
vendored
|
@ -63,7 +63,7 @@ case $cpuname in
|
||||||
amd64|x86_64)
|
amd64|x86_64)
|
||||||
buildarch=x64
|
buildarch=x64
|
||||||
;;
|
;;
|
||||||
armv7l)
|
armv*l)
|
||||||
buildarch=arm
|
buildarch=arm
|
||||||
;;
|
;;
|
||||||
i686)
|
i686)
|
||||||
|
|
|
@ -34,6 +34,14 @@ while (($# > 0)); do
|
||||||
force=true
|
force=true
|
||||||
shift 1
|
shift 1
|
||||||
;;
|
;;
|
||||||
|
--donotabortonfailure)
|
||||||
|
donotabortonfailure=true
|
||||||
|
shift 1
|
||||||
|
;;
|
||||||
|
--donotdisplaywarnings)
|
||||||
|
donotdisplaywarnings=true
|
||||||
|
shift 1
|
||||||
|
;;
|
||||||
--downloadretries)
|
--downloadretries)
|
||||||
download_retries=$2
|
download_retries=$2
|
||||||
shift 2
|
shift 2
|
||||||
|
@ -52,6 +60,8 @@ while (($# > 0)); do
|
||||||
echo " - (default) %USERPROFILE%/.netcoreeng/native"
|
echo " - (default) %USERPROFILE%/.netcoreeng/native"
|
||||||
echo ""
|
echo ""
|
||||||
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
|
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
|
||||||
|
echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure"
|
||||||
|
echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure"
|
||||||
echo " --force Clean and then install tools"
|
echo " --force Clean and then install tools"
|
||||||
echo " --help Print help and exit"
|
echo " --help Print help and exit"
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -92,6 +102,7 @@ if [[ -z $install_directory ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install_bin="${native_base_dir}/bin"
|
install_bin="${native_base_dir}/bin"
|
||||||
|
installed_any=false
|
||||||
|
|
||||||
ReadGlobalJsonNativeTools
|
ReadGlobalJsonNativeTools
|
||||||
|
|
||||||
|
@ -103,8 +114,8 @@ else
|
||||||
for tool in "${!native_assets[@]}"
|
for tool in "${!native_assets[@]}"
|
||||||
do
|
do
|
||||||
tool_version=${native_assets[$tool]}
|
tool_version=${native_assets[$tool]}
|
||||||
installer_name="install-$tool.sh"
|
installer_path="$native_installer_dir/install-$tool.sh"
|
||||||
installer_command="$native_installer_dir/$installer_name"
|
installer_command="$installer_path"
|
||||||
installer_command+=" --baseuri $base_uri"
|
installer_command+=" --baseuri $base_uri"
|
||||||
installer_command+=" --installpath $install_bin"
|
installer_command+=" --installpath $install_bin"
|
||||||
installer_command+=" --version $tool_version"
|
installer_command+=" --version $tool_version"
|
||||||
|
@ -118,11 +129,29 @@ else
|
||||||
installer_command+=" --clean"
|
installer_command+=" --clean"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$installer_command
|
if [[ -a $installer_path ]]; then
|
||||||
|
$installer_command
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
|
if [[ $donotabortonfailure = true ]]; then
|
||||||
exit 1
|
if [[ $donotdisplaywarnings != true ]]; then
|
||||||
|
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
$installed_any = true
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if [[ $donotabortonfailure == true ]]; then
|
||||||
|
if [[ $donotdisplaywarnings != true ]]; then
|
||||||
|
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -135,8 +164,10 @@ if [[ -d $install_bin ]]; then
|
||||||
echo "Native tools are available from $install_bin"
|
echo "Native tools are available from $install_bin"
|
||||||
echo "##vso[task.prependpath]$install_bin"
|
echo "##vso[task.prependpath]$install_bin"
|
||||||
else
|
else
|
||||||
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
|
if [[ $installed_any = true ]]; then
|
||||||
exit 1
|
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
"dotnet": "5.0.100-alpha1-015949"
|
"dotnet": "5.0.100-alpha1-015949"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20126.7"
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20127.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue