diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-15 06:56:23 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-15 06:56:23 -0700 |
| commit | 8e6d871558520b74b5e9716745b644999feba7db (patch) | |
| tree | 73e767391f0032118b10dbf60eb22f0e01a21b68 /tools | |
| parent | e54cbec88f59ceb334bcfce5b4338908e5b32c95 (diff) | |
| parent | f785ae38c9e4a3ed52099acc162616c737a2f3c6 (diff) | |
Merge pull request #8076 from jtattermusch/csharp_use_dotnetcli_nugets
Start using nuget packages built by dotnet CLI
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/build_artifact_protoc.bat | 6 | ||||
| -rw-r--r-- | tools/run_tests/pre_build_csharp.bat | 3 | ||||
| -rwxr-xr-x | tools/run_tests/pre_build_csharp.sh | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tools/run_tests/build_artifact_protoc.bat b/tools/run_tests/build_artifact_protoc.bat index e1dc032188..3246a903d0 100644 --- a/tools/run_tests/build_artifact_protoc.bat +++ b/tools/run_tests/build_artifact_protoc.bat @@ -32,12 +32,8 @@ mkdir artifacts setlocal cd third_party/protobuf -powershell -Command "Invoke-WebRequest https://googlemock.googlecode.com/files/gmock-1.7.0.zip -OutFile gmock.zip" -powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::ExtractToDirectory('gmock.zip', '.');" -rename gmock-1.7.0 gmock - cd cmake -cmake -G "%generator%" || goto :error +cmake -G "%generator%" -Dprotobuf_BUILD_TESTS=OFF || goto :error endlocal call vsprojects/build_plugins.bat || goto :error diff --git a/tools/run_tests/pre_build_csharp.bat b/tools/run_tests/pre_build_csharp.bat index 580d5638fd..f15979a96b 100644 --- a/tools/run_tests/pre_build_csharp.bat +++ b/tools/run_tests/pre_build_csharp.bat @@ -38,9 +38,10 @@ cd /d %~dp0\..\.. set NUGET=C:\nuget\nuget.exe if exist %NUGET% ( + @rem TODO(jtattermusch): Get rid of this hack. See #8034 @rem Restore Grpc packages by packages since Nuget client 3.4.4 doesnt support restore @rem by solution - @rem Moving into each directory to let the restores work with both nuget 3.4 and 2.8 + @rem Moving into each directory to let the restores work based on per-project packages.config files %NUGET% restore vsprojects/grpc_csharp_ext.sln || goto :error cd src/csharp diff --git a/tools/run_tests/pre_build_csharp.sh b/tools/run_tests/pre_build_csharp.sh index 0fd3b92a95..ee678ddce5 100755 --- a/tools/run_tests/pre_build_csharp.sh +++ b/tools/run_tests/pre_build_csharp.sh @@ -37,9 +37,10 @@ root=`pwd` if [ -x "$(command -v nuget)" ] then + # TODO(jtattermusch): Get rid of this hack. See #8034 # Restoring Nuget packages by packages rather than by solution because of # inability to restore by solution with Nuget client 3.4.4 - # Moving into each directory to let the restores work with nuget 3.4 and 2.8 + # Moving into each directory to let the restores work based on per-project packages.config files cd Grpc.Auth nuget restore -PackagesDirectory ../packages cd .. |