diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-24 00:08:49 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-24 00:08:49 +0200 |
| commit | cdbe6b3963528167ba581fb039b8fa9e5e0ea34f (patch) | |
| tree | 880d2bde69f1062411af1e89f1c9cb45229466fb /test | |
| parent | 668bf881a9449cc4f9885e4d3492e2cbe7476925 (diff) | |
| parent | d7ff4ff40071d2b486a052183e3e9f9382afb745 (diff) | |
Merge branch 'v1.0.x' into upmerge-from-v1.0.x
Diffstat (limited to 'test')
| -rw-r--r-- | test/distrib/csharp/DistribTest/DistribTest.csproj | 2 | ||||
| -rw-r--r-- | test/distrib/csharp/DistribTest/packages.config | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/distrib/csharp/DistribTest/DistribTest.csproj b/test/distrib/csharp/DistribTest/DistribTest.csproj index 6ca03b2c80..0bff9ff3e0 100644 --- a/test/distrib/csharp/DistribTest/DistribTest.csproj +++ b/test/distrib/csharp/DistribTest/DistribTest.csproj @@ -65,7 +65,7 @@ <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Interactive.Async"> - <HintPath>..\packages\Ix-Async.1.2.3\lib\net45\System.Interactive.Async.dll</HintPath> + <HintPath>..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath> </Reference> <Reference Include="System.Net" /> <Reference Include="System.Net.Http" /> diff --git a/test/distrib/csharp/DistribTest/packages.config b/test/distrib/csharp/DistribTest/packages.config index e5d2d9d383..84be8f76b5 100644 --- a/test/distrib/csharp/DistribTest/packages.config +++ b/test/distrib/csharp/DistribTest/packages.config @@ -6,6 +6,6 @@ <package id="Grpc" version="__GRPC_NUGET_VERSION__" targetFramework="net45" /> <package id="Grpc.Auth" version="__GRPC_NUGET_VERSION__" targetFramework="net45" /> <package id="Grpc.Core" version="__GRPC_NUGET_VERSION__" targetFramework="net45" /> - <package id="Ix-Async" version="1.2.3" targetFramework="net45" /> + <package id="System.Interactive.Async" version="3.0.0" targetFramework="net45" /> <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> -</packages> +</packages>
\ No newline at end of file |