diff --git a/scripts/build/build.ps1 b/scripts/build/build.ps1 index 8bae51f8d..53ec11d2b 100644 --- a/scripts/build/build.ps1 +++ b/scripts/build/build.ps1 @@ -6,7 +6,6 @@ param( [string]$Configuration="Debug", [switch]$Offline, - [switch]$NoCache, [switch]$NoPackage) $ErrorActionPreference="Stop" @@ -40,7 +39,7 @@ if ($Offline){ else { _ "$RepoRoot\scripts\obtain\install-tools.ps1" - _ "$RepoRoot\scripts\build\restore-packages.ps1" @("$NoCache") + _ "$RepoRoot\scripts\build\restore-packages.ps1" } header "Compiling" diff --git a/scripts/build/process-args.sh b/scripts/build/process-args.sh index f344d1b70..53178bd0d 100755 --- a/scripts/build/process-args.sh +++ b/scripts/build/process-args.sh @@ -22,9 +22,6 @@ do "nopackage" | "--nopackage") export NOPACKAGE=true ;; - "nocache" | "--nocache") - export NOCACHE=--No-Cache - ;; "--buildindocker-ubuntu") export BUILD_IN_DOCKER=true export DOCKER_OS=ubuntu diff --git a/scripts/build/restore-packages.ps1 b/scripts/build/restore-packages.ps1 index 9a42e3bc5..aa062b0b2 100644 --- a/scripts/build/restore-packages.ps1 +++ b/scripts/build/restore-packages.ps1 @@ -3,24 +3,13 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. # -param( - [string]$NoCache="") - . $PSScriptRoot\..\common\_common.ps1 -if ($NoCache -eq "True") { - $NoCacheArg = "--no-cache" - info "Bypassing NuGet Cache" -} -else { - $NoCacheArg = "" -} - # Restore packages header "Restoring packages" -& "$DnxRoot\dnu" restore "$RepoRoot\src" --quiet --runtime "$Rid" "$NoCacheArg" -& "$DnxRoot\dnu" restore "$RepoRoot\test" --quiet --runtime "$Rid" "$NoCacheArg" -& "$DnxRoot\dnu" restore "$RepoRoot\tools" --quiet --runtime "$Rid" "$NoCacheArg" +& "$DnxRoot\dnu" restore "$RepoRoot\src" --quiet --runtime "$Rid" +& "$DnxRoot\dnu" restore "$RepoRoot\test" --quiet --runtime "$Rid" +& "$DnxRoot\dnu" restore "$RepoRoot\tools" --quiet --runtime "$Rid" $oldErrorAction=$ErrorActionPreference $ErrorActionPreference="SilentlyContinue" diff --git a/scripts/build/restore-packages.sh b/scripts/build/restore-packages.sh index 2e8c7616f..3063336aa 100755 --- a/scripts/build/restore-packages.sh +++ b/scripts/build/restore-packages.sh @@ -18,9 +18,9 @@ source "$DIR/../common/_common.sh" header "Restoring packages" -$DNX_ROOT/dnu restore "$REPOROOT/src" --quiet "$NOCACHE" -$DNX_ROOT/dnu restore "$REPOROOT/test" --quiet "$NOCACHE" -$DNX_ROOT/dnu restore "$REPOROOT/tools" --quiet "$NOCACHE" +$DNX_ROOT/dnu restore "$REPOROOT/src" --quiet +$DNX_ROOT/dnu restore "$REPOROOT/test" --quiet +$DNX_ROOT/dnu restore "$REPOROOT/tools" --quiet 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 diff --git a/scripts/ci_build.cmd b/scripts/ci_build.cmd index 96e691152..54f5f51e3 100644 --- a/scripts/ci_build.cmd +++ b/scripts/ci_build.cmd @@ -5,6 +5,6 @@ REM Licensed under the MIT license. See LICENSE file in the project root for ful set CI_BUILD=1 -CALL %~dp0..\build.cmd -NoCache %* +CALL %~dp0..\build.cmd %* exit /b %errorlevel% diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 86eb958a3..c7604c65e 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -41,7 +41,6 @@ export DOTNET_BUILD_CONTAINER_NAME="$container_name" if [[ "$OSNAME" == "ubuntu" ]]; then export PACKAGE_IN_DOCKER="true" - export NOCACHE="--no-cache" unset BUILD_IN_DOCKER $SCRIPT_DIR/../build.sh $@ diff --git a/scripts/common/_common.sh b/scripts/common/_common.sh index 1d13441e6..e6e3f016f 100644 --- a/scripts/common/_common.sh +++ b/scripts/common/_common.sh @@ -32,7 +32,6 @@ export CHANNEL=$RELEASE_SUFFIX [ -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 "$CONFIGURATION" ] && export CONFIGURATION=Debug -[ -z "$NOCACHE" ] && export NOCACHE="" unset COMMONSOURCE unset COMMONDIR