diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-06-23 13:58:29 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-06-23 13:58:29 -0700 |
| commit | 09b1ec8ccb7b0e5b9073fb346840bcfd00f35caf (patch) | |
| tree | b2bc46c3e3741240b98c99bc1673da0b43676c03 /src/csharp/Grpc.Examples.Tests/NUnitMain.cs | |
| parent | d139da8b9a9c482a83b23c926690f01b49025640 (diff) | |
| parent | 0140f7c9e6c20fe78035d9635a3f5725d51ad35a (diff) | |
Merge remote-tracking branch 'upstream/master' into auto-build-example
Diffstat (limited to 'src/csharp/Grpc.Examples.Tests/NUnitMain.cs')
| -rw-r--r-- | src/csharp/Grpc.Examples.Tests/NUnitMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Examples.Tests/NUnitMain.cs b/src/csharp/Grpc.Examples.Tests/NUnitMain.cs index ea87802766..1a522cab93 100644 --- a/src/csharp/Grpc.Examples.Tests/NUnitMain.cs +++ b/src/csharp/Grpc.Examples.Tests/NUnitMain.cs @@ -49,7 +49,7 @@ namespace Grpc.Examples.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); |