diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
| commit | b0f3bf16cee1d893fc0414fcfe1060baac4eaa9b (patch) | |
| tree | 747298bf60f8a0b1c519a33d6084fad42fc192de /examples/csharp/route_guide/RouteGuideClient/packages.config | |
| parent | 350835a9566a4b56bfd409108ec235ef2424b630 (diff) | |
| parent | a9154a36fbc019b87f4d62ce16b346f3d44ec2de (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'examples/csharp/route_guide/RouteGuideClient/packages.config')
| -rw-r--r-- | examples/csharp/route_guide/RouteGuideClient/packages.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/csharp/route_guide/RouteGuideClient/packages.config b/examples/csharp/route_guide/RouteGuideClient/packages.config index 1273624cbd..22d34981e5 100644 --- a/examples/csharp/route_guide/RouteGuideClient/packages.config +++ b/examples/csharp/route_guide/RouteGuideClient/packages.config @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Google.Protobuf" version="3.0.0-alpha4" targetFramework="net45" /> - <package id="Grpc" version="0.7.0" targetFramework="net45" /> - <package id="Grpc.Core" version="0.7.0" targetFramework="net45" /> + <package id="Grpc" version="0.7.1" targetFramework="net45" /> + <package id="Grpc.Core" version="0.7.1" targetFramework="net45" /> <package id="grpc.dependencies.openssl.redist" version="1.0.2.3" targetFramework="net45" /> <package id="grpc.dependencies.zlib.redist" version="1.2.8.9" targetFramework="net45" /> - <package id="grpc.native.csharp_ext" version="0.11.0" targetFramework="net45" /> + <package id="grpc.native.csharp_ext" version="0.11.1" targetFramework="net45" /> <package id="Ix-Async" version="1.2.3" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> </packages>
\ No newline at end of file |