diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2018-05-10 16:07:12 +0200 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-10 16:07:55 +0200 |
commit | 32c41e8d729b040c556389ca294125bcd3757639 (patch) | |
tree | 560be03a8149f734760b756b8c39ed055155dd3d /tools/run_tests | |
parent | d3eab8f288bf083d7e345c08400301940f7365d2 (diff) |
avoid concurrency issues with dotnet restore
Diffstat (limited to 'tools/run_tests')
-rw-r--r-- | tools/run_tests/artifacts/build_artifact_csharp.bat | 2 | ||||
-rw-r--r-- | tools/run_tests/helper_scripts/pre_build_csharp.bat | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/artifacts/build_artifact_csharp.bat b/tools/run_tests/artifacts/build_artifact_csharp.bat index 91fdb0d29e..a84bc54157 100644 --- a/tools/run_tests/artifacts/build_artifact_csharp.bat +++ b/tools/run_tests/artifacts/build_artifact_csharp.bat @@ -15,7 +15,7 @@ @rem Builds C# artifacts on Windows set ARCHITECTURE=%1 - +set GRPC_SKIP_DOTNET_RESTORE=true @call tools\run_tests\helper_scripts\pre_build_csharp.bat %ARCHITECTURE% || goto :error cd cmake\build\%ARCHITECTURE% diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 05c6cf0f61..2ae870ebb1 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -32,7 +32,9 @@ cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC cd ..\..\..\src\csharp -dotnet restore Grpc.sln || goto :error +if NOT DEFINED GRPC_SKIP_DOTNET_RESTORE ( + dotnet restore Grpc.sln || goto :error +) endlocal |