diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
| commit | f173793e51e726a887b84b4c37588e2e308191cc (patch) | |
| tree | 0c03feb8ebdb68a99c51d3f24c3aa39755f14793 /src/csharp/Grpc.Core/packages.config | |
| parent | 882d7a7eec148046a90e1d111b93e353e3df0c31 (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into travis-speedup
Conflicts:
.travis.yml
Diffstat (limited to 'src/csharp/Grpc.Core/packages.config')
| -rw-r--r-- | src/csharp/Grpc.Core/packages.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/packages.config b/src/csharp/Grpc.Core/packages.config index cf711ac362..71967de56e 100644 --- a/src/csharp/Grpc.Core/packages.config +++ b/src/csharp/Grpc.Core/packages.config @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.Collections.Immutable" version="1.1.34-rc" targetFramework="net45" /> + <package id="grpc.dependencies.openssl.redist" version="1.0.2.2" targetFramework="net45" /> + <package id="grpc.dependencies.zlib.redist" version="1.2.8.9" targetFramework="net45" /> + <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net45" /> </packages>
\ No newline at end of file |