From 156e2dea96a7f7ffecdfdd4db88c88ee132f3257 Mon Sep 17 00:00:00 2001 From: csainty Date: Wed, 3 Oct 2012 15:52:07 +0200 Subject: [PATCH] Updated to Nancy v0.12 and fixed compile and unit tests errors caused by the upgrade. --- Apphbify.Tests/App.config | 3 ++- Apphbify.Tests/Apphbify.Tests.csproj | 29 ++++++++++++--------------- Apphbify.Tests/Testing.cs | 1 - Apphbify.Tests/packages.config | 9 +++++---- Apphbify/Apphbify.csproj | 22 +++++++++++--------- Apphbify/OAuthModule.cs | 6 +++--- Apphbify/PagesModule.Secure.cs | 8 ++++---- Apphbify/PagesModule.cs | 6 +++--- Apphbify/Resources/StaticResources.cs | 8 +------- Apphbify/Web.config | 19 +++++++++--------- Apphbify/packages.config | 6 +++--- 11 files changed, 57 insertions(+), 60 deletions(-) diff --git a/Apphbify.Tests/App.config b/Apphbify.Tests/App.config index 7d80ef6..210d1f7 100644 --- a/Apphbify.Tests/App.config +++ b/Apphbify.Tests/App.config @@ -1,7 +1,8 @@ - + + \ No newline at end of file diff --git a/Apphbify.Tests/Apphbify.Tests.csproj b/Apphbify.Tests/Apphbify.Tests.csproj index 746e7ca..8425e04 100644 --- a/Apphbify.Tests/Apphbify.Tests.csproj +++ b/Apphbify.Tests/Apphbify.Tests.csproj @@ -36,26 +36,23 @@ ..\packages\AppHarbor.NET.2.0.0\lib\net35\AppHarbor.Sdk.dll - - ..\packages\Nancy.Testing.0.11.0\lib\net40\HtmlAgilityPack.dll - - - ..\packages\Nancy.Testing.0.11.0\lib\net40\HtmlAgilityPlus.dll + + ..\packages\CsQuery.1.2.1\lib\net40\CsQuery.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - + False - ..\packages\Nancy.0.11.0\lib\net40\Nancy.dll + ..\packages\Nancy.0.12.1\lib\net40\Nancy.dll - + False - ..\packages\Nancy.Testing.0.11.0\lib\net40\Nancy.Testing.dll + ..\packages\Nancy.Testing.0.12.1\lib\net40\Nancy.Testing.dll - + False - ..\packages\Nancy.Viewengines.Razor.0.11.0\lib\net40\Nancy.ViewEngines.Razor.dll + ..\packages\Nancy.Viewengines.Razor.0.12.1\lib\net40\Nancy.ViewEngines.Razor.dll False @@ -65,16 +62,16 @@ True - ..\packages\Nancy.Viewengines.Razor.0.11.0\lib\net40\System.Web.Razor.dll + ..\packages\Nancy.Viewengines.Razor.0.12.1\lib\net40\System.Web.Razor.dll - + False - ..\packages\xunit.1.9.0.1566\lib\xunit.dll + ..\packages\xunit.1.9.1\lib\net20\xunit.dll @@ -145,8 +142,8 @@ if $(ConfigurationName) == Debug ( - xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.11.0\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin" - xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.11.0\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin" + xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.12.1\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin" + xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.12.1\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin" ) diff --git a/Apphbify.Tests/Testing.cs b/Apphbify.Tests/Testing.cs index 4e78e06..9ed1b0b 100644 --- a/Apphbify.Tests/Testing.cs +++ b/Apphbify.Tests/Testing.cs @@ -32,7 +32,6 @@ static Testing() { cfg.Module(); config.Dependencies(cfg); - cfg.DisableAutoRegistration(); cfg.NancyEngine(); cfg.ViewEngines(typeof(TestingViewEngine)); }); diff --git a/Apphbify.Tests/packages.config b/Apphbify.Tests/packages.config index 0243c12..2275098 100644 --- a/Apphbify.Tests/packages.config +++ b/Apphbify.Tests/packages.config @@ -1,10 +1,11 @@  + - - - + + + - + \ No newline at end of file diff --git a/Apphbify/Apphbify.csproj b/Apphbify/Apphbify.csproj index 6df1707..58ae657 100644 --- a/Apphbify/Apphbify.csproj +++ b/Apphbify/Apphbify.csproj @@ -23,6 +23,10 @@ 4.0 + + + + true @@ -46,17 +50,17 @@ ..\packages\AppHarbor.NET.2.0.0\lib\net35\AppHarbor.Sdk.dll - + False - ..\packages\Nancy.0.11.0\lib\net40\Nancy.dll + ..\packages\Nancy.0.12.1\lib\net40\Nancy.dll - + False - ..\packages\Nancy.Hosting.Aspnet.0.11.0\lib\net40\Nancy.Hosting.Aspnet.dll + ..\packages\Nancy.Hosting.Aspnet.0.12.1\lib\net40\Nancy.Hosting.Aspnet.dll - + False - ..\packages\Nancy.Viewengines.Razor.0.11.0\lib\net40\Nancy.ViewEngines.Razor.dll + ..\packages\Nancy.Viewengines.Razor.0.12.1\lib\net40\Nancy.ViewEngines.Razor.dll ..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll @@ -75,7 +79,7 @@ True - ..\packages\Nancy.Viewengines.Razor.0.11.0\lib\net40\System.Web.Razor.dll + ..\packages\Nancy.Viewengines.Razor.0.12.1\lib\net40\System.Web.Razor.dll @@ -269,8 +273,8 @@ if $(ConfigurationName) == Debug ( - xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.11.0\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin" - xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.11.0\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin" + xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.12.1\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin" + xcopy /s /y "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.12.1\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin" ) diff --git a/Apphbify/OAuthModule.cs b/Apphbify/OAuthModule.cs index 957868f..ee7d37d 100644 --- a/Apphbify/OAuthModule.cs +++ b/Apphbify/OAuthModule.cs @@ -17,20 +17,20 @@ public OAuthModule(IOAuth api) Get["/callback"] = Callback; } - private Response SignIn(dynamic parameters) + private dynamic SignIn(dynamic parameters) { string redirect = Request.Query.redirect.HasValue ? Request.Query.redirect : ""; Session[SessionKeys.SIGN_IN_REDIRECT] = redirect; return View["SignIn", new SignInViewModel(_OAuth, Request.Session)]; } - private Response SignOut(dynamic parameters) + private dynamic SignOut(dynamic parameters) { Request.Session.DeleteAll(); return Response.AsRedirect("/").WithSuccessFlash(Session, "Signed out!"); } - private Response Callback(dynamic parameters) + private dynamic Callback(dynamic parameters) { string access_token = ""; if (Request.Query.code.HasValue) access_token = _OAuth.GetAccessToken(Request.Query.code); diff --git a/Apphbify/PagesModule.Secure.cs b/Apphbify/PagesModule.Secure.cs index 9aa434f..97de513 100644 --- a/Apphbify/PagesModule.Secure.cs +++ b/Apphbify/PagesModule.Secure.cs @@ -27,12 +27,12 @@ public SecuredPagesModule(DataStore data, IApiService api, IDeploymentService de Post["/Deploy/{key}"] = DoDeploy; } - private Response Sites(dynamic parameters) + private dynamic Sites(dynamic parameters) { return View["Sites", new SitesViewModel(_Api, Request.Session)]; } - private Response EnableEmailNotification(dynamic parameters) + private dynamic EnableEmailNotification(dynamic parameters) { if (!Request.Form.email.HasValue) return Response.AsJson(JsonResult.Error("Please provide an email address."), HttpStatusCode.BadRequest); @@ -47,7 +47,7 @@ private Response EnableEmailNotification(dynamic parameters) return Response.AsJson(JsonResult.OK()); } - private Response Deploy(dynamic parameters) + private dynamic Deploy(dynamic parameters) { var app = _Data.GetAppByKey((string)parameters.key); if (app == null) return Response.AsRedirect("/Apps").WithErrorFlash(Session, String.Format("App {0} not found.", (string)parameters.key)); @@ -55,7 +55,7 @@ private Response Deploy(dynamic parameters) return View["Deploy", new DeployViewModel(app, _Data, Request.Session)]; } - private Response DoDeploy(dynamic parameters) + private dynamic DoDeploy(dynamic parameters) { var app = _Data.GetAppByKey((string)parameters.key); if (app == null) return Response.AsRedirect("/Apps").WithErrorFlash(Session, String.Format("App {0} not found.", (string)parameters.key)); diff --git a/Apphbify/PagesModule.cs b/Apphbify/PagesModule.cs index c4ee4f9..9f35741 100644 --- a/Apphbify/PagesModule.cs +++ b/Apphbify/PagesModule.cs @@ -16,17 +16,17 @@ public PagesModule(DataStore store) Get["/About"] = About; } - private Response Home(dynamic parameters) + private dynamic Home(dynamic parameters) { return View["Home", new BaseViewModel("Home", Request.Session)]; } - private Response Apps(dynamic parameters) + private dynamic Apps(dynamic parameters) { return View["Apps", new AppsViewModel(_Store, Request.Session)]; } - private Response About(dynamic parameters) + private dynamic About(dynamic parameters) { return View["About", new BaseViewModel("About", Request.Session)]; } diff --git a/Apphbify/Resources/StaticResources.cs b/Apphbify/Resources/StaticResources.cs index b72abc8..724d9c9 100644 --- a/Apphbify/Resources/StaticResources.cs +++ b/Apphbify/Resources/StaticResources.cs @@ -29,14 +29,8 @@ private static byte[] ReadFile(string name) } } - public class StaticResourceStartup : IStartup + public class StaticResourceStartup : IApplicationStartup { - public IEnumerable CollectionTypeRegistrations { get { return null; } } - - public IEnumerable InstanceRegistrations { get { return null; } } - - public IEnumerable TypeRegistrations { get { return null; } } - public void Initialize(IPipelines pipelines) { RegisterFile("/robots.txt", StaticResources.Robots, pipelines); diff --git a/Apphbify/Web.config b/Apphbify/Web.config index 187cbea..be0912c 100644 --- a/Apphbify/Web.config +++ b/Apphbify/Web.config @@ -11,29 +11,30 @@ - + + + + + - - - + + + + + - - - - - \ No newline at end of file diff --git a/Apphbify/packages.config b/Apphbify/packages.config index dacead9..dff17e2 100644 --- a/Apphbify/packages.config +++ b/Apphbify/packages.config @@ -1,9 +1,9 @@  - - - + + + \ No newline at end of file