aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-09-14 17:43:56 +0200
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-09-14 17:43:56 +0200
commitf785ae38c9e4a3ed52099acc162616c737a2f3c6 (patch)
treec5e49443cbdc9744aa2dca18581e221a40a6003d /test/distrib
parent867f1fa72f0753693b6a4ed2d399c5c6bd5649c3 (diff)
fix windows distribtest and add TODOs to remove hacks
Diffstat (limited to 'test/distrib')
-rw-r--r--test/distrib/csharp/run_distrib_test.bat12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/distrib/csharp/run_distrib_test.bat b/test/distrib/csharp/run_distrib_test.bat
index b4a6aefc67..6cf381142f 100644
--- a/test/distrib/csharp/run_distrib_test.bat
+++ b/test/distrib/csharp/run_distrib_test.bat
@@ -36,7 +36,17 @@ powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [Sys
update_version.sh auto
set NUGET=C:\nuget\nuget.exe
-%NUGET% restore || goto :error
+
+@rem TODO(jtattermusch): Get rid of this hack. See #8034
+@rem We can't do just "nuget restore" because restoring a .sln solution doesn't work
+@rem with nuget 3.X. On the other hand, we need nuget 2.12+ to be able to restore
+@rem some of the packages (e.g. System.Interactive.Async), but nuget 2.12
+@rem hasn't been officially released.
+@rem Please note that "Restore nuget packages" in VS2013 and VS2015 GUI works as usual.
+
+cd DistribTest || goto :error
+%NUGET% restore -PackagesDirectory ../packages || goto :error
+cd ..
@call build_vs2015.bat DistribTest.sln %MSBUILD_EXTRA_ARGS% || goto :error