github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 18:57:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updated nancy to 0.17.1.0

Browse source
This commit is contained in:
kay.one 2013-07-06 16:29:01 -07:00
commit 92c3fe61f2
10 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NzbDrone.Api/Frontend/IndexModule.cs
View file

@ -24,7 +24,8 @@ namespace NzbDrone.Api.Frontend
_indexCache = cacheManger.GetCache<string>(typeof(IndexModule));
//Serve anything that doesn't have an extension
Get[@"/(.*)"] = x => Index();
Get[@"^(?:.*)$"] = x => Index();
Get[@"/"] = x => Index();
}
private object Index()

9
NzbDrone.Api/NzbDrone.Api.csproj
View file

@ -63,12 +63,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Nancy, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
<HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
</Reference>
<Reference Include="Nancy.Authentication.Basic">
<HintPath>..\packages\Nancy.Authentication.Basic.0.16.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
<Reference Include="Nancy.Authentication.Basic, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Nancy.Authentication.Basic.0.17.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

21
NzbDrone.Api/TinyIoCNancyBootstrapper.cs
View file

@ -20,15 +20,6 @@ namespace NzbDrone.Api
return this.ApplicationContainer.Resolve<INancyEngine>();
}
/// <summary>
/// Get the moduleKey generator
/// </summary>
/// <returns>IModuleKeyGenerator instance</returns>
protected override sealed IModuleKeyGenerator GetModuleKeyGenerator()
{
return this.ApplicationContainer.Resolve<IModuleKeyGenerator>();
}
/// <summary>
/// Create a default, unconfigured, container
/// </summary>
@ -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
}
/// <summary>
/// Retreive a specific module instance from the container by its key
/// Retreive a specific module instance from the container
/// </summary>
/// <param name="container">Container to use</param>
/// <param name="moduleKey">Module key of the module</param>
/// <param name="moduleType">Type of the module</param>
/// <returns>NancyModule instance</returns>
protected override sealed INancyModule GetModuleByKey(TinyIoCContainer container, string moduleKey)
protected override sealed INancyModule GetModule(TinyIoCContainer container, Type moduleType)
{
return container.Resolve<INancyModule>(moduleKey);
return (INancyModule)container.Resolve(moduleType);
}
/// <summary>

4
NzbDrone.Api/packages.config
View file

@ -2,8 +2,8 @@
<packages>
<package id="FluentValidation" version="4.0.0.0" targetFramework="net40" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.1.1" targetFramework="net40" />
<package id="Nancy" version="0.16.1" targetFramework="net40" />
<package id="Nancy.Authentication.Basic" version="0.16.1" targetFramework="net40" />
<package id="Nancy" version="0.17.1" targetFramework="net40" />
<package id="Nancy.Authentication.Basic" version="0.17.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="5.0.3" targetFramework="net40" />
<package id="NLog" version="2.0.1.2" targetFramework="net40" />
<package id="ValueInjecter" version="2.3.3" targetFramework="net40" />