diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
| commit | d067c263b250657891de4ad96ae51249435c6066 (patch) | |
| tree | 03611c21ff494f0652e70d424af1dddae4c1da28 /src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | |
| parent | d5689305612f5597716a4337ce934883a472a266 (diff) | |
| parent | 826f07eb6f8dc2366375b7c96cc12bca1302518c (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Conflicts:
src/core/security/google_default_credentials.c
test/core/security/verify_jwt.c
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj index f2bf459dc5..97ee0454bb 100644 --- a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj +++ b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj @@ -77,6 +77,10 @@ <Compile Include="TimeoutsTest.cs" /> <Compile Include="NUnitVersionTest.cs" /> <Compile Include="ChannelTest.cs" /> + <Compile Include="MockServiceHelper.cs" /> + <Compile Include="ResponseHeadersTest.cs" /> + <Compile Include="CompressionTest.cs" /> + <Compile Include="ContextPropagationTest.cs" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> |