Repository: reef Updated Branches: refs/heads/master 7343e62c4 -> c93e1219c
[REEF-1992] Upgrade Azure Storage from 6.1 to 8.1.3 Upgrades all Azure Storage dependencies to version 8.1.3. Change is necessary for external consumers of REEF as well as matching the Org.Apache.Reef.DotNet.sln. JIRA: [REEF-1992](https://issues.apache.org/jira/browse/REEF-1992) Pull Request: This closes #1439 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/c93e1219 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/c93e1219 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/c93e1219 Branch: refs/heads/master Commit: c93e1219c0783371b5e31e00d4c0d812c8f3d98a Parents: 7343e62 Author: Markus Weimer <[email protected]> Authored: Tue Apr 24 17:50:15 2018 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Apr 24 17:52:02 2018 -0700 ---------------------------------------------------------------------- lang/cs/App.config | 14 +++++++++++- .../Org.Apache.REEF.IO.Tests.csproj | 24 ++++++++++++++++---- .../TestAzureBlockBlobFileSystemE2E.cs | 1 + .../cs/Org.Apache.REEF.IO.Tests/packages.config | 10 ++++++++ .../FileSystem/AzureBlob/AzureCloudBlockBlob.cs | 6 +---- .../Org.Apache.REEF.IO.csproj | 24 ++++++++++---------- lang/cs/Org.Apache.REEF.IO/packages.config | 16 ++++++++----- .../Org.Apache.REEF.Tests.csproj | 22 +++++++++--------- lang/cs/Org.Apache.REEF.Tests/packages.config | 16 ++++++++----- 9 files changed, 87 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/lang/cs/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/App.config b/lang/cs/App.config index ccdbecf..51d8c4f 100644 --- a/lang/cs/App.config +++ b/lang/cs/App.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?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 @@ -27,6 +27,18 @@ under the License. <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration> http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj index 5d688cc..da352b4 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj @@ -38,6 +38,18 @@ under the License. <HintPath>$(PackagesDir)\Microsoft.Azure.DataLake.Store.1.0.4\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> + </Reference> <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath> </Reference> @@ -51,6 +63,10 @@ under the License. <Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath> </Reference> + <Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\WindowsAzure.Storage.8.1.3\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> @@ -62,6 +78,9 @@ under the License. <Reference Include="System.Core" /> <Reference Include="System.Management" /> <Reference Include="System.Net.Http" /> + <Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath> + </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -71,11 +90,6 @@ under the License. <HintPath>$(PackagesDir)\NSubstitute.$(NSubstituteVersion)\lib\net45\NSubstitute.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <SpecificVersion>True</SpecificVersion> - <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> - <Private>True</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs"> http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs b/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs index 4e47d6b..bbe2b9e 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs +++ b/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs @@ -178,6 +178,7 @@ namespace Org.Apache.REEF.IO.Tests var blob = _container.GetBlockBlobReference(HelloFile); var tempFilePath = Path.GetTempFileName(); File.Delete(tempFilePath); // Delete the file as CopyToLocal will create it + const string Text = "hello"; try http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/lang/cs/Org.Apache.REEF.IO.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/packages.config b/lang/cs/Org.Apache.REEF.IO.Tests/packages.config index cc3ad3b..285e0b9 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.IO.Tests/packages.config @@ -19,6 +19,10 @@ under the License. --> <packages> <package id="Microsoft.Azure.DataLake.Store" version="1.0.4" targetFramework="net452" /> + <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" /> + <package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" /> <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net452" /> <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" /> <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" /> @@ -26,6 +30,12 @@ under the License. <package id="NLog" version="4.4.12" targetFramework="net452" /> <package id="NSubstitute" version="1.8.2.0" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" /> + <package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net452" /> + <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net452" /> + <package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" /> + <package id="System.Net.Requests" version="4.0.11" targetFramework="net452" /> + <package id="System.Spatial" version="5.8.2" targetFramework="net452" /> + <package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" /> <package id="xunit" version="2.1.0" targetFramework="net45" /> <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" /> <package id="xunit.assert" version="2.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs b/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs index 3305094..5610230 100644 --- a/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs +++ b/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs @@ -112,11 +112,7 @@ namespace Org.Apache.REEF.IO.FileSystem.AzureBlob public void UploadFromFile(string path, FileMode mode) { - #if REEF_DOTNET_BUILD - _blob.UploadFromFileAsync(path).Wait(); - #else - _blob.UploadFromFileAsync(path, mode).Wait(); - #endif + _blob.UploadFromFileAsync(path).Wait(); } public void FetchAttributes() http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/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 055c139..f651c84 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 @@ -44,16 +44,16 @@ under the License. <Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.Azure.Management.DataLake.Store.2.2.1\lib\net452\Microsoft.Azure.Management.DataLake.Store.dll</HintPath> </Reference> - <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath> + <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath> + <Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> + <Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> @@ -63,10 +63,6 @@ under the License. <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath> </Reference> - <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath> </Reference> @@ -76,6 +72,10 @@ under the License. <Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath> </Reference> + <Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\WindowsAzure.Storage.8.1.3\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> <Private>True</Private> @@ -88,8 +88,8 @@ under the License. <Reference Include="System.Core" /> <Reference Include="System.Management" /> <Reference Include="System.Net.Http" /> - <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath> + <Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System.Xml.Linq" /> http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/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 f53a362..8473e55 100644 --- a/lang/cs/Org.Apache.REEF.IO/packages.config +++ b/lang/cs/Org.Apache.REEF.IO/packages.config @@ -21,9 +21,9 @@ under the License. <package id="Microsoft.Azure.DataLake.Store" version="1.0.4" targetFramework="net452" /> <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" /> <package id="Microsoft.Azure.Management.DataLake.Store" version="2.2.1" targetFramework="net452" /> - <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="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" /> <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net452" /> <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" /> <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" /> @@ -31,6 +31,10 @@ under the License. <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" /> <package id="NLog" version="4.4.12" targetFramework="net452" /> <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" /> - <package id="System.Spatial" version="5.6.4" targetFramework="net45" /> - <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /> -</packages> + <package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net452" /> + <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net452" /> + <package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" /> + <package id="System.Net.Requests" version="4.0.11" targetFramework="net452" /> + <package id="System.Spatial" version="5.8.2" targetFramework="net452" /> + <package id="WindowsAzure.Storage" version="8.1.3" targetFramework="net452" /> +</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/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 7436b09..1df8499 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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 @@ -38,20 +38,20 @@ under the License. <HintPath>$(PackagesDir)\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath> + <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath> + <Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> + <Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> + <Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\WindowsAzure.Storage.8.1.3\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Newtonsoft.Json"> @@ -67,8 +67,8 @@ under the License. <Reference Include="System.Reactive.Interfaces"> <HintPath>$(PackagesDir)\System.Reactive.Interfaces.$(SystemReactiveVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath> </Reference> - <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath> + <Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>$(PackagesDir)\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath> <Private>True</Private> </Reference> </ItemGroup> http://git-wip-us.apache.org/repos/asf/reef/blob/c93e1219/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 933ef87..9df6ffc 100644 --- a/lang/cs/Org.Apache.REEF.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tests/packages.config @@ -19,16 +19,20 @@ under the License. --> <packages> <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" /> - <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="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" /> + <package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" /> <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" /> <package id="protobuf-net" version="2.1.0" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" /> + <package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net452" /> + <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net452" /> + <package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" /> + <package id="System.Net.Requests" version="4.0.11" targetFramework="net452" /> <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" /> <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" /> - <package id="System.Spatial" version="5.6.4" targetFramework="net45" /> - <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /> + <package id="System.Spatial" version="5.8.2" targetFramework="net452" /> + <package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" /> <package id="xunit" version="2.1.0" targetFramework="net45" /> <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" /> <package id="xunit.assert" version="2.1.0" targetFramework="net45" /> @@ -36,4 +40,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> +</packages> \ No newline at end of file
