diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-16 11:16:34 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-16 11:16:34 -0700 |
| commit | e61bf3b406ae5705dafc76899eb84427961a686d (patch) | |
| tree | 958c605b213d1cba94b5f00540de224b446b1d24 /src/csharp/Grpc.Examples | |
| parent | 7ef54b662f7993e425e44c28362bbbc99d49ca18 (diff) | |
| parent | 6b38251f079556833de244c0ab08101e47b6f367 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares
Diffstat (limited to 'src/csharp/Grpc.Examples')
| -rw-r--r-- | src/csharp/Grpc.Examples/Grpc.Examples.csproj | 4 | ||||
| -rw-r--r-- | src/csharp/Grpc.Examples/packages.config | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Examples/project.json | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Examples/Grpc.Examples.csproj b/src/csharp/Grpc.Examples/Grpc.Examples.csproj index 3dfa84e896..4521649b6f 100644 --- a/src/csharp/Grpc.Examples/Grpc.Examples.csproj +++ b/src/csharp/Grpc.Examples/Grpc.Examples.csproj @@ -48,7 +48,7 @@ <Reference Include="System.Data.Linq" /> <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.5\lib\net45\System.Interactive.Async.dll</HintPath> + <HintPath>..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -72,4 +72,4 @@ <None Include="Grpc.Examples.project.json" /> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/csharp/Grpc.Examples/packages.config b/src/csharp/Grpc.Examples/packages.config index a70dcbd4c6..8985ae4c77 100644 --- a/src/csharp/Grpc.Examples/packages.config +++ b/src/csharp/Grpc.Examples/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Google.Protobuf" version="3.0.0-beta3" targetFramework="net45" /> - <package id="Ix-Async" version="1.2.5" targetFramework="net45" /> + <package id="System.Interactive.Async" version="3.0.0" targetFramework="net45" /> <package id="NUnit" version="3.2.0" targetFramework="net45" /> </packages>
\ No newline at end of file diff --git a/src/csharp/Grpc.Examples/project.json b/src/csharp/Grpc.Examples/project.json index 48ec530abb..5329f390e4 100644 --- a/src/csharp/Grpc.Examples/project.json +++ b/src/csharp/Grpc.Examples/project.json @@ -1,6 +1,11 @@ { "buildOptions": { }, + "runtimes": { + "win7-x64": { }, + "debian.8-x64": { }, + "osx.10.11-x64": { } + }, "dependencies": { "Grpc.Core": { |