open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Browse Source
pull/3113/head
Mark McDowall 13 years ago
parent be64822f08 5aecd63d09
commit 1b8e359a63
40 changed files with 8648 additions and 3201 deletions
Show Stats Download Patch File Download Diff File

5
NzbDrone.App.Test/NzbDrone.App.Test.csproj
Unescape View File

@ -35,8 +35,9 @@
<Reference Include="FizzWare.NBuilder">
<HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<HintPath>..\packages\FluentAssertions.1.5.0.0\Lib\.NetFramework 4.0\FluentAssertions.dll</HintPath>
<Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.1.6.0\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>

2
NzbDrone.App.Test/packages.config
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="1.5.0.0" />
<package id="FluentAssertions" version="1.6.0" />
<package id="Moq" version="4.0.10827" />
<package id="NBuilder" version="3.0.1" />
<package id="Ninject" version="2.2.1.4" />

5
NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
Unescape View File

@ -32,8 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions">
<HintPath>..\packages\FluentAssertions.1.5.0.0\Lib\.NetFramework 4.0\FluentAssertions.dll</HintPath>
<Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.1.6.0\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>

2
NzbDrone.Common.Test/packages.config
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="1.5.0.0" />
<package id="FluentAssertions" version="1.6.0" />
<package id="Moq" version="4.0.10827" />
<package id="NLog" version="2.0.0.2000" />
<package id="NUnit" version="2.5.10.11092" />

4
NzbDrone.Core.Test/IndexerTests.cs
Unescape View File

@ -234,11 +234,13 @@ namespace NzbDrone.Core.Test
var result = mocker.Resolve<Newzbin>().FetchEpisode(title, season, episode);
ExceptionVerification.MarkInconclusive(typeof(WebException));
ExceptionVerification.IgnoreWarns();
result.Should().NotBeEmpty();
result.Should().OnlyContain(r => r.CleanTitle == Parser.NormalizeTitle(title));
result.Should().OnlyContain(r => r.SeasonNumber == season);
result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(episode));
}
[Test]

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

@ -40,8 +40,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<HintPath>..\packages\FluentAssertions.1.5.0.0\Lib\.NetFramework 4.0\FluentAssertions.dll</HintPath>
<Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.1.6.0\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>

2
NzbDrone.Core.Test/packages.config
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMoq" version="1.3.1.3" />
<package id="FluentAssertions" version="1.5.0.0" />
<package id="FluentAssertions" version="1.6.0" />
<package id="Moq" version="4.0.10827" />
<package id="NBuilder" version="3.0.1" />
<package id="Ninject" version="2.2.1.4" />

5
NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
Unescape View File

@ -41,8 +41,9 @@
<Reference Include="FizzWare.NBuilder">
<HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions">
<HintPath>..\packages\FluentAssertions.1.5.0.0\Lib\.NetFramework 4.0\FluentAssertions.dll</HintPath>
<Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.1.6.0\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>

2
NzbDrone.Update.Test/packages.config
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="1.5.0.0" />
<package id="FluentAssertions" version="1.6.0" />
<package id="Moq" version="4.0.10827" />
<package id="NBuilder" version="3.0.1" />
<package id="NUnit" version="2.5.10.11092" />

6
NzbDrone.Web/NzbDrone.Web.csproj
Unescape View File

@ -46,11 +46,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libraries\MVC3\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MvcMiniProfiler, Version=1.9.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll</HintPath>
@ -129,7 +124,6 @@
<HintPath>..\Libraries\TvdbLib.dll</HintPath>
</Reference>
<Reference Include="WebActivator, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WebActivator.1.4.2\lib\net40\WebActivator.dll</HintPath>
</Reference>
</ItemGroup>

18
NzbDrone.Web/packages.config
Unescape View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ninject.Web.Mvc2" version="2.2.0.1" />
<package id="Ninject.MVC3" version="2.2.2.0" />
<package id="Ninject" version="2.2.1.4" />
<package id="jQuery.vsdoc" version="1.6" />
<package id="jQuery.Validation" version="1.8.0.1" />
<package id="jQuery" version="1.6.1" />
<package id="SqlServerCompact" version="4.0.8482.1" />
<package id="MiniProfiler" version="1.9" />
<package id="WebActivator" version="1.4.2" />
<package id="jQuery" version="1.6.3" />
<package id="jQuery.UI.Combined" version="1.8.16" />
<package id="TelerikMvcExtensions" version="2011.2.712" />
<package id="jQuery.Validation" version="1.8.0.1" />
<package id="jQuery.vsdoc" version="1.6" />
<package id="MiniProfiler" version="1.9" />
<package id="Ninject" version="2.2.1.4" />
<package id="Ninject.MVC3" version="2.2.2.0" />
<package id="Ninject.Web.Mvc2" version="2.2.0.1" />
<package id="NLog" version="2.0.0.2000" />
<package id="SqlServerCompact" version="4.0.8482.1" />
<package id="TelerikMvcExtensions" version="2011.2.712" />
<package id="WebActivator" version="1.4.2" />
</packages>

1
NzbDrone/Providers/ConfigProvider.cs
Unescape View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Xml.Linq;
using System.Xml.XPath;
using NLog;
using NLog.Config;
using Ninject;
using NzbDrone.Common;
using NzbDrone.Model;

BIN
packages/FluentAssertions.1.5.0.0/FluentAssertions.1.5.0.0.nupkg vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.5.0.0/Lib/.NetFramework 3.5/FluentAssertions.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.5.0.0/Lib/.NetFramework 4.0/FluentAssertions.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/FluentAssertions.Silverlight.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.6.0/FluentAssertions.1.6.0.nupkg vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.6.0/Lib/net35/FluentAssertions.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.6.0/Lib/net35/FluentAssertions.pdb vendored
View File

Binary file not shown.

4679
packages/FluentAssertions.1.5.0.0/Lib/.NetFramework 4.0/FluentAssertions.xml → packages/FluentAssertions.1.6.0/Lib/net35/FluentAssertions.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/FluentAssertions.1.6.0/Lib/net40/FluentAssertions.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.6.0/Lib/net40/FluentAssertions.pdb vendored
View File

Binary file not shown.

4419
packages/FluentAssertions.1.5.0.0/Lib/.NetFramework 3.5/FluentAssertions.xml → packages/FluentAssertions.1.6.0/Lib/net40/FluentAssertions.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/FluentAssertions.1.6.0/Lib/sl40/FluentAssertions.Silverlight.dll vendored
View File

Binary file not shown.

BIN
packages/FluentAssertions.1.6.0/Lib/sl40/FluentAssertions.Silverlight.pdb vendored
View File

Binary file not shown.

2694
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/FluentAssertions.Silverlight.xml → packages/FluentAssertions.1.6.0/Lib/sl40/FluentAssertions.Silverlight.xml vendored
View File

File diff suppressed because it is too large Load Diff

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll → packages/FluentAssertions.1.6.0/Lib/sl40/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.pdb → packages/FluentAssertions.1.6.0/Lib/sl40/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.pdb vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.xml → packages/FluentAssertions.1.6.0/Lib/sl40/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.xml vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/System.Xml.Serialization.dll → packages/FluentAssertions.1.6.0/Lib/sl40/System.Xml.Serialization.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/System.Xml.Serialization.xml → packages/FluentAssertions.1.6.0/Lib/sl40/System.Xml.Serialization.xml vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/de/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/de/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/es/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/es/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/fr/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/fr/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/it/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/it/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/ja/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/ja/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/ko/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/ko/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/ru/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/ru/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/zh-Hans/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/zh-Hans/System.Xml.Serialization.resources.dll vendored
Unescape View File

0
packages/FluentAssertions.1.5.0.0/Lib/Silverlight 4.0/zh-Hant/System.Xml.Serialization.resources.dll → packages/FluentAssertions.1.6.0/Lib/sl40/zh-Hant/System.Xml.Serialization.resources.dll vendored
Unescape View File

Write Preview
Loading…
Cancel
Save