diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-06-23 10:54:52 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-06-23 10:54:52 -0700 |
| commit | 5fec4bf5f34792e30d2691024cbd9914626db0a3 (patch) | |
| tree | e1e07586bc1745c32139011fde6c7fe4e61812a7 /src/csharp/Grpc.Core.Tests/NUnitMain.cs | |
| parent | e16907e5a1fb7e61b24d4d141cbad021e96252bf (diff) | |
| parent | b309bc94bfd3bdd067e4f0a62d0cd9f29cf3a288 (diff) | |
Merge branch 'master' into grpc_trace_granularity
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); |