diff --git a/build.sh b/build.sh index aef8655c66c290c2093419876b72075cf363de89..2e011ae8bac122925fe1338d46101d8bee7be409 100755 --- a/build.sh +++ b/build.sh @@ -104,6 +104,12 @@ do shift done +config_path=${binaries_path}/${build_configuration} +logs_path=${config_path}/Logs +mkdir -p ${binaries_path} +mkdir -p ${config_path} +mkdir -p ${logs_path} + if [[ "$build_in_docker" = true ]] then echo "Docker exec: $args" @@ -115,7 +121,10 @@ source "${root_path}"/build/scripts/obtain_dotnet.sh if [[ "$restore" == true ]] then - "${root_path}"/build/scripts/restore.sh + echo "Restoring RoslynToolset.csproj" + dotnet restore "${root_path}/build/ToolsetPackages/RoslynToolset.csproj" /bl:${logs_path}/Restore-RoslynToolset.binlog + echo "Restoring Compilers.sln" + dotnet restore "${root_path}/Compilers.sln" /bl:${logs_path}/Restore-Compilers.binlog fi build_args="--no-restore -c ${build_configuration} /nologo /maxcpucount:1" diff --git a/build/scripts/restore.sh b/build/scripts/restore.sh deleted file mode 100755 index 4e6ddb12e72ba8cc86ca68cd2b0d8acbd7fbd07f..0000000000000000000000000000000000000000 --- a/build/scripts/restore.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -THIS_DIR=$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd) - -echo "Restoring toolset packages" - -RESTORE_ARGS="-v Minimal --disable-parallel" -echo "Restoring RoslynToolset.csproj" -dotnet restore ${RESTORE_ARGS} "${THIS_DIR}/../ToolsetPackages/RoslynToolset.csproj" -echo "Restoring Compilers.sln" -dotnet restore ${RESTORE_ARGS} "${THIS_DIR}/../../Compilers.sln"