diff --git a/src/LogentriesCore/LogentriesCore.csproj b/src/LogentriesCore/LogentriesCore.csproj index 4f6c66677..eb2d0c560 100644 --- a/src/LogentriesCore/LogentriesCore.csproj +++ b/src/LogentriesCore/LogentriesCore.csproj @@ -51,6 +51,9 @@ MinimumRecommendedRules.ruleset + + ..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll + diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj index bca5c6d2d..86bc11eff 100644 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties NzbDrone.Api.Test NzbDrone.Api.Test - v4.0 + v4.6.1 512 ..\ true 12.0.0 2.0 + true @@ -26,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -36,23 +38,25 @@ prompt MinimumRecommendedRules.ruleset 4 + false ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll True + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll + - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Api.Test/packages.config b/src/NzbDrone.Api.Test/packages.config index 0913b6416..0018c93df 100644 --- a/src/NzbDrone.Api.Test/packages.config +++ b/src/NzbDrone.Api.Test/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index cb4aeaf29..7dc8ce06e 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties NzbDrone.Api NzbDrone.Api - v4.0 + v4.6.1 512 ..\ true @@ -28,6 +28,7 @@ MinimumRecommendedRules.ruleset 4 false + false ..\..\_output\ @@ -38,42 +39,38 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\Ical.Net.2.2.32\lib\net40\antlr.runtime.dll + ..\packages\Ical.Net.2.2.32\lib\net46\antlr.runtime.dll - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - ..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.dll + ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.dll - ..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.Collections.dll + ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.Collections.dll ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll - True ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - True ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\Ical.Net.2.2.32\lib\net40\NodaTime.dll + ..\packages\Ical.Net.2.2.32\lib\net46\NodaTime.dll @@ -202,9 +199,7 @@ - - Designer - + diff --git a/src/NzbDrone.Api/app.config b/src/NzbDrone.Api/app.config index c1684a7be..aa61b66fd 100644 --- a/src/NzbDrone.Api/app.config +++ b/src/NzbDrone.Api/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index ba6f1b3ed..63b6b683e 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index 5c28f26e2..8b08da58c 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,10 +10,11 @@ Properties NzbDrone.App.Test NzbDrone.App.Test - v4.0 + v4.6.1 512 ..\ true + true @@ -25,6 +26,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -35,17 +37,20 @@ prompt MinimumRecommendedRules.ruleset 4 + false ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll @@ -53,10 +58,10 @@ True - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index 81a4765e8..c3b56c772 100644 --- a/src/NzbDrone.App.Test/packages.config +++ b/src/NzbDrone.App.Test/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj index 72a909bbf..64d9a27d5 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties NzbDrone.Automation.Test NzbDrone.Automation.Test - v4.0 + v4.6.1 512 ..\ true 12.0.0 2.0 + true @@ -26,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -36,19 +38,20 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Automation.Test/app.config b/src/NzbDrone.Automation.Test/app.config index c1684a7be..077a6a061 100644 --- a/src/NzbDrone.Automation.Test/app.config +++ b/src/NzbDrone.Automation.Test/app.config @@ -10,6 +10,10 @@ + + + + - \ No newline at end of file + diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index f92f63790..0a18f619f 100644 --- a/src/NzbDrone.Automation.Test/packages.config +++ b/src/NzbDrone.Automation.Test/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index c6ed9935e..d1ddb7ec8 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,10 +10,11 @@ Properties NzbDrone.Common.Test NzbDrone.Common.Test - v4.0 + v4.6.1 512 ..\ true + true @@ -25,6 +26,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -35,23 +37,27 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll True - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 69062660f..9fa8c161a 100644 --- a/src/NzbDrone.Common.Test/packages.config +++ b/src/NzbDrone.Common.Test/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 4e16b072c..235967a68 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Common NzbDrone.Common - v4.0 + v4.6.1 512 ..\ true @@ -27,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false ..\..\_output\ @@ -37,20 +38,23 @@ prompt MinimumRecommendedRules.ruleset 4 + false + + ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll + - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll ..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll - ..\packages\SharpRaven.2.2.0\lib\net40\SharpRaven.dll + ..\packages\SharpRaven.2.2.0\lib\net45\SharpRaven.dll ..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\SocksWebProxy.dll @@ -233,9 +237,7 @@ Always - - Designer - + diff --git a/src/NzbDrone.Common/app.config b/src/NzbDrone.Common/app.config index 8460dd432..9566343db 100644 --- a/src/NzbDrone.Common/app.config +++ b/src/NzbDrone.Common/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index c1e8d1e7b..da14bab26 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 0b78bfdf8..58f4d5248 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Console NzbDrone.Console - v4.0 + v4.6.1 512 @@ -43,6 +43,7 @@ 4 true BasicCorrectnessRules.ruleset + false x86 @@ -52,6 +53,7 @@ TRACE prompt 4 + false ..\NzbDrone.Host\NzbDrone.ico @@ -68,19 +70,18 @@ - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll @@ -93,6 +94,11 @@ + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + @@ -125,14 +131,6 @@ - - {1B9A82C4-BCA1-4834-A33E-226F17BE070B} - Microsoft.AspNet.SignalR.Core - - - {2B8C6DAD-4D85-41B1-83FD-248D9F347522} - Microsoft.AspNet.SignalR.Owin - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} NzbDrone.Common diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index f3188f1a4..d4bd980f4 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs index baca51b08..21690a20b 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using NUnit.Framework; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.HealthCheck.Checks; @@ -18,11 +18,14 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Returns(new Version(version)); } - [TestCase("3.10")] - [TestCase("4.0.0.0")] - [TestCase("4.2")] + [TestCase("4.6")] [TestCase("4.4.2")] + [TestCase("4.6")] + [TestCase("4.8")] + [TestCase("5.0")] + [TestCase("5.2")] + [TestCase("5.4")] public void should_return_ok(string version) { GivenOutput(version); @@ -38,6 +41,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks [TestCase("3.2.7")] [TestCase("3.6.1")] [TestCase("3.8")] + [TestCase("3.10")] + [TestCase("4.0.0.0")] + [TestCase("4.2")] public void should_return_warning(string version) { GivenOutput(version); diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index b3992b479..0efc9c6d6 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,10 +10,11 @@ Properties NzbDrone.Core.Test NzbDrone.Core.Test - v4.0 + v4.6.1 512 ..\ true + true @@ -25,6 +26,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -35,6 +37,7 @@ prompt MinimumRecommendedRules.ruleset 4 + false OnBuildSuccess @@ -42,40 +45,36 @@ ..\packages\AutoMoq.1.8.1.0\lib\net40\AutoMoq.dll - True ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll ..\packages\FluentMigrator.1.6.2\lib\40\FluentMigrator.dll - True ..\packages\FluentMigrator.Runner.1.6.2\lib\40\FluentMigrator.Runner.dll - True - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll - True ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll - True + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll @@ -86,14 +85,16 @@ True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll + + + ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll @@ -439,6 +440,7 @@ + diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 732b2e721..27c11bc8b 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -1,16 +1,16 @@  - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Core/App.config b/src/NzbDrone.Core/App.config index 043c42fe9..3129d272c 100644 --- a/src/NzbDrone.Core/App.config +++ b/src/NzbDrone.Core/App.config @@ -1,6 +1,6 @@  - + diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index 639686cc7..faf2152d7 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Reflection; +using System; using NLog; using NzbDrone.Common.EnvironmentInfo; @@ -26,21 +24,15 @@ namespace NzbDrone.Core.HealthCheck.Checks var monoVersion = _platformInfo.Version; - if (monoVersion == new Version("3.4.0") && HasMonoBug18599()) - { - _logger.Debug("Mono version 3.4.0, checking for Mono bug #18599 returned positive."); - return new HealthCheck(GetType(), HealthCheckResult.Error, "You are running an old and unsupported version of Mono with a known bug. You should upgrade to a higher version"); - } - if (monoVersion == new Version("4.4.0") || monoVersion == new Version("4.4.1")) { _logger.Debug("Mono version {0}", monoVersion); - return new HealthCheck(GetType(), HealthCheckResult.Error, $"Your Mono version {monoVersion} has a bug that causes issues connecting to indexers/download clients. You should upgrade to a higher version"); + return new HealthCheck(GetType(), HealthCheckResult.Error, $"Your Mono version {monoVersion} has a bug that causes issues connecting to indexers/download clients. You should upgrade to a higher version"); } - if (monoVersion >= new Version("3.10")) + if (monoVersion >= new Version("4.4.2")) { - _logger.Debug("Mono version is 3.10 or better: {0}", monoVersion); + _logger.Debug("Mono version is 4.4.2 or better: {0}", monoVersion); return new HealthCheck(GetType()); } @@ -48,34 +40,5 @@ namespace NzbDrone.Core.HealthCheck.Checks } public override bool CheckOnSchedule => false; - - private bool HasMonoBug18599() - { - _logger.Debug("mono version 3.4.0, checking for mono bug #18599."); - var numberFormatterType = Type.GetType("System.NumberFormatter"); - - if (numberFormatterType == null) - { - _logger.Debug("Couldn't find System.NumberFormatter. Aborting test."); - return false; - } - - var fieldInfo = numberFormatterType.GetField("userFormatProvider", - BindingFlags.Static | BindingFlags.NonPublic); - - if (fieldInfo == null) - { - _logger.Debug("userFormatProvider field not found, version likely preceeds the official v3.4.0."); - return false; - } - - if (fieldInfo.GetCustomAttributes(false).Any(v => v is ThreadStaticAttribute)) - { - _logger.Debug("userFormatProvider field doesn't contain the ThreadStatic Attribute, version is affected by the critical bug #18599."); - return true; - } - - return false; - } } } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 82e539d67..5b61be565 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Core NzbDrone.Core - v4.0 + v4.6.1 512 @@ -41,6 +41,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -50,19 +51,20 @@ TRACE prompt 4 + false + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + ..\packages\FluentMigrator.1.6.2\lib\40\FluentMigrator.dll - True ..\packages\FluentMigrator.Runner.1.6.2\lib\40\FluentMigrator.Runner.dll - True - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll False @@ -74,25 +76,21 @@ ..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - + ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll - - False - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll @@ -109,9 +107,6 @@ - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - ..\Libraries\Sqlite\System.Data.SQLite.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index fffed8fac..fecd9ff16 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -1,14 +1,14 @@  - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index a4f1d2842..13e363e7d 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Host NzbDrone.Host - v4.0 + v4.6.1 512 @@ -43,6 +43,7 @@ 4 true BasicCorrectnessRules.ruleset + false x86 @@ -52,6 +53,7 @@ TRACE prompt 4 + false OnOutputUpdated @@ -59,31 +61,34 @@ - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll + - False - ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll + ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll + - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll - True ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll + + + ..\packages\NLog.Extensions.Logging.1.1.0\lib\net461\NLog.Extensions.Logging.dll + + + ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -199,7 +204,6 @@ Sonarr.Http - diff --git a/src/NzbDrone.Host/app.config b/src/NzbDrone.Host/app.config index 885d99232..3e7fd958a 100644 --- a/src/NzbDrone.Host/app.config +++ b/src/NzbDrone.Host/app.config @@ -6,7 +6,7 @@ - + diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 9bc2cc789..4d920f347 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -1,11 +1,11 @@  - - - + + + - - + + \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index 981d0d591..e920a3181 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties NzbDrone.Integration.Test NzbDrone.Integration.Test - v4.0 + v4.6.1 512 ..\ true 12.0.0 2.0 + true @@ -26,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -36,31 +38,32 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - ..\packages\Microsoft.AspNet.SignalR.Client.1.2.2\lib\net40\Microsoft.AspNet.SignalR.Client.dll + + ..\packages\Microsoft.AspNet.SignalR.Client.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Client.dll - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll + + ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll @@ -74,21 +77,21 @@ ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll + + + ..\packages\Owin.1.0\lib\net40\Owin.dll - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 444135304..a346fada5 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -1,17 +1,17 @@  - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj index b16c163ce..d2af1ea36 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties NzbDrone.Libraries.Test NzbDrone.Libraries.Test - v4.0 + v4.6.1 512 ..\ true 12.0.0 2.0 + true @@ -26,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -36,20 +38,20 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll @@ -58,6 +60,8 @@ + + diff --git a/src/NzbDrone.Libraries.Test/app.config b/src/NzbDrone.Libraries.Test/app.config index c1684a7be..077a6a061 100644 --- a/src/NzbDrone.Libraries.Test/app.config +++ b/src/NzbDrone.Libraries.Test/app.config @@ -10,6 +10,10 @@ + + + + - \ No newline at end of file + diff --git a/src/NzbDrone.Libraries.Test/packages.config b/src/NzbDrone.Libraries.Test/packages.config index 413eb1612..1ebfe9722 100644 --- a/src/NzbDrone.Libraries.Test/packages.config +++ b/src/NzbDrone.Libraries.Test/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj index 9e78587a3..663a985f0 100644 --- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties NzbDrone.Mono.Test NzbDrone.Mono.Test - v4.0 + v4.6.1 512 ..\ true + true @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false true @@ -39,6 +42,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false bin\x86\Release\ @@ -48,13 +52,14 @@ x86 prompt MinimumRecommendedRules.ruleset + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll False @@ -62,10 +67,9 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Mono.Test/app.config b/src/NzbDrone.Mono.Test/app.config index b6d9543c5..182ee5626 100644 --- a/src/NzbDrone.Mono.Test/app.config +++ b/src/NzbDrone.Mono.Test/app.config @@ -14,6 +14,10 @@ + + + + - \ No newline at end of file + diff --git a/src/NzbDrone.Mono.Test/packages.config b/src/NzbDrone.Mono.Test/packages.config index 337af9af9..2b0cc4306 100644 --- a/src/NzbDrone.Mono.Test/packages.config +++ b/src/NzbDrone.Mono.Test/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 50ef3a188..04841b928 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties NzbDrone.Mono NzbDrone.Mono - v4.0 + v4.6.1 512 ..\ @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +32,7 @@ TRACE prompt 4 + false true @@ -40,6 +42,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false ..\..\_output\ @@ -49,10 +52,11 @@ x86 prompt MinimumRecommendedRules.ruleset + false - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll diff --git a/src/NzbDrone.Mono/app.config b/src/NzbDrone.Mono/app.config index 8460dd432..9566343db 100644 --- a/src/NzbDrone.Mono/app.config +++ b/src/NzbDrone.Mono/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config index 6f6ef792a..e913eaeaa 100644 --- a/src/NzbDrone.Mono/packages.config +++ b/src/NzbDrone.Mono/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj index 0cabc3c01..9e93390d5 100644 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties NzbDrone.SignalR NzbDrone.SignalR - v4.0 + v4.6.1 512 ..\ true 12.0.0 2.0 + true @@ -26,6 +27,7 @@ MinimumRecommendedRules.ruleset 4 false + false ..\..\_output\ @@ -36,11 +38,12 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + diff --git a/src/NzbDrone.SignalR/SonarrPerformanceCounterManager.cs b/src/NzbDrone.SignalR/SonarrPerformanceCounterManager.cs index fd1a9e4e3..ca5fcf386 100644 --- a/src/NzbDrone.SignalR/SonarrPerformanceCounterManager.cs +++ b/src/NzbDrone.SignalR/SonarrPerformanceCounterManager.cs @@ -1,4 +1,4 @@ -using System.Threading; +using System.Threading; using Microsoft.AspNet.SignalR.Infrastructure; namespace NzbDrone.SignalR @@ -50,5 +50,9 @@ namespace NzbDrone.SignalR public IPerformanceCounter ScaleoutErrorsTotal => _counter; public IPerformanceCounter ScaleoutErrorsPerSec => _counter; public IPerformanceCounter ScaleoutSendQueueLength => _counter; + public IPerformanceCounter ConnectionsCurrentForeverFrame => _counter; + public IPerformanceCounter ConnectionsCurrentLongPolling => _counter; + public IPerformanceCounter ConnectionsCurrentServerSentEvents => _counter; + public IPerformanceCounter ConnectionsCurrentWebSockets => _counter; } } \ No newline at end of file diff --git a/src/NzbDrone.SignalR/app.config b/src/NzbDrone.SignalR/app.config index c1684a7be..aa61b66fd 100644 --- a/src/NzbDrone.SignalR/app.config +++ b/src/NzbDrone.SignalR/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.SignalR/packages.config b/src/NzbDrone.SignalR/packages.config index 7c276ed86..7ee8c1052 100644 --- a/src/NzbDrone.SignalR/packages.config +++ b/src/NzbDrone.SignalR/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/App.config b/src/NzbDrone.Test.Common/App.config index c7a8ca18c..e2317eebd 100644 --- a/src/NzbDrone.Test.Common/App.config +++ b/src/NzbDrone.Test.Common/App.config @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index 989ba8739..9756cf557 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,10 +10,11 @@ Properties NzbDrone.Test.Common NzbDrone.Test.Common - v4.0 + v4.6.1 512 ..\ true + true @@ -25,6 +26,7 @@ MinimumRecommendedRules.ruleset 4 false + false bin\x86\Release\ @@ -35,34 +37,45 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll + + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll + + + ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + + ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index 043baa4cd..12b967b2f 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -1,12 +1,12 @@  - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj index fb311dbd5..0a9d39c47 100644 --- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Test.Dummy NzbDrone.Test.Dummy - v4.0 + v4.6.1 512 @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -35,6 +36,7 @@ TRACE prompt 4 + false @@ -60,4 +62,4 @@ --> - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Dummy/app.config b/src/NzbDrone.Test.Dummy/app.config index e36560333..0dff63a07 100644 --- a/src/NzbDrone.Test.Dummy/app.config +++ b/src/NzbDrone.Test.Dummy/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index fc059ebb3..271ce288a 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Update.Test NzbDrone.Update.Test - v4.0 + v4.6.1 512 @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -35,27 +36,30 @@ TRACE prompt 4 + false ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll True - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index 81a4765e8..c3b56c772 100644 --- a/src/NzbDrone.Update.Test/packages.config +++ b/src/NzbDrone.Update.Test/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 2e82da4c5..3c675df58 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone.Update NzbDrone.Update - v4.0 + v4.6.1 512 @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -35,6 +36,7 @@ TRACE prompt 4 + false app.manifest @@ -42,11 +44,10 @@ - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll diff --git a/src/NzbDrone.Update/app.config b/src/NzbDrone.Update/app.config index 76f6c07e9..65f7b09db 100644 --- a/src/NzbDrone.Update/app.config +++ b/src/NzbDrone.Update/app.config @@ -1,7 +1,7 @@  - + @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index bd5160055..9f71c54ed 100644 --- a/src/NzbDrone.Update/packages.config +++ b/src/NzbDrone.Update/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj index 9eb35ad5e..41115ac08 100644 --- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties NzbDrone.Windows.Test NzbDrone.Windows.Test - v4.0 + v4.6.1 512 ..\ true + true @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false true @@ -39,6 +42,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false bin\x86\Release\ @@ -48,16 +52,17 @@ x86 prompt MinimumRecommendedRules.ruleset + false - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Windows.Test/app.config b/src/NzbDrone.Windows.Test/app.config index b6d9543c5..182ee5626 100644 --- a/src/NzbDrone.Windows.Test/app.config +++ b/src/NzbDrone.Windows.Test/app.config @@ -14,6 +14,10 @@ + + + + - \ No newline at end of file + diff --git a/src/NzbDrone.Windows.Test/packages.config b/src/NzbDrone.Windows.Test/packages.config index a4dcb9206..fd0af0f89 100644 --- a/src/NzbDrone.Windows.Test/packages.config +++ b/src/NzbDrone.Windows.Test/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 9011e93a4..9603336f8 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties NzbDrone.Windows NzbDrone.Windows - v4.0 + v4.6.1 512 ..\ true + true @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false true @@ -39,6 +42,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false ..\..\_output\ @@ -48,10 +52,11 @@ x86 prompt MinimumRecommendedRules.ruleset + false - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll diff --git a/src/NzbDrone.Windows/app.config b/src/NzbDrone.Windows/app.config index 8460dd432..9566343db 100644 --- a/src/NzbDrone.Windows/app.config +++ b/src/NzbDrone.Windows/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config index 6f6ef792a..e913eaeaa 100644 --- a/src/NzbDrone.Windows/packages.config +++ b/src/NzbDrone.Windows/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index 0e2e040a8..8f3c7a7da 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties NzbDrone NzbDrone - v4.0 + v4.6.1 512 @@ -43,6 +43,7 @@ 4 true BasicCorrectnessRules.ruleset + false x86 @@ -52,6 +53,7 @@ TRACE prompt 4 + false ..\NzbDrone.Host\NzbDrone.ico @@ -68,19 +70,22 @@ - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -135,14 +140,6 @@ - - {1B9A82C4-BCA1-4834-A33E-226F17BE070B} - Microsoft.AspNet.SignalR.Core - - - {2B8C6DAD-4D85-41B1-83FD-248D9F347522} - Microsoft.AspNet.SignalR.Owin - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} NzbDrone.Common diff --git a/src/NzbDrone/Properties/Resources.Designer.cs b/src/NzbDrone/Properties/Resources.Designer.cs index 65584111d..dfbfeb594 100644 --- a/src/NzbDrone/Properties/Resources.Designer.cs +++ b/src/NzbDrone/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.32559 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,6 +9,9 @@ //------------------------------------------------------------------------------ namespace NzbDrone.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index f3188f1a4..d4bd980f4 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index 5334a144e..64a646a01 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 @@ -10,7 +10,7 @@ Properties ServiceInstall ServiceInstall - v4.0 + v4.6.1 512 @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -35,6 +36,7 @@ TRACE prompt 4 + false app.manifest @@ -77,4 +79,4 @@ --> - + \ No newline at end of file diff --git a/src/ServiceHelpers/ServiceInstall/app.config b/src/ServiceHelpers/ServiceInstall/app.config index e33d6f761..99216b8f8 100644 --- a/src/ServiceHelpers/ServiceInstall/app.config +++ b/src/ServiceHelpers/ServiceInstall/app.config @@ -1,6 +1,6 @@ - + diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index 5905c1dbd..cf036844f 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 @@ -10,7 +10,7 @@ Properties ServiceUninstall ServiceUninstall - v4.0 + v4.6.1 512 @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -35,6 +36,7 @@ TRACE prompt 4 + false ServiceUninstall.Program @@ -77,4 +79,4 @@ --> - + \ No newline at end of file diff --git a/src/ServiceHelpers/ServiceUninstall/app.config b/src/ServiceHelpers/ServiceUninstall/app.config index e33d6f761..99216b8f8 100644 --- a/src/ServiceHelpers/ServiceUninstall/app.config +++ b/src/ServiceHelpers/ServiceUninstall/app.config @@ -1,6 +1,6 @@ - + diff --git a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj index 540aec752..f56ae54c1 100644 --- a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj +++ b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Sonarr.Api.V3 Sonarr.Api.V3 - v4.0 + v4.6.1 512 ..\ true @@ -28,6 +28,7 @@ MinimumRecommendedRules.ruleset 4 false + false ..\..\_output\ @@ -38,46 +39,49 @@ prompt MinimumRecommendedRules.ruleset 4 + false - ..\packages\Ical.Net.2.2.32\lib\net40\antlr.runtime.dll + ..\packages\Ical.Net.2.2.32\lib\net46\antlr.runtime.dll - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - ..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.dll + ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.dll - ..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.Collections.dll + ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.Collections.dll ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll - True ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - True ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.3\lib\net40\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll - ..\packages\Ical.Net.2.2.32\lib\net40\NodaTime.dll + ..\packages\Ical.Net.2.2.32\lib\net46\NodaTime.dll + + + + + + + @@ -206,9 +210,7 @@ - - Designer - + diff --git a/src/Sonarr.Api.V3/app.config b/src/Sonarr.Api.V3/app.config index c1684a7be..aa61b66fd 100644 --- a/src/Sonarr.Api.V3/app.config +++ b/src/Sonarr.Api.V3/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Sonarr.Api.V3/packages.config b/src/Sonarr.Api.V3/packages.config index f68f69f6b..63b6b683e 100644 --- a/src/Sonarr.Api.V3/packages.config +++ b/src/Sonarr.Api.V3/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/Sonarr.Http/Sonarr.Http.csproj b/src/Sonarr.Http/Sonarr.Http.csproj index 3cd96b074..c9c6ff1f4 100644 --- a/src/Sonarr.Http/Sonarr.Http.csproj +++ b/src/Sonarr.Http/Sonarr.Http.csproj @@ -9,8 +9,9 @@ Properties Sonarr.Http Sonarr.Http - v4.0 + v4.6.1 512 + true @@ -20,6 +21,8 @@ DEBUG;TRACE prompt 4 + MinimumRecommendedRules.ruleset + false pdbonly @@ -28,38 +31,41 @@ TRACE prompt 4 + MinimumRecommendedRules.ruleset + false - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True + ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll - True ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - True ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - True - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.3\lib\net40\NLog.dll + ..\packages\NLog.4.5.3\lib\net45\NLog.dll + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + diff --git a/src/Sonarr.Http/app.config b/src/Sonarr.Http/app.config index 8460dd432..9566343db 100644 --- a/src/Sonarr.Http/app.config +++ b/src/Sonarr.Http/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Sonarr.Http/packages.config b/src/Sonarr.Http/packages.config index 1d49009e6..1521e78db 100644 --- a/src/Sonarr.Http/packages.config +++ b/src/Sonarr.Http/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file