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