diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-25 08:18:25 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-25 08:18:25 -0700 |
| commit | f03b112d12d32f42b023a5c49d994438dde0a95e (patch) | |
| tree | 979d4e64ecf7ed31495d635ea4caa7c037284f72 /src/csharp/Grpc.Core/project.json | |
| parent | 7187ab9866f95181212cdb8b80fcbe0a36b01765 (diff) | |
| parent | 19ea0cffd7ba3df686ed05671f9ed35b8e9fa830 (diff) | |
Merge remote-tracking branch 'upstream/master' into cq_verifier_file_line
Diffstat (limited to 'src/csharp/Grpc.Core/project.json')
| -rw-r--r-- | src/csharp/Grpc.Core/project.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core/project.json b/src/csharp/Grpc.Core/project.json index 807508896a..f7e21a25dd 100644 --- a/src/csharp/Grpc.Core/project.json +++ b/src/csharp/Grpc.Core/project.json @@ -31,7 +31,7 @@ "xmlDoc": true }, "dependencies": { - "Ix-Async": "1.2.5" + "System.Interactive.Async": "3.0.0" }, "frameworks": { "net45": { }, @@ -40,8 +40,8 @@ "portable-net45" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-24027", - "System.Threading.Thread": "4.0.0-rc2-24027" + "NETStandard.Library": "1.6.0", + "System.Threading.Thread": "4.0.0" } } } |