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

Merge pull request #998 from piotrpMSFT/piotrpMSFT/issue995/removeNoCache

Browse source 
Remove --no-cache from scripts
This commit is contained in:
Piotr Puszkiewicz 2016-01-23 11:41:21 -08:00
commit df42fa0747
7 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/build/build.ps1
View file

@ -6,7 +6,6 @@
param( param(
[string]$Configuration="Debug", [string]$Configuration="Debug",
[switch]$Offline, [switch]$Offline,
[switch]$NoCache,
[switch]$NoPackage) [switch]$NoPackage)
$ErrorActionPreference="Stop" $ErrorActionPreference="Stop"
@ -40,7 +39,7 @@ if ($Offline){
else { else {
_ "$RepoRoot\scripts\obtain\install-tools.ps1" _ "$RepoRoot\scripts\obtain\install-tools.ps1"
_ "$RepoRoot\scripts\build\restore-packages.ps1" @("$NoCache") _ "$RepoRoot\scripts\build\restore-packages.ps1"
} }
header "Compiling" header "Compiling"

3
scripts/build/process-args.sh
View file

@ -22,9 +22,6 @@ do
"nopackage" | "--nopackage") "nopackage" | "--nopackage")
export NOPACKAGE=true export NOPACKAGE=true
;; ;;
"nocache" | "--nocache")
export NOCACHE=--No-Cache
;;
"--buildindocker-ubuntu") "--buildindocker-ubuntu")
export BUILD_IN_DOCKER=true export BUILD_IN_DOCKER=true
export DOCKER_OS=ubuntu export DOCKER_OS=ubuntu

17
scripts/build/restore-packages.ps1
View file

@ -3,24 +3,13 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information. # Licensed under the MIT license. See LICENSE file in the project root for full license information.
# #
param(
[string]$NoCache="")
. $PSScriptRoot\..\common\_common.ps1 . $PSScriptRoot\..\common\_common.ps1
if ($NoCache -eq "True") {
$NoCacheArg = "--no-cache"
info "Bypassing NuGet Cache"
}
else {
$NoCacheArg = ""
}
# Restore packages # Restore packages
header "Restoring packages" header "Restoring packages"
& "$DnxRoot\dnu" restore "$RepoRoot\src" --quiet --runtime "$Rid" "$NoCacheArg" & "$DnxRoot\dnu" restore "$RepoRoot\src" --quiet --runtime "$Rid"
& "$DnxRoot\dnu" restore "$RepoRoot\test" --quiet --runtime "$Rid" "$NoCacheArg" & "$DnxRoot\dnu" restore "$RepoRoot\test" --quiet --runtime "$Rid"
& "$DnxRoot\dnu" restore "$RepoRoot\tools" --quiet --runtime "$Rid" "$NoCacheArg" & "$DnxRoot\dnu" restore "$RepoRoot\tools" --quiet --runtime "$Rid"
$oldErrorAction=$ErrorActionPreference $oldErrorAction=$ErrorActionPreference
$ErrorActionPreference="SilentlyContinue" $ErrorActionPreference="SilentlyContinue"

8
scripts/build/restore-packages.sh
View file

@ -18,9 +18,9 @@ source "$DIR/../common/_common.sh"
header "Restoring packages" header "Restoring packages"
$DNX_ROOT/dnu restore "$REPOROOT/src" --quiet "$NOCACHE" $DNX_ROOT/dnu restore "$REPOROOT/src" --quiet
$DNX_ROOT/dnu restore "$REPOROOT/test" --quiet "$NOCACHE" $DNX_ROOT/dnu restore "$REPOROOT/test" --quiet
$DNX_ROOT/dnu restore "$REPOROOT/tools" --quiet "$NOCACHE" $DNX_ROOT/dnu restore "$REPOROOT/tools" --quiet
set +e set +e
$DNX_ROOT/dnu restore "$REPOROOT/testapp" --quiet "$NOCACHE" >/dev/null 2>&1 $DNX_ROOT/dnu restore "$REPOROOT/testapp" --quiet >/dev/null 2>&1
set -e set -e

2
scripts/ci_build.cmd
View file

@ -5,6 +5,6 @@ REM Licensed under the MIT license. See LICENSE file in the project root for ful
set CI_BUILD=1 set CI_BUILD=1
CALL %~dp0..\build.cmd -NoCache %* CALL %~dp0..\build.cmd %*
exit /b %errorlevel% exit /b %errorlevel%

1
scripts/ci_build.sh
View file

@ -41,7 +41,6 @@ export DOTNET_BUILD_CONTAINER_NAME="$container_name"
if [[ "$OSNAME" == "ubuntu" ]]; then if [[ "$OSNAME" == "ubuntu" ]]; then
export PACKAGE_IN_DOCKER="true" export PACKAGE_IN_DOCKER="true"
export NOCACHE="--no-cache"
unset BUILD_IN_DOCKER unset BUILD_IN_DOCKER
$SCRIPT_DIR/../build.sh $@ $SCRIPT_DIR/../build.sh $@

1
scripts/common/_common.sh
View file

@ -32,7 +32,6 @@ export CHANNEL=$RELEASE_SUFFIX
[ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0 [ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0
[ -z "$DOTNET_HOME" ] && export DOTNET_HOME=$STAGE2_DIR && export PATH=$STAGE2_DIR/bin:$PATH [ -z "$DOTNET_HOME" ] && export DOTNET_HOME=$STAGE2_DIR && export PATH=$STAGE2_DIR/bin:$PATH
[ -z "$CONFIGURATION" ] && export CONFIGURATION=Debug [ -z "$CONFIGURATION" ] && export CONFIGURATION=Debug
[ -z "$NOCACHE" ] && export NOCACHE=""
unset COMMONSOURCE unset COMMONSOURCE
unset COMMONDIR unset COMMONDIR