You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by mo...@apache.org on 2017/07/20 21:56:30 UTC
reef git commit: [REEF-1830] Update Protobuf to version 2.1.0
Repository: reef
Updated Branches:
refs/heads/master 2b42c504a -> 564b88066
[REEF-1830] Update Protobuf to version 2.1.0
This updates our protobuf version to 2.1.0. This is needed to support
.net core 2.0 as the library contains netstandard binaries.
JIRA:
[REEF-1830] https://issues.apache.org/jira/browse/REEF-1830
Pull Request:
This closes #1334
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/564b8806
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/564b8806
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/564b8806
Branch: refs/heads/master
Commit: 564b880665f27c4330530867837b159829300c06
Parents: 2b42c50
Author: Scott Inglis <ms...@gmail.com>
Authored: Thu Jul 13 17:40:53 2017 -0700
Committer: Sergiy Matusevych <mo...@apache.org>
Committed: Thu Jul 20 14:55:14 2017 -0700
----------------------------------------------------------------------
lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj | 2 +-
lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj | 4 ++--
lang/cs/Org.Apache.REEF.Driver/packages.config | 4 ++--
.../Org.Apache.REEF.Evaluator.Tests.csproj | 6 +++---
lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config | 4 ++--
.../Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj | 4 ++--
lang/cs/Org.Apache.REEF.Evaluator/packages.config | 4 ++--
lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj | 2 +-
lang/cs/Org.Apache.REEF.Network/packages.config | 2 +-
.../Org.Apache.REEF.Tang.Tests.csproj | 4 ++--
lang/cs/Org.Apache.REEF.Tang.Tests/packages.config | 4 ++--
lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj | 4 ++--
lang/cs/Org.Apache.REEF.Tang/packages.config | 4 ++--
lang/cs/Org.Apache.REEF.Tests/packages.config | 4 ++--
lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj | 2 +-
lang/cs/Org.Apache.REEF.Wake/packages.config | 2 +-
lang/cs/build.DotNet.props | 2 +-
lang/cs/build.props | 2 +-
18 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
index 41095fa..4bbab06 100644
--- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
+++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
@@ -37,7 +37,7 @@ under the License.
<HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
index d76e250..1857ada 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
+++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
@@ -34,7 +34,7 @@ under the License.
<HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -184,4 +184,4 @@ under the License.
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Driver/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/packages.config b/lang/cs/Org.Apache.REEF.Driver/packages.config
index 3114a87..101d669 100644
--- a/lang/cs/Org.Apache.REEF.Driver/packages.config
+++ b/lang/cs/Org.Apache.REEF.Driver/packages.config
@@ -20,6 +20,6 @@ under the License.
<packages>
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj
index 58e7162..4fc54ad 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj
@@ -43,8 +43,8 @@ under the License.
<HintPath>$(PackagesDir)\NSubstitute.$(NSubstituteVersion)\lib\net45\NSubstitute.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="protobuf-net, Version=$(ProtobufVersion), Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <Reference Include="protobuf-net">
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -110,4 +110,4 @@ under the License.
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(NuGetError)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config b/lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config
index d7ef120..8e15bbc 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config
+++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/packages.config
@@ -19,7 +19,7 @@ under the License.
-->
<packages>
<package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
@@ -28,4 +28,4 @@ under the License.
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
index 6cd54e8..6833548 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
+++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
@@ -41,7 +41,7 @@ under the License.
<Import Project="$(SolutionDir)\build.props" />
<ItemGroup>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -96,4 +96,4 @@ under the License.
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Evaluator/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator/packages.config b/lang/cs/Org.Apache.REEF.Evaluator/packages.config
index 75512ca..a0f4669 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/packages.config
+++ b/lang/cs/Org.Apache.REEF.Evaluator/packages.config
@@ -18,6 +18,6 @@ specific language governing permissions and limitations
under the License.
-->
<packages>
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj
index 9114d17..4c3b6b8 100644
--- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj
+++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj
@@ -34,7 +34,7 @@ under the License.
<HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Network/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/packages.config b/lang/cs/Org.Apache.REEF.Network/packages.config
index 66ec02f..7db384f 100644
--- a/lang/cs/Org.Apache.REEF.Network/packages.config
+++ b/lang/cs/Org.Apache.REEF.Network/packages.config
@@ -20,7 +20,7 @@ under the License.
<packages>
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
index 9e21b45..4313e69 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
@@ -41,7 +41,7 @@ under the License.
<HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -155,4 +155,4 @@ under the License.
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config
index 0e262ae..0d72235 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config
@@ -20,7 +20,7 @@ under the License.
<packages>
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
@@ -29,4 +29,4 @@ under the License.
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
index 7403450..616cb57 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
@@ -37,7 +37,7 @@ under the License.
<HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -175,4 +175,4 @@ under the License.
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Tang/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/packages.config b/lang/cs/Org.Apache.REEF.Tang/packages.config
index 3114a87..101d669 100644
--- a/lang/cs/Org.Apache.REEF.Tang/packages.config
+++ b/lang/cs/Org.Apache.REEF.Tang/packages.config
@@ -20,6 +20,6 @@ under the License.
<packages>
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Tests/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/packages.config b/lang/cs/Org.Apache.REEF.Tests/packages.config
index 17f2443..ec9b572 100644
--- a/lang/cs/Org.Apache.REEF.Tests/packages.config
+++ b/lang/cs/Org.Apache.REEF.Tests/packages.config
@@ -23,7 +23,7 @@ under the License.
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
@@ -36,4 +36,4 @@ under the License.
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
index 9dcc039..ea76e5d 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
@@ -42,7 +42,7 @@ under the License.
<HintPath>$(PackagesDir)\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
+ <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/Org.Apache.REEF.Wake/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/packages.config b/lang/cs/Org.Apache.REEF.Wake/packages.config
index beb1da1..e6f2691 100644
--- a/lang/cs/Org.Apache.REEF.Wake/packages.config
+++ b/lang/cs/Org.Apache.REEF.Wake/packages.config
@@ -22,7 +22,7 @@ under the License.
<package id="Microsoft.Avro.Tools" version="0.1.0" targetFramework="net451" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" developmentDependency="true" />
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+ <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/build.DotNet.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props
index 7dd5d1d..d60ed35 100644
--- a/lang/cs/build.DotNet.props
+++ b/lang/cs/build.DotNet.props
@@ -40,7 +40,7 @@ under the License.
<AvroVersion>1.5.6</AvroVersion>
<NewtonsoftJsonVersion>10.0.1</NewtonsoftJsonVersion>
<NSubstituteVersion>1.8.2.0</NSubstituteVersion>
- <ProtobufVersion>2.0.0.668</ProtobufVersion>
+ <ProtobufVersion>2.1.0</ProtobufVersion>
<SystemReactiveVersion>3.1.1</SystemReactiveVersion>
<StyleCopVersion>4.7.49.1</StyleCopVersion>
<TransientFaultHandlingVersion>1.0.0</TransientFaultHandlingVersion>
http://git-wip-us.apache.org/repos/asf/reef/blob/564b8806/lang/cs/build.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.props b/lang/cs/build.props
index 4506c17..84173ca 100644
--- a/lang/cs/build.props
+++ b/lang/cs/build.props
@@ -69,7 +69,7 @@ under the License.
<PropertyGroup>
<AvroVersion>1.5.6</AvroVersion>
<NewtonsoftJsonVersion>8.0.3</NewtonsoftJsonVersion>
- <ProtobufVersion>2.0.0.668</ProtobufVersion>
+ <ProtobufVersion>2.1.0</ProtobufVersion>
<SystemReactiveVersion>3.1.1</SystemReactiveVersion>
<StyleCopVersion>4.7.49.1</StyleCopVersion>
<NSubstituteVersion>1.8.2.0</NSubstituteVersion>