diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-05 10:40:25 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-05 10:40:25 -0700 |
| commit | bb36cebc1d013f81c595996f59f749e8a2bae9c8 (patch) | |
| tree | b41106ce258c258ff62a83df07c8820f8720b972 /src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs | |
| parent | d4bbfc7dcf11a421d91918c8b32fc7ca959daff3 (diff) | |
| parent | ffbfd01049fc2ae4e402539905ebcfa22c1094e8 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs b/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs index eb7b55a286..c17ede7561 100644 --- a/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs +++ b/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs @@ -49,7 +49,7 @@ namespace Grpc.IntegrationTesting TestService.TestServiceClient unimplementedClient = new UnimplementedTestServiceClient(); // TODO: replace Moq by some mocking library with CoreCLR support. -#if !NETSTANDARD1_5 +#if !NETCOREAPP1_0 [Test] public void ExpandedParamOverloadCanBeMocked() { |