Skip to content

Commit df27fee

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#4696 from bganapa/odata-version
Updating the Odata dll versions to be 5.6.4
2 parents 5d6bc32 + fb2e32e commit df27fee

File tree

6 files changed

+36
-34
lines changed

6 files changed

+36
-34
lines changed

‎src/ResourceManager/Compute/Stack/Commands.Compute/Commands.Compute.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@
5959
<HintPath>..\..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
62+
<Reference Include="Microsoft.Data.Edm">
63+
<HintPath>..\..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
66-
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
66+
<Reference Include="Microsoft.Data.OData">
67+
<HintPath>..\..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
70+
<Reference Include="Microsoft.Data.Services.Client">
71+
<HintPath>..\..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -77,8 +77,8 @@
7777
</Reference>
7878
<Reference Include="System.IO.Compression.FileSystem" />
7979
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
80-
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81-
<HintPath>..\..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
80+
<Reference Include="System.Spatial">
81+
<HintPath>..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
8484
</ItemGroup>

‎src/ResourceManager/Compute/Stack/Commands.Compute/packages.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<package id="AutoMapper" version="3.1.1" targetFramework="net45" />
44
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
55
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
6-
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net40" />
7-
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net40" />
8-
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net40" />
6+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net40" />
7+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net40" />
8+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net40" />
9+
<package id="System.Spatial" version="5.6.4" targetFramework="net40" />
910
</packages>

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage/Commands.Management.Storage.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@
5656
<HintPath>..\..\..\..\packages\Microsoft.Azure.Management.Storage.6.4.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
5757
</Reference>
5858
-->
59-
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
59+
<Reference Include="Microsoft.Data.Edm">
60+
<HintPath>..\..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
63+
<Reference Include="Microsoft.Data.OData">
64+
<HintPath>..\..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
67-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
67+
<Reference Include="Microsoft.Data.Services.Client">
68+
<HintPath>..\..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
@@ -76,8 +76,8 @@
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
79-
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
79+
<Reference Include="System.Spatial">
80+
<HintPath>..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
</ItemGroup>

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage/packages.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
4-
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net40" />
5-
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net40" />
6-
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net40" />
4+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net40" />
5+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net40" />
6+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net40" />
7+
<package id="System.Spatial" version="5.6.4" targetFramework="net40" />
78
</packages>

‎src/Storage/Stack/Commands.Storage/Commands.Storage.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
48+
<Reference Include="Microsoft.Data.Edm">
49+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
52+
<Reference Include="Microsoft.Data.OData">
53+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
56+
<Reference Include="Microsoft.Data.Services.Client">
57+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -75,8 +75,8 @@
7575
<Reference Include="System.ServiceModel" />
7676
<Reference Include="System.ServiceModel.Channels" />
7777
<Reference Include="System.ServiceModel.Web" />
78-
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
78+
<Reference Include="System.Spatial">
79+
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
</ItemGroup>

‎src/Storage/Stack/Commands.Storage/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
44
<package id="Microsoft.Azure.Storage.DataMovement" version="0.2.0" targetFramework="net452" />
5-
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
6-
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
7-
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" />
8-
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
5+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net452" />
6+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net452" />
7+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net452" />
8+
<package id="System.Spatial" version="5.6.4" targetFramework="net452" />
99
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net452" />
1010
</packages>

0 commit comments

Comments
 (0)