Repository: reef Updated Branches: refs/heads/master fa16b8db0 -> 07b60112d
[REEF-1245] Update Newtonsoft.Json package version to 7.0.1 This change: * updates Newtonsoft.Json package version to 7.0.1 in all packages that use it. * adds assembly binding redirect to executables and dlls which use Avro. JIRA: [REEF-1245](https://issues.apache.org/jira/browse/REEF-1245) Pull request: This closes #886 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/07b60112 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/07b60112 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/07b60112 Branch: refs/heads/master Commit: 07b60112dad0667f8e75282218e2c4876658ce1f Parents: fa16b8d Author: Mariia Mykhailova <[email protected]> Authored: Mon Feb 29 11:27:10 2016 -0800 Committer: Markus Weimer <[email protected]> Committed: Mon Mar 14 16:50:05 2016 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Client.Tests.csproj | 2 +- lang/cs/Org.Apache.REEF.Client.Tests/packages.config | 2 +- .../Common/DriverFolderPreparationHelper.cs | 10 ++++++++++ lang/cs/Org.Apache.REEF.Client/packages.config | 2 +- lang/cs/Org.Apache.REEF.Common/packages.config | 2 +- lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config | 14 +++++++++++--- lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj | 2 +- lang/cs/Org.Apache.REEF.IO/packages.config | 2 +- lang/cs/Org.Apache.REEF.Network/packages.config | 2 +- .../Org.Apache.REEF.Tang.Tests.csproj | 3 +++ lang/cs/Org.Apache.REEF.Tang.Tests/packages.config | 2 +- lang/cs/Org.Apache.REEF.Tang/packages.config | 2 +- .../Org.Apache.REEF.Tests.csproj | 6 +++++- lang/cs/Org.Apache.REEF.Tests/app.config | 6 +++--- lang/cs/Org.Apache.REEF.Tests/packages.config | 2 +- lang/cs/Org.Apache.REEF.Utilities/packages.config | 2 +- lang/cs/build.props | 2 +- 17 files changed, 44 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj index 1d9e18a..681d2ef 100644 --- a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj @@ -35,7 +35,7 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> <Private>True</Private> </Reference> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Client.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config index 657c994..b976e6b 100644 --- a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="NSubstitute" version="1.8.2.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" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs index f579ee1..8996a2a 100644 --- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs +++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs @@ -40,10 +40,15 @@ namespace Org.Apache.REEF.Client.Common @"<configuration>" + @" <runtime>" + @" <assemblyBinding xmlns=""urn:schemas-microsoft-com:asm.v1"">" + + @" <dependentAssembly>" + + @" <assemblyIdentity name=""Newtonsoft.Json"" publicKeyToken=""30ad4fe6b2a6aeed"" culture=""neutral"" />" + + @" <bindingRedirect oldVersion=""0.0.0.0-7.0.0.0"" newVersion=""7.0.0.0"" />" + + @" </dependentAssembly>" + @" <probing privatePath=""local;global""/>" + @" </assemblyBinding>" + @" </runtime>" + @"</configuration>"; + private const string EvaluatorExecutable = "Org.Apache.REEF.Evaluator.exe.config"; private static readonly Logger Logger = Logger.GetLogger(typeof(DriverFolderPreparationHelper)); private readonly AvroConfigurationSerializer _configurationSerializer; @@ -129,12 +134,17 @@ namespace Org.Apache.REEF.Client.Common File.WriteAllBytes(fileName, resourceHelper.GetBytes(fileResources.Value)); } + // generate .config file for bridge executable var config = DefaultDriverConfigurationFileContents; if (!string.IsNullOrEmpty(appParameters.DriverConfigurationFileContents)) { config = appParameters.DriverConfigurationFileContents; } File.WriteAllText(Path.Combine(driverFolderPath, _fileNames.GetBridgeExeConfigPath()), config); + + // generate .config file for Evaluator executable + File.WriteAllText(Path.Combine(driverFolderPath, _fileNames.GetGlobalFolderPath(), EvaluatorExecutable), + DefaultDriverConfigurationFileContents); } /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Client/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/packages.config b/lang/cs/Org.Apache.REEF.Client/packages.config index 63005d5..41386fa 100644 --- a/lang/cs/Org.Apache.REEF.Client/packages.config +++ b/lang/cs/Org.Apache.REEF.Client/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Common/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/packages.config b/lang/cs/Org.Apache.REEF.Common/packages.config index 8da6ad7..240e99e 100644 --- a/lang/cs/Org.Apache.REEF.Common/packages.config +++ b/lang/cs/Org.Apache.REEF.Common/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config index e429816..72dbca3 100644 --- a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config +++ b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config @@ -18,7 +18,15 @@ specific language governing permissions and limitations under the License. --> <configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj index 29360d5..2fda120 100644 --- a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj +++ b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.csproj @@ -53,7 +53,7 @@ under the License. <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> <Private>True</Private> </Reference> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.IO/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/packages.config b/lang/cs/Org.Apache.REEF.IO/packages.config index 2814084..e7e7b1b 100644 --- a/lang/cs/Org.Apache.REEF.IO/packages.config +++ b/lang/cs/Org.Apache.REEF.IO/packages.config @@ -22,7 +22,7 @@ under the License. <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" /> <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="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="System.Spatial" version="5.6.4" targetFramework="net45" /> <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/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 8da6ad7..240e99e 100644 --- a/lang/cs/Org.Apache.REEF.Network/packages.config +++ b/lang/cs/Org.Apache.REEF.Network/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/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 36b2604..6ca1207 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 @@ -148,4 +148,7 @@ 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')" /> + <Target Name="AfterBuild"> + <Copy SourceFiles="$(SolutionDir)\Org.Apache.REEF.Tests\app.config" DestinationFiles="$(OutputPath)\$(AssemblyName).dll.config" /> + </Target> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/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 4f496ab..08ffe47 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="xunit" version="2.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/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 5757dcc..086bedd 100644 --- a/lang/cs/Org.Apache.REEF.Tang/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj index 68fba1b..921d862 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj @@ -54,7 +54,7 @@ under the License. <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> <Private>True</Private> </Reference> @@ -103,6 +103,7 @@ under the License. <None Include="$(SolutionDir)\Org.Apache.REEF.Client\run.cmd"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> + <None Include="app.config" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup> @@ -157,4 +158,7 @@ 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')" /> + <Target Name="AfterBuild"> + <Copy SourceFiles="$(SolutionDir)\Org.Apache.REEF.Tests\app.config" DestinationFiles="$(OutputPath)\$(AssemblyName).dll.config" /> + </Target> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Tests/app.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/app.config b/lang/cs/Org.Apache.REEF.Tests/app.config index 226a6a8..39d3857 100644 --- a/lang/cs/Org.Apache.REEF.Tests/app.config +++ b/lang/cs/Org.Apache.REEF.Tests/app.config @@ -1,4 +1,5 @@ -<!-- +<?xml version="1.0" encoding="utf-8"?> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -16,13 +17,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<?xml version="1.0" encoding="utf-8"?> <configuration> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> </dependentAssembly> </assemblyBinding> </runtime> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/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 8e0db25..c8142fc 100644 --- a/lang/cs/Org.Apache.REEF.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tests/packages.config @@ -22,7 +22,7 @@ under the License. <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" /> <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="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/Org.Apache.REEF.Utilities/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/packages.config b/lang/cs/Org.Apache.REEF.Utilities/packages.config index 90497de..e858e14 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/packages.config +++ b/lang/cs/Org.Apache.REEF.Utilities/packages.config @@ -19,6 +19,6 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/07b60112/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 2c5a6fe..11d367a 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -68,7 +68,7 @@ under the License. <!-- Package versions --> <PropertyGroup> <AvroVersion>1.5.6</AvroVersion> - <NewtonsoftJsonVersion>6.0.8</NewtonsoftJsonVersion> + <NewtonsoftJsonVersion>7.0.1</NewtonsoftJsonVersion> <ProtobufVersion>2.0.0.668</ProtobufVersion> <RxVersion>2.2.5</RxVersion> <StyleCopVersion>4.7.49.1</StyleCopVersion>
