From 92c3fe61f2700e4a171e23857707740ce91dcd21 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sat, 6 Jul 2013 16:29:01 -0700 Subject: [PATCH] updated nancy to 0.17.1.0 --- NzbDrone.Api/Frontend/IndexModule.cs | 3 ++- NzbDrone.Api/NzbDrone.Api.csproj | 9 ++++---- NzbDrone.Api/TinyIoCNancyBootstrapper.cs | 21 ++++++------------- NzbDrone.Api/packages.config | 4 ++-- NzbDrone.Console/NzbDrone.Console.csproj | 8 +++++++ NzbDrone.Console/packages.config | 4 ++-- .../NzbDrone.Integration.Test.csproj | 11 +++++----- NzbDrone.Integration.Test/packages.config | 4 ++-- NzbDrone/NzbDrone.csproj | 11 +++++----- NzbDrone/packages.config | 4 ++-- 10 files changed, 41 insertions(+), 38 deletions(-) diff --git a/NzbDrone.Api/Frontend/IndexModule.cs b/NzbDrone.Api/Frontend/IndexModule.cs index 46eac2824..2045e2973 100644 --- a/NzbDrone.Api/Frontend/IndexModule.cs +++ b/NzbDrone.Api/Frontend/IndexModule.cs @@ -24,7 +24,8 @@ namespace NzbDrone.Api.Frontend _indexCache = cacheManger.GetCache(typeof(IndexModule)); //Serve anything that doesn't have an extension - Get[@"/(.*)"] = x => Index(); + Get[@"^(?:.*)$"] = x => Index(); + Get[@"/"] = x => Index(); } private object Index() diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj index 7dd87b51a..56ed08026 100644 --- a/NzbDrone.Api/NzbDrone.Api.csproj +++ b/NzbDrone.Api/NzbDrone.Api.csproj @@ -63,12 +63,13 @@ False ..\packages\Microsoft.AspNet.SignalR.Core.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll - + False - ..\packages\Nancy.0.16.1\lib\net40\Nancy.dll + ..\packages\Nancy.0.17.1\lib\net40\Nancy.dll - - ..\packages\Nancy.Authentication.Basic.0.16.1\lib\net40\Nancy.Authentication.Basic.dll + + False + ..\packages\Nancy.Authentication.Basic.0.17.1\lib\net40\Nancy.Authentication.Basic.dll False diff --git a/NzbDrone.Api/TinyIoCNancyBootstrapper.cs b/NzbDrone.Api/TinyIoCNancyBootstrapper.cs index 8ed1c5795..bd4a05712 100644 --- a/NzbDrone.Api/TinyIoCNancyBootstrapper.cs +++ b/NzbDrone.Api/TinyIoCNancyBootstrapper.cs @@ -20,15 +20,6 @@ namespace NzbDrone.Api return this.ApplicationContainer.Resolve(); } - /// - /// Get the moduleKey generator - /// - /// IModuleKeyGenerator instance - protected override sealed IModuleKeyGenerator GetModuleKeyGenerator() - { - return this.ApplicationContainer.Resolve(); - } - /// /// Create a default, unconfigured, container /// @@ -88,8 +79,8 @@ namespace NzbDrone.Api container.Register( typeof(INancyModule), moduleRegistrationType.ModuleType, - moduleRegistrationType.ModuleKey). - AsSingleton(); + moduleRegistrationType.ModuleType.FullName). + AsSingleton(); } } @@ -156,14 +147,14 @@ namespace NzbDrone.Api } /// - /// Retreive a specific module instance from the container by its key + /// Retreive a specific module instance from the container /// /// Container to use - /// Module key of the module + /// Type of the module /// NancyModule instance - protected override sealed INancyModule GetModuleByKey(TinyIoCContainer container, string moduleKey) + protected override sealed INancyModule GetModule(TinyIoCContainer container, Type moduleType) { - return container.Resolve(moduleKey); + return (INancyModule)container.Resolve(moduleType); } /// diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config index 2d743b79b..73b126c5b 100644 --- a/NzbDrone.Api/packages.config +++ b/NzbDrone.Api/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/NzbDrone.Console/NzbDrone.Console.csproj b/NzbDrone.Console/NzbDrone.Console.csproj index 5e6425b74..ca36f6d8d 100644 --- a/NzbDrone.Console/NzbDrone.Console.csproj +++ b/NzbDrone.Console/NzbDrone.Console.csproj @@ -83,6 +83,14 @@ MinimumRecommendedRules.ruleset + + False + ..\packages\Nancy.0.17.1\lib\net40\Nancy.dll + + + False + ..\packages\Nancy.Authentication.Basic.0.17.1\lib\net40\Nancy.Authentication.Basic.dll + False ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll diff --git a/NzbDrone.Console/packages.config b/NzbDrone.Console/packages.config index d889a47ab..1de49248b 100644 --- a/NzbDrone.Console/packages.config +++ b/NzbDrone.Console/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index e9f35f536..f83a90b4e 100644 --- a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -56,12 +56,13 @@ False ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - ..\packages\Nancy.0.16.1\lib\net40\Nancy.dll - - + False - ..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll + ..\packages\Nancy.0.17.1\lib\net40\Nancy.dll + + + False + ..\packages\Nancy.Owin.0.17.1\lib\net40\Nancy.Owin.dll ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/NzbDrone.Integration.Test/packages.config b/NzbDrone.Integration.Test/packages.config index 80db9bbad..944360f9b 100644 --- a/NzbDrone.Integration.Test/packages.config +++ b/NzbDrone.Integration.Test/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj index 905fff021..9587c478a 100644 --- a/NzbDrone/NzbDrone.csproj +++ b/NzbDrone/NzbDrone.csproj @@ -112,12 +112,13 @@ False ..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll - - ..\packages\Nancy.0.16.1\lib\net40\Nancy.dll - - + False - ..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll + ..\packages\Nancy.0.17.1\lib\net40\Nancy.dll + + + False + ..\packages\Nancy.Owin.0.17.1\lib\net40\Nancy.Owin.dll False diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config index 4b7086895..2d3615860 100644 --- a/NzbDrone/packages.config +++ b/NzbDrone/packages.config @@ -6,8 +6,8 @@ - - + +