diff --git a/.gitignore b/.gitignore index bdc3535..3b547dd 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ Generated_Code #added for RIA/Silverlight projects _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML +.vs/ diff --git a/sample/WebApi.OutputCache.V2.Demo/WebApi.OutputCache.V2.Demo.csproj b/sample/WebApi.OutputCache.V2.Demo/WebApi.OutputCache.V2.Demo.csproj index d365b49..e1480c8 100644 --- a/sample/WebApi.OutputCache.V2.Demo/WebApi.OutputCache.V2.Demo.csproj +++ b/sample/WebApi.OutputCache.V2.Demo/WebApi.OutputCache.V2.Demo.csproj @@ -38,25 +38,22 @@ - - ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Net.Http.dll - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll - - False - ..\..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.2\lib\net45\System.Web.Http.SelfHost.dll + + ..\..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.6\lib\net45\System.Web.Http.SelfHost.dll diff --git a/sample/WebApi.OutputCache.V2.Demo/app.config b/sample/WebApi.OutputCache.V2.Demo/app.config index 7435912..180c008 100644 --- a/sample/WebApi.OutputCache.V2.Demo/app.config +++ b/sample/WebApi.OutputCache.V2.Demo/app.config @@ -11,6 +11,10 @@ + + + + diff --git a/sample/WebApi.OutputCache.V2.Demo/packages.config b/sample/WebApi.OutputCache.V2.Demo/packages.config index ba57378..b6788cb 100644 --- a/sample/WebApi.OutputCache.V2.Demo/packages.config +++ b/sample/WebApi.OutputCache.V2.Demo/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/WebApi.OutputCache.V2/WebApi.OutputCache.V2.csproj b/src/WebApi.OutputCache.V2/WebApi.OutputCache.V2.csproj index 8b04ea1..b320860 100644 --- a/src/WebApi.OutputCache.V2/WebApi.OutputCache.V2.csproj +++ b/src/WebApi.OutputCache.V2/WebApi.OutputCache.V2.csproj @@ -38,20 +38,17 @@ false - - False - ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll @@ -71,15 +68,16 @@ - - - {3e45fa0b-c465-4de9-9bc3-40a606b73e84} WebApi.OutputCache.Core + + + +