aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2015-02-20 09:24:45 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2015-02-20 09:49:25 -0800
commit03e9da7a7cd1ba1a99e88f18c9f2fed0f708abec (patch)
tree132b13799b17e95418a3e051cec50ace8d9a42a4
parent8b86b15e67fdcb7dc175ff3779b1f4ae4e7ec2ed (diff)
moved interop testing specific files to Grpc.IntegrationTesting
-rw-r--r--src/csharp/Grpc.Api/Grpc.Api.csproj3
-rw-r--r--src/csharp/Grpc.IntegrationTesting/Empty.cs (renamed from src/csharp/Grpc.Api/Empty.cs)0
-rw-r--r--src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj3
-rw-r--r--src/csharp/Grpc.IntegrationTesting/Messages.cs (renamed from src/csharp/Grpc.Api/Messages.cs)0
-rw-r--r--src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs (renamed from src/csharp/Grpc.Api/TestServiceGrpc.cs)1
5 files changed, 3 insertions, 4 deletions
diff --git a/src/csharp/Grpc.Api/Grpc.Api.csproj b/src/csharp/Grpc.Api/Grpc.Api.csproj
index aa6e872fe4..5d3843cd0e 100644
--- a/src/csharp/Grpc.Api/Grpc.Api.csproj
+++ b/src/csharp/Grpc.Api/Grpc.Api.csproj
@@ -53,9 +53,6 @@
<Compile Include="Math.cs" />
<Compile Include="MathGrpc.cs" />
<Compile Include="MathServiceImpl.cs" />
- <Compile Include="Empty.cs" />
- <Compile Include="Messages.cs" />
- <Compile Include="TestServiceGrpc.cs" />
<Compile Include="MathExamples.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/csharp/Grpc.Api/Empty.cs b/src/csharp/Grpc.IntegrationTesting/Empty.cs
index 7169ee2a4a..7169ee2a4a 100644
--- a/src/csharp/Grpc.Api/Empty.cs
+++ b/src/csharp/Grpc.IntegrationTesting/Empty.cs
diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
index 6fcee0f126..ee2c327ebd 100644
--- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
+++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
@@ -44,6 +44,9 @@
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Client.cs" />
+ <Compile Include="TestServiceGrpc.cs" />
+ <Compile Include="Empty.cs" />
+ <Compile Include="Messages.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
diff --git a/src/csharp/Grpc.Api/Messages.cs b/src/csharp/Grpc.IntegrationTesting/Messages.cs
index 386f377f08..386f377f08 100644
--- a/src/csharp/Grpc.Api/Messages.cs
+++ b/src/csharp/Grpc.IntegrationTesting/Messages.cs
diff --git a/src/csharp/Grpc.Api/TestServiceGrpc.cs b/src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs
index 15700e40ac..b71704bcc7 100644
--- a/src/csharp/Grpc.Api/TestServiceGrpc.cs
+++ b/src/csharp/Grpc.IntegrationTesting/TestServiceGrpc.cs
@@ -33,7 +33,6 @@
using System;
using System.Collections.Generic;
-using System.Reactive.Linq;
using System.Threading;
using System.Threading.Tasks;
using Grpc.Core;