From 3689fc623f589ee9ace23d8b390a51193f84e425 Mon Sep 17 00:00:00 2001 From: "marcin@woflo.io" Date: Thu, 12 Feb 2015 04:29:10 +0800 Subject: [PATCH] Update all packages and add effort provider registration to fix EF tests --- ...PI.EntityFramework.Tests.TestWebApp.csproj | 26 +++++++++++-------- .../Web.config | 24 ++++++++--------- .../packages.config | 10 +++---- JSONAPI.EntityFramework.Tests/App.Config | 6 ++--- .../JSONAPI.EntityFramework.Tests.csproj | 8 +++--- JSONAPI.EntityFramework.Tests/TestHelpers.cs | 1 + JSONAPI.EntityFramework.Tests/packages.config | 4 +-- JSONAPI.EntityFramework/App.config | 8 ++++++ .../JSONAPI.EntityFramework.csproj | 8 +++--- JSONAPI.EntityFramework/packages.config | 4 +-- JSONAPI.Tests/JSONAPI.Tests.csproj | 12 ++++----- JSONAPI.Tests/packages.config | 6 ++--- .../JSONAPI.TodoMVC.API.csproj | 12 ++++----- JSONAPI.TodoMVC.API/Web.config | 4 +-- JSONAPI.TodoMVC.API/packages.config | 6 ++--- JSONAPI/JSONAPI.csproj | 16 +++++++----- JSONAPI/packages.config | 6 ++--- 17 files changed, 88 insertions(+), 73 deletions(-) diff --git a/JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj b/JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj index b4e0f039..500ccc24 100644 --- a/JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj +++ b/JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj @@ -54,11 +54,11 @@ False - ..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll False - ..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll @@ -67,16 +67,17 @@ ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + False + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll @@ -87,12 +88,13 @@ - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.2\lib\net45\System.Web.Http.Owin.dll + + False + ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll @@ -112,7 +114,9 @@ - + + Designer + diff --git a/JSONAPI.EntityFramework.Tests.TestWebApp/Web.config b/JSONAPI.EntityFramework.Tests.TestWebApp/Web.config index 1bc02ea7..b3961976 100644 --- a/JSONAPI.EntityFramework.Tests.TestWebApp/Web.config +++ b/JSONAPI.EntityFramework.Tests.TestWebApp/Web.config @@ -22,23 +22,16 @@ - - - - - - - - + - + - + @@ -46,8 +39,15 @@ - + - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/JSONAPI.EntityFramework.Tests.TestWebApp/packages.config b/JSONAPI.EntityFramework.Tests.TestWebApp/packages.config index 116d5bd9..b443a3ea 100644 --- a/JSONAPI.EntityFramework.Tests.TestWebApp/packages.config +++ b/JSONAPI.EntityFramework.Tests.TestWebApp/packages.config @@ -4,12 +4,12 @@ - - - - + + + + - + \ No newline at end of file diff --git a/JSONAPI.EntityFramework.Tests/App.Config b/JSONAPI.EntityFramework.Tests/App.Config index 7548116e..e9e1357c 100644 --- a/JSONAPI.EntityFramework.Tests/App.Config +++ b/JSONAPI.EntityFramework.Tests/App.Config @@ -18,7 +18,7 @@ - + @@ -34,11 +34,11 @@ - + - + diff --git a/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj b/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj index f2593c70..eef87ee4 100644 --- a/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj +++ b/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj @@ -88,16 +88,16 @@ - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll diff --git a/JSONAPI.EntityFramework.Tests/TestHelpers.cs b/JSONAPI.EntityFramework.Tests/TestHelpers.cs index 3411ffdd..e44af4a7 100644 --- a/JSONAPI.EntityFramework.Tests/TestHelpers.cs +++ b/JSONAPI.EntityFramework.Tests/TestHelpers.cs @@ -21,6 +21,7 @@ public static string ReadEmbeddedFile(string path) public static DbConnection GetEffortConnection(string relativeDataPath) { + Effort.Provider.EffortProviderConfiguration.RegisterProvider(); var dataPath = Path.GetFullPath(relativeDataPath); var dataLoader = new CsvDataLoader(dataPath); return DbConnectionFactory.CreateTransient(dataLoader); diff --git a/JSONAPI.EntityFramework.Tests/packages.config b/JSONAPI.EntityFramework.Tests/packages.config index df24cfb7..ee922c92 100644 --- a/JSONAPI.EntityFramework.Tests/packages.config +++ b/JSONAPI.EntityFramework.Tests/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/JSONAPI.EntityFramework/App.config b/JSONAPI.EntityFramework/App.config index 70ad9000..c0a55e41 100644 --- a/JSONAPI.EntityFramework/App.config +++ b/JSONAPI.EntityFramework/App.config @@ -32,6 +32,14 @@ + + + + + + + + \ No newline at end of file diff --git a/JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj b/JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj index 5953bb90..c69fc42b 100644 --- a/JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj +++ b/JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj @@ -55,15 +55,15 @@ - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll diff --git a/JSONAPI.EntityFramework/packages.config b/JSONAPI.EntityFramework/packages.config index eddb39d3..899a534f 100644 --- a/JSONAPI.EntityFramework/packages.config +++ b/JSONAPI.EntityFramework/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/JSONAPI.Tests/JSONAPI.Tests.csproj b/JSONAPI.Tests/JSONAPI.Tests.csproj index 7242fe08..c994b289 100644 --- a/JSONAPI.Tests/JSONAPI.Tests.csproj +++ b/JSONAPI.Tests/JSONAPI.Tests.csproj @@ -54,17 +54,17 @@ 3.5 - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - + False - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll diff --git a/JSONAPI.Tests/packages.config b/JSONAPI.Tests/packages.config index be589f3d..db0cbbb2 100644 --- a/JSONAPI.Tests/packages.config +++ b/JSONAPI.Tests/packages.config @@ -1,8 +1,8 @@  - - - + + + \ No newline at end of file diff --git a/JSONAPI.TodoMVC.API/JSONAPI.TodoMVC.API.csproj b/JSONAPI.TodoMVC.API/JSONAPI.TodoMVC.API.csproj index bdb8e452..efb37137 100644 --- a/JSONAPI.TodoMVC.API/JSONAPI.TodoMVC.API.csproj +++ b/JSONAPI.TodoMVC.API/JSONAPI.TodoMVC.API.csproj @@ -63,9 +63,9 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll @@ -76,13 +76,13 @@ - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.2\lib\net45\System.Web.Http.Owin.dll + ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll diff --git a/JSONAPI.TodoMVC.API/Web.config b/JSONAPI.TodoMVC.API/Web.config index f52ca3cb..d06a967a 100644 --- a/JSONAPI.TodoMVC.API/Web.config +++ b/JSONAPI.TodoMVC.API/Web.config @@ -61,11 +61,11 @@ - + - + diff --git a/JSONAPI.TodoMVC.API/packages.config b/JSONAPI.TodoMVC.API/packages.config index ec7ec963..8f32ee29 100644 --- a/JSONAPI.TodoMVC.API/packages.config +++ b/JSONAPI.TodoMVC.API/packages.config @@ -1,9 +1,9 @@  - - - + + + diff --git a/JSONAPI/JSONAPI.csproj b/JSONAPI/JSONAPI.csproj index e4815238..464d761b 100644 --- a/JSONAPI/JSONAPI.csproj +++ b/JSONAPI/JSONAPI.csproj @@ -46,18 +46,18 @@ - + False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - + False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - + False - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll @@ -90,7 +90,9 @@ - + + Designer + diff --git a/JSONAPI/packages.config b/JSONAPI/packages.config index 16569ef0..2297b3a3 100644 --- a/JSONAPI/packages.config +++ b/JSONAPI/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file