diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-06-23 09:23:01 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-06-23 09:23:01 -0700 |
| commit | 05fd4fe0436fadeb7c10bba2c326c9687d485a8d (patch) | |
| tree | 27a37a9398c80583cda23504725cfc78020594a0 /src/csharp/Grpc.Core.Tests/NUnitMain.cs | |
| parent | 0224dcc2dcda932a171776de325fa2e66c95478f (diff) | |
| parent | 60e98ec3feab9cc347d6eacb48fb98cecb88c089 (diff) | |
Merge branch 'master' into epoll_changes
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/NUnitMain.cs')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/NUnitMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core.Tests/NUnitMain.cs b/src/csharp/Grpc.Core.Tests/NUnitMain.cs index 9c1d7bf3c8..24a9f846d1 100644 --- a/src/csharp/Grpc.Core.Tests/NUnitMain.cs +++ b/src/csharp/Grpc.Core.Tests/NUnitMain.cs @@ -49,7 +49,7 @@ namespace Grpc.Core.Tests { // 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 DOTNET5_4 +#if NETSTANDARD1_5 return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In); #else return new AutoRun().Execute(args); |