diff --git a/build.sh b/build.sh index 2d8703f48..5fd89109d 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,6 @@ outputFolderLinux='./_output_linux' outputFolderMacOS='./_output_macos' outputFolderMacOSApp='./_output_macos_app' testPackageFolder='./_tests/' -testSearchPattern='*.Test/bin/x86/Release' sourceFolder='./src' slnFile=$sourceFolder/Sonarr.sln updateFolder=$outputFolder/Sonarr.Update @@ -47,7 +46,7 @@ UpdateVersionNumber() verBuild=`echo "${BUILD_NUMBER}" | cut -d. -f4` BUILD_NUMBER=$verMajorMinorRevision.$verBuild echo "##teamcity[buildNumber '$BUILD_NUMBER']" - sed -i "s/^[[]assembly: Assembly\(File\|Informational\)\?Version[(]\"[0-9.*]\+\"[)]/[assembly: Assembly\1Version(\"$BUILD_NUMBER\")/g" ./src/NzbDrone*/Properties/AssemblyInfo.cs ./src/Sonarr*/Properties/AssemblyInfo.cs ./src/ServiceHelpers/*/Properties/AssemblyInfo.cs ./src/Common/CommonVersionInfo.cs + sed -i "s/[0-9.*]\+<\/AssemblyVersion>/$BUILD_NUMBER<\/AssemblyVersion>/g" ./src/Directory.Build.props fi } @@ -122,6 +121,7 @@ Build() ProgressStart 'Build' rm -rf $outputFolder + rm -rf $testPackageFolder if [ $runtime = "dotnet" ] ; then BuildWithMSBuild @@ -270,18 +270,12 @@ PackageTests() { ProgressStart 'Creating Test Package' - rm -rf $testPackageFolder - mkdir $testPackageFolder - - find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \; - if [ $runtime = "dotnet" ] ; then - $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder + $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder else - mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder + mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder fi - cp $outputFolder/*.dll $testPackageFolder cp ./test.sh $testPackageFolder echo "Creating MDBs for tests" diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..11063a6f8 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,69 @@ + + + + $(MSBuildThisFileDirectory)..\ + + + Library + Test + Exe + Exe + Exe + Exe + Update + + + false + true + true + true + + + + + $(SonarrRootDir)_temp\obj\$(Configuration)\$(MSBuildProjectName)\ + $(SonarrRootDir)_temp\bin\$(Configuration)\$(MSBuildProjectName)\ + + + $(SonarrRootDir)_output\ + $(SonarrRootDir)_tests\ + $(SonarrRootDir)_output\Sonarr.Update\ + + + $([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(IntermediateOutputPath)')) + $([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(OutputPath)')) + + + full + true + + + + + true + true + + + + + Sonarr + sonarr.tv + Copyright 2014-$([System.DateTime]::Now.ToString('yyyy')) sonarr.tv (GNU General Public v3) + + + 10.0.0.* + + false + false + + False + + + + + false + + + $(MSBuildProjectName.Replace('Sonarr','NzbDrone')) + + \ No newline at end of file diff --git a/src/LogentriesCore/LogentriesCore.csproj b/src/LogentriesCore/LogentriesCore.csproj index eb2d0c560..b0d212bae 100644 --- a/src/LogentriesCore/LogentriesCore.csproj +++ b/src/LogentriesCore/LogentriesCore.csproj @@ -1,86 +1,13 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {90D6E9FC-7B88-4E1B-B018-8FA742274558} - Library - Properties - LogentriesCore - LogentriesCore - 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 + net462 + x86 + + 2.6.0.0 + false + false - - ..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - - - - - - - - - + - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/LogentriesCore/Properties/AssemblyInfo.cs b/src/LogentriesCore/Properties/AssemblyInfo.cs deleted file mode 100644 index b720a8243..000000000 --- a/src/LogentriesCore/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LogentriesCore")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LogentriesCore")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("14055980-6937-4745-9449-dabf47c1d892")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.6.0.0")] -[assembly: AssemblyFileVersion("2.6.0.0")] diff --git a/src/LogentriesCore/packages.config b/src/LogentriesCore/packages.config deleted file mode 100644 index e0b68ff6f..000000000 --- a/src/LogentriesCore/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index fba6880c2..413be33da 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -1,100 +1,16 @@ - - + - 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 + net462 + x86 + + 2.4.0.0 + false + false - - ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll - - - - - - - - - - - - + - - - - - - - + - - - {90D6E9FC-7B88-4E1B-B018-8FA742274558} - LogentriesCore - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/LogentriesNLog/Properties/AssemblyInfo.cs b/src/LogentriesNLog/Properties/AssemblyInfo.cs deleted file mode 100644 index f9479b9dc..000000000 --- a/src/LogentriesNLog/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LogentriesNLog")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LogentriesNLog")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7e04ff2d-ea59-4b62-969d-72bd3e37c684")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.0.0")] -[assembly: AssemblyFileVersion("2.4.0.0")] diff --git a/src/LogentriesNLog/packages.config b/src/LogentriesNLog/packages.config deleted file mode 100644 index 6f6ef792a..000000000 --- a/src/LogentriesNLog/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Marr.Data/Marr.Data.csproj b/src/Marr.Data/Marr.Data.csproj index 449ee5e38..e57aa9941 100644 --- a/src/Marr.Data/Marr.Data.csproj +++ b/src/Marr.Data/Marr.Data.csproj @@ -1,154 +1,10 @@ - - + - Debug - x86 - 9.0.30729 - 2.0 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Library - Properties - Marr.Data - Marr.Data - v4.0 - 512 - - - 3.5 - - - - ..\ - true + net462 + x86 + + 3.17.0.0 + false + false - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - - 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/Marr.Data/Properties/AssemblyInfo.cs b/src/Marr.Data/Properties/AssemblyInfo.cs deleted file mode 100644 index 8b5025d1a..000000000 --- a/src/Marr.Data/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Marr.Data")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Marr.Data")] -[assembly: AssemblyCopyright("Copyright © 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Share internals -[assembly: InternalsVisibleTo("Marr.Data.Relationships")] -[assembly: InternalsVisibleTo("Marr.Data.Tests")] - - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6864f4d2-cd0f-4720-9c15-3085f1aa8293")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.17.*")] -[assembly: AssemblyInformationalVersion("3.17")] diff --git a/src/MonoTorrent/MonoTorrent.csproj b/src/MonoTorrent/MonoTorrent.csproj index dd8fd6907..8fb49e77b 100644 --- a/src/MonoTorrent/MonoTorrent.csproj +++ b/src/MonoTorrent/MonoTorrent.csproj @@ -1,117 +1,8 @@ - - + - Debug - x86 - Local - 9.0.21022 - 2.0 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8} - Library - MonoTorrent - MonoTorrent - - - JScript - Grid - IE50 - false - - - MonoTorrent - - - 3.5 - - - v4.0 - - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\ + net462 + x86 + + 9.0.21022 - - x86 - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - - - - - - \ No newline at end of file + diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj deleted file mode 100644 index 6897b0f7b..000000000 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Debug - x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B} - Library - Properties - NzbDrone.Api.Test - Sonarr.Api.Test - v4.6.2 - 512 - ..\ - true - 12.0.0 - 2.0 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll - - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - - - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Sonarr.Http - - - - - App.config - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index bc1d4a443..000000000 --- a/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Api.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Api.Test")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("260b2ff9-d3b7-4d8a-b720-a12c93d045e5")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj new file mode 100644 index 000000000..d3cd67585 --- /dev/null +++ b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj @@ -0,0 +1,14 @@ + + + net462 + x86 + + + + + + + + + + diff --git a/src/NzbDrone.Api.Test/packages.config b/src/NzbDrone.Api.Test/packages.config deleted file mode 100644 index 5c7d283cd..000000000 --- a/src/NzbDrone.Api.Test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj deleted file mode 100644 index 175d4a7e7..000000000 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ /dev/null @@ -1,223 +0,0 @@ - - - - - Debug - x86 - {FD286DF8-2D3A-4394-8AD5-443FADE55FB2} - Library - Properties - NzbDrone.Api - Sonarr.Api - v4.6.2 - 512 - ..\ - true - - - 12.0.0 - 2.0 - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\Ical.Net.2.2.32\lib\net46\antlr.runtime.dll - - - ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.Collections.dll - - - ..\packages\Nancy.1.4.4\lib\net40\Nancy.dll - - - ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - - - ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\NodaTime.dll - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {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 - - - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Sonarr.Http - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Api/Properties/AssemblyInfo.cs b/src/NzbDrone.Api/Properties/AssemblyInfo.cs deleted file mode 100644 index 3848d0c83..000000000 --- a/src/NzbDrone.Api/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Sonarr.Api")] - -[assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")] - -[assembly: AssemblyVersion("10.0.0.*")] - -[assembly: InternalsVisibleTo("Sonarr.Core")] diff --git a/src/NzbDrone.Api/Sonarr.Api.csproj b/src/NzbDrone.Api/Sonarr.Api.csproj new file mode 100644 index 000000000..52389eeb8 --- /dev/null +++ b/src/NzbDrone.Api/Sonarr.Api.csproj @@ -0,0 +1,18 @@ + + + net462 + x86 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Api/app.config b/src/NzbDrone.Api/app.config deleted file mode 100644 index a822016cb..000000000 --- a/src/NzbDrone.Api/app.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config deleted file mode 100644 index 9345b21b6..000000000 --- a/src/NzbDrone.Api/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.App.Test/License.txt b/src/NzbDrone.App.Test/License.txt deleted file mode 100644 index 5ead6991a..000000000 --- a/src/NzbDrone.App.Test/License.txt +++ /dev/null @@ -1,22 +0,0 @@ - Copyright (c) 2010 Darren Cauthon - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj deleted file mode 100644 index dd99f67ea..000000000 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} - Library - Properties - NzbDrone.App.Test - Sonarr.App.Test - v4.6.2 - 512 - ..\ - true - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.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 - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {911284d3-f130-459e-836c-2430b6fbf21d} - NzbDrone.Windows - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Sonarr.Api.V3 - - - {5370bff7-1bd7-46bc-af06-7d9ea5cda1d6} - Sonarr.Http - - - - - sqlite3.dll - Always - - - - - - - - - xcopy /s /y "$(SolutionDir)\..\_output\Sonarr.Mono.*" "$(TargetDir)" - xcopy /s /y "$(SolutionDir)\..\_output\Sonarr.Windows.*" "$(TargetDir)" - - - cp -rv $(SolutionDir)\..\_output\Sonarr.Mono.* $(TargetDir) || true - cp -rv $(SolutionDir)\..\_output\Sonarr.Windows.* $(TargetDir) || true - - - - \ No newline at end of file diff --git a/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index e04468025..000000000 --- a/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.App.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sonarr.App.Test")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b47d34ef-05e8-4826-8a57-9dd05106c964")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.App.Test/app.config b/src/NzbDrone.App.Test/app.config deleted file mode 100644 index a6a2b7fa9..000000000 --- a/src/NzbDrone.App.Test/app.config +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config deleted file mode 100644 index 0fbe30367..000000000 --- a/src/NzbDrone.App.Test/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ 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 deleted file mode 100644 index 5b29c525e..000000000 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - Debug - x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3} - Library - Properties - NzbDrone.Automation.Test - Sonarr.Automation.Test - v4.6.2 - 512 - ..\ - true - 12.0.0 - 2.0 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - - - - - ..\packages\Selenium.WebDriver.3.2.0\lib\net40\WebDriver.dll - - - ..\packages\Selenium.Support.3.2.0\lib\net40\WebDriver.Support.dll - - - - - - - - - - - - {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/Properties/AssemblyInfo.cs b/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 2a5688499..000000000 --- a/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Automation.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Automation.Test")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6b8945f5-f5b5-4729-865d-f958fbd673d9")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj new file mode 100644 index 000000000..4abfdf265 --- /dev/null +++ b/src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj @@ -0,0 +1,12 @@ + + + net462 + x86 + + + + + + + + diff --git a/src/NzbDrone.Automation.Test/app.config b/src/NzbDrone.Automation.Test/app.config index dcfa42729..d660afa84 100644 --- a/src/NzbDrone.Automation.Test/app.config +++ b/src/NzbDrone.Automation.Test/app.config @@ -1,19 +1,8 @@  - - - - - - - - - - - - - - - + + + + diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config deleted file mode 100644 index 8dcf67531..000000000 --- a/src/NzbDrone.Automation.Test/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/License.txt b/src/NzbDrone.Common.Test/License.txt deleted file mode 100644 index 5ead6991a..000000000 --- a/src/NzbDrone.Common.Test/License.txt +++ /dev/null @@ -1,22 +0,0 @@ - Copyright (c) 2010 Darren Cauthon - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj deleted file mode 100644 index f29c9f5a7..000000000 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ /dev/null @@ -1,165 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} - Library - Properties - NzbDrone.Common.Test - Sonarr.Common.Test - v4.6.2 - 512 - ..\ - true - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.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 - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {FAFB5948-A222-4CF6-AD14-026BE7564802} - NzbDrone.Test.Dummy - - - {911284d3-f130-459e-836c-2430b6fbf21d} - NzbDrone.Windows - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Sonarr.Api.V3 - - - - - - - - - - - xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)" - - - \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj new file mode 100644 index 000000000..12ee65a6e --- /dev/null +++ b/src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj @@ -0,0 +1,19 @@ + + + net462 + x86 + + + + + + + + + + + + PreserveNewest + + + diff --git a/src/NzbDrone.Common.Test/WebClientTests.cs b/src/NzbDrone.Common.Test/WebClientTests.cs index 899fbadbd..46a3561c8 100644 --- a/src/NzbDrone.Common.Test/WebClientTests.cs +++ b/src/NzbDrone.Common.Test/WebClientTests.cs @@ -23,7 +23,8 @@ namespace NzbDrone.Common.Test [TestCase("http://")] public void DownloadString_should_throw_on_error(string url) { - Assert.Throws(() => Subject.DownloadString(url)); + Action action = () => Subject.DownloadString(url); + action.Should().Throw(); ExceptionVerification.ExpectedWarns(1); } } diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config deleted file mode 100644 index 606d1039a..000000000 --- a/src/NzbDrone.Common.Test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj deleted file mode 100644 index bb752c062..000000000 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ /dev/null @@ -1,271 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - Library - Properties - NzbDrone.Common - Sonarr.Common - v4.6.2 - 512 - ..\ - true - - - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.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.4.0\lib\net45\SharpRaven.dll - - - ..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\SocksWebProxy.dll - - - - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - - - - - - {74420a79-cc16-442c-8b1e-7c1b913844f0} - CurlSharp - - - {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} - LogentriesNLog - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Common/Properties/AssemblyInfo.cs b/src/NzbDrone.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 71909244c..000000000 --- a/src/NzbDrone.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Common")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b6eaa144-e13b-42e5-a738-c60d89c0f728")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs deleted file mode 100644 index 0a88c5981..000000000 --- a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Gets updated at build time by TeamCity to branch name -[assembly: AssemblyConfiguration("debug")] - -[assembly: AssemblyCompany("sonarr.tv")] -[assembly: AssemblyProduct("Sonarr")] -[assembly: AssemblyCopyright("GNU General Public v3")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] diff --git a/src/NzbDrone.Common/Sonarr.Common.csproj b/src/NzbDrone.Common/Sonarr.Common.csproj new file mode 100644 index 000000000..f1011a919 --- /dev/null +++ b/src/NzbDrone.Common/Sonarr.Common.csproj @@ -0,0 +1,33 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + + + + True + True + ExceptionMessages.resx + + + ResXFileCodeGenerator + ExceptionMessages.Designer.cs + + + \ No newline at end of file diff --git a/src/NzbDrone.Common/app.config b/src/NzbDrone.Common/app.config deleted file mode 100644 index a3afbaf46..000000000 --- a/src/NzbDrone.Common/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config deleted file mode 100644 index a149463ba..000000000 --- a/src/NzbDrone.Common/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj deleted file mode 100644 index 96890d9f0..000000000 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} - Exe - Properties - NzbDrone.Console - Sonarr.Console - v4.6.2 - 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 - false - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - false - - - ..\NzbDrone.Host\Sonarr.ico - - - NzbDrone.Console.ConsoleApp - - - OnBuildSuccess - - - app.manifest - - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\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 - - - - - {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/Properties/AssemblyInfo.cs b/src/NzbDrone.Console/Properties/AssemblyInfo.cs deleted file mode 100644 index 6315d987b..000000000 --- a/src/NzbDrone.Console/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sonarr.Host")] -[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] - -[assembly: AssemblyVersion("10.0.0.*")] \ No newline at end of file diff --git a/src/NzbDrone.Console/Sonarr.Console.csproj b/src/NzbDrone.Console/Sonarr.Console.csproj new file mode 100644 index 000000000..3ab1fbef4 --- /dev/null +++ b/src/NzbDrone.Console/Sonarr.Console.csproj @@ -0,0 +1,13 @@ + + + Exe + net462 + x86 + + ..\NzbDrone.Host\Sonarr.ico + app.manifest + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Console/app.config b/src/NzbDrone.Console/app.config index a6a2b7fa9..2b0b69660 100644 --- a/src/NzbDrone.Console/app.config +++ b/src/NzbDrone.Console/app.config @@ -1,2 +1,14 @@  - \ No newline at end of file + + + + + + + + + + + + + diff --git a/src/NzbDrone.Console/app.manifest b/src/NzbDrone.Console/app.manifest index 8e6eb2fea..eb0054be9 100644 --- a/src/NzbDrone.Console/app.manifest +++ b/src/NzbDrone.Console/app.manifest @@ -4,33 +4,12 @@ - - - - - - - - diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config deleted file mode 100644 index ec2519895..000000000 --- a/src/NzbDrone.Console/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/MediaCoverTests/ImageResizerFixture.cs b/src/NzbDrone.Core.Test/MediaCoverTests/ImageResizerFixture.cs index dc37776fa..dd9ae13d0 100644 --- a/src/NzbDrone.Core.Test/MediaCoverTests/ImageResizerFixture.cs +++ b/src/NzbDrone.Core.Test/MediaCoverTests/ImageResizerFixture.cs @@ -4,13 +4,12 @@ using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Common.Disk; -using NzbDrone.Core.MediaCover; using NzbDrone.Core.Test.Framework; namespace NzbDrone.Core.Test.MediaCoverTests { [TestFixture] - public class ImageResizerFixture : CoreTest + public class ImageResizerFixture : CoreTest { [SetUp] public void SetUp() diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj deleted file mode 100644 index eccad5401..000000000 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ /dev/null @@ -1,673 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} - Library - Properties - NzbDrone.Core.Test - Sonarr.Core.Test - v4.6.2 - 512 - ..\ - true - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - OnBuildSuccess - - - - ..\packages\AutoMoq.1.8.1.0\lib\net40\AutoMoq.dll - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\FluentMigrator.1.6.2\lib\40\FluentMigrator.dll - - - ..\packages\FluentMigrator.Runner.1.6.2\lib\40\FluentMigrator.Runner.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 - True - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - - - - - - - - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - Files\1024.png - Always - - - sqlite3.dll - Always - - - Designer - Always - - - Always - Designer - - - Always - - - Always - - - - Always - - - Always - - - Always - - - PreserveNewest - - - 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 - - - Always - - - Always - - - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index e84bb3c69..000000000 --- a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sonarr.Core.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sonarr.Core.Test")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("699aed1b-015e-4f0d-9c81-d5557b05d260")] - -[assembly: AssemblyVersion("10.0.0.*")] - -[assembly: InternalsVisibleTo("Sonarr.Core")] diff --git a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj new file mode 100644 index 000000000..cc9302a0d --- /dev/null +++ b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj @@ -0,0 +1,22 @@ + + + net462 + x86 + + + + + + + + + + + Files\1024.png + PreserveNewest + + + PreserveNewest + + + diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config deleted file mode 100644 index 3d784308f..000000000 --- a/src/NzbDrone.Core.Test/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Core/App.config b/src/NzbDrone.Core/App.config deleted file mode 100644 index 59064c6a8..000000000 --- a/src/NzbDrone.Core/App.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj deleted file mode 100644 index 9e2475c9e..000000000 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ /dev/null @@ -1,1377 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - Library - Properties - NzbDrone.Core - Sonarr.Core - v4.6.2 - - - 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 - false - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - false - - - - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - - ..\packages\FluentMigrator.1.6.2\lib\40\FluentMigrator.dll - - - ..\packages\FluentMigrator.Runner.1.6.2\lib\40\FluentMigrator.Runner.dll - - - ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - - False - ..\Libraries\Growl.Connector.dll - - - False - ..\Libraries\Growl.CoreLibrary.dll - - - ..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll - - - ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.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/Properties/AnalysisRules.ruleset b/src/NzbDrone.Core/Properties/AnalysisRules.ruleset deleted file mode 100644 index 9925a186f..000000000 --- a/src/NzbDrone.Core/Properties/AnalysisRules.ruleset +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Core/Properties/AssemblyInfo.cs b/src/NzbDrone.Core/Properties/AssemblyInfo.cs index 4ebaab27b..709f9de53 100644 --- a/src/NzbDrone.Core/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Core/Properties/AssemblyInfo.cs @@ -1,16 +1,3 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sonarr.Core")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3C29FEF7-4B07-49ED-822E-1C29DC49BFAB")] - -[assembly: AssemblyVersion("10.0.0.*")] - -[assembly: InternalsVisibleTo("Sonarr.Core.Test")] +[assembly: InternalsVisibleTo("Sonarr.Core.Test")] \ No newline at end of file diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj new file mode 100644 index 000000000..70f42cd39 --- /dev/null +++ b/src/NzbDrone.Core/Sonarr.Core.csproj @@ -0,0 +1,47 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + + + + + ..\Libraries\Growl.Connector.dll + + + ..\Libraries\Growl.CoreLibrary.dll + + + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + + + Resources\Logo\64.png + + + PreserveNewest + + + PreserveNewest + + + \ No newline at end of file diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config deleted file mode 100644 index 2c1f2cbe8..000000000 --- a/src/NzbDrone.Core/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.App.Test/ContainerFixture.cs b/src/NzbDrone.Host.Test/ContainerFixture.cs similarity index 100% rename from src/NzbDrone.App.Test/ContainerFixture.cs rename to src/NzbDrone.Host.Test/ContainerFixture.cs diff --git a/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs b/src/NzbDrone.Host.Test/NzbDroneProcessServiceFixture.cs similarity index 100% rename from src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs rename to src/NzbDrone.Host.Test/NzbDroneProcessServiceFixture.cs diff --git a/src/NzbDrone.App.Test/RouterTest.cs b/src/NzbDrone.Host.Test/RouterTest.cs similarity index 100% rename from src/NzbDrone.App.Test/RouterTest.cs rename to src/NzbDrone.Host.Test/RouterTest.cs diff --git a/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj new file mode 100644 index 000000000..e25fc31df --- /dev/null +++ b/src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj @@ -0,0 +1,13 @@ + + + net462 + x86 + + + + + + + + + diff --git a/src/NzbDrone.Api.Test/app.config b/src/NzbDrone.Host.Test/app.config similarity index 100% rename from src/NzbDrone.Api.Test/app.config rename to src/NzbDrone.Host.Test/app.config diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj deleted file mode 100644 index 727f69349..000000000 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {95C11A9E-56ED-456A-8447-2C89C1139266} - Library - Properties - NzbDrone.Host - Sonarr.Host - v4.6.2 - 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 - false - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - false - - - OnOutputUpdated - - - - ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll - - - ..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.4.0\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll - - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Diagnostics.3.1.0\lib\net45\Microsoft.Owin.Diagnostics.dll - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - - ..\packages\Microsoft.Owin.Host.SystemWeb.2.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll - - - ..\packages\Nancy.1.4.4\lib\net40\Nancy.dll - - - ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - - - ..\Libraries\Interop.NetFwTypeLib.dll - True - - - ..\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 - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {5370bff7-1bd7-46bc-af06-7d9ea5cda1d6} - Sonarr.Http - - - - - - - - - - - - - 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/Properties/AssemblyInfo.cs b/src/NzbDrone.Host/Properties/AssemblyInfo.cs deleted file mode 100644 index a6b28134f..000000000 --- a/src/NzbDrone.Host/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sonarr.exe")] -[assembly: Guid("C2172AF4-F9A6-4D91-BAEE-C2E4EE680613")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Host/Sonarr.Host.csproj b/src/NzbDrone.Host/Sonarr.Host.csproj new file mode 100644 index 000000000..8d558a33c --- /dev/null +++ b/src/NzbDrone.Host/Sonarr.Host.csproj @@ -0,0 +1,26 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + ..\Libraries\Interop.NetFwTypeLib.dll + True + + + + \ No newline at end of file diff --git a/src/NzbDrone.Host/app.config b/src/NzbDrone.Host/app.config deleted file mode 100644 index e5a829c44..000000000 --- a/src/NzbDrone.Host/app.config +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config deleted file mode 100644 index f0576b690..000000000 --- a/src/NzbDrone.Host/packages.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 0aafb8dac..000000000 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - Debug - x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB} - Library - Properties - NzbDrone.Integration.Test - Sonarr.Integration.Test - v4.6.2 - 512 - ..\ - true - 12.0.0 - 2.0 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - - ..\packages\Microsoft.AspNet.SignalR.Client.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Client.dll - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True - - - ..\packages\Nancy.1.4.4\lib\net40\Nancy.dll - - - ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.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\net46\RestSharp.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 - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Sonarr.Http - - - - - sqlite3.dll - Always - - - - - - - - - xcopy /s /y "$(SolutionDir)\..\_output\Sonarr.Mono.*" "$(TargetDir)" - xcopy /s /y "$(SolutionDir)\..\_output\Sonarr.Windows.*" "$(TargetDir)" - - - cp -rv $(SolutionDir)\..\_output\Sonarr.Mono.* $(TargetDir) - cp -rv $(SolutionDir)\..\_output\Sonarr.Windows.* $(TargetDir) - - - - \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index f444edc58..000000000 --- a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Smoke.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Smoke.Test")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8a49cb1d-87ac-42f9-a582-607365a6bd79")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj new file mode 100644 index 000000000..f09998d8e --- /dev/null +++ b/src/NzbDrone.Integration.Test/Sonarr.Integration.Test.csproj @@ -0,0 +1,13 @@ + + + net462 + x86 + + + + + + + + + diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config deleted file mode 100644 index a66179e0e..000000000 --- a/src/NzbDrone.Integration.Test/packages.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 3921f51c3..000000000 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770} - Library - Properties - NzbDrone.Libraries.Test - Sonarr.Libraries.Test - v4.6.2 - 512 - ..\ - true - 12.0.0 - 2.0 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - - - {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.Libraries.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index ebd2dcebf..000000000 --- a/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Libraries.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Libraries.Test")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("32ec29e2-40ba-4050-917d-e295d85d4969")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj new file mode 100644 index 000000000..8a7864ca0 --- /dev/null +++ b/src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj @@ -0,0 +1,9 @@ + + + net462 + x86 + + + + + diff --git a/src/NzbDrone.Libraries.Test/app.config b/src/NzbDrone.Libraries.Test/app.config index dcfa42729..d660afa84 100644 --- a/src/NzbDrone.Libraries.Test/app.config +++ b/src/NzbDrone.Libraries.Test/app.config @@ -1,19 +1,8 @@  - - - - - - - - - - - - - - - + + + + diff --git a/src/NzbDrone.Libraries.Test/packages.config b/src/NzbDrone.Libraries.Test/packages.config deleted file mode 100644 index eae481ad7..000000000 --- a/src/NzbDrone.Libraries.Test/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ 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 deleted file mode 100644 index 048aa6da5..000000000 --- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - AnyCPU - {40D72824-7D02-4A77-9106-8FE0EEA2B997} - Library - Properties - NzbDrone.Mono.Test - Sonarr.Mono.Test - v4.6.2 - 512 - ..\ - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - False - ..\Libraries\Mono.Posix.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - Always - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - - - {15ad7579-a314-4626-b556-663f51d97cd1} - NzbDrone.Mono - - - {caddfce0-7509-4430-8364-2074e1eefca2} - NzbDrone.Test.Common - - - - - - - - Always - - - - - Always - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 8351955ba..000000000 --- a/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Mono.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Mono.Test")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("45299d3c-34ff-48ca-9093-de2f037c38ac")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj new file mode 100644 index 000000000..f6a12231f --- /dev/null +++ b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj @@ -0,0 +1,21 @@ + + + net462 + x86 + + + + + + + + + ..\Libraries\Mono.Posix.dll + + + + + PreserveNewest + + + diff --git a/src/NzbDrone.Mono.Test/app.config b/src/NzbDrone.Mono.Test/app.config index b9b6046ce..d660afa84 100644 --- a/src/NzbDrone.Mono.Test/app.config +++ b/src/NzbDrone.Mono.Test/app.config @@ -1,27 +1,8 @@  - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/NzbDrone.Mono.Test/packages.config b/src/NzbDrone.Mono.Test/packages.config deleted file mode 100644 index b46a2fdaf..000000000 --- a/src/NzbDrone.Mono.Test/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj deleted file mode 100644 index 93f6d698d..000000000 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - - Debug - AnyCPU - {15AD7579-A314-4626-B556-663F51D97CD1} - Library - Properties - NzbDrone.Mono - Sonarr.Mono - v4.6.2 - 512 - - ..\ - true - - - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - ..\packages\NLog.4.5.3\lib\net45\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/Properties/AssemblyInfo.cs b/src/NzbDrone.Mono/Properties/AssemblyInfo.cs deleted file mode 100644 index f81c67622..000000000 --- a/src/NzbDrone.Mono/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Mono")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Mono")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("01493ea5-494f-43bf-be18-8ae4d0708fc6")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Mono/Sonarr.Mono.csproj b/src/NzbDrone.Mono/Sonarr.Mono.csproj new file mode 100644 index 000000000..81739ad2d --- /dev/null +++ b/src/NzbDrone.Mono/Sonarr.Mono.csproj @@ -0,0 +1,17 @@ + + + net462 + x86 + + + + + + + + + + ..\Libraries\Mono.Posix.dll + + + diff --git a/src/NzbDrone.Mono/app.config b/src/NzbDrone.Mono/app.config deleted file mode 100644 index a3afbaf46..000000000 --- a/src/NzbDrone.Mono/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config deleted file mode 100644 index a838a7096..000000000 --- a/src/NzbDrone.Mono/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj deleted file mode 100644 index 2a7274f69..000000000 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ /dev/null @@ -1,115 +0,0 @@ - - - - - Debug - x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - Library - Properties - NzbDrone.SignalR - Sonarr.SignalR - v4.6.2 - 512 - ..\ - true - 12.0.0 - 2.0 - - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll - - - ..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.4.0\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll - - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Diagnostics.3.1.0\lib\net45\Microsoft.Owin.Diagnostics.dll - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - - ..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - {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.SignalR/Properties/AssemblyInfo.cs b/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs deleted file mode 100644 index a786eb581..000000000 --- a/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.SignalR")] -[assembly: Guid("98bd985a-4f23-4201-8ed3-f6f3d7f2a5fe")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.SignalR/Sonarr.SignalR.csproj b/src/NzbDrone.SignalR/Sonarr.SignalR.csproj new file mode 100644 index 000000000..2df9cd9ee --- /dev/null +++ b/src/NzbDrone.SignalR/Sonarr.SignalR.csproj @@ -0,0 +1,17 @@ + + + net462 + x86 + + + + + + + + + + + + + diff --git a/src/NzbDrone.SignalR/app.config b/src/NzbDrone.SignalR/app.config deleted file mode 100644 index 491faf219..000000000 --- a/src/NzbDrone.SignalR/app.config +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NzbDrone.SignalR/packages.config b/src/NzbDrone.SignalR/packages.config deleted file mode 100644 index fb0d4c3e6..000000000 --- a/src/NzbDrone.SignalR/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/App.config b/src/NzbDrone.Test.Common/App.config index dc236ab6b..d1790b089 100644 --- a/src/NzbDrone.Test.Common/App.config +++ b/src/NzbDrone.Test.Common/App.config @@ -4,35 +4,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/NzbDrone.Test.Common/License.txt b/src/NzbDrone.Test.Common/License.txt deleted file mode 100644 index 5ead6991a..000000000 --- a/src/NzbDrone.Test.Common/License.txt +++ /dev/null @@ -1,22 +0,0 @@ - Copyright (c) 2010 Darren Cauthon - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj deleted file mode 100644 index a067d4aee..000000000 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - Library - Properties - NzbDrone.Test.Common - Sonarr.Test.Common - v4.6.2 - 512 - ..\ - true - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.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 - True - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - - - - - - - ..\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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index c4f297d63..7029de422 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -36,7 +36,7 @@ namespace NzbDrone.Test.Common if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\..\\..\\..\\..\\_output\\Sonarr.Console.exe")); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\_output\\Sonarr.Console.exe")); } else { diff --git a/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs b/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 14d420a75..000000000 --- a/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Test.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sonarr.Test.Common")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3e91f6e-d01d-4f20-8255-147cc10f04e3")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj new file mode 100644 index 000000000..5220c1dec --- /dev/null +++ b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj @@ -0,0 +1,20 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config deleted file mode 100644 index fba59d4e3..000000000 --- a/src/NzbDrone.Test.Common/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ 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 deleted file mode 100644 index 40dbe7c2b..000000000 --- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {FAFB5948-A222-4CF6-AD14-026BE7564802} - Exe - Properties - NzbDrone.Test.Dummy - Sonarr.Test.Dummy - v4.6.2 - - - 512 - ..\ - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs b/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs deleted file mode 100644 index cde75a801..000000000 --- a/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Test.Dummy")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sonarr.Test.Dummy")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7b773a86-574d-48c3-9e89-6f2e0dff714b")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Test.Dummy/Sonarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Sonarr.Test.Dummy.csproj new file mode 100644 index 000000000..2da82570e --- /dev/null +++ b/src/NzbDrone.Test.Dummy/Sonarr.Test.Dummy.csproj @@ -0,0 +1,7 @@ + + + Exe + net462 + x86 + + diff --git a/src/NzbDrone.Update.Test/License.txt b/src/NzbDrone.Update.Test/License.txt deleted file mode 100644 index 5ead6991a..000000000 --- a/src/NzbDrone.Update.Test/License.txt +++ /dev/null @@ -1,22 +0,0 @@ - Copyright (c) 2010 Darren Cauthon - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj deleted file mode 100644 index 22e0e4805..000000000 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} - Library - Properties - NzbDrone.Update.Test - Sonarr.Update.Test - v4.6.2 - - - 512 - ..\ - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.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/Properties/AssemblyInfo.cs b/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 93ca6a8d2..000000000 --- a/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Update.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sonarr.Update.Test")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b323e212-2d04-4c7f-9097-c356749ace4d")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Update.Test/Sonarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Sonarr.Update.Test.csproj new file mode 100644 index 000000000..69d6b7a5f --- /dev/null +++ b/src/NzbDrone.Update.Test/Sonarr.Update.Test.csproj @@ -0,0 +1,10 @@ + + + net462 + x86 + + + + + + diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config deleted file mode 100644 index 0fbe30367..000000000 --- a/src/NzbDrone.Update.Test/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj deleted file mode 100644 index c37424755..000000000 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} - WinExe - Properties - NzbDrone.Update - Sonarr.Update - v4.6.2 - - - 512 - ..\ - true - - - x86 - true - full - false - ..\..\_output\Sonarr.Update\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - ..\..\_output\Sonarr.Update\ - TRACE - prompt - 4 - false - - - app.manifest - - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Update/Properties/AssemblyInfo.cs b/src/NzbDrone.Update/Properties/AssemblyInfo.cs deleted file mode 100644 index 802ee73b5..000000000 --- a/src/NzbDrone.Update/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Update")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e4560a3d-8053-4d57-a260-bfe52f4cc357")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Update/Sonarr.Update.csproj b/src/NzbDrone.Update/Sonarr.Update.csproj new file mode 100644 index 000000000..ccd6d7c7b --- /dev/null +++ b/src/NzbDrone.Update/Sonarr.Update.csproj @@ -0,0 +1,13 @@ + + + WinExe + net462 + x86 + + + + + + + + diff --git a/src/NzbDrone.Update/app.config b/src/NzbDrone.Update/app.config index 1fc29df82..d660afa84 100644 --- a/src/NzbDrone.Update/app.config +++ b/src/NzbDrone.Update/app.config @@ -1,18 +1,8 @@  + + - - - - - - - - - - - - diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config deleted file mode 100644 index 6c0072e21..000000000 --- a/src/NzbDrone.Update/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ 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 deleted file mode 100644 index 83b2425f2..000000000 --- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj +++ /dev/null @@ -1,112 +0,0 @@ - - - - - Debug - AnyCPU - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA} - Library - Properties - NzbDrone.Windows.Test - Sonarr.Windows.Test - v4.6.2 - 512 - ..\ - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.dll - - - ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - - ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - - - {caddfce0-7509-4430-8364-2074e1eefca2} - NzbDrone.Test.Common - - - {911284d3-f130-459e-836c-2430b6fbf21d} - NzbDrone.Windows - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 0876ee92e..000000000 --- a/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Windows.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Windows.Test")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("372cb8dc-5cdf-4fe4-9e1d-725827889bc7")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Windows.Test/Sonarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Sonarr.Windows.Test.csproj new file mode 100644 index 000000000..b14d20354 --- /dev/null +++ b/src/NzbDrone.Windows.Test/Sonarr.Windows.Test.csproj @@ -0,0 +1,11 @@ + + + net462 + x86 + + + + + + + diff --git a/src/NzbDrone.Windows.Test/app.config b/src/NzbDrone.Windows.Test/app.config index 71c70c478..d660afa84 100644 --- a/src/NzbDrone.Windows.Test/app.config +++ b/src/NzbDrone.Windows.Test/app.config @@ -1,27 +1,8 @@  - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/NzbDrone.Windows.Test/packages.config b/src/NzbDrone.Windows.Test/packages.config deleted file mode 100644 index d10f8ce10..000000000 --- a/src/NzbDrone.Windows.Test/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj deleted file mode 100644 index 45a269346..000000000 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - AnyCPU - {911284D3-F130-459E-836C-2430B6FBF21D} - Library - Properties - NzbDrone.Windows - Sonarr.Windows - v4.6.2 - 512 - ..\ - true - - - - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Windows/Properties/AssemblyInfo.cs b/src/NzbDrone.Windows/Properties/AssemblyInfo.cs deleted file mode 100644 index 17b280d9f..000000000 --- a/src/NzbDrone.Windows/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Windows")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Windows")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cea28fa9-43d0-4682-99f2-d364377adbdf")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Windows/Sonarr.Windows.csproj b/src/NzbDrone.Windows/Sonarr.Windows.csproj new file mode 100644 index 000000000..d3ae88b68 --- /dev/null +++ b/src/NzbDrone.Windows/Sonarr.Windows.csproj @@ -0,0 +1,12 @@ + + + net462 + x86 + + + + + + + + diff --git a/src/NzbDrone.Windows/app.config b/src/NzbDrone.Windows/app.config deleted file mode 100644 index a3afbaf46..000000000 --- a/src/NzbDrone.Windows/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config deleted file mode 100644 index a838a7096..000000000 --- a/src/NzbDrone.Windows/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj deleted file mode 100644 index 1f9e80f39..000000000 --- a/src/NzbDrone/NzbDrone.csproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - WinExe - Properties - NzbDrone - Sonarr - v4.6.2 - 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 - false - - - x86 - pdbonly - true - ..\..\_output\ - TRACE - prompt - 4 - false - - - ..\NzbDrone.Host\Sonarr.ico - - - NzbDrone.WindowsApp - - - OnOutputUpdated - - - app.manifest - - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\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 - - - - - - - ..\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 - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - app.config - - - Designer - - - - - - - - - - - xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)" - - - - \ No newline at end of file diff --git a/src/NzbDrone/Properties/AssemblyInfo.cs b/src/NzbDrone/Properties/AssemblyInfo.cs deleted file mode 100644 index fd72b559e..000000000 --- a/src/NzbDrone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sonarr.exe")] -[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone/Sonarr.csproj b/src/NzbDrone/Sonarr.csproj new file mode 100644 index 000000000..aa68a32cc --- /dev/null +++ b/src/NzbDrone/Sonarr.csproj @@ -0,0 +1,29 @@ + + + WinExe + net462 + x86 + + ..\NzbDrone.Host\Sonarr.ico + app.manifest + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/src/NzbDrone/app.config b/src/NzbDrone/app.config index a6a2b7fa9..2b0b69660 100644 --- a/src/NzbDrone/app.config +++ b/src/NzbDrone/app.config @@ -1,2 +1,14 @@  - \ No newline at end of file + + + + + + + + + + + + + diff --git a/src/NzbDrone/app.manifest b/src/NzbDrone/app.manifest index 8e6eb2fea..d875ce85e 100644 --- a/src/NzbDrone/app.manifest +++ b/src/NzbDrone/app.manifest @@ -4,34 +4,13 @@ - - - - - - - - - + diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config deleted file mode 100644 index ec2519895..000000000 --- a/src/NzbDrone/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs b/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs deleted file mode 100644 index 63a2e4bc0..000000000 --- a/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("InstallService")] - - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("13976baa-e5ba-42b2-8ad7-8d568b68a53b")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index ca6d7739b..2da82570e 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,82 +1,7 @@ - - + - Debug - x86 - 8.0.30703 - 2.0 - {6BCE712F-846D-4846-9D1B-A66B858DA755} Exe - Properties - ServiceInstall - ServiceInstall - v4.6.2 - - - 512 - ..\..\ - true + net462 + x86 - - x86 - true - full - false - ..\..\..\_output\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - ..\..\..\_output\ - TRACE - prompt - 4 - false - - - app.manifest - - - OnBuildSuccess - - - ServiceInstall.Program - - - green_puzzle.ico - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - Designer - - - - - - - - \ No newline at end of file + diff --git a/src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs b/src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs deleted file mode 100644 index c5e087a13..000000000 --- a/src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("UninstallService")] -[assembly: Guid("0a964b21-9de9-40b3-9378-0474fd5f21a8")] - -[assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index ba377b51d..2da82570e 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,82 +1,7 @@ - - + - Debug - x86 - 8.0.30703 - 2.0 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4} Exe - Properties - ServiceUninstall - ServiceUninstall - v4.6.2 - - - 512 - ..\..\ - true + net462 + x86 - - x86 - true - full - false - ..\..\..\_output\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - ..\..\..\_output\ - TRACE - prompt - 4 - false - - - ServiceUninstall.Program - - - red_puzzle.ico - - - app.manifest - - - OnBuildSuccess - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - Designer - - - - - - - - \ No newline at end of file + diff --git a/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs b/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs deleted file mode 100644 index deeee4d43..000000000 --- a/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Sonarr.Api")] - -[assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")] - -[assembly: AssemblyVersion("10.0.0.*")] - -[assembly: InternalsVisibleTo("Sonarr.Core")] diff --git a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj index deec8c714..87b9433d2 100644 --- a/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj +++ b/src/Sonarr.Api.V3/Sonarr.Api.V3.csproj @@ -1,244 +1,19 @@ - - - + - Debug - x86 - {7140FF1F-79BE-492F-9188-B21A050BF708} - Library - Properties - Sonarr.Api.V3 - Sonarr.Api.V3 - v4.6.2 - 512 - ..\ - true - - - 12.0.0 - 2.0 - - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false + net462 + x86 - - ..\packages\Ical.Net.2.2.32\lib\net46\antlr.runtime.dll - - - ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\Ical.Net.Collections.dll - - - ..\packages\Nancy.1.4.4\lib\net40\Nancy.dll - - - ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - - - ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - ..\packages\Ical.Net.2.2.32\lib\net46\NodaTime.dll - - - - - + + + + + + + - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - {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 - - - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Sonarr.Http - - - - - - - - \ No newline at end of file + diff --git a/src/Sonarr.Api.V3/app.config b/src/Sonarr.Api.V3/app.config deleted file mode 100644 index a822016cb..000000000 --- a/src/Sonarr.Api.V3/app.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Sonarr.Api.V3/packages.config b/src/Sonarr.Api.V3/packages.config deleted file mode 100644 index 9345b21b6..000000000 --- a/src/Sonarr.Api.V3/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Sonarr.Http/Properties/AssemblyInfo.cs b/src/Sonarr.Http/Properties/AssemblyInfo.cs deleted file mode 100644 index 9d340b973..000000000 --- a/src/Sonarr.Http/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Sonarr.Nancy")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Sonarr.Nancy")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5370bff7-1bd7-46bc-af06-7d9ea5cda1d6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Sonarr.Http/Sonarr.Http.csproj b/src/Sonarr.Http/Sonarr.Http.csproj index fe956dee7..90f53aa36 100644 --- a/src/Sonarr.Http/Sonarr.Http.csproj +++ b/src/Sonarr.Http/Sonarr.Http.csproj @@ -1,160 +1,23 @@ - - - + - Debug - AnyCPU - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Library - Properties - Sonarr.Http - Sonarr.Http - v4.6.2 - 512 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - 4 - MinimumRecommendedRules.ruleset - false - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - 4 - MinimumRecommendedRules.ruleset - false - MinimumRecommendedRules.ruleset + net462 + x86 - - ..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll - - - ..\packages\Nancy.1.4.4\lib\net40\Nancy.dll - - - ..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll - - - ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.3\lib\net45\NLog.dll - - - + + + + + + + + + + + + ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {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/Sonarr.Http/app.config b/src/Sonarr.Http/app.config deleted file mode 100644 index d43363246..000000000 --- a/src/Sonarr.Http/app.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/Sonarr.Http/packages.config b/src/Sonarr.Http/packages.config deleted file mode 100644 index e944a7618..000000000 --- a/src/Sonarr.Http/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Sonarr.sln b/src/Sonarr.sln index 0d25c827a..d03703391 100644 --- a/src/Sonarr.sln +++ b/src/Sonarr.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\NzbDrone.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Console", "NzbDrone.Console\Sonarr.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}" ProjectSection(ProjectDependencies) = postProject {7140FF1F-79BE-492F-9188-B21A050BF708} = {7140FF1F-79BE-492F-9188-B21A050BF708} {15AD7579-A314-4626-B556-663F51D97CD1} = {15AD7579-A314-4626-B556-663F51D97CD1} @@ -18,37 +18,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test.Common", "Test.Common", "{47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Test.Dummy", "NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj", "{FAFB5948-A222-4CF6-AD14-026BE7564802}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Test.Dummy", "NzbDrone.Test.Dummy\Sonarr.Test.Dummy.csproj", "{FAFB5948-A222-4CF6-AD14-026BE7564802}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Test.Common", "NzbDrone.Test.Common\NzbDrone.Test.Common.csproj", "{CADDFCE0-7509-4430-8364-2074E1EEFCA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Test.Common", "NzbDrone.Test.Common\Sonarr.Test.Common.csproj", "{CADDFCE0-7509-4430-8364-2074E1EEFCA2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core.Test", "NzbDrone.Core.Test\NzbDrone.Core.Test.csproj", "{193ADD3B-792B-4173-8E4C-5A3F8F0237F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Core.Test", "NzbDrone.Core.Test\Sonarr.Core.Test.csproj", "{193ADD3B-792B-4173-8E4C-5A3F8F0237F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host.Test", "NzbDrone.App.Test\NzbDrone.Host.Test.csproj", "{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Update.Test", "NzbDrone.Update.Test\Sonarr.Update.Test.csproj", "{35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update.Test", "NzbDrone.Update.Test\NzbDrone.Update.Test.csproj", "{35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Common.Test", "NzbDrone.Common.Test\Sonarr.Common.Test.csproj", "{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Common.Test", "NzbDrone.Common.Test\NzbDrone.Common.Test.csproj", "{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Api.Test", "NzbDrone.Api.Test\Sonarr.Api.Test.csproj", "{D18A5DEB-5102-4775-A1AF-B75DAAA8907B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Api.Test", "NzbDrone.Api.Test\NzbDrone.Api.Test.csproj", "{D18A5DEB-5102-4775-A1AF-B75DAAA8907B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Libraries.Test", "NzbDrone.Libraries.Test\Sonarr.Libraries.Test.csproj", "{CBF6B8B0-A015-413A-8C86-01238BB45770}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Libraries.Test", "NzbDrone.Libraries.Test\NzbDrone.Libraries.Test.csproj", "{CBF6B8B0-A015-413A-8C86-01238BB45770}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Integration.Test", "NzbDrone.Integration.Test\Sonarr.Integration.Test.csproj", "{8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Integration.Test", "NzbDrone.Integration.Test\NzbDrone.Integration.Test.csproj", "{8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Automation.Test", "NzbDrone.Automation.Test\Sonarr.Automation.Test.csproj", "{CC26800D-F67E-464B-88DE-8EB1A0C227A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Automation.Test", "NzbDrone.Automation.Test\NzbDrone.Automation.Test.csproj", "{CC26800D-F67E-464B-88DE-8EB1A0C227A3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServiceHelpers", "WindowsServiceHelpers", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceInstall", "ServiceHelpers\ServiceInstall\ServiceInstall.csproj", "{6BCE712F-846D-4846-9D1B-A66B858DA755}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceInstall", "ServiceHelpers\ServiceInstall\ServiceInstall.csproj", "{6BCE712F-846D-4846-9D1B-A66B858DA755}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceUninstall", "ServiceHelpers\ServiceUninstall\ServiceUninstall.csproj", "{700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUninstall", "ServiceHelpers\ServiceUninstall\ServiceUninstall.csproj", "{700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Core", "NzbDrone.Core\Sonarr.Core.csproj", "{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core", "NzbDrone.Core\NzbDrone.Core.csproj", "{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Update", "NzbDrone.Update\Sonarr.Update.csproj", "{4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update", "NzbDrone.Update\NzbDrone.Update.csproj", "{4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Common", "NzbDrone.Common\NzbDrone.Common.csproj", "{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Common", "NzbDrone.Common\Sonarr.Common.csproj", "{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}" ProjectSection(ProjectDependencies) = postProject {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} = {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} EndProjectSection @@ -58,31 +56,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E6B3C .nuget\NuGet.exe = .nuget\NuGet.exe EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Api", "NzbDrone.Api\NzbDrone.Api.csproj", "{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Api", "NzbDrone.Api\Sonarr.Api.csproj", "{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host", "NzbDrone.Host\NzbDrone.Host.csproj", "{95C11A9E-56ED-456A-8447-2C89C1139266}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Host", "NzbDrone.Host\Sonarr.Host.csproj", "{95C11A9E-56ED-456A-8447-2C89C1139266}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone", "NzbDrone\NzbDrone.csproj", "{D12F7F2F-8A3C-415F-88FA-6DD061A84869}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr", "NzbDrone\Sonarr.csproj", "{D12F7F2F-8A3C-415F-88FA-6DD061A84869}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.SignalR", "NzbDrone.SignalR\NzbDrone.SignalR.csproj", "{7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.SignalR", "NzbDrone.SignalR\Sonarr.SignalR.csproj", "{7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{F6E3A728-AE77-4D02-BAC8-82FBC1402DDA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marr.Data", "Marr.Data\Marr.Data.csproj", "{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Mono", "NzbDrone.Mono\NzbDrone.Mono.csproj", "{15AD7579-A314-4626-B556-663F51D97CD1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Mono", "NzbDrone.Mono\Sonarr.Mono.csproj", "{15AD7579-A314-4626-B556-663F51D97CD1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Windows", "NzbDrone.Windows\NzbDrone.Windows.csproj", "{911284D3-F130-459E-836C-2430B6FBF21D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Windows", "NzbDrone.Windows\Sonarr.Windows.csproj", "{911284D3-F130-459E-836C-2430B6FBF21D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{0F0D4998-8F5D-4467-A909-BB192C4B3B4B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{4EACDBBC-BCD7-4765-A57B-3E08331E4749}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Windows.Test", "NzbDrone.Windows.Test\NzbDrone.Windows.Test.csproj", "{80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Windows.Test", "NzbDrone.Windows.Test\Sonarr.Windows.Test.csproj", "{80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Mono.Test", "NzbDrone.Mono.Test\NzbDrone.Mono.Test.csproj", "{40D72824-7D02-4A77-9106-8FE0EEA2B997}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Mono.Test", "NzbDrone.Mono.Test\Sonarr.Mono.Test.csproj", "{40D72824-7D02-4A77-9106-8FE0EEA2B997}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoTorrent", "MonoTorrent\MonoTorrent.csproj", "{411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}" EndProject @@ -95,9 +93,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogentriesNLog", "Logentrie EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurlSharp", "ExternalModules\CurlSharp\CurlSharp\CurlSharp.csproj", "{74420A79-CC16-442C-8B1E-7C1B913844F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sonarr.Api.V3", "Sonarr.Api.V3\Sonarr.Api.V3.csproj", "{7140FF1F-79BE-492F-9188-B21A050BF708}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Api.V3", "Sonarr.Api.V3\Sonarr.Api.V3.csproj", "{7140FF1F-79BE-492F-9188-B21A050BF708}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sonarr.Http", "Sonarr.Http\Sonarr.Http.csproj", "{5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Http", "Sonarr.Http\Sonarr.Http.csproj", "{5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sonarr.Host.Test", "NzbDrone.Host.Test\Sonarr.Host.Test.csproj", "{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -108,8 +108,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Debug|x86.ActiveCfg = Debug|x86 {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Debug|x86.Build.0 = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.ActiveCfg = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.Build.0 = Debug|x86 + {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.ActiveCfg = Release|x86 + {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.Build.0 = Release|x86 {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Release|x86.ActiveCfg = Release|x86 {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Release|x86.Build.0 = Release|x86 {FAFB5948-A222-4CF6-AD14-026BE7564802}.Debug|x86.ActiveCfg = Debug|x86 @@ -120,32 +120,26 @@ Global {FAFB5948-A222-4CF6-AD14-026BE7564802}.Release|x86.Build.0 = Release|x86 {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Debug|x86.ActiveCfg = Debug|x86 {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Debug|x86.Build.0 = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.ActiveCfg = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.Build.0 = Debug|x86 + {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.ActiveCfg = Release|x86 + {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.Build.0 = Release|x86 {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Release|x86.ActiveCfg = Release|x86 {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Release|x86.Build.0 = Release|x86 {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Debug|x86.ActiveCfg = Debug|x86 {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Debug|x86.Build.0 = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.ActiveCfg = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.Build.0 = Debug|x86 + {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.ActiveCfg = Release|x86 + {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.Build.0 = Release|x86 {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x86.ActiveCfg = Release|x86 {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x86.Build.0 = Release|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.ActiveCfg = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.Build.0 = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.ActiveCfg = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.Build.0 = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.ActiveCfg = Release|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.Build.0 = Release|x86 {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Debug|x86.ActiveCfg = Debug|x86 {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Debug|x86.Build.0 = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.ActiveCfg = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.Build.0 = Debug|x86 + {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.ActiveCfg = Release|x86 + {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.Build.0 = Release|x86 {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Release|x86.ActiveCfg = Release|x86 {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Release|x86.Build.0 = Release|x86 {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Debug|x86.ActiveCfg = Debug|x86 {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Debug|x86.Build.0 = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.ActiveCfg = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.Build.0 = Debug|x86 + {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.ActiveCfg = Release|x86 + {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.Build.0 = Release|x86 {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Release|x86.ActiveCfg = Release|x86 {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Release|x86.Build.0 = Release|x86 {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Debug|x86.ActiveCfg = Debug|x86 @@ -156,30 +150,32 @@ Global {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Release|x86.Build.0 = Release|x86 {CBF6B8B0-A015-413A-8C86-01238BB45770}.Debug|x86.ActiveCfg = Debug|x86 {CBF6B8B0-A015-413A-8C86-01238BB45770}.Debug|x86.Build.0 = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.ActiveCfg = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.Build.0 = Debug|x86 + {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.ActiveCfg = Release|x86 + {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.Build.0 = Release|x86 {CBF6B8B0-A015-413A-8C86-01238BB45770}.Release|x86.ActiveCfg = Release|x86 {CBF6B8B0-A015-413A-8C86-01238BB45770}.Release|x86.Build.0 = Release|x86 {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Debug|x86.ActiveCfg = Debug|x86 {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Debug|x86.Build.0 = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.ActiveCfg = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.Build.0 = Debug|x86 + {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.ActiveCfg = Release|x86 + {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.Build.0 = Release|x86 {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Release|x86.ActiveCfg = Release|x86 {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Release|x86.Build.0 = Release|x86 {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Debug|x86.ActiveCfg = Debug|x86 {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Debug|x86.Build.0 = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.ActiveCfg = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.Build.0 = Debug|x86 + {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.ActiveCfg = Release|x86 + {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.Build.0 = Release|x86 {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Release|x86.ActiveCfg = Release|x86 {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Release|x86.Build.0 = Release|x86 {6BCE712F-846D-4846-9D1B-A66B858DA755}.Debug|x86.ActiveCfg = Debug|x86 {6BCE712F-846D-4846-9D1B-A66B858DA755}.Debug|x86.Build.0 = Debug|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Mono|x86.ActiveCfg = Debug|x86 + {6BCE712F-846D-4846-9D1B-A66B858DA755}.Mono|x86.ActiveCfg = Release|x86 + {6BCE712F-846D-4846-9D1B-A66B858DA755}.Mono|x86.Build.0 = Release|x86 {6BCE712F-846D-4846-9D1B-A66B858DA755}.Release|x86.ActiveCfg = Release|x86 {6BCE712F-846D-4846-9D1B-A66B858DA755}.Release|x86.Build.0 = Release|x86 {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Debug|x86.ActiveCfg = Debug|x86 {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Debug|x86.Build.0 = Debug|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Mono|x86.ActiveCfg = Debug|x86 + {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Mono|x86.ActiveCfg = Release|x86 + {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Mono|x86.Build.0 = Release|x86 {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Release|x86.ActiveCfg = Release|x86 {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Release|x86.Build.0 = Release|x86 {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Debug|x86.ActiveCfg = Debug|x86 @@ -190,8 +186,8 @@ Global {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Release|x86.Build.0 = Release|x86 {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Debug|x86.ActiveCfg = Debug|x86 {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Debug|x86.Build.0 = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.ActiveCfg = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.Build.0 = Debug|x86 + {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.ActiveCfg = Release|x86 + {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.Build.0 = Release|x86 {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Release|x86.ActiveCfg = Release|x86 {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Release|x86.Build.0 = Release|x86 {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Debug|x86.ActiveCfg = Debug|x86 @@ -208,19 +204,20 @@ Global {FD286DF8-2D3A-4394-8AD5-443FADE55FB2}.Release|x86.Build.0 = Release|x86 {95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.ActiveCfg = Debug|x86 {95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.Build.0 = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.ActiveCfg = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.Build.0 = Debug|x86 + {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.ActiveCfg = Release|x86 + {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.Build.0 = Release|x86 {95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.ActiveCfg = Release|x86 {95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.Build.0 = Release|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.ActiveCfg = Debug|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.Build.0 = Debug|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Mono|x86.ActiveCfg = Release|x86 + {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Mono|x86.Build.0 = Release|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.ActiveCfg = Release|x86 {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.Build.0 = Release|x86 {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Debug|x86.ActiveCfg = Debug|x86 {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Debug|x86.Build.0 = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.ActiveCfg = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.Build.0 = Debug|x86 + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.ActiveCfg = Release|x86 + {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.Build.0 = Release|x86 {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Release|x86.ActiveCfg = Release|x86 {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Release|x86.Build.0 = Release|x86 {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x86.ActiveCfg = Debug|x86 @@ -232,21 +229,25 @@ Global {15AD7579-A314-4626-B556-663F51D97CD1}.Debug|x86.ActiveCfg = Debug|x86 {15AD7579-A314-4626-B556-663F51D97CD1}.Debug|x86.Build.0 = Debug|x86 {15AD7579-A314-4626-B556-663F51D97CD1}.Mono|x86.ActiveCfg = Release|x86 + {15AD7579-A314-4626-B556-663F51D97CD1}.Mono|x86.Build.0 = Release|x86 {15AD7579-A314-4626-B556-663F51D97CD1}.Release|x86.ActiveCfg = Release|x86 {15AD7579-A314-4626-B556-663F51D97CD1}.Release|x86.Build.0 = Release|x86 {911284D3-F130-459E-836C-2430B6FBF21D}.Debug|x86.ActiveCfg = Debug|x86 {911284D3-F130-459E-836C-2430B6FBF21D}.Debug|x86.Build.0 = Debug|x86 {911284D3-F130-459E-836C-2430B6FBF21D}.Mono|x86.ActiveCfg = Release|x86 + {911284D3-F130-459E-836C-2430B6FBF21D}.Mono|x86.Build.0 = Release|x86 {911284D3-F130-459E-836C-2430B6FBF21D}.Release|x86.ActiveCfg = Release|x86 {911284D3-F130-459E-836C-2430B6FBF21D}.Release|x86.Build.0 = Release|x86 {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Debug|x86.ActiveCfg = Debug|x86 {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Debug|x86.Build.0 = Debug|x86 {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Mono|x86.ActiveCfg = Release|x86 + {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Mono|x86.Build.0 = Release|x86 {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Release|x86.ActiveCfg = Release|x86 {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Release|x86.Build.0 = Release|x86 {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Debug|x86.ActiveCfg = Debug|x86 {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Debug|x86.Build.0 = Debug|x86 {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Mono|x86.ActiveCfg = Release|x86 + {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Mono|x86.Build.0 = Release|x86 {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Release|x86.ActiveCfg = Release|x86 {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Release|x86.Build.0 = Release|x86 {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Debug|x86.ActiveCfg = Debug|x86 @@ -285,6 +286,12 @@ Global {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Mono|x86.Build.0 = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.ActiveCfg = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.Build.0 = Release|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.ActiveCfg = Debug|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.Build.0 = Debug|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.ActiveCfg = Release|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.Build.0 = Release|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.ActiveCfg = Release|x86 + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -295,7 +302,6 @@ Global {FAFB5948-A222-4CF6-AD14-026BE7564802} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} {CADDFCE0-7509-4430-8364-2074E1EEFCA2} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} = {57A04B72-8088-4F75-A582-1158CF8291F7} {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} = {57A04B72-8088-4F75-A582-1158CF8291F7} {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} = {57A04B72-8088-4F75-A582-1158CF8291F7} {D18A5DEB-5102-4775-A1AF-B75DAAA8907B} = {57A04B72-8088-4F75-A582-1158CF8291F7} @@ -304,6 +310,7 @@ Global {CC26800D-F67E-464B-88DE-8EB1A0C227A3} = {57A04B72-8088-4F75-A582-1158CF8291F7} {6BCE712F-846D-4846-9D1B-A66B858DA755} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} + {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} {95C11A9E-56ED-456A-8447-2C89C1139266} = {486ADF86-DD89-4E19-B805-9D94F19800D9} {D12F7F2F-8A3C-415F-88FA-6DD061A84869} = {486ADF86-DD89-4E19-B805-9D94F19800D9} {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} @@ -316,6 +323,7 @@ Global {90D6E9FC-7B88-4E1B-B018-8FA742274558} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} {9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} {74420A79-CC16-442C-8B1E-7C1B913844F0} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} + {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} = {57A04B72-8088-4F75-A582-1158CF8291F7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35 diff --git a/test.sh b/test.sh index cdaa3a497..3d93e96aa 100644 --- a/test.sh +++ b/test.sh @@ -15,7 +15,7 @@ rm -f "$TEST_LOG_FILE" # Uncomment to log test output to a file instead of the console # export SONARR_TESTS_LOG_OUTPUT="File" -NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe" +NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe" NUNIT_COMMAND="$NUNIT" NUNIT_PARAMS="--teamcity --workers=1"