aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/csharp/Grpc.IntegrationTesting/project.json
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2017-03-06 15:58:03 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2017-03-06 15:58:03 -0800
commit78fd7db29f122a59ae5cbdf65d5ae90fc94b8787 (patch)
treeed241cf03061315daabc405990d8c948b08d4bae /src/csharp/Grpc.IntegrationTesting/project.json
parentcf54c151f1853af1fe1df2058ccbc2ca3a26c43c (diff)
parent7bc4f4a1e044976130dde5170a814e59019afc78 (diff)
Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/project.json')
-rw-r--r--src/csharp/Grpc.IntegrationTesting/project.json5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/project.json b/src/csharp/Grpc.IntegrationTesting/project.json
index eba54318a5..b86227a258 100644
--- a/src/csharp/Grpc.IntegrationTesting/project.json
+++ b/src/csharp/Grpc.IntegrationTesting/project.json
@@ -62,10 +62,7 @@
},
"frameworks": {
"net45": {
- "frameworkAssemblies": {
- "System.Runtime": "",
- "System.IO": ""
- }
+ "frameworkAssemblies": {}
},
"netcoreapp1.0": {
"imports": [