diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-27 19:57:58 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-27 19:57:58 -0800 |
| commit | b4e51b52bdd3a41f44e4959d08957f7142c9c56a (patch) | |
| tree | 699df3ca4dfe307dc9e139dab565dc1db1a700fe /src/csharp/Grpc.Examples.Tests | |
| parent | 5a9462339dd35de13acd44e7c8a001ac727c038e (diff) | |
| parent | f846aaf41baf34d68f9aa7e3daa2c65cd75dd7f1 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces
Diffstat (limited to 'src/csharp/Grpc.Examples.Tests')
| -rw-r--r-- | src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Examples.Tests/packages.config | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj index 54c68c1f92..9aeab059f9 100644 --- a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj +++ b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj @@ -47,7 +47,7 @@ <Reference Include="System" /> <Reference Include="System.Interactive.Async, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\Ix-Async.1.2.3\lib\net45\System.Interactive.Async.dll</HintPath> + <HintPath>..\packages\Ix-Async.1.2.5\lib\net45\System.Interactive.Async.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/src/csharp/Grpc.Examples.Tests/packages.config b/src/csharp/Grpc.Examples.Tests/packages.config index 10bf1e82d0..ed30d2d428 100644 --- a/src/csharp/Grpc.Examples.Tests/packages.config +++ b/src/csharp/Grpc.Examples.Tests/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Google.Protobuf" version="3.0.0-beta2" targetFramework="net45" />
- <package id="Ix-Async" version="1.2.3" targetFramework="net45" />
+ <package id="Ix-Async" version="1.2.5" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
</packages>
\ No newline at end of file |