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

NzbDrone.Core.Test/CentralDispatchFixture.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Indexer;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/Framework/CoreTest.cs

@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using NUnit.Framework;
-using Ninject;
 using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Test.Common;
@@ -10,7 +8,6 @@ using PetaPoco;
 namespace NzbDrone.Core.Test.Framework
 {
     public class CoreTest : TestBase
-    // ReSharper disable InconsistentNaming
     {
         static CoreTest()
         {
@@ -46,17 +43,16 @@ namespace NzbDrone.Core.Test.Framework
 
                 return _db;
             }
-            private set { _db = value; }
         }
 
         protected void WithRealDb()
         {
-            Db = TestDbHelper.GetEmptyDatabase();
+            _db = TestDbHelper.GetEmptyDatabase();
             Mocker.SetConstant(Db);
         }
 
 
-        protected ProgressNotification MockNotification
+        protected static ProgressNotification MockNotification
         {
             get
             {

NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs

@@ -6,6 +6,7 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
@@ -121,7 +122,7 @@ namespace NzbDrone.Core.Test.JobTests
         }
 
         [Test]
-        [Category(IntegrationTest)]
+        [Category(INTEGRATION_TEST)]
         public void Should_download_and_extract_to_temp_folder()
         {
 

NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs

@@ -5,6 +5,7 @@ using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;

NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/JobTests/SearchJobTest.cs

@@ -2,6 +2,7 @@ using System;
 
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Test.Common.AutoMoq;

NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs

@@ -2,6 +2,7 @@
 
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Threading;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Test.Framework;

NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers.Jobs;
 

NzbDrone.Core/CentralDispatch.cs

@@ -7,6 +7,7 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Providers.Indexer;

NzbDrone.Core/Jobs/AppUpdateJob.cs

@@ -1,11 +1,14 @@
-using System.Diagnostics;
+using System.Linq;
+using System.Diagnostics;
 using System.IO;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Providers.Jobs;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class AppUpdateJob : IJob
     {

NzbDrone.Core/Jobs/BacklogSearchJob.cs

@@ -2,9 +2,11 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class BacklogSearchJob : IJob
     {

NzbDrone.Core/Jobs/BannerDownloadJob.cs

@@ -1,15 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Ninject;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class BannerDownloadJob : IJob
     {

NzbDrone.Core/Jobs/ConvertEpisodeJob.cs

@@ -1,10 +1,13 @@
-using System;
+using System.Linq;
+using System;
 using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Converting;
+using NzbDrone.Core.Providers.Jobs;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class ConvertEpisodeJob : IJob
     {

NzbDrone.Core/Jobs/DeleteSeriesJob.cs

@@ -1,9 +1,12 @@
-using System;
+using System.Linq;
+using System;
 using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Jobs;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class DeleteSeriesJob : IJob
     {

NzbDrone.Core/Jobs/DiskScanJob.cs

@@ -5,9 +5,11 @@ using Ninject;
 using NLog;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class DiskScanJob : IJob
     {

NzbDrone.Core/Jobs/EpisodeSearchJob.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using NLog;
+using System.Linq;
+using System;
 using Ninject;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Jobs;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class EpisodeSearchJob : IJob
     {

NzbDrone.Core/Jobs/IJob.cs

@@ -1,6 +1,7 @@
-using NzbDrone.Core.Model.Notification;
+using System.Linq;
+using NzbDrone.Core.Model.Notification;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public interface IJob
     {

NzbDrone.Core/Jobs/ImportNewSeriesJob.cs

@@ -5,9 +5,10 @@ using System.Linq;
 using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Providers;
+using NzbDrone.Core.Providers.Jobs;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     /// <summary>
     /// This job processes newly added jobs by downloading their info

NzbDrone.Core/Jobs/JobProvider.cs

@@ -1,18 +1,20 @@
-//https://github.com/kayone/NzbDrone/blob/master/NzbDrone.Core/Providers/Jobs/JobProvider.cs
+//https://github.com/kayone/NzbDrone/blob/master/NzbDrone.Core/Providers/Jobs/JobProvider.cs
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Ninject;
 using NLog;
+using Ninject;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using PetaPoco;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     /// <summary>
     /// Provides a background task runner, tasks could be queue either by the scheduler using QueueScheduled()

NzbDrone.Core/Jobs/PostDownloadScanJob.cs

@@ -1,11 +1,13 @@
-using System;
+using System.Linq;
+using System;
 using NLog;
 using Ninject;
 using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class PostDownloadScanJob : IJob
     {

NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs

@@ -2,8 +2,9 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class RecentBacklogSearchJob : IJob
     {

NzbDrone.Core/Jobs/RenameEpisodeJob.cs

@@ -1,10 +1,11 @@
-using System;
+using System.Linq;
+using System;
 using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class RenameEpisodeJob : IJob
     {

NzbDrone.Core/Jobs/RenameSeasonJob.cs

@@ -1,10 +1,11 @@
-using System;
-using Ninject;
+using System.Linq;
+using System;
 using NLog;
+using Ninject;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class RenameSeasonJob : IJob
     {

NzbDrone.Core/Jobs/RssSyncJob.cs

@@ -5,9 +5,10 @@ using Ninject;
 using NLog;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Indexer;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class RssSyncJob : IJob
     {

NzbDrone.Core/Jobs/SeasonSearchJob.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class SeasonSearchJob : IJob
     {

NzbDrone.Core/Jobs/SeriesSearchJob.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class SeriesSearchJob : IJob
     {

NzbDrone.Core/Jobs/TrimLogsJob.cs

@@ -1,12 +1,8 @@
-using System.Diagnostics;
-using System.IO;
-using NLog;
-using NzbDrone.Common;
+using System.Linq;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class TrimLogsJob : IJob
     {

NzbDrone.Core/Jobs/UpdateInfoJob.cs

@@ -3,9 +3,10 @@ using System.Linq;
 using Ninject;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class UpdateInfoJob : IJob
     {

NzbDrone.Core/Jobs/UpdateSceneMappingsJob.cs

@@ -1,6 +1,8 @@
-using NzbDrone.Core.Model.Notification;
+using System.Linq;
+using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class UpdateSceneMappingsJob : IJob
     {

NzbDrone.Core/Model/EpisodeRenameModel.cs

@@ -1,12 +0,0 @@
-using NzbDrone.Core.Repository;
-
-namespace NzbDrone.Core.Model
-{
-    public class EpisodeRenameModel
-    {
-        public string SeriesName { get; set; }
-        public string Folder { get; set; }
-        public EpisodeFile EpisodeFile { get; set; }
-        public bool NewDownload { get; set; }
-    }
-}

NzbDrone.Core/Model/ExternalNotificationType.cs

@@ -1,9 +0,0 @@
-namespace NzbDrone.Core.Model
-{
-    public enum ExternalNotificationType
-    {
-        Grab = 0,
-        Download = 1,
-        Rename = 2
-    }
-}

NzbDrone.Core/Model/SceneNameModel.cs

@@ -1,8 +0,0 @@
-namespace NzbDrone.Core.Model
-{
-    public class SceneNameModel
-    {
-        public string Name { get; set; }
-        public int SeriesId { get; set; }
-    }
-}

NzbDrone.Core/Model/UpdatePackage.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace NzbDrone.Core.Model
 {

NzbDrone.Core/NzbDrone.Core.csproj

@@ -223,7 +223,6 @@
     <Compile Include="Model\AtomicParsleyTitleType.cs" />
     <Compile Include="Model\ConnectionInfoModel.cs" />
     <Compile Include="Model\PostDownloadStatusType.cs" />
-    <Compile Include="Model\ExternalNotificationType.cs" />
     <Compile Include="Model\JobQueueItem.cs" />
     <Compile Include="Model\LanguageType.cs" />
     <Compile Include="Model\MisnamedEpisodeModel.cs" />
@@ -239,24 +238,25 @@
     <Compile Include="Providers\Converting\AtomicParsleyProvider.cs" />
     <Compile Include="Providers\Converting\HandbrakeProvider.cs" />
     <Compile Include="Providers\Indexer\Newznab.cs" />
-    <Compile Include="Providers\Jobs\RecentBacklogSearchJob.cs" />
-    <Compile Include="Providers\Jobs\TrimLogsJob.cs" />
+    <Compile Include="Jobs\RecentBacklogSearchJob.cs" />
+    <Compile Include="Jobs\TrimLogsJob.cs" />
+    <Compile Include="Jobs\JobProvider.cs" />
+    <Compile Include="Jobs\RenameSeasonJob.cs" />
+    <Compile Include="Providers\Jobs\RenameSeriesJob.cs" />
     <Compile Include="Providers\NewznzbProvider.cs" />
     <Compile Include="Providers\ExternalNotification\Prowl.cs" />
-    <Compile Include="Providers\Jobs\AppUpdateJob.cs" />
+    <Compile Include="Jobs\AppUpdateJob.cs" />
     <Compile Include="Providers\ProwlProvider.cs" />
     <Compile Include="Providers\Core\UdpProvider.cs" />
     <Compile Include="Providers\ExternalNotification\Growl.cs" />
     <Compile Include="Providers\ExternalNotification\Twitter.cs" />
     <Compile Include="Providers\ExternalNotification\Smtp.cs" />
     <Compile Include="Providers\GrowlProvider.cs" />
-    <Compile Include="Providers\Jobs\BacklogSearchJob.cs" />
-    <Compile Include="Providers\Jobs\BannerDownloadJob.cs" />
-    <Compile Include="Providers\Jobs\ConvertEpisodeJob.cs" />
-    <Compile Include="Providers\Jobs\RenameSeriesJob.cs" />
-    <Compile Include="Providers\Jobs\SeriesSearchJob.cs" />
-    <Compile Include="Providers\Jobs\RenameSeasonJob.cs" />
-    <Compile Include="Providers\Jobs\SeasonSearchJob.cs" />
+    <Compile Include="Jobs\BacklogSearchJob.cs" />
+    <Compile Include="Jobs\BannerDownloadJob.cs" />
+    <Compile Include="Jobs\ConvertEpisodeJob.cs" />
+    <Compile Include="Jobs\SeriesSearchJob.cs" />
+    <Compile Include="Jobs\SeasonSearchJob.cs" />
     <Compile Include="Providers\MisnamedProvider.cs" />
     <Compile Include="Providers\PostDownloadProvider.cs" />
     <Compile Include="Providers\QualityTypeProvider.cs" />
@@ -279,19 +279,18 @@
     <Compile Include="Providers\Indexer\SyndicationFeedXmlReader.cs" />
     <Compile Include="Providers\AutoConfigureProvider.cs" />
     <Compile Include="Providers\Indexer\NzbMatrix.cs" />
-    <Compile Include="Providers\Jobs\UpdateSceneMappingsJob.cs" />
-    <Compile Include="Providers\Jobs\PostDownloadScanJob.cs" />
-    <Compile Include="Providers\Jobs\RenameEpisodeJob.cs" />
-    <Compile Include="Providers\Jobs\EpisodeSearchJob.cs" />
-    <Compile Include="Providers\Jobs\DeleteSeriesJob.cs" />
-    <Compile Include="Providers\Jobs\DiskScanJob.cs" />
-    <Compile Include="Providers\Jobs\ImportNewSeriesJob.cs" />
-    <Compile Include="Providers\Jobs\JobProvider.cs" />
+    <Compile Include="Jobs\UpdateSceneMappingsJob.cs" />
+    <Compile Include="Jobs\PostDownloadScanJob.cs" />
+    <Compile Include="Jobs\RenameEpisodeJob.cs" />
+    <Compile Include="Jobs\EpisodeSearchJob.cs" />
+    <Compile Include="Jobs\DeleteSeriesJob.cs" />
+    <Compile Include="Jobs\DiskScanJob.cs" />
+    <Compile Include="Jobs\ImportNewSeriesJob.cs" />
     <Compile Include="Providers\Indexer\Newzbin.cs" />
     <Compile Include="Providers\Indexer\NzbsRUs.cs" />
-    <Compile Include="Providers\Jobs\IJob.cs" />
-    <Compile Include="Providers\Jobs\RssSyncJob.cs" />
-    <Compile Include="Providers\Jobs\UpdateInfoJob.cs" />
+    <Compile Include="Jobs\IJob.cs" />
+    <Compile Include="Jobs\RssSyncJob.cs" />
+    <Compile Include="Jobs\UpdateInfoJob.cs" />
     <Compile Include="Providers\SceneMappingProvider.cs" />
     <Compile Include="Providers\Xbmc\EventClientProvider.cs" />
     <Compile Include="Repository\NewznabDefinition.cs" />
@@ -299,11 +298,9 @@
     <Compile Include="Repository\JobDefinition.cs" />
     <Compile Include="Repository\IndexerDefinition.cs" />
     <Compile Include="Model\EpisodeParseResult.cs" />
-    <Compile Include="Model\EpisodeRenameModel.cs" />
     <Compile Include="Model\EpisodeSortingType.cs" />
     <Compile Include="Model\EpisodeStatusType.cs" />
     <Compile Include="Model\SabnzbdPriorityType.cs" />
-    <Compile Include="Model\SceneNameModel.cs" />
     <Compile Include="Model\SeasonParseResult.cs" />
     <Compile Include="Model\UpcomingEpisodesModel.cs" />
     <Compile Include="Providers\Indexer\IndexerBase.cs" />
@@ -386,6 +383,7 @@
     <Content Include="NzbDrone.ico" />
     <Content Include="license.txt" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs

@@ -1,8 +1,8 @@
-using System;
-using Ninject;
+using System;
 using NLog;
+using Ninject;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Providers.Jobs
 {

NzbDrone.Core/WebTimer.cs

@@ -2,6 +2,7 @@
 using System.Web;
 using System.Web.Caching;
 using NLog;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core

NzbDrone.Test.Common/TestBase.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.IO;
-
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
@@ -9,12 +8,11 @@ using NzbDrone.Test.Common.AutoMoq;
 namespace NzbDrone.Test.Common
 {
     public class TestBase : LoggingTest
-    // ReSharper disable InconsistentNaming
     {
 
-        protected const string IntegrationTest = "Integration Test";
+        protected const string INTEGRATION_TEST = "Integration Test";
 
-        protected AutoMoqer Mocker;
+        protected AutoMoqer Mocker { get; private set; }
 
         protected string VirtualPath
         {
@@ -46,7 +44,7 @@ namespace NzbDrone.Test.Common
 
         }
 
-        protected virtual void WithStrictMocker()
+        protected void WithStrictMocker()
         {
             Mocker = new AutoMoqer(MockBehavior.Strict);
         }

NzbDrone.Web/Controllers/AddSeriesController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web.Mvc;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Web/Controllers/CommandController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.Mvc;
 using NLog;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Twitter;
 using NzbDrone.Core.Providers;

NzbDrone.Web/Controllers/EpisodeController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Web.Mvc;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Web/Controllers/HistoryController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Web/Controllers/SeriesController.cs

@@ -6,6 +6,7 @@ using System.Web.Mvc;
 using MvcMiniProfiler;
 using NzbDrone.Core;
 using NzbDrone.Core.Helpers;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;

NzbDrone.Web/Controllers/SettingsController.cs

@@ -52,11 +52,6 @@ namespace NzbDrone.Web.Controllers
             _seriesProvider = seriesProvider;
         }
 
-        public ActionResult Test()
-        {
-            return View();
-        }
-
         public JsonResult TestResults(string q)
         {
             var results = new List<TvDbSearchResultModel>();
@@ -312,10 +307,6 @@ namespace NzbDrone.Web.Controllers
             return new JsonResult { Data = "ok" };
         }
 
-        public ActionResult SubMenu()
-        {
-            return PartialView();
-        }
 
         public QualityModel GetUpdatedProfileList()
         {

NzbDrone.Web/Controllers/SharedController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Web.Mvc;
 using NzbDrone.Common;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;

NzbDrone.Web/Controllers/SystemController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web.Mvc;
 using NzbDrone.Common;
 using NzbDrone.Core.Helpers;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Jobs;

NzbDrone.Web/Controllers/UpdateController.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Mvc;
 using NzbDrone.Common;
+using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;

NzbDrone.Web/Scripts/jquery.validate.unobtrusive.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-1.6.3.js" />
+/// <reference path="jquery-1.7.1.js" />
 /// <reference path="jquery.validate.js" />
 
 /*!