diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-03 19:54:49 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-03 19:54:49 +0200 |
| commit | 229b1619f070b6c99cc7c753b446b8d6af6a047b (patch) | |
| tree | fedd6af4122c068e033e471684c60e60087fd2b5 /src/csharp/Grpc.Auth | |
| parent | eedc335580c6691f5401674841be0362596e1d9c (diff) | |
| parent | 86ea627270142b15be2262ca60802e007b62f6fd (diff) | |
Merge branch 'v1.0.x' of https://github.com/grpc/grpc
Conflicts:
CMakeLists.txt
Makefile
build.yaml
package.json
src/core/lib/surface/version.c
src/csharp/Grpc.Auth/project.json
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Core/project.json
src/csharp/Grpc.HealthCheck/project.json
src/csharp/build_packages.bat
src/node/health_check/package.json
src/node/tools/package.json
src/python/grpcio/grpc_version.py
src/python/grpcio_health_checking/grpc_version.py
src/python/grpcio_tests/grpc_version.py
src/ruby/lib/grpc/version.rb
src/ruby/tools/version.rb
tools/distrib/python/grpcio_tools/grpc_version.py
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'src/csharp/Grpc.Auth')
| -rw-r--r-- | src/csharp/Grpc.Auth/project.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Auth/project.json b/src/csharp/Grpc.Auth/project.json index 08429f1d46..6215ca3585 100644 --- a/src/csharp/Grpc.Auth/project.json +++ b/src/csharp/Grpc.Auth/project.json @@ -32,9 +32,9 @@ "net45" ], "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027", - "NETStandard.Library": "1.5.0-rc2-24027", - "System.Threading.Tasks": "4.0.11-rc2-24027" + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.0", + "System.Threading.Tasks": "4.0.11" } } } |