Merge branch 'autofac'

Conflicts:
	NzbDrone.Common/IISProvider.cs
	NzbDrone.Core/CentralDispatch.cs
This commit is contained in:
Mark McDowall 2013-01-06 01:14:52 -08:00
commit 1ef6906dc1
142 changed files with 552 additions and 627 deletions

View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using NLog;
using Ninject;
using NzbDrone.Common;
namespace NzbDrone.Update.Providers
@ -17,7 +16,6 @@ namespace NzbDrone.Update.Providers
private readonly IISProvider _iisProvider;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
[Inject]
public UpdateProvider(DiskProvider diskProvider, ServiceProvider serviceProvider,
ProcessProvider processProvider, EnvironmentProvider environmentProvider, IISProvider iisProvider)
{