diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj
index 55c76cf7e..605dc0094 100644
--- a/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/NzbDrone.Common/NzbDrone.Common.csproj
@@ -42,11 +42,6 @@
-
-
-
-
-
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index b294c0c0e..f1e127439 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -121,10 +121,6 @@
-
- False
- ..\Libraries\Exceptioneer.WindowsFormsClient.dll
-
..\packages\Growl.0.6\lib\Growl.Connector.dll
@@ -134,7 +130,6 @@
..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll
-
False
..\Libraries\Migrator.NET\Migrator.dll
@@ -143,17 +138,10 @@
False
..\Libraries\Migrator.NET\Migrator.Framework.dll
-
- False
- ..\Libraries\Migrator.NET\Migrator.Providers.dll
-
False
..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll
-
- ..\packages\Newtonsoft.Json.3.5.8\lib\35\Newtonsoft.Json.dll
-
..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll
@@ -164,7 +152,6 @@
..\packages\Prowlin 0.9.4163.39219\Prowlin.dll
-
@@ -174,7 +161,6 @@
..\packages\SqlServerCompact.4.0.8482.1\lib\System.Data.SqlServerCe.dll
-
diff --git a/NzbDrone.Update/NzbDrone.Update.csproj b/NzbDrone.Update/NzbDrone.Update.csproj
index 1bb943104..1310f2da8 100644
--- a/NzbDrone.Update/NzbDrone.Update.csproj
+++ b/NzbDrone.Update/NzbDrone.Update.csproj
@@ -39,11 +39,6 @@
-
-
-
-
-
diff --git a/NzbDrone.Update/Providers/UpdateProvider.cs b/NzbDrone.Update/Providers/UpdateProvider.cs
index 69aa02e6f..d9ad53bc6 100644
--- a/NzbDrone.Update/Providers/UpdateProvider.cs
+++ b/NzbDrone.Update/Providers/UpdateProvider.cs
@@ -9,17 +9,15 @@ namespace NzbDrone.Update.Providers
public class UpdateProvider
{
private readonly DiskProvider _diskProvider;
- private readonly EnviromentProvider _enviromentProvider;
private readonly ServiceProvider _serviceProvider;
private readonly ProcessProvider _processProvider;
private readonly PathProvider _pathProvider;
- private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+ private static readonly Logger logger = LogManager.GetCurrentClassLogger();
- public UpdateProvider(DiskProvider diskProvider, EnviromentProvider enviromentProvider,
- ServiceProvider serviceProvider, ProcessProvider processProvider, PathProvider pathProvider)
+ public UpdateProvider(DiskProvider diskProvider,ServiceProvider serviceProvider,
+ ProcessProvider processProvider, PathProvider pathProvider)
{
_diskProvider = diskProvider;
- _enviromentProvider = enviromentProvider;
_serviceProvider = serviceProvider;
_processProvider = processProvider;
_pathProvider = pathProvider;
@@ -27,7 +25,7 @@ namespace NzbDrone.Update.Providers
private void Verify(string installationFolder)
{
- Logger.Info("Verifying requirements before update...");
+ logger.Info("Verifying requirements before update...");
if (String.IsNullOrWhiteSpace(installationFolder))
throw new ArgumentException("Target folder can not be null or empty");
@@ -35,7 +33,7 @@ namespace NzbDrone.Update.Providers
if (!_diskProvider.FolderExists(installationFolder))
throw new DirectoryNotFoundException("Target folder doesn't exist" + installationFolder);
- Logger.Info("Verifying Update Folder");
+ logger.Info("Verifying Update Folder");
if (!_diskProvider.FolderExists(_pathProvider.UpdatePackageFolder))
throw new DirectoryNotFoundException("Update folder doesn't exist" + _pathProvider.UpdateSandboxFolder);
@@ -46,7 +44,7 @@ namespace NzbDrone.Update.Providers
Verify(targetFolder);
bool isService = false;
- Logger.Info("Stopping all running services");
+ logger.Info("Stopping all running services");
if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME))
{
if (_serviceProvider.IsServiceRunning(ServiceProvider.NZBDRONE_SERVICE_NAME))
@@ -56,18 +54,18 @@ namespace NzbDrone.Update.Providers
_serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME);
}
- Logger.Info("Killing all running processes");
+ logger.Info("Killing all running processes");
var processes = _processProvider.GetProcessByName(ProcessProvider.NzbDroneProccessName);
foreach (var processInfo in processes)
{
_processProvider.Kill(processInfo.Id);
}
- Logger.Info("Creating backup of existing installation");
+ logger.Info("Creating backup of existing installation");
_diskProvider.CopyDirectory(targetFolder, _pathProvider.UpdateBackUpFolder);
- Logger.Info("Copying update package to target");
+ logger.Info("Copying update package to target");
try
{
@@ -76,7 +74,7 @@ namespace NzbDrone.Update.Providers
catch (Exception e)
{
RollBack(targetFolder);
- Logger.Fatal("Failed to copy upgrade package to target folder.", e);
+ logger.Fatal("Failed to copy upgrade package to target folder.", e);
}
finally
{
@@ -86,7 +84,7 @@ namespace NzbDrone.Update.Providers
private void RollBack(string targetFolder)
{
- Logger.Info("Attempting to rollback upgrade");
+ logger.Info("Attempting to rollback upgrade");
_diskProvider.CopyDirectory(_pathProvider.UpdateBackUpFolder, targetFolder);
}
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index dee81fc2e..1e95ce60d 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -45,11 +45,6 @@
x86
-
-
- True
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
False
..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll
@@ -65,38 +60,18 @@
-
-
- True
- ..\packages\SqlServerCompact.4.0.8482.1\lib\System.Data.SqlServerCe.dll
-
-
-
-
-
3.5
-
True
-
- False
- ..\Libraries\MVC3\System.Web.Helpers.dll
- True
-
False
..\Libraries\MVC3\System.Web.Mvc.dll
True
-
- False
- ..\Libraries\MVC3\System.Web.Razor.dll
- True
-
True
@@ -105,21 +80,7 @@
..\Libraries\MVC3\System.Web.WebPages.dll
True
-
- False
- ..\Libraries\MVC3\System.Web.WebPages.Deployment.dll
- True
-
-
- False
- ..\Libraries\MVC3\System.Web.WebPages.Razor.dll
- True
-
-
-
-
-
..\packages\TelerikMvcExtensions.2011.2.712\lib\net40\Telerik.Web.Mvc.dll
@@ -127,10 +88,6 @@
False
..\Libraries\TvdbLib.dll
-
- False
- ..\packages\WebActivator.1.5\lib\net40\WebActivator.dll
-
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index ba239aa30..f32f9e508 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -57,19 +57,12 @@
NzbDrone.AppMain
-
- True
-
True
True
-
- False
- ..\Libraries\Exceptioneer.WindowsFormsClient.dll
-
..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll
@@ -77,13 +70,9 @@
..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll
-
-
-
-
diff --git a/NzbDrone/Providers/MonitoringProvider.cs b/NzbDrone/Providers/MonitoringProvider.cs
index 087052110..95dfa13d5 100644
--- a/NzbDrone/Providers/MonitoringProvider.cs
+++ b/NzbDrone/Providers/MonitoringProvider.cs
@@ -2,7 +2,6 @@
using System.Diagnostics;
using System.Runtime.Remoting;
using System.Timers;
-using Exceptioneer.WindowsFormsClient;
using NLog;
using Ninject;
using NzbDrone.Common;