diff --git a/NzbDrone.Web/Libraries/Ninject.Web.Mvc.dll b/NzbDrone.Web/Libraries/Ninject.Web.Mvc.dll deleted file mode 100644 index 840dac24d..000000000 Binary files a/NzbDrone.Web/Libraries/Ninject.Web.Mvc.dll and /dev/null differ diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 66b2780ce..07455f82d 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -57,7 +57,9 @@ False ..\packages\Ninject.2.2.1.0\lib\.NetFramework 4.0\Ninject.dll - + + ..\packages\Ninject.MVC3.2.2.2.0\lib\net40-Full\Ninject.Web.Mvc.dll + D:\My Dropbox\Git\NzbDrone\NzbDrone.Core\Libraries\SubSonic.Core.dll @@ -109,6 +111,9 @@ ..\NzbDrone.Core\Libraries\TvdbLib.dll + + ..\packages\WebActivator.1.4.1\lib\net40\WebActivator.dll + @@ -619,8 +624,6 @@ - - diff --git a/NzbDrone.Web/packages.config b/NzbDrone.Web/packages.config index 3202b0471..95e02c9f5 100644 --- a/NzbDrone.Web/packages.config +++ b/NzbDrone.Web/packages.config @@ -7,4 +7,6 @@ + + \ No newline at end of file diff --git a/packages/Ninject.MVC3.2.2.2.0/Content/App_Start/NinjectMVC3.cs.pp b/packages/Ninject.MVC3.2.2.2.0/Content/App_Start/NinjectMVC3.cs.pp new file mode 100644 index 000000000..02598ea5d --- /dev/null +++ b/packages/Ninject.MVC3.2.2.2.0/Content/App_Start/NinjectMVC3.cs.pp @@ -0,0 +1,52 @@ +[assembly: WebActivator.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.NinjectMVC3), "Start")] +[assembly: WebActivator.ApplicationShutdownMethodAttribute(typeof($rootnamespace$.App_Start.NinjectMVC3), "Stop")] + +namespace $rootnamespace$.App_Start +{ + using System.Reflection; + using Microsoft.Web.Infrastructure.DynamicModuleHelper; + using Ninject; + using Ninject.Web.Mvc; + + public static class NinjectMVC3 + { + private static readonly Bootstrapper bootstrapper = new Bootstrapper(); + + /// + /// Starts the application + /// + public static void Start() + { + DynamicModuleUtility.RegisterModule(typeof(OnePerRequestModule)); + DynamicModuleUtility.RegisterModule(typeof(HttpApplicationInitializationModule)); + bootstrapper.Initialize(CreateKernel); + } + + /// + /// Stops the application. + /// + public static void Stop() + { + bootstrapper.ShutDown(); + } + + /// + /// Creates the kernel that will manage your application. + /// + /// The created kernel. + private static IKernel CreateKernel() + { + var kernel = new StandardKernel(); + RegisterServices(kernel); + return kernel; + } + + /// + /// Load your modules or register your services here! + /// + /// The kernel. + private static void RegisterServices(IKernel kernel) + { + } + } +} diff --git a/packages/Ninject.MVC3.2.2.2.0/Ninject.MVC3.2.2.2.0.nupkg b/packages/Ninject.MVC3.2.2.2.0/Ninject.MVC3.2.2.2.0.nupkg new file mode 100644 index 000000000..36f4a878c Binary files /dev/null and b/packages/Ninject.MVC3.2.2.2.0/Ninject.MVC3.2.2.2.0.nupkg differ diff --git a/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.dll b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.dll new file mode 100644 index 000000000..958928788 Binary files /dev/null and b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.dll differ diff --git a/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.pdb b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.pdb new file mode 100644 index 000000000..e38dcc922 Binary files /dev/null and b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.pdb differ diff --git a/NzbDrone.Web/Libraries/Ninject.Web.Mvc.xml b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.xml similarity index 97% rename from NzbDrone.Web/Libraries/Ninject.Web.Mvc.xml rename to packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.xml index b366bd6da..c39564baf 100644 --- a/NzbDrone.Web/Libraries/Ninject.Web.Mvc.xml +++ b/packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.xml @@ -794,6 +794,12 @@ The create kernel callback function. + + + Initializes a HttpApplication instance. + + The HttpApplication instance. + Releases the kernel on application end. @@ -810,6 +816,12 @@ The create kernel callback function. + + + Initializes a HttpApplication instance. + + The HttpApplication instance. + Releases the kernel on application end. @@ -831,6 +843,17 @@ Gets the kernel. + + + Initializes a HttpApplication instance + + + + + Initializes a module and prepares it to handle requests. + + An that provides access to the methods, properties, and events common to all application objects within an ASP.NET application + Dependency resolver implementation for ninject. @@ -876,6 +899,11 @@ Initializes a new instance of the class. + + + Executes custom initialization code after all event handler modules have been added. + + Starts the application. diff --git a/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg b/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg new file mode 100644 index 000000000..270b40aab Binary files /dev/null and b/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg differ diff --git a/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll b/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll new file mode 100644 index 000000000..8ae134cbf Binary files /dev/null and b/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll differ