Skip to content

Commit

Permalink
Update build tools version to have a new "tools" structure for config…
Browse files Browse the repository at this point in the history
….json file (dotnet#10864)

(cherry picked from commit e622857)

# Conflicts:
#	BuildToolsVersion.txt
#	config.json
  • Loading branch information
maririos authored and dagood committed Aug 23, 2016
1 parent d71fa97 commit 6f62cf0
Show file tree
Hide file tree
Showing 7 changed files with 173 additions and 210 deletions.
2 changes: 1 addition & 1 deletion build-managed.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@call %~dp0run.cmd build-managed -nodeReuse -binclashWindows %*
@call %~dp0run.cmd build-managed %*
@exit /b %ERRORLEVEL%
2 changes: 1 addition & 1 deletion build-managed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ done

export CORECLR_SERVER_GC="$__ServerGC"

$__scriptpath/run.sh build-managed -binclashUnix $__BuildOS $__TargetOS $__TestNugetRuntimeId $__UnprocessedBuildArgs
$__scriptpath/run.sh build-managed $__BuildOS $__TargetOS $__TestNugetRuntimeId $__UnprocessedBuildArgs
exit $?
2 changes: 1 addition & 1 deletion build-packages.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@call %~dp0run.cmd build-managed -packages -nodeReuse -binclashWindows %*
@call %~dp0run.cmd build-managed -packages %*
@exit /b %ERRORLEVEL%
2 changes: 1 addition & 1 deletion build-packages.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$working_tree_root/run.sh build-managed -packages -binclashUnix $*
$working_tree_root/run.sh build-managed -packages $*
exit $?
2 changes: 1 addition & 1 deletion build-tests.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@call %~dp0run.cmd build-managed -tests -nodeReuse -binclashWindows %*
@call %~dp0run.cmd build-managed -tests %*
@exit /b %ERRORLEVEL%
2 changes: 1 addition & 1 deletion build-tests.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$working_tree_root/run.sh build-managed -tests -binclashUnix $*
$working_tree_root/run.sh build-managed -tests $*
exit $?
Loading

0 comments on commit 6f62cf0

Please sign in to comment.