diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-07-30 03:59:16 +0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-07-31 03:27:54 +0800 |
| commit | 1c0f30c4a8fc1f2d9bd8dd1702ee4563060f3637 (patch) | |
| tree | e2d316c0a9252b3e19bd452f03c6945c00f12f6a /src/csharp/Grpc.Core.Tests | |
| parent | 3fc8c8a9ff0402e3aa699c8ae4f9acf893c61fc9 (diff) | |
fix conditional compilation for netcoreapp1.0 projects
Diffstat (limited to 'src/csharp/Grpc.Core.Tests')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/NUnitMain.cs | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/SanityTest.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs b/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs index 064bc13cab..d7ebdb4201 100644 --- a/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs +++ b/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs @@ -40,7 +40,7 @@ namespace Grpc.Core.Tests { public class AppDomainUnloadTest { -#if NETSTANDARD1_5 +#if NETCOREAPP1_0 [Test] [Ignore("Not supported for CoreCLR")] public void AppDomainUnloadHookCanCleanupAbandonedCall() diff --git a/src/csharp/Grpc.Core.Tests/NUnitMain.cs b/src/csharp/Grpc.Core.Tests/NUnitMain.cs index 24a9f846d1..870c726ac0 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 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); diff --git a/src/csharp/Grpc.Core.Tests/SanityTest.cs b/src/csharp/Grpc.Core.Tests/SanityTest.cs index 501992c569..19c7a0b440 100644 --- a/src/csharp/Grpc.Core.Tests/SanityTest.cs +++ b/src/csharp/Grpc.Core.Tests/SanityTest.cs @@ -46,7 +46,7 @@ namespace Grpc.Core.Tests public class SanityTest { // TODO: make sanity test work for CoreCLR as well -#if !NETSTANDARD1_5 +#if !NETCOREAPP1_0 /// <summary> /// Because we depend on a native library, sometimes when things go wrong, the /// entire NUnit test process crashes. To be able to track down problems better, |