aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-06-23 13:58:29 -0700
committerGravatar Yuchen Zeng <zyc@google.com>2016-06-23 13:58:29 -0700
commit09b1ec8ccb7b0e5b9073fb346840bcfd00f35caf (patch)
treeb2bc46c3e3741240b98c99bc1673da0b43676c03 /src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
parentd139da8b9a9c482a83b23c926690f01b49025640 (diff)
parent0140f7c9e6c20fe78035d9635a3f5725d51ad35a (diff)
Merge remote-tracking branch 'upstream/master' into auto-build-example
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj')
-rw-r--r--src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
index 0089049408..3a0764230d 100644
--- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
+++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
@@ -129,6 +129,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="Grpc.IntegrationTesting.project.json" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>