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

Merge pull request #258 from dotnet/darc-master-625688e9-aeaa-4c70-ad2e-decf27dc1b9a

Browse source 
Update dependencies from dotnet/arcade
This commit is contained in:
Livar 2019-01-09 10:50:53 -08:00 • committed by GitHub
commit 2b74fceb74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -24,9 +24,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19057.6"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19058.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>860df47b9e2b3f06f458382c20276bac3f84301c</Sha> <Sha>35ce15432d5ae2faa563ad0ba99aff49f8e28130</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

4
eng/common/build.sh
View file

@ -3,6 +3,10 @@
# Stop script if unbound variable found (use ${var:-} if intentional) # Stop script if unbound variable found (use ${var:-} if intentional)
set -u set -u
# Stop script if command returns non-zero exit code.
# Prevents hidden errors caused by missing error code propagation.
set -e
usage() usage()
{ {
echo "Common settings:" echo "Common settings:"

33
eng/common/tools.sh
View file

@ -1,8 +1,3 @@
#!/usr/bin/env bash
# Stop script if unbound variable found (use ${var:-} if intentional)
set -u
# Initialize variables if they aren't already defined. # Initialize variables if they aren't already defined.
# CI mode - set to true on CI server for PR validation build or official build. # CI mode - set to true on CI server for PR validation build or official build.
@ -151,13 +146,11 @@ function InstallDotNetSdk {
GetDotNetInstallScript "$root" GetDotNetInstallScript "$root"
local install_script=$_GetDotNetInstallScript local install_script=$_GetDotNetInstallScript
bash "$install_script" --version $version --install-dir "$root" bash "$install_script" --version $version --install-dir "$root" || {
local lastexitcode=$? local exit_code=$?
echo "Failed to install dotnet SDK (exit code '$exit_code')." >&2
if [[ $lastexitcode != 0 ]]; then ExitWithExitCode $exit_code
echo "Failed to install dotnet SDK (exit code '$lastexitcode')." >&2 }
ExitWithExitCode $lastexitcode
fi
} }
function GetDotNetInstallScript { function GetDotNetInstallScript {
@ -259,8 +252,8 @@ function ExitWithExitCode {
function StopProcesses { function StopProcesses {
echo "Killing running build processes..." echo "Killing running build processes..."
pkill -9 "dotnet" pkill -9 "dotnet" || true
pkill -9 "vbcscompiler" pkill -9 "vbcscompiler" || true
return 0 return 0
} }
@ -284,13 +277,11 @@ function MSBuild {
warnaserror_switch="/warnaserror" warnaserror_switch="/warnaserror"
fi fi
"$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" || {
lastexitcode=$? local exit_code=$?
echo "Build failed (exit code '$exit_code')." >&2
if [[ $lastexitcode != 0 ]]; then ExitWithExitCode $exit_code
echo "Build failed (exit code '$lastexitcode')." >&2 }
ExitWithExitCode $lastexitcode
fi
} }
ResolvePath "${BASH_SOURCE[0]}" ResolvePath "${BASH_SOURCE[0]}"

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.19057.6" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19058.2"
} }
} }