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

remove predefined runtimes from dotnet-restore

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2015-11-02 16:42:21 -08:00
parent b35fba863b
commit ee84f498fa
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/bootstrap.cmd
View file

@ -45,7 +45,7 @@ popd
if exist "%STAGE1_DIR%" rd /s /q "%STAGE1_DIR%"
echo Running 'dotnet restore' to restore packages
call dotnet restore "%REPOROOT%"
call dotnet restore "%REPOROOT%" --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64"
if errorlevel 1 goto fail
echo Building basic dotnet tools using older dotnet SDK version
@ -132,7 +132,7 @@ REM Smoke-test the output
set PATH=%STAGE2_DIR%;%START_PATH%
del "%REPOROOT%\test\TestApp\project.lock.json"
dotnet restore "%REPOROOT%\test\TestApp" --quiet
dotnet restore "%REPOROOT%\test\TestApp" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64"
dotnet compile "%REPOROOT%\test\TestApp" --output "%REPOROOT%\artifacts\%RID%\smoketest"
set CLRHOST_CLR_PATH=%STAGE2_DIR%

5
scripts/bootstrap.sh
View file

@ -43,7 +43,7 @@ DNX_ROOT="$(dirname $(which dotnet))/dnx"
banner "Restoring packages"
dotnet restore "$REPOROOT" --quiet
dotnet restore "$REPOROOT" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64"
# Clean up stage1
[ -d "$STAGE1_DIR" ] && rm -Rf "$STAGE1_DIR"
@ -103,7 +103,8 @@ banner "Testing stage2 ..."
export PATH=$STAGE2_DIR:$START_PATH
rm "$REPOROOT/test/TestApp/project.lock.json"
dotnet restore "$REPOROOT/test/TestApp"
dotnet restore "$REPOROOT/test/TestApp" --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64"
dotnet compile "$REPOROOT/test/TestApp" --output "$REPOROOT/artifacts/$RID/smoketest"
export CLRHOST_CLR_PATH=$STAGE2_DIR

2
scripts/dotnet-restore.cmd
View file

@ -2,7 +2,7 @@
SETLOCAL
SET ERRORLEVEL=
"%~dp0dnx\dnx" "%~dp0dnx\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" %*
"%~dp0dnx\dnx" "%~dp0dnx\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore %*
exit /b %ERRORLEVEL%
ENDLOCAL

2
scripts/dotnet-restore.sh
View file

@ -12,4 +12,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
# work around restore timeouts on Mono
[ -z "$MONO_THREADS_PER_CPU" ] && export MONO_THREADS_PER_CPU=50
exec "$DIR/dnx/dnx" "$DIR/dnx/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll" "restore" --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" "$@"
exec "$DIR/dnx/dnx" "$DIR/dnx/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll" "restore" "$@"