diff options
author | 2015-08-13 10:31:05 -0700 | |
---|---|---|
committer | 2015-08-13 10:31:05 -0700 | |
commit | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (patch) | |
tree | 51bccc374623625a19a5fb53df60bc08c2c7713e /src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | |
parent | 58d637444187f36181d3662e85e42aa1d23af92a (diff) | |
parent | 58d7310fbc291d2afa9cbb100544fc5c96cd3249 (diff) |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
src/csharp/Grpc.IntegrationTesting/packages.config
src/csharp/build_packages.bat
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj')
-rw-r--r-- | src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | 5 |
1 files changed, 5 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..d6a8f52570 100644 --- a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj +++ b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj @@ -63,6 +63,7 @@ <Compile Include="..\Grpc.Core\Version.cs"> <Link>Version.cs</Link> </Compile> + <Compile Include="ClientBaseTest.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="ClientServerTest.cs" /> <Compile Include="ServerTest.cs" /> @@ -77,6 +78,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> |