aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/src/csharp/Grpc.Core
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-08-16 11:13:33 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-08-16 11:13:33 -0700
commitdd93704056742921220ba4dc1f8d9b288398ed1f (patch)
tree8f2101ad5ee866f6aeeeeed5b535ce7e7ed38825 /templates/src/csharp/Grpc.Core
parenta9288afaa90ffe38d3b41d1b9ec697621f41be59 (diff)
parent6b38251f079556833de244c0ab08101e47b6f367 (diff)
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'templates/src/csharp/Grpc.Core')
-rw-r--r--templates/src/csharp/Grpc.Core/project.json.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template
index bd0e8b2c13..e6f8290200 100644
--- a/templates/src/csharp/Grpc.Core/project.json.template
+++ b/templates/src/csharp/Grpc.Core/project.json.template
@@ -33,7 +33,7 @@
"xmlDoc": true
},
"dependencies": {
- "Ix-Async": "1.2.5"
+ "System.Interactive.Async": "3.0.0"
},
"frameworks": {
"net45": { },