diff options
Diffstat (limited to 'tools/run_tests/helper_scripts/pre_build_csharp.bat')
| -rw-r--r-- | tools/run_tests/helper_scripts/pre_build_csharp.bat | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 63f6645620..2ae870ebb1 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -28,15 +28,13 @@ cd build mkdir %ARCHITECTURE% cd %ARCHITECTURE% -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../../.. || goto :error +cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../../.. || goto :error cd ..\..\..\src\csharp -dotnet restore Grpc.sln || goto :error +if NOT DEFINED GRPC_SKIP_DOTNET_RESTORE ( + dotnet restore Grpc.sln || goto :error +) endlocal |