Skip to content

Commit d9f8a53

Browse files
javiercnjaviercn
committed
Updated OData dependencies to JSON.NET 6.0.4 and Web API 5.2.2-rc
1 parent 2eb1926 commit d9f8a53

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

‎OData/src/System.Web.Http.OData/System.Web.Http.OData.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@
2020
<SpecificVersion>False</SpecificVersion>
2121
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
2222
</Reference>
23-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
23+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
2424
<SpecificVersion>False</SpecificVersion>
25-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
25+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
2626
</Reference>
2727
<Reference Include="System" />
2828
<Reference Include="System.ComponentModel.DataAnnotations" />
2929
<Reference Include="System.Core" />
3030
<Reference Include="System.Data.Linq" />
3131
<Reference Include="System.Net.Http" />
32-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
32+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3333
<SpecificVersion>False</SpecificVersion>
34-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
34+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2-rc\lib\net45\System.Net.Http.Formatting.dll</HintPath>
3535
</Reference>
3636
<Reference Include="System.Net.Http.WebRequest" />
3737
<Reference Include="System.Runtime.Serialization" />
3838
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3939
<SpecificVersion>False</SpecificVersion>
4040
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
4141
</Reference>
42-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
44+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2-rc\lib\net45\System.Web.Http.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System.Xml" />
4747
<Reference Include="System.Xml.Linq" />

‎OData/src/System.Web.Http.OData/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2-rc" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2-rc" targetFramework="net45" />
55
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
66
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
7-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
88
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
99
</packages>

‎OData/src/System.Web.OData/System.Web.OData.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
<SpecificVersion>False</SpecificVersion>
2525
<HintPath>..\..\packages\Microsoft.Spatial.6.5.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
2626
</Reference>
27-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
27+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
2828
<SpecificVersion>False</SpecificVersion>
29-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
29+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
3030
</Reference>
3131
<Reference Include="System" />
3232
<Reference Include="System.ComponentModel.DataAnnotations" />
3333
<Reference Include="System.Core" />
3434
<Reference Include="System.Data.Linq" />
3535
<Reference Include="System.Net.Http" />
36-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3737
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
38+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2-rc\lib\net45\System.Net.Http.Formatting.dll</HintPath>
3939
</Reference>
4040
<Reference Include="System.Net.Http.WebRequest" />
4141
<Reference Include="System.Runtime.Serialization" />
42-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
44+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2-rc\lib\net45\System.Web.Http.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System.Xml" />
4747
<Reference Include="System.Xml.Linq" />

‎OData/src/System.Web.OData/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2-rc" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2-rc" targetFramework="net45" />
55
<package id="Microsoft.OData.Core" version="6.5.0" targetFramework="net45" />
66
<package id="Microsoft.OData.Edm" version="6.5.0" targetFramework="net45" />
77
<package id="Microsoft.Spatial" version="6.5.0" targetFramework="net45" />
8-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
99
</packages>

‎OData/test/System.Web.Http.OData.Test/System.Web.Http.OData.Test.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
<SpecificVersion>False</SpecificVersion>
2424
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
2525
</Reference>
26-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
26+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
2727
<SpecificVersion>False</SpecificVersion>
28-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
28+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
2929
</Reference>
3030
<Reference Include="System" />
3131
<Reference Include="System.ComponentModel.DataAnnotations" />
3232
<Reference Include="System.Data.Entity" />
3333
<Reference Include="System.Data.Linq" />
3434
<Reference Include="System.Net.Http" />
35-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3636
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
37+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2-rc\lib\net45\System.Net.Http.Formatting.dll</HintPath>
3838
</Reference>
3939
<Reference Include="System.Net.Http.WebRequest" />
4040
<Reference Include="System.Runtime.Serialization" />
@@ -43,9 +43,9 @@
4343
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System.Web" />
46-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
48+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2-rc\lib\net45\System.Web.Http.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System.Web.Http.SelfHost, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>

‎OData/test/System.Web.Http.OData.Test/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2-rc" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2-rc" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.0" targetFramework="net45" />
66
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
77
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
88
<package id="Moq" version="4.0.10827" targetFramework="net45" />
9-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
9+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1010
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
1111
<package id="xunit" version="1.9.1" targetFramework="net45" />
1212
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />

‎OData/test/System.Web.OData.Test/System.Web.OData.Test.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
<SpecificVersion>False</SpecificVersion>
2828
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
2929
</Reference>
30-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
30+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3131
<SpecificVersion>False</SpecificVersion>
32-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
32+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
3333
</Reference>
3434
<Reference Include="System" />
3535
<Reference Include="System.ComponentModel.DataAnnotations" />
3636
<Reference Include="System.Data.Entity" />
3737
<Reference Include="System.Data.Linq" />
3838
<Reference Include="System.Net.Http" />
39-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
41+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2-rc\lib\net45\System.Net.Http.Formatting.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System.Net.Http.WebRequest" />
4444
<Reference Include="System.Runtime.Serialization" />
4545
<Reference Include="System.Web" />
46-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
48+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2-rc\lib\net45\System.Web.Http.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System.Web.Http.SelfHost, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>

‎OData/test/System.Web.OData.Test/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2-rc" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2-rc" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.0" targetFramework="net45" />
66
<package id="Microsoft.OData.Core" version="6.5.0" targetFramework="net45" />
77
<package id="Microsoft.OData.Edm" version="6.5.0" targetFramework="net45" />
88
<package id="Microsoft.Spatial" version="6.5.0" targetFramework="net45" />
99
<package id="Moq" version="4.0.10827" targetFramework="net45" />
10-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
10+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1111
<package id="xunit" version="1.9.1" targetFramework="net45" />
1212
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
1313
</packages>

0 commit comments

Comments
 (0)