diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-08-02 14:37:05 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-08-02 14:37:05 -0700 |
| commit | a1c442a203f6526b280c9dd29dd629249b2d0da5 (patch) | |
| tree | 55a3383da920d9390c20263d0137ed12aa650123 /src/csharp/Grpc.Core.Tests/SanityTest.cs | |
| parent | fcb5271105ec2c439f83ec3cce6456b73824b6be (diff) | |
| parent | 9fa684fa0d0527b9a9271681940d8f99b9c2787c (diff) | |
Merge remote-tracking branch 'upstream/v1.0.x' into node_dependency_update
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/SanityTest.cs')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/SanityTest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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, |