From: Gleb Balykov Date: Wed, 15 Jul 2020 10:29:10 +0000 (+0300) Subject: [Tizen] Add skiprestore option to skip restore of packages X-Git-Tag: accepted/tizen/unified/20200724.124146~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c36b643dc506ad763c389ba676d213b16e2645f;p=platform%2Fupstream%2Fcoreclr.git [Tizen] Add skiprestore option to skip restore of packages Partial cherry-pick of https://github.com/dotnet/coreclr/pull/27633 --- diff --git a/build-test.sh b/build-test.sh index 538f0c3..94c9a4b 100755 --- a/build-test.sh +++ b/build-test.sh @@ -320,6 +320,11 @@ build_Tests() if [ ${__SkipRestorePackages} != 1 ]; then build_MSBuild_projects "Restore_Product" "${__ProjectDir}/tests/build.proj" "Restore product binaries (build tests)" "/t:BatchRestorePackages" + + if [ $? -ne 0 ]; then + echo "${__ErrMsgPrefix}${__MsgPrefix}Error: package restoration failed. Refer to the build log files for details (above)" + exit 1 + fi fi if [ $__SkipNative != 1 ]; then @@ -418,6 +423,7 @@ build_MSBuild_projects() buildArgs+=("${extraBuildParameters[@]}") buildArgs+=("${__CommonMSBuildArgs[@]}") buildArgs+=("${__UnprocessedBuildArgs[@]}") + buildArgs+=("/p:__SkipPackageRestore=true"); nextCommand="\"$__ProjectRoot/dotnet.sh\" msbuild ${buildArgs[@]}" echo "Building step '$stepName' testGroupToBuild=$testGroupToBuild via $nextCommand"