diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-03 19:54:49 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-03 19:54:49 +0200 |
| commit | 229b1619f070b6c99cc7c753b446b8d6af6a047b (patch) | |
| tree | fedd6af4122c068e033e471684c60e60087fd2b5 /src/csharp/Grpc.IntegrationTesting/NUnitMain.cs | |
| parent | eedc335580c6691f5401674841be0362596e1d9c (diff) | |
| parent | 86ea627270142b15be2262ca60802e007b62f6fd (diff) | |
Merge branch 'v1.0.x' of https://github.com/grpc/grpc
Conflicts:
CMakeLists.txt
Makefile
build.yaml
package.json
src/core/lib/surface/version.c
src/csharp/Grpc.Auth/project.json
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Core/project.json
src/csharp/Grpc.HealthCheck/project.json
src/csharp/build_packages.bat
src/node/health_check/package.json
src/node/tools/package.json
src/python/grpcio/grpc_version.py
src/python/grpcio_health_checking/grpc_version.py
src/python/grpcio_tests/grpc_version.py
src/ruby/lib/grpc/version.rb
src/ruby/tools/version.rb
tools/distrib/python/grpcio_tools/grpc_version.py
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/NUnitMain.cs')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/NUnitMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs b/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs index 100ff0b5de..21c8adb45c 100644 --- a/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs +++ b/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs @@ -49,7 +49,7 @@ namespace Grpc.IntegrationTesting { // Make logger immune to NUnit capturing stdout and stderr to workaround https://github.com/nunit/nunit/issues/1406. GrpcEnvironment.SetLogger(new TextWriterLogger(Console.Error)); -#if NETSTANDARD1_5 +#if NETCOREAPP1_0 return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In); #else return new AutoRun().Execute(args); |