diff --git a/.gitignore b/.gitignore index 67e398b33..aa234c2fe 100644 --- a/.gitignore +++ b/.gitignore @@ -148,8 +148,9 @@ _temp_*/**/* Thumbs.db # AppVeyor -/tools-cake/ +/tools/cake/ /_artifacts/ # Cake -/tools/Addins/* \ No newline at end of file +/tools/Addins/* +packages.config.md5sum \ No newline at end of file diff --git a/build-appveyor.cake b/build-appveyor.cake index 5fd95b0c6..ff4ef9617 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -1,6 +1,6 @@ -#addin "Cake.Npm" -#addin "SharpZipLib" -#addin "Cake.Compression" +#addin nuget:?package=Cake.Npm&version=0.12.1 +#addin nuget:?package=SharpZipLib&version=0.86.0 +#addin nuget:?package=Cake.Compression&version=0.1.4 // Build variables var outputFolder = "./_output"; diff --git a/build-appveyor.ps1 b/build-appveyor.ps1 index fd3bea746..742cc6808 100644 --- a/build-appveyor.ps1 +++ b/build-appveyor.ps1 @@ -81,8 +81,8 @@ if(!$PSScriptRoot){ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent } -$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" +$TOOLS_DIR = Join-Path $PSScriptRoot "tools" +$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/nuget.exe" $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" @@ -156,7 +156,12 @@ if(-Not $SkipToolPackageRestore.IsPresent) { if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe + Get-ChildItem -Path $TOOLS_DIR -Recurse -Exclude packages.config | + Select -ExpandProperty FullName | + Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} | + Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} | + sort length -Descending | + Remove-Item -Recurse } Write-Verbose -Message "Restoring tools from NuGet..." @@ -181,4 +186,4 @@ if (!(Test-Path $CAKE_EXE)) { # Start Cake Write-Host "Running build script..." Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file +exit $LASTEXITCODE diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 5996ca202..3594b4be9 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -1,96 +1,100 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} - Library - Properties - LogentriesNLog - LogentriesNLog - v4.0 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - - - - - - - - - - - - - - - - {90D6E9FC-7B88-4E1B-B018-8FA742274558} - LogentriesCore - - - - - - - - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} + Library + Properties + LogentriesNLog + LogentriesNLog + v4.0 + 512 + ..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + + + + + + + + + + + + + + + + {90D6E9FC-7B88-4E1B-B018-8FA742274558} + LogentriesCore + + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/LogentriesNLog/packages.config b/src/LogentriesNLog/packages.config index 44135561f..6aa24212b 100644 --- a/src/LogentriesNLog/packages.config +++ b/src/LogentriesNLog/packages.config @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index b9b0f0506..bd09741b9 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -1,300 +1,305 @@ - - - - - Debug - x86 - {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} - Library - Properties - NzbDrone.Api - NzbDrone.Api - v4.0 - 512 - ..\ - true - - - 12.0.0 - 2.0 - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\Ical.Net.2.2.25\lib\net40\antlr.runtime.dll - True - - - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True - - - ..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.dll - True - - - ..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.Collections.dll - True - - - ..\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 - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll - True - - - - - - - False - ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - - + + + + + Debug + x86 + {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} + Library + Properties + NzbDrone.Api + NzbDrone.Api + v4.0 + 512 + ..\ + true + + + 12.0.0 + 2.0 + + + true + ..\..\_output\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + ..\..\_output\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\Ical.Net.2.2.25\lib\net40\antlr.runtime.dll + True + + + ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll + True + + + ..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.dll + True + + + ..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.Collections.dll + True + + + ..\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 + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll + True + + + + + + + + False + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} + Marr.Data + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} + NzbDrone.SignalR + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index 23373871c..97cec19fa 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 eb6c1bebb..3a369fd06 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -1,125 +1,131 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} - Library - Properties - NzbDrone.App.Test - NzbDrone.App.Test - v4.0 - 512 - ..\ - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - - - - - - - - App.config - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - sqlite3.dll - Always - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} + Library + Properties + NzbDrone.App.Test + NzbDrone.App.Test + v4.0 + 512 + ..\ + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + + + + + + + + + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + + + + + + + + + + App.config + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {95C11A9E-56ED-456A-8447-2C89C1139266} + NzbDrone.Host + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + + + sqlite3.dll + Always + + + + + + + xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*" "$(TargetDir)" xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*" "$(TargetDir)" - + cp -rv $(SolutionDir)\..\_output\NzbDrone.Mono.* $(TargetDir) cp -rv $(SolutionDir)\..\_output\NzbDrone.Windows.* $(TargetDir) - - + + + --> \ No newline at end of file diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index f12ad74d1..36c0e6d75 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 63f9c8280..7ef094c28 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -1,105 +1,109 @@ - - - - - Debug - x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3} - Library - Properties - NzbDrone.Automation.Test - NzbDrone.Automation.Test - v4.0 - 512 - ..\ - true - 12.0.0 - 2.0 - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - - - - - - - - - ..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll - True - - - ..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll - True - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - - - - - - + + + + + Debug + x86 + {CC26800D-F67E-464B-88DE-8EB1A0C227A3} + Library + Properties + NzbDrone.Automation.Test + NzbDrone.Automation.Test + v4.0 + 512 + ..\ + true + 12.0.0 + 2.0 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + + + + + + + + + + + + + ..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll + True + + + ..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll + True + + + + + + + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index 1e183b82d..77169e153 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 188dad035..deb2ae33d 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -1,160 +1,164 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} - Library - Properties - NzbDrone.Common.Test - NzbDrone.Common.Test - v4.0 - 512 - ..\ - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - - - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.config - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {15ad7579-a314-4626-b556-663f51d97cd1} - NzbDrone.Mono - - - {911284d3-f130-459e-836c-2430b6fbf21d} - NzbDrone.Windows - - - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - NzbDrone - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {FAFB5948-A222-4CF6-AD14-026BE7564802} - NzbDrone.Test.Dummy - - - - - - - - - - - xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)" - + + + + Debug + x86 + 8.0.30703 + 2.0 + {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} + Library + Properties + NzbDrone.Common.Test + NzbDrone.Common.Test + v4.0 + 512 + ..\ + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + + + + + + + + + + + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + App.config + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {95C11A9E-56ED-456A-8447-2C89C1139266} + NzbDrone.Host + + + {15ad7579-a314-4626-b556-663f51d97cd1} + NzbDrone.Mono + + + {911284d3-f130-459e-836c-2430b6fbf21d} + NzbDrone.Windows + + + {D12F7F2F-8A3C-415F-88FA-6DD061A84869} + NzbDrone + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + {FAFB5948-A222-4CF6-AD14-026BE7564802} + NzbDrone.Test.Dummy + + + + + + + + + + + xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)" + + --> \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 805d86b0b..410304445 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 de89b4059..ac0c62da3 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -1,261 +1,264 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - Library - Properties - NzbDrone.Common - NzbDrone.Common - v4.0 - 512 - ..\ - true - - - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll - True - - - ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\SocksWebProxy.dll - True - - - - - - - - - - - ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Designer - - - - - - - - - - - - {74420a79-cc16-442c-8b1e-7c1b913844f0} - CurlSharp - - - {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} - LogentriesNLog - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + Library + Properties + NzbDrone.Common + NzbDrone.Common + v4.0 + 512 + ..\ + true + + + + + true + ..\..\_output\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + ..\..\_output\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll + True + + + ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\SocksWebProxy.dll + True + + + + + + + + + + + + + ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + + + + + + + + + + + + + + + + Component + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Designer + + + + + + + + + + + + {74420a79-cc16-442c-8b1e-7c1b913844f0} + CurlSharp + + + {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} + LogentriesNLog + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index 6bda9797d..ac888c8be 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Console/ConsoleApp.cs b/src/NzbDrone.Console/ConsoleApp.cs index 665a1c179..f36a8fa6e 100644 --- a/src/NzbDrone.Console/ConsoleApp.cs +++ b/src/NzbDrone.Console/ConsoleApp.cs @@ -23,7 +23,15 @@ public static void Main(string[] args) try { var startupArgs = new StartupContext(args); - NzbDroneLogger.Register(startupArgs, false, true); + try + { + NzbDroneLogger.Register(startupArgs, false, true); + } + catch (Exception ex) + { + System.Console.WriteLine("NLog Exception: " + ex.ToString()); + throw; + } Bootstrap.Start(startupArgs, new ConsoleAlerts()); } catch (SocketException e) diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 8a5abdbfc..3229c4b61 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -1,156 +1,163 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} - Exe - Properties - NzbDrone.Console - Radarr.Console - v4.0 - 512 - - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\ - true - - - x86 - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - true - BasicCorrectnessRules.ruleset - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - - - Radarr.ico - - - NzbDrone.Console.ConsoleApp - - - OnBuildSuccess - - - - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll - - - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - {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 - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - - - app.config - - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} + Exe + Properties + NzbDrone.Console + Radarr.Console + v4.0 + 512 + + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + ..\ + true + + + x86 + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + true + BasicCorrectnessRules.ruleset + + + x86 + pdbonly + true + ..\..\_output\ + TRACE + prompt + 4 + + + Radarr.ico + + + NzbDrone.Console.ConsoleApp + + + OnBuildSuccess + + + + + False + ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + + + False + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + + + + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + {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 + + + {95C11A9E-56ED-456A-8447-2C89C1139266} + NzbDrone.Host + + + + + app.config + + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 5f3ede259..48ed9e74d 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/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index df5b4d375..d59ea9a1a 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -1,601 +1,603 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} - Library - Properties - NzbDrone.Core.Test - NzbDrone.Core.Test - v4.0 - 512 - ..\ - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - OnBuildSuccess - - - - ..\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.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\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\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll - True - - - ..\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 - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - ..\packages\NCrunch.Framework.1.46.0.9\lib\net35\NCrunch.Framework.dll - - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - Always - - - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - Files\1024.png - Always - - - sqlite3.dll - Always - - - Always - - - Always - Designer - - - - Always - - - Always - - - Always - - - PreserveNewest - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Designer - Always - - - Always - - - Always - Designer - - - App.config - - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - Designer - - - Always - - - Always - - - Always - Designer - - - Always - - - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} + Library + Properties + NzbDrone.Core.Test + NzbDrone.Core.Test + v4.0 + 512 + ..\ + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + OnBuildSuccess + + + + ..\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.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + ..\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\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + True + + + ..\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 + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + + + + + + + + + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + + ..\packages\NCrunch.Framework.1.46.0.9\lib\net35\NCrunch.Framework.dll + + + ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + Always + + + + + + + {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} + Marr.Data + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} + NzbDrone.SignalR + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + + + Files\1024.png + Always + + + sqlite3.dll + Always + + + Always + + + Always + Designer + + + + Always + + + Always + + + Always + + + PreserveNewest + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Designer + Always + + + Always + + + Always + Designer + + + App.config + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Designer + + + Always + + + Always + + + Always + Designer + + + Always + + + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 164b69a3f..0efd582ac 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index f733517e7..f9e94cd45 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -1,1395 +1,1397 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - Library - Properties - NzbDrone.Core - NzbDrone.Core - v4.0 - - - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\ - true - - - x86 - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - - - - ..\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 - - - False - ..\Libraries\Growl.Connector.dll - - - False - ..\Libraries\Growl.CoreLibrary.dll - - - False - ..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll - - - False - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True - - - - - - - - - - - - - - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - - - ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - - Code - - - Code - - - - - - - - - Code - - - - - - - - - - - Code - - - - - - - - - - - - Code - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - - Always - - - - - - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {411a9e0e-fdc6-4e25-828a-0c2cd1cd96f8} - MonoTorrent - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - - - Resources\Logo\64.png - - - - - MediaInfo.dll - PreserveNewest - - - libmediainfo.0.dylib - PreserveNewest - - - libsqlite3.0.dylib - PreserveNewest - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + Library + Properties + NzbDrone.Core + NzbDrone.Core + v4.0 + + + 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + ..\ + true + + + x86 + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + ..\..\_output\ + TRACE + prompt + 4 + + + + ..\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 + + + False + ..\Libraries\Growl.Connector.dll + + + False + ..\Libraries\Growl.CoreLibrary.dll + + + False + ..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll + + + False + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + + ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll + True + + + + + + + + + + + + + + + + + ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll + + + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + Code + + + + Code + + + Code + + + + + + + + + Code + + + + + + + + + + + Code + + + + + + + + + + + + Code + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + + Always + + + + + + + + + + {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} + Marr.Data + + + {411a9e0e-fdc6-4e25-828a-0c2cd1cd96f8} + MonoTorrent + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + + + Resources\Logo\64.png + + + + + MediaInfo.dll + PreserveNewest + + + libmediainfo.0.dylib + PreserveNewest + + + libsqlite3.0.dylib + PreserveNewest + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index a8050c0ca..530314fd0 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 de791d870..329294639 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -1,211 +1,218 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {95C11A9E-56ED-456A-8447-2C89C1139266} - Library - Properties - Radarr.Host - Radarr.Host - v4.0 - 512 - - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\ - true - - - x86 - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - true - BasicCorrectnessRules.ruleset - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - - - OnOutputUpdated - - - Radarr.ico - - - - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll - - - False - ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll - - - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\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 - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - ..\Libraries\Interop.NetFwTypeLib.dll - False - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - {1B9A82C4-BCA1-4834-A33E-226F17BE070B} - Microsoft.AspNet.SignalR.Core - - - {2B8C6DAD-4D85-41B1-83FD-248D9F347522} - Microsoft.AspNet.SignalR.Owin - - - {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} - NzbDrone.Api - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {95C11A9E-56ED-456A-8447-2C89C1139266} + Library + Properties + Radarr.Host + Radarr.Host + v4.0 + 512 + + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + ..\ + true + + + x86 + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + true + BasicCorrectnessRules.ruleset + + + x86 + pdbonly + true + ..\..\_output\ + TRACE + prompt + 4 + + + OnOutputUpdated + + + Radarr.ico + + + + + False + ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + + + False + ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll + + + False + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\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 + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + ..\Libraries\Interop.NetFwTypeLib.dll + False + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + + Component + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + {1B9A82C4-BCA1-4834-A33E-226F17BE070B} + Microsoft.AspNet.SignalR.Core + + + {2B8C6DAD-4D85-41B1-83FD-248D9F347522} + Microsoft.AspNet.SignalR.Owin + + + {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} + NzbDrone.Api + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} + NzbDrone.SignalR + + + + + + + + + + + xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)" - + cp -rv $(SolutionDir)Libraries\Sqlite\*.* $(TargetDir) - - + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 35fe8a180..6c3e3c3fc 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 cdb4734d4..7e6d7de48 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -1,195 +1,199 @@ - - - - - Debug - x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB} - Library - Properties - NzbDrone.Integration.Test - NzbDrone.Integration.Test - v4.0 - 512 - ..\ - true - 12.0.0 - 2.0 - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll - True - - - ..\packages\Microsoft.AspNet.SignalR.Client.1.2.1\lib\net40\Microsoft.AspNet.SignalR.Client.dll - - - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll - - - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\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 - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True - - - - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.config - - - - - - {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} - NzbDrone.Api - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - sqlite3.dll - Always - - - - - - - + + + + + Debug + x86 + {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB} + Library + Properties + NzbDrone.Integration.Test + NzbDrone.Integration.Test + v4.0 + 512 + ..\ + true + 12.0.0 + 2.0 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + ..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll + True + + + ..\packages\Microsoft.AspNet.SignalR.Client.1.2.1\lib\net40\Microsoft.AspNet.SignalR.Client.dll + + + False + ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + + + ..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll + + + False + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\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 + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll + True + + + + + + + + + + + + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + App.config + + + + + + {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} + NzbDrone.Api + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + {95C11A9E-56ED-456A-8447-2C89C1139266} + NzbDrone.Host + + + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} + NzbDrone.SignalR + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + + + sqlite3.dll + Always + + + + + + + xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*" "$(TargetDir)" xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*" "$(TargetDir)" - + cp -rv $(SolutionDir)\..\_output\NzbDrone.Mono.* $(TargetDir) cp -rv $(SolutionDir)\..\_output\NzbDrone.Windows.* $(TargetDir) - - + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 2555551c3..937417ead 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.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 3de5073b7..e50a3ee17 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -1,96 +1,100 @@ - - - - - Debug - AnyCPU - {15AD7579-A314-4626-B556-663F51D97CD1} - Library - Properties - NzbDrone.Mono - NzbDrone.Mono - v4.0 - 512 - - ..\ - true - - - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - - - - - False - ..\Libraries\Mono.Posix.dll - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - - - - + + + + + Debug + AnyCPU + {15AD7579-A314-4626-B556-663F51D97CD1} + Library + Properties + NzbDrone.Mono + NzbDrone.Mono + v4.0 + 512 + + ..\ + true + + + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + ..\..\_output\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + ..\..\_output\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + + + + + False + ..\Libraries\Mono.Posix.dll + + + + + + + + + + + + + + + {f2be0fdf-6e47-4827-a420-dd4ef82407f8} + NzbDrone.Common + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config index 44135561f..6aa24212b 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.Test.Common/App.config b/src/NzbDrone.Test.Common/App.config index bb5601bf6..1318017d2 100644 --- a/src/NzbDrone.Test.Common/App.config +++ b/src/NzbDrone.Test.Common/App.config @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 0a2f8bd54..e92511b41 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -1,129 +1,133 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - Library - Properties - NzbDrone.Test.Common - NzbDrone.Test.Common - v4.0 - 512 - ..\ - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - True - - - - - - - - - - ..\packages\CommonServiceLocator.1.0\lib\NET35\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 - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - Always - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + Library + Properties + NzbDrone.Test.Common + NzbDrone.Test.Common + v4.0 + 512 + ..\ + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll + True + + + + + + + + + + + + + + ..\packages\CommonServiceLocator.1.0\lib\NET35\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 + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + Always + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} + NzbDrone.Core + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index 56671ca77..7bc3af495 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -1,11 +1,11 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 7f6c74468..694d4219d 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -1,108 +1,112 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} - Library - Properties - NzbDrone.Update.Test - NzbDrone.Update.Test - v4.0 - - - 512 - ..\ - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll - True - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll - True - - - - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - - - - - - - - - App.config - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} - NzbDrone.Update - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} + Library + Properties + NzbDrone.Update.Test + NzbDrone.Update.Test + v4.0 + + + 512 + ..\ + true + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll + True + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll + True + + + + + + + + + + + + + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + + + + + + + + + + + App.config + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + NzbDrone.Test.Common + + + {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} + NzbDrone.Update + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index f12ad74d1..36c0e6d75 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 b296eabf8..907888c68 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -1,86 +1,93 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} - WinExe - Properties - NzbDrone.Update - Radarr.Update - v4.0 - - - 512 - ..\ - true - - - x86 - true - full - false - ..\..\_output\NzbDrone.Update\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - ..\..\_output\NzbDrone.Update\ - TRACE - prompt - 4 - - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} + WinExe + Properties + NzbDrone.Update + Radarr.Update + v4.0 + + + 512 + ..\ + true + + + x86 + true + full + false + ..\..\_output\NzbDrone.Update\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + ..\..\_output\NzbDrone.Update\ + TRACE + prompt + 4 + + + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + + + + + + + + + + + + + + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} + NzbDrone.Common + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index a9cb2e050..b0d27c27b 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/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 7a7ab799f..66841fa31 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -1,86 +1,90 @@ - - - - - Debug - AnyCPU - {911284D3-F130-459E-836C-2430B6FBF21D} - Library - Properties - NzbDrone.Windows - NzbDrone.Windows - v4.0 - 512 - ..\ - true - - - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - - - - + + + + + Debug + AnyCPU + {911284D3-F130-459E-836C-2430B6FBF21D} + Library + Properties + NzbDrone.Windows + NzbDrone.Windows + v4.0 + 512 + ..\ + true + + + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + ..\..\_output\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + ..\..\_output\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + + + + + + + + + + + + {f2be0fdf-6e47-4827-a420-dd4ef82407f8} + NzbDrone.Common + + + + + + + --> \ No newline at end of file diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config index 44135561f..6aa24212b 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 9d76df2dd..2e3ec02ab 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -1,179 +1,186 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - WinExe - Properties - NzbDrone - Radarr - v4.0 - 512 - - - false - ..\ - true - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - x86 - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - true - BasicCorrectnessRules.ruleset - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - - - Resources\Radarr.ico - - - NzbDrone.WindowsApp - - - OnOutputUpdated - - - - False - ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll - - - False - ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll - - - False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - - - - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - Properties\SharedAssemblyInfo.cs - - - - - True - True - Resources.resx - - - Form - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - {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 - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - app.config - - - - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {D12F7F2F-8A3C-415F-88FA-6DD061A84869} + WinExe + Properties + NzbDrone + Radarr + v4.0 + 512 + + + false + ..\ + true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + x86 + true + full + false + ..\..\_output\ + DEBUG;TRACE + prompt + 4 + true + BasicCorrectnessRules.ruleset + + + x86 + pdbonly + true + ..\..\_output\ + TRACE + prompt + 4 + + + Resources\Radarr.ico + + + NzbDrone.WindowsApp + + + OnOutputUpdated + + + + + False + ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll + + + False + ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + + + + + + + + + + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + + + + Properties\SharedAssemblyInfo.cs + + + + + True + True + Resources.resx + + + Form + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + {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 + + + {95C11A9E-56ED-456A-8447-2C89C1139266} + NzbDrone.Host + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + app.config + + + + + + + + + + + + + xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)" - - + + + --> \ No newline at end of file diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 5f3ede259..48ed9e74d 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/tools/packages.config b/tools/packages.config new file mode 100644 index 000000000..36afb6f92 --- /dev/null +++ b/tools/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file