mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed ninject 2 reference 

Fixed Core.Test reference to Signalr
This commit is contained in:
Mark McDowall 2012-12-10 23:52:30 -08:00
parent 8be47a128c
commit 5a1039ed8d
51 changed files with 44 additions and 109593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,7 +31,7 @@ _ReSharper*/
[Bb]uild/
[Ll]ogs/
[Aa]pp_Data/
/[Pp]ackage/
packages/
/FakesAssemblies/
#NZBDrone specific
*.db

4
NzbDrone.Common/NzbDrone.Common.csproj
View File

@ -57,10 +57,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Exceptron.Client.1.0.7\lib\net20\Exceptron.Client.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>

2
NzbDrone.Common/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Exceptron.Client" version="1.0.7" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" />
</packages>

5
NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View File

@ -95,7 +95,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -112,9 +112,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Prowlin 0.9.4163.39219\Prowlin.dll</HintPath>
</Reference>
<Reference Include="SignalR">
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />

3
NzbDrone.Core.Test/packages.config
View File

@ -8,10 +8,11 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="Moq" version="4.0.10827" />
<package id="NBuilder" version="3.0.1.1" />
<package id="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" />
<package id="NUnit" version="2.6.0.12054" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
<package id="SqlServerCompact" version="4.0.8482.1" />
<package id="Unity" version="2.1.505.2" targetFramework="net40" />
<package id="WebActivator" version="1.5" />

1
NzbDrone.Core/CentralDispatch.cs
View File

@ -19,7 +19,6 @@ using PetaPoco;
using SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
using SignalR.Ninject;
using Connection = NzbDrone.Core.Datastore.Connection;
using Xbmc = NzbDrone.Core.Providers.ExternalNotification.Xbmc;

34
NzbDrone.Core/NinjectDependencyResolver.cs Normal file
View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Ninject;
using SignalR;
namespace NzbDrone.Core
{
public class NinjectDependencyResolver : DefaultDependencyResolver
{
private readonly IKernel _kernel;
public NinjectDependencyResolver(IKernel kernel)
{
if (kernel == null)
{
throw new ArgumentNullException("kernel");
}
_kernel = kernel;
}
public override object GetService(Type serviceType)
{
return _kernel.TryGet(serviceType) ?? base.GetService(serviceType);
}
public override IEnumerable<object> GetServices(Type serviceType)
{
return _kernel.GetAll(serviceType).Concat(base.GetServices(serviceType));
}
}
}

7
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -163,9 +163,6 @@
<Reference Include="MiniProfiler">
<HintPath>..\packages\MiniProfiler.2.0.2\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.10\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>
@ -185,9 +182,6 @@
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
</Reference>
<Reference Include="SignalR.Ninject">
<HintPath>..\packages\SignalR.Ninject.0.5.0\lib\net40\SignalR.Ninject.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.configuration" />
@ -304,6 +298,7 @@
<Compile Include="Model\Xem\XemResult.cs" />
<Compile Include="Model\Xem\XemSceneTvdbMapping.cs" />
<Compile Include="Model\Xem\XemValues.cs" />
<Compile Include="NinjectDependencyResolver.cs" />
<Compile Include="Providers\BannerProvider.cs" />
<Compile Include="Providers\DecisionEngine\AllowedReleaseGroupSpecification.cs" />
<Compile Include="Providers\DecisionEngine\CustomStartDateSpecification.cs" />

3
NzbDrone.Core/packages.config
View File

@ -7,12 +7,11 @@
<package id="Growl" version="0.6" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="MiniProfiler" version="2.0.2" />
<package id="Newtonsoft.Json" version="4.5.10" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net40" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
<package id="SignalR.Ninject" version="0.5.0" targetFramework="net40" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
<package id="SqlServerCompact" version="4.0.8482.1" />
<package id="twitterizer" version="2.4.0.26532" />

4
NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj
View File

@ -67,10 +67,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Libraries\Migrator.NET\Migrator.Providers.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>

2
NzbDrone.Services/NzbDrone.Services.Service/packages.config
View File

@ -8,7 +8,7 @@
<package id="jQuery.UI.Combined" version="1.8.23" targetFramework="net40" />
<package id="jQuery.Validation" version="1.9.0.1" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net40" />
<package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net40" />

4
NzbDrone.Web.UI.Test/NzbDrone.Web.UI.Automation.csproj
View File

@ -59,10 +59,6 @@
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>

2
NzbDrone.Web.UI.Test/packages.config
View File

@ -2,7 +2,7 @@
<packages>
<package id="DotNetZip" version="1.9.1.8" />
<package id="FluentAssertions" version="1.7.0" />
<package id="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="NUnit" version="2.6.0.12054" />
<package id="Selenium.WebDriver" version="2.25.1" targetFramework="net40" />
</packages>

4
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -76,10 +76,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.2.0.2\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.10\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>

2
NzbDrone.Web/packages.config
View File

@ -19,7 +19,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="MiniProfiler" version="2.0.2" />
<package id="MiniProfiler.MVC3" version="2.0.2" />
<package id="Newtonsoft.Json" version="4.5.10" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net40" />
<package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net40" />

BIN
packages/Newtonsoft.Json.4.5.10/Newtonsoft.Json.4.5.10.nupkg vendored
View File

Binary file not shown.

16
packages/Newtonsoft.Json.4.5.10/Newtonsoft.Json.4.5.10.nuspec vendored
View File

@ -1,16 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Newtonsoft.Json</id>
<version>4.5.10</version>
<title>Json.NET</title>
<authors>James Newton-King</authors>
<owners>James Newton-King</owners>
<licenseUrl>http://json.codeplex.com/license</licenseUrl>
<projectUrl>http://james.newtonking.com/projects/json-net.aspx</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
<language>en-US</language>
<tags>json</tags>
</metadata>
</package>

BIN
packages/Newtonsoft.Json.4.5.10/lib/net20/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

8280
packages/Newtonsoft.Json.4.5.10/lib/net20/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/net35/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7416
packages/Newtonsoft.Json.4.5.10/lib/net35/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/net40/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7659
packages/Newtonsoft.Json.4.5.10/lib/net40/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6838
packages/Newtonsoft.Json.4.5.10/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/sl3-wp/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6959
packages/Newtonsoft.Json.4.5.10/lib/sl3-wp/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/sl4-windowsphone71/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6959
packages/Newtonsoft.Json.4.5.10/lib/sl4-windowsphone71/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/sl4/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6981
packages/Newtonsoft.Json.4.5.10/lib/sl4/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.10/lib/winrt45/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7177
packages/Newtonsoft.Json.4.5.10/lib/winrt45/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/Newtonsoft.Json.4.5.9.nupkg vendored
View File

Binary file not shown.

BIN
packages/Newtonsoft.Json.4.5.9/lib/net20/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

8255
packages/Newtonsoft.Json.4.5.9/lib/net20/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/net35/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7391
packages/Newtonsoft.Json.4.5.9/lib/net35/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/net40/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7634
packages/Newtonsoft.Json.4.5.9/lib/net40/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/sl3-wp/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6934
packages/Newtonsoft.Json.4.5.9/lib/sl3-wp/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/sl4-windowsphone71/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6934
packages/Newtonsoft.Json.4.5.9/lib/sl4-windowsphone71/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/sl4/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

6956
packages/Newtonsoft.Json.4.5.9/lib/sl4/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/Newtonsoft.Json.4.5.9/lib/winrt45/Newtonsoft.Json.dll vendored
View File

Binary file not shown.

7152
packages/Newtonsoft.Json.4.5.9/lib/winrt45/Newtonsoft.Json.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/SignalR.Ninject.0.5.0/SignalR.Ninject.0.5.0.nupkg vendored
View File

Binary file not shown.

17
packages/SignalR.Ninject.0.5.0/SignalR.Ninject.0.5.0.nuspec vendored
View File

@ -1,17 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>SignalR.Ninject</id>
<version>0.5.0</version>
<authors>David Fowler, Damian Edwards</authors>
<owners>David Fowler, Damian Edwards</owners>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A ninject dependency resolver implementation for SignalR.</description>
<dependencies>
<dependency id="Ninject" version="2.2.1.4" />
<dependency id="SignalR.Server" version="0.5.0" />
</dependencies>
</metadata>
</package>

BIN
packages/SignalR.Ninject.0.5.0/lib/net40/SignalR.Ninject.dll vendored
View File

Binary file not shown.