From 8a5a3264806cd67b2b5228565269a1511b01c115 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Wed, 30 Jan 2013 13:13:19 -0800 Subject: [PATCH] updated autofac to 3.0 --- NzbDrone.Api/NzbDrone.Api.csproj | 10 ++++++---- NzbDrone.Api/packages.config | 2 +- NzbDrone.App.Test/NzbDrone.App.Test.csproj | 10 ++++++---- NzbDrone.App.Test/packages.config | 2 +- .../NzbDrone.Common.Test.csproj | 10 ++++++---- NzbDrone.Common.Test/packages.config | 2 +- NzbDrone.Common/NzbDrone.Common.csproj | 18 ++++++++++-------- NzbDrone.Common/ReportingService.cs | 9 +++------ NzbDrone.Common/packages.config | 4 ++-- NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 10 ++++++---- NzbDrone.Core.Test/packages.config | 2 +- NzbDrone.Core/NzbDrone.Core.csproj | 10 ++++++---- NzbDrone.Core/packages.config | 2 +- .../NzbDrone.Services.Api.csproj | 8 +++++--- NzbDrone.Services.Api/packages.config | 2 +- .../NzbDrone.Services.Service.csproj | 10 ++++++---- .../NzbDrone.Services.Service/Web.config | 6 +++++- .../NzbDrone.Services.Service/packages.config | 2 +- NzbDrone.Update/NzbDrone.Update.csproj | 10 ++++++---- NzbDrone.Update/packages.config | 2 +- NzbDrone.Web/NzbDrone.Web.csproj | 10 ++++++---- NzbDrone.Web/Web.config | 4 ++++ NzbDrone.Web/packages.config | 2 +- NzbDrone/NzbDrone.csproj | 8 ++++---- NzbDrone/packages.config | 2 +- 25 files changed, 91 insertions(+), 66 deletions(-) diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj index 63e4b4977..47b8aa89b 100644 --- a/NzbDrone.Api/NzbDrone.Api.csproj +++ b/NzbDrone.Api/NzbDrone.Api.csproj @@ -50,11 +50,13 @@ MinimumRecommendedRules.ruleset - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\packages\AutoMapper.2.2.0\lib\net40\AutoMapper.dll diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config index 98eaade7f..a62a3ed37 100644 --- a/NzbDrone.Api/packages.config +++ b/NzbDrone.Api/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.App.Test/NzbDrone.App.Test.csproj b/NzbDrone.App.Test/NzbDrone.App.Test.csproj index 1d78377b4..a23588bd5 100644 --- a/NzbDrone.App.Test/NzbDrone.App.Test.csproj +++ b/NzbDrone.App.Test/NzbDrone.App.Test.csproj @@ -53,11 +53,13 @@ MinimumRecommendedRules.ruleset - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll diff --git a/NzbDrone.App.Test/packages.config b/NzbDrone.App.Test/packages.config index 7fe15cba5..3fc658a47 100644 --- a/NzbDrone.App.Test/packages.config +++ b/NzbDrone.App.Test/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index cf8f13cc0..8aa7e730a 100644 --- a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -53,11 +53,13 @@ MinimumRecommendedRules.ruleset - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll False diff --git a/NzbDrone.Common.Test/packages.config b/NzbDrone.Common.Test/packages.config index 9eebdc51e..f78150324 100644 --- a/NzbDrone.Common.Test/packages.config +++ b/NzbDrone.Common.Test/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj index 69c667320..8f0d69f44 100644 --- a/NzbDrone.Common/NzbDrone.Common.csproj +++ b/NzbDrone.Common/NzbDrone.Common.csproj @@ -53,15 +53,17 @@ MinimumRecommendedRules.ruleset - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll - - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll - - + False - ..\packages\Exceptron.Client.1.0.7\lib\net20\Exceptron.Client.dll + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll + + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll + + + False + ..\packages\Exceptron.Client.1.0.20\lib\net20\Exceptron.Client.dll False diff --git a/NzbDrone.Common/ReportingService.cs b/NzbDrone.Common/ReportingService.cs index 84ba0b528..2f9cd7a2f 100644 --- a/NzbDrone.Common/ReportingService.cs +++ b/NzbDrone.Common/ReportingService.cs @@ -109,14 +109,11 @@ namespace NzbDrone.Common { var config = new ExceptronConfiguration { - ApiKey = "CB230C312E5C4FF38B4FB9644B05E60G", - ThrowExceptions = !EnvironmentProvider.IsProduction, + ApiKey = "CB230C312E5C4FF38B4FB9644B05E60G", + ThrowExceptions = !EnvironmentProvider.IsProduction, }; - ExceptronClient = new ExceptronClient(config) - { - ApplicationVersion = new EnvironmentProvider().Version.ToString() - }; + ExceptronClient = new ExceptronClient(config, new EnvironmentProvider().Version); } private static void VerifyDependencies() diff --git a/NzbDrone.Common/packages.config b/NzbDrone.Common/packages.config index 5490096a8..0d73463d9 100644 --- a/NzbDrone.Common/packages.config +++ b/NzbDrone.Common/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index e6403ee35..84be7eed2 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -56,11 +56,13 @@ True - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\packages\AutoMoq.1.6.1\lib\AutoMoq.dll diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config index c9d7a612d..67cc6e123 100644 --- a/NzbDrone.Core.Test/packages.config +++ b/NzbDrone.Core.Test/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index cd7d821c1..4a877241c 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -123,11 +123,13 @@ - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll False diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config index d39126f55..b10865175 100644 --- a/NzbDrone.Core/packages.config +++ b/NzbDrone.Core/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj b/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj index 994612bb5..f32883a5e 100644 --- a/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj +++ b/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj @@ -41,10 +41,12 @@ - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll + True - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll diff --git a/NzbDrone.Services.Api/packages.config b/NzbDrone.Services.Api/packages.config index e714240a5..c922c7f95 100644 --- a/NzbDrone.Services.Api/packages.config +++ b/NzbDrone.Services.Api/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj b/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj index b2b576e4d..52cf29455 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj +++ b/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj @@ -47,11 +47,13 @@ x86 - - ..\..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\..\packages\Autofac.Mvc3.2.6.3.862\lib\NET40\Autofac.Integration.Mvc.dll diff --git a/NzbDrone.Services/NzbDrone.Services.Service/Web.config b/NzbDrone.Services/NzbDrone.Services.Service/Web.config index d93876ae7..64c9e1520 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/Web.config +++ b/NzbDrone.Services/NzbDrone.Services.Service/Web.config @@ -16,12 +16,16 @@ - + + + + + diff --git a/NzbDrone.Services/NzbDrone.Services.Service/packages.config b/NzbDrone.Services/NzbDrone.Services.Service/packages.config index 777884cc2..732cc8a55 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/packages.config +++ b/NzbDrone.Services/NzbDrone.Services.Service/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NzbDrone.Update/NzbDrone.Update.csproj b/NzbDrone.Update/NzbDrone.Update.csproj index 0ba0117ab..f26186bdf 100644 --- a/NzbDrone.Update/NzbDrone.Update.csproj +++ b/NzbDrone.Update/NzbDrone.Update.csproj @@ -37,11 +37,13 @@ 4 - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll diff --git a/NzbDrone.Update/packages.config b/NzbDrone.Update/packages.config index 1e7f62b53..04d064fb2 100644 --- a/NzbDrone.Update/packages.config +++ b/NzbDrone.Update/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 311633649..f0ac0d9fb 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -57,11 +57,13 @@ ..\packages\AjaxMin.4.60.4609.17023\lib\net20\AjaxMin.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + + False + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll ..\packages\Autofac.Mvc3.2.6.3.862\lib\NET40\Autofac.Integration.Mvc.dll diff --git a/NzbDrone.Web/Web.config b/NzbDrone.Web/Web.config index 844591b28..290458cc1 100644 --- a/NzbDrone.Web/Web.config +++ b/NzbDrone.Web/Web.config @@ -86,6 +86,10 @@ + + + + diff --git a/NzbDrone.Web/packages.config b/NzbDrone.Web/packages.config index d0c44136e..c6e93a699 100644 --- a/NzbDrone.Web/packages.config +++ b/NzbDrone.Web/packages.config @@ -1,7 +1,7 @@  - + diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj index 913092971..4bf7e3074 100644 --- a/NzbDrone/NzbDrone.csproj +++ b/NzbDrone/NzbDrone.csproj @@ -64,13 +64,13 @@ OnOutputUpdated - + False - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll + ..\packages\Autofac.3.0.0\lib\net40\Autofac.dll - + False - ..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll + ..\packages\Autofac.3.0.0\lib\net40\Autofac.Configuration.dll True diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config index 1e7f62b53..04d064fb2 100644 --- a/NzbDrone/packages.config +++ b/NzbDrone/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file