diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-05-18 21:26:01 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-05-18 21:26:01 -0700 |
| commit | 166d48232de5d4ebcd381b8a365ea34332f28c81 (patch) | |
| tree | fe8e0ba712ef971f25d91233e90f2b157f2c8157 /src/csharp/Grpc.Examples.Tests | |
| parent | 37f3184b4cc33869af7d03546e4470e34bbbbe23 (diff) | |
| parent | c1dc660cc3a98211c55c4e90fcfd80c218afde2b (diff) | |
Merge remote-tracking branch 'upstream/release-0_14' into HEAD
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 cfe668b6be..3fd28c6528 100644 --- a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj +++ b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj @@ -37,7 +37,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Google.Protobuf"> - <HintPath>..\packages\Google.Protobuf.3.0.0-beta2\lib\portable-net45+netcore45+wpa81+wp8\Google.Protobuf.dll</HintPath> + <HintPath>..\packages\Google.Protobuf.3.0.0-beta3\lib\portable-net45+netcore45+wpa81+wp8\Google.Protobuf.dll</HintPath> </Reference> <Reference Include="nunit.framework"> <HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath> diff --git a/src/csharp/Grpc.Examples.Tests/packages.config b/src/csharp/Grpc.Examples.Tests/packages.config index ce030f9d77..668601af8e 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="Google.Protobuf" version="3.0.0-beta3" targetFramework="net45" /> <package id="Ix-Async" version="1.2.5" targetFramework="net45" /> <package id="NUnit" version="3.2.0" targetFramework="net45" /> <package id="NUnitLite" version="3.2.0" targetFramework="net45" /> |