diff options
author | 2016-08-04 11:19:26 -0700 | |
---|---|---|
committer | 2016-08-04 11:19:26 -0700 | |
commit | 32387b3a34918ae0cc16348e001c08f1d60ed121 (patch) | |
tree | 97e544e4e9363a39081c2a8e530d8d50a344ab42 /src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs | |
parent | 34befcaa20699eb9fe3e26be1ec6fcaa57d333ad (diff) | |
parent | a3e7bd85c064da9a1011fd31209e5af6a7ff8f38 (diff) |
Merge branch 'handshaker_api' into http_connect
Diffstat (limited to 'src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs')
-rw-r--r-- | src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs b/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs index 44634671ce..dca61e3f96 100644 --- a/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs +++ b/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs @@ -49,7 +49,7 @@ namespace Grpc.HealthCheck.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 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); |