Skip to content

Commit c6454f2

Browse files
SphtKrSphtKr
committed
Upgraded dependencies to latest, fixed incompatabilities when doing a Release build (?!?), apparently I was still using EF4's PluralizationService, that has now been changed to use EF6's. Should be no EF4 code or dependencies left anymore.
1 parent 1ce712e commit c6454f2

19 files changed

+164
-94
lines changed

‎JSONAPI.EntityFramework.Tests/App.Config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@
1616
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
1717
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
1818
</dependentAssembly>
19+
<dependentAssembly>
20+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
21+
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
22+
</dependentAssembly>
23+
<dependentAssembly>
24+
<assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
25+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
26+
</dependentAssembly>
27+
<dependentAssembly>
28+
<assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
29+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
30+
</dependentAssembly>
31+
<dependentAssembly>
32+
<assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
33+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
34+
</dependentAssembly>
1935
</assemblyBinding>
2036
</runtime>
2137
<entityFramework>

‎JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4949
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5050
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -57,9 +57,9 @@
5757
</Reference>
5858
<Reference Include="System.Data" />
5959
<Reference Include="System.Net.Http" />
60-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>C:\temp\JSONAPI.EntityFramework.Tests\bin\Debug\System.Net.Http.Formatting.dll</HintPath>
62+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Runtime.Serialization" />
6565
<Reference Include="System.Security" />

‎JSONAPI.EntityFramework.Tests/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
56
</packages>

‎JSONAPI.EntityFramework/App.config‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
4+
55
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>
@@ -20,6 +20,18 @@
2020
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
2121
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
2222
</dependentAssembly>
23+
<dependentAssembly>
24+
<assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
25+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
26+
</dependentAssembly>
27+
<dependentAssembly>
28+
<assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
29+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
30+
</dependentAssembly>
31+
<dependentAssembly>
32+
<assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
33+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
34+
</dependentAssembly>
2335
</assemblyBinding>
2436
</runtime>
2537
</configuration>

‎JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,35 @@
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
<Prefer32Bit>false</Prefer32Bit>
37+
<DocumentationFile>bin\Release\JSONAPI.EntityFramework.XML</DocumentationFile>
3738
</PropertyGroup>
3839
<ItemGroup>
39-
<Reference Include="EntityFramework">
40-
<HintPath>..\..\Pyro\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
40+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
4143
</Reference>
42-
<Reference Include="EntityFramework.SqlServer">
43-
<HintPath>..\..\Pyro\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
44+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4447
</Reference>
4548
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4649
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
4851
</Reference>
4952
<Reference Include="System" />
5053
<Reference Include="System.ComponentModel.DataAnnotations" />
5154
<Reference Include="System.Core" />
5255
<Reference Include="System.Data" />
53-
<Reference Include="System.Data.Entity" />
54-
<Reference Include="System.Data.Entity.Design" />
5556
<Reference Include="System.Net.Http" />
56-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5758
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\..\Pyro\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
59+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
5960
</Reference>
6061
<Reference Include="System.Runtime.Serialization" />
6162
<Reference Include="System.Web" />
62-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6364
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\..\Pyro\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
65+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
6566
</Reference>
6667
<Reference Include="System.Xml.Linq" />
6768
<Reference Include="Microsoft.CSharp" />

‎JSONAPI.EntityFramework/PluralizationService.cs‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace JSONAPI.EntityFramework
77
{
88
public class PluralizationService : JSONAPI.Core.IPluralizationService
99
{
10-
private static Lazy<System.Data.Entity.Design.PluralizationServices.PluralizationService> _pls
11-
= new Lazy<System.Data.Entity.Design.PluralizationServices.PluralizationService>(
12-
() => System.Data.Entity.Design.PluralizationServices.PluralizationService.CreateService(System.Globalization.CultureInfo.CreateSpecificCulture("en-US"))
10+
private static Lazy<System.Data.Entity.Infrastructure.Pluralization.EnglishPluralizationService> _pls
11+
= new Lazy<System.Data.Entity.Infrastructure.Pluralization.EnglishPluralizationService>(
12+
() => new System.Data.Entity.Infrastructure.Pluralization.EnglishPluralizationService()
1313
);
1414
public string Pluralize(string s)
1515
{
@@ -19,13 +19,5 @@ public string Singularize(string s)
1919
{
2020
return _pls.Value.Singularize(s);
2121
}
22-
public bool IsPlural(string s)
23-
{
24-
return _pls.Value.IsPlural(s);
25-
}
26-
public bool IsSingular(string s)
27-
{
28-
return _pls.Value.IsSingular(s);
29-
}
3022
}
3123
}

‎JSONAPI.EntityFramework/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("JSONAPI.EntityFramework")]
9-
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyDescription("A toolkit for using WebAPI and (optionally) EntityFramework to quickly build REST services complying with the JSON API spec (jsonapi.org).")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("ERMC")]
12-
[assembly: AssemblyProduct("JSONAPI.EntityFramework")]
13-
[assembly: AssemblyCopyright("Copyright © ERMC 2014")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("JSONAPI.NET")]
13+
[assembly: AssemblyCopyright("")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("0.1.0.0")]
36+
[assembly: AssemblyFileVersion("0.1.0.0")]

‎JSONAPI.EntityFramework/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
6+
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
77
</packages>

‎JSONAPI.Tests/JSONAPI.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@
4141
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4242
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
44+
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core">
4848
<RequiredTargetFramework>3.5</RequiredTargetFramework>
4949
</Reference>
5050
<Reference Include="System.Net.Http" />
51-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
53+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
5454
</Reference>
55-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
57+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
5858
</Reference>
59-
<Reference Include="System.Web.Http.WebHost, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<Reference Include="System.Web.Http.WebHost, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.0\lib\net45\System.Web.Http.WebHost.dll</HintPath>
61+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll</HintPath>
6262
</Reference>
6363
</ItemGroup>
6464
<ItemGroup>

‎JSONAPI.Tests/app.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-6.8.1.0" newVersion="6.8.1.0" />
28+
</dependentAssembly>
929
</assemblyBinding>
1030
</runtime>
1131
</configuration>

0 commit comments

Comments
 (0)