diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
| commit | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (patch) | |
| tree | 51bccc374623625a19a5fb53df60bc08c2c7713e /src/csharp/Grpc.IntegrationTesting.Client | |
| parent | 58d637444187f36181d3662e85e42aa1d23af92a (diff) | |
| parent | 58d7310fbc291d2afa9cbb100544fc5c96cd3249 (diff) | |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
src/csharp/Grpc.IntegrationTesting/packages.config
src/csharp/build_packages.bat
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting.Client')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting.Client/app.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting.Client/app.config b/src/csharp/Grpc.IntegrationTesting.Client/app.config index 0a82bb4f16..84d7534d65 100644 --- a/src/csharp/Grpc.IntegrationTesting.Client/app.config +++ b/src/csharp/Grpc.IntegrationTesting.Client/app.config @@ -10,6 +10,10 @@ <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-4.2.28.0" newVersion="4.0.0.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.9.2.38523" newVersion="1.9.2.38523" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration>
\ No newline at end of file |