mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20190205.5 (#396)

Browse source 
This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19105.5
This commit is contained in:
dotnet-maestro[bot] 2019-02-06 13:45:20 +00:00 committed by GitHub
parent 4100ddf0c4
commit 3a9bb28036
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -28,9 +28,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19104.18"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19105.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8888f0d15c7cc51018ffaf0a9a408f7ba8e82301</Sha> <Sha>fa3e68e079feda7443f2a783dc2065b087038113</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

5
eng/common/tools.ps1
View file

@ -161,9 +161,10 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
return $installScript return $installScript
} }
function InstallDotNetSdk([string] $dotnetRoot, [string] $version) { function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") {
$installScript = GetDotNetInstallScript $dotnetRoot $installScript = GetDotNetInstallScript $dotnetRoot
& $installScript -Version $version -InstallDir $dotnetRoot $archArg = if ($architecture) { $architecture } else { "<auto>" }
& $installScript -Version $version -InstallDir $dotnetRoot -Architecture $archArg
if ($lastExitCode -ne 0) { if ($lastExitCode -ne 0) {
Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red
ExitWithExitCode $lastExitCode ExitWithExitCode $lastExitCode

7
eng/common/tools.sh
View file

@ -153,7 +153,12 @@ function InstallDotNetSdk {
GetDotNetInstallScript "$root" GetDotNetInstallScript "$root"
local install_script=$_GetDotNetInstallScript local install_script=$_GetDotNetInstallScript
bash "$install_script" --version $version --install-dir "$root" || { local arch_arg=""
if [[ $# == 3 ]]; then
arch_arg="--architecture $3"
fi
bash "$install_script" --version $version --install-dir "$root" $arch_arg || {
local exit_code=$? local exit_code=$?
echo "Failed to install dotnet SDK (exit code '$exit_code')." >&2 echo "Failed to install dotnet SDK (exit code '$exit_code')." >&2
ExitWithExitCode $exit_code ExitWithExitCode $exit_code

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview-009812" "dotnet": "3.0.100-preview-009812"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19104.18" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19105.5"
} }
} }