diff --git a/.gitattributes b/.gitattributes index e67ee2ab0..17a25adb7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,7 +7,6 @@ # Custom for Visual Studio *.cs diff=csharp *.sln merge=union -*.csproj merge=union *.vbproj merge=union *.fsproj merge=union *.dbproj merge=union diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d4fee4c7a..33359a3c4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,18 +53,6 @@ stages: - checkout: self submodules: true fetchDepth: 1 - - task: Assembly-Info-NetFramework@2 - displayName: Patch AssemblyInfo - inputs: - Path: '$(Build.SourcesDirectory)' - FileNames: 'src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs' - InsertAttributes: false - FileEncoding: 'auto' - WriteBOM: false - Configuration: 'debug' - VersionNumber: '$(lidarrVersion)' - FileVersionNumber: '$(lidarrVersion)' - InformationalVersion: '$(lidarrVersion)-rc1' - bash: ./build.sh --only-backend displayName: Build Lidarr Backend - publish: $(outputFolder) @@ -210,10 +198,11 @@ stages: - bash: | echo "Uploading source maps to sentry" curl -sL https://sentry.io/get-cli/ | bash - sentry-cli releases new --finalize -p lidarr -p lidarr-ui -p lidarr-update "${LIDARRVERSION}-debug" - sentry-cli releases -p lidarr-ui files "${LIDARRVERSION}-debug" upload-sourcemaps _output/UI/ --rewrite - sentry-cli releases set-commits --auto "${LIDARRVERSION}-debug" - sentry-cli releases deploys "${LIDARRVERSION}-debug" new -e nightly + RELEASENAME="${LIDARRVERSION}-${BUILD_SOURCEBRANCHNAME}" + sentry-cli releases new --finalize -p lidarr -p lidarr-ui -p lidarr-update "${RELEASENAME}" + sentry-cli releases -p lidarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite + sentry-cli releases set-commits --auto "${RELEASENAME}" + sentry-cli releases deploys "${RELEASENAME}" new -e nightly displayName: Publish Sentry Source Maps condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) env: diff --git a/build.sh b/build.sh index 9ebe84062..f88ddd6b3 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/Lidarr.sln updateFolder=$outputFolder/Lidarr.Update @@ -42,6 +41,15 @@ ProgressEnd() echo "Finish '$1'" } +UpdateVersionNumber() +{ + if [ "$LIDARRVERSION" != "" ]; then + echo "Updating Version Info" + sed -i "s/[0-9.*]\+<\/AssemblyVersion>/$LIDARRVERSION<\/AssemblyVersion>/g" ./src/Directory.Build.props + sed -i "s/[\$()A-Za-z-]\+<\/AssemblyConfiguration>/${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" ./src/Directory.Build.props + fi +} + CleanFolder() { local path=$1 @@ -113,6 +121,7 @@ Build() ProgressStart 'Build' rm -rf $outputFolder + rm -rf $testPackageFolder if [ $runtime = "dotnet" ] ; then BuildWithMSBuild @@ -231,20 +240,12 @@ PackageTests() { ProgressStart 'Creating Test Package' - rm -rf $testPackageFolder - mkdir $testPackageFolder - - find . -maxdepth 6 -path $testSearchPattern -exec cp -r "{}" $testPackageFolder \; - if [ $runtime = "dotnet" ] ; then - $nuget install NUnit.ConsoleRunner -Version 3.7.0 -Output $testPackageFolder + $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder else - mono $nuget install NUnit.ConsoleRunner -Version 3.7.0 -Output $testPackageFolder + mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder fi - cp $outputFolder/*.dll $testPackageFolder - cp $outputFolder/*.exe $testPackageFolder - cp $outputFolder/fpcalc $testPackageFolder cp ./test.sh $testPackageFolder rm -f $testPackageFolder/*.log.config @@ -341,6 +342,7 @@ set -- "${POSITIONAL[@]}" # restore positional parameters # Only build backend if we haven't set only-frontend or only-packages if [ -z "$ONLY_FRONTEND" ] && [ -z "$ONLY_PACKAGES" ]; then + UpdateVersionNumber Build PackageTests fi diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..322b4ac30 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,77 @@ + + + + $(MSBuildThisFileDirectory)..\ + + + Library + Test + Exe + Exe + Exe + Exe + Update + + + false + true + true + true + + + + + $(LidarrRootDir)_temp\obj\$(Configuration)\$(MSBuildProjectName)\ + $(LidarrRootDir)_temp\bin\$(Configuration)\$(MSBuildProjectName)\ + + + $(LidarrRootDir)_output\ + $(LidarrRootDir)_tests\ + $(LidarrRootDir)_output\Lidarr.Update\ + + + $([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(IntermediateOutputPath)')) + $([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(OutputPath)')) + + + full + true + + + + + true + true + + + + + Lidarr + lidarr.audio + Copyright 2017-$([System.DateTime]::Now.ToString('yyyy')) lidarr.audio (GNU General Public v3) + + + 10.0.0.* + $(Configuration)-dev + + false + false + false + + False + + + + + <_Parameter1>$(AssemblyConfiguration) + + + + + + false + + + $(MSBuildProjectName.Replace('Lidarr','NzbDrone')) + + diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj index 4d9b79052..1e47e39cf 100644 --- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj +++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj @@ -1,247 +1,23 @@ - - - + - Debug - x86 - {7140FF1F-79BE-492F-9188-B21A050BF708} - Library - Properties - Lidarr.Api.V1 - Lidarr.Api.V1 - v4.6.2 - 512 - ..\ - true - - - 12.0.0 - 2.0 + net462 + x86 - - true - ..\..\_output\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - false - - - ..\..\_output\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Lidarr.Http - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - {ff5ee3b6-913b-47ce-9ceb-11c51b4e1205} - NzbDrone.Core - - - {7c2cc69f-5ca0-4e5c-85cb-983f9f6c3b36} - NzbDrone.SignalR - + + + + + - - 6.2.1 - - - 2.2.32 - - - 1.4.4 - - - 1.4.1 - - - 1.4.1 - - - 12.0.2 - - - 4.5.4 - - - 4.0.11 - + + + + + + + + - - - \ No newline at end of file + diff --git a/src/Lidarr.Api.V1/Properties/AssemblyInfo.cs b/src/Lidarr.Api.V1/Properties/AssemblyInfo.cs deleted file mode 100644 index 8cfbdf950..000000000 --- a/src/Lidarr.Api.V1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Lidarr.Api")] - -[assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")] - -[assembly: InternalsVisibleTo("Lidarr.Core")] diff --git a/src/Lidarr.Http/Lidarr.Http.csproj b/src/Lidarr.Http/Lidarr.Http.csproj index 8d00d1732..8d0098386 100644 --- a/src/Lidarr.Http/Lidarr.Http.csproj +++ b/src/Lidarr.Http/Lidarr.Http.csproj @@ -1,160 +1,23 @@ - - - + - Debug - AnyCPU - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6} - Library - Properties - Lidarr.Http - Lidarr.Http - v4.6.2 - 512 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false + net462 + x86 - - + + + + + + + + ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {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 - - - - - - 6.2.1 - - - 1.4.4 - - - 1.4.1 - - - 1.4.1 - - - 12.0.2 - - - 4.5.4 - + + - - - \ No newline at end of file + diff --git a/src/Lidarr.Http/Properties/AssemblyInfo.cs b/src/Lidarr.Http/Properties/AssemblyInfo.cs deleted file mode 100644 index 63facfcae..000000000 --- a/src/Lidarr.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("Lidarr.Nancy")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.Nancy")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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/Lidarr.sln b/src/Lidarr.sln index 16dd811fe..1afb16fd1 100644 --- a/src/Lidarr.sln +++ b/src/Lidarr.sln @@ -7,25 +7,25 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Test.Dummy", "NzbDrone.Test.Dummy\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Test.Common", "NzbDrone.Test.Common\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core.Test", "NzbDrone.Core.Test\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host.Test", "NzbDrone.Host.Test\Lidarr.Host.Test.csproj", "{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update.Test", "NzbDrone.Update.Test\NzbDrone.Update.Test.csproj", "{35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update.Test", "NzbDrone.Update.Test\Lidarr.Update.Test.csproj", "{35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Common.Test", "NzbDrone.Common.Test\NzbDrone.Common.Test.csproj", "{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Common.Test", "NzbDrone.Common.Test\Lidarr.Common.Test.csproj", "{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Api.Test", "NzbDrone.Api.Test\NzbDrone.Api.Test.csproj", "{D18A5DEB-5102-4775-A1AF-B75DAAA8907B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Api.Test", "NzbDrone.Api.Test\Lidarr.Api.Test.csproj", "{D18A5DEB-5102-4775-A1AF-B75DAAA8907B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Libraries.Test", "NzbDrone.Libraries.Test\NzbDrone.Libraries.Test.csproj", "{CBF6B8B0-A015-413A-8C86-01238BB45770}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Libraries.Test", "NzbDrone.Libraries.Test\Lidarr.Libraries.Test.csproj", "{CBF6B8B0-A015-413A-8C86-01238BB45770}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Integration.Test", "NzbDrone.Integration.Test\NzbDrone.Integration.Test.csproj", "{8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Integration.Test", "NzbDrone.Integration.Test\Lidarr.Integration.Test.csproj", "{8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Automation.Test", "NzbDrone.Automation.Test\NzbDrone.Automation.Test.csproj", "{CC26800D-F67E-464B-88DE-8EB1A0C227A3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Automation.Test", "NzbDrone.Automation.Test\Lidarr.Automation.Test.csproj", "{CC26800D-F67E-464B-88DE-8EB1A0C227A3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServiceHelpers", "WindowsServiceHelpers", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" EndProject @@ -33,11 +33,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceInstall", "ServiceHe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUninstall", "ServiceHelpers\ServiceUninstall\ServiceUninstall.csproj", "{700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core", "NzbDrone.Core\NzbDrone.Core.csproj", "{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core", "NzbDrone.Core\Lidarr.Core.csproj", "{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update", "NzbDrone.Update\NzbDrone.Update.csproj", "{4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Update", "NzbDrone.Update\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Common", "NzbDrone.Common\Lidarr.Common.csproj", "{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E6B3CBE-1578-41C1-9BF9-78D818740BE9}" ProjectSection(SolutionItems) = preProject @@ -46,29 +46,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E6B3C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\NzbDrone.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\Lidarr.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host", "NzbDrone.Host\NzbDrone.Host.csproj", "{95C11A9E-56ED-456A-8447-2C89C1139266}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host", "NzbDrone.Host\Lidarr.Host.csproj", "{95C11A9E-56ED-456A-8447-2C89C1139266}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone", "NzbDrone\NzbDrone.csproj", "{D12F7F2F-8A3C-415F-88FA-6DD061A84869}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone", "NzbDrone\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.SignalR", "NzbDrone.SignalR\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Mono", "NzbDrone.Mono\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Windows", "NzbDrone.Windows\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Windows.Test", "NzbDrone.Windows.Test\Lidarr.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Mono.Test", "NzbDrone.Mono.Test\Lidarr.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 @@ -281,7 +281,7 @@ Global EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.4.0.1\lib\net45;packages\Unity.4.0.1\lib\net45 EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = NzbDrone.Console\NzbDrone.Console.csproj + StartupItem = NzbDrone.Console\Lidarr.Console.csproj EndGlobalSection GlobalSection(JSLint) = preSolution SolutionConfigurationLocation = JSLintOptions.xml 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 - - - 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 + net462 + x86 + + 3.17.0.0 + false + false + + 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/Lidarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj new file mode 100644 index 000000000..d68c5beab --- /dev/null +++ b/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj @@ -0,0 +1,14 @@ + + + net462 + x86 + + + + + + + + + + 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 cfb9dc79b..000000000 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Debug - x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B} - Library - Properties - NzbDrone.Api.Test - Lidarr.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 - - - - - - - - - - - - - - - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V1 - - - {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 - - - {5370bff7-1bd7-46bc-af06-7d9ea5cda1d6} - Lidarr.Http - - - - - App.config - - - - - - - - 4.19.0 - - - 4.12.0 - - - 4.0.0 - - - 3.11.0 - - - - - \ 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 2bcd18392..000000000 --- a/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Api.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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")] - 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 53429c4eb..000000000 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ /dev/null @@ -1,128 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} - Library - Properties - NzbDrone.App.Test - Lidarr.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 - - - - - - - - - - - - - - - - - App.config - - - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V1 - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - sqlite3.dll - Always - - - - - - - - 4.19.0 - - - 4.12.0 - - - 4.0.0 - - - 4.5.4 - - - 3.11.0 - - - - - - xcopy /s /y "$(SolutionDir)\..\_output\Lidarr.Mono.*" "$(TargetDir)" - xcopy /s /y "$(SolutionDir)\..\_output\Lidarr.Windows.*" "$(TargetDir)" - - - cp -rv $(SolutionDir)\..\_output\Lidarr.Mono.* $(TargetDir) || true - cp -rv $(SolutionDir)\..\_output\Lidarr.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 3c316c92f..000000000 --- a/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.App.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj new file mode 100644 index 000000000..126a44b19 --- /dev/null +++ b/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj @@ -0,0 +1,13 @@ + + + net462 + x86 + + + + + + + + + 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 50bf57b92..000000000 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - Debug - x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3} - Library - Properties - NzbDrone.Automation.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - - - - - - - 4.19.0 - - - 4.5.4 - - - 3.11.0 - - - 0.24.0 - - - 3.141.0 - - - 3.141.0 - - - - - \ 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 cea10d8a1..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("Lidarr.Automation.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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.Common.Test/EnvironmentInfo/BuildInfoFixture.cs b/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs index a40ccbe3c..f87c79bfe 100644 --- a/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs +++ b/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs @@ -16,7 +16,7 @@ namespace NzbDrone.Common.Test.EnvironmentInfo [Test] public void should_get_branch() { - BuildInfo.Branch.Should().NotBe("unknow"); + BuildInfo.Branch.Should().NotBe("unknown"); BuildInfo.Branch.Should().NotBeNullOrWhiteSpace(); } } 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/Lidarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj new file mode 100644 index 000000000..e535b3304 --- /dev/null +++ b/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj @@ -0,0 +1,19 @@ + + + net462 + x86 + + + + + + + + + + + + PreserveNewest + + + 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 50315469b..000000000 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} - Library - Properties - NzbDrone.Common.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.config - - - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V1 - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {15ad7579-a314-4626-b556-663f51d97cd1} - NzbDrone.Mono - - - {911284d3-f130-459e-836c-2430b6fbf21d} - NzbDrone.Windows - - - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - NzbDrone - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {FAFB5948-A222-4CF6-AD14-026BE7564802} - NzbDrone.Test.Dummy - - - - - - - - - - - 4.19.0 - - - 4.12.0 - - - 4.5.4 - - - 3.11.0 - - - 4.0.11 - - - 4.0.1 - - - - - xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)" - - - \ No newline at end of file diff --git a/src/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs b/src/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs index 5b800bb9c..0dda76095 100644 --- a/src/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs +++ b/src/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,6 +9,9 @@ //------------------------------------------------------------------------------ namespace NzbDrone.Common.EnsureThat.Resources { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -16,7 +19,7 @@ namespace NzbDrone.Common.EnsureThat.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ExceptionMessages { diff --git a/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs index 84a1d3435..fb75ad41e 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; @@ -16,7 +15,7 @@ namespace NzbDrone.Common.EnvironmentInfo var attributes = assembly.GetCustomAttributes(true); - Branch = "unknow"; + Branch = "unknown"; var config = attributes.OfType().FirstOrDefault(); if (config != null) @@ -52,4 +51,4 @@ namespace NzbDrone.Common.EnvironmentInfo } } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Common/Lidarr.Common.csproj b/src/NzbDrone.Common/Lidarr.Common.csproj new file mode 100644 index 000000000..d6341de66 --- /dev/null +++ b/src/NzbDrone.Common/Lidarr.Common.csproj @@ -0,0 +1,36 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + + True + True + ExceptionMessages.resx + + + ResXFileCodeGenerator + ExceptionMessages.Designer.cs + + + diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj deleted file mode 100644 index 087b1b639..000000000 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ /dev/null @@ -1,269 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - Library - Properties - NzbDrone.Common - Lidarr.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 - - - - - - - - - - - - ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - - - - - libsqlite3.0.dylib - PreserveNewest - - - - - {74420a79-cc16-442c-8b1e-7c1b913844f0} - CurlSharp - - - - - 1.3.4 - - - 0.86.5 - - - 12.0.2 - - - 4.5.4 - - - 1.2.0 - - - 4.0.11 - - - - - - \ 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 77d21a2e6..000000000 --- a/src/NzbDrone.Common/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("Lidarr.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")] - diff --git a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs deleted file mode 100644 index 2234c9d14..000000000 --- a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Gets updated at build time by TeamCity to branch name -[assembly: AssemblyConfiguration("debug")] - -[assembly: AssemblyCompany("lidarr.audio")] -[assembly: AssemblyProduct("Lidarr")] -[assembly: AssemblyVersion("10.0.0.*")] -[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.Console/Lidarr.Console.csproj b/src/NzbDrone.Console/Lidarr.Console.csproj new file mode 100644 index 000000000..9f416b8a2 --- /dev/null +++ b/src/NzbDrone.Console/Lidarr.Console.csproj @@ -0,0 +1,13 @@ + + + Exe + net462 + x86 + + ..\NzbDrone.Host\NzbDrone.ico + app.manifest + + + + + diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj deleted file mode 100644 index 596f9b202..000000000 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} - Exe - Properties - NzbDrone.Console - Lidarr.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\NzbDrone.ico - - - NzbDrone.Console.ConsoleApp - - - OnBuildSuccess - - - app.manifest - - - - - - - - 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 - - - - - - 3.1.0 - - - 12.0.2 - - - 4.5.4 - - - - - - - - - \ 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 78d2227d3..000000000 --- a/src/NzbDrone.Console/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +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("Lidarr.Host")] -[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] diff --git a/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj new file mode 100644 index 000000000..16efb130f --- /dev/null +++ b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj @@ -0,0 +1,26 @@ + + + net462 + x86 + + + + + + + + + + + + Files\1024.png + Always + + + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + PreserveNewest + + + 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 6fb6da137..000000000 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ /dev/null @@ -1,645 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} - Library - Properties - NzbDrone.Core.Test - Lidarr.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 - - - - - - - - - - - ..\Libraries\Sqlite\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - Always - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {15AD7579-A314-4626-B556-663F51D97CD1} - NzbDrone.Mono - - - {911284D3-F130-459E-836C-2430B6FBF21D} - NzbDrone.Windows - - - - - Files\1024.png - Always - - - sqlite3.dll - Always - - - Always - - - Always - - - Designer - Always - - - Always - Designer - - - Always - - - Always - - - PreserveNewest - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Designer - 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 - - - Always - - - Always - - - Always - - - - - - - - - - - - - - 2.0.0 - - - 4.19.0 - - - 1.6.2 - - - 6.2.1 - - - 15.0.0 - - - 4.12.0 - - - 4.0.0 - - - 12.0.2 - - - 4.5.4 - - - 3.11.0 - - - 0.9.4456.26422 - - - 4.0.11 - - - 2.2.0.19 - - - 4.0.1 - - - - - - - - - - - - - - - - - - - diff --git a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 606b5b963..000000000 --- a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +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("Lidarr.Core.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Lidarr.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: InternalsVisibleTo("Lidarr.Core")] diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs index a59bceb66..0d4bf0a13 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs @@ -1,5 +1,4 @@ using System; -using System.Windows.Forms; using FluentMigrator; using NLog; using NzbDrone.Common.Instrumentation; diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs index bb8f06396..fc5f3d4b8 100644 --- a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs +++ b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs @@ -1,6 +1,6 @@ namespace NzbDrone.Core.Download.Clients.Deluge { - class DelugeTorrentStatus + public class DelugeTorrentStatus { public const string Paused = "Paused"; public const string Queued = "Queued"; diff --git a/src/NzbDrone.Core/Lidarr.Core.csproj b/src/NzbDrone.Core/Lidarr.Core.csproj new file mode 100644 index 000000000..2b76d4fc8 --- /dev/null +++ b/src/NzbDrone.Core/Lidarr.Core.csproj @@ -0,0 +1,55 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + + + + + + + ..\Libraries\Growl.Connector.dll + + + ..\Libraries\Growl.CoreLibrary.dll + + + ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + + + + Resources\Logo\64.png + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj deleted file mode 100644 index afd98df8b..000000000 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ /dev/null @@ -1,1346 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - Library - Properties - NzbDrone.Core - Lidarr.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 - - - - False - ..\Libraries\Growl.Connector.dll - - - False - ..\Libraries\Growl.CoreLibrary.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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} - Marr.Data - - - {411a9e0e-fdc6-4e25-828a-0c2cd1cd96f8} - MonoTorrent - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - - - Resources\Logo\64.png - - - - - libsqlite3.0.dylib - PreserveNewest - - - - - - PreserveNewest - - - PreserveNewest - - - - - 1.6.2 - - - 6.2.1 - - - 4.2.5 - - - 12.0.2 - - - 4.5.4 - - - 1.0.3 - - - 0.9.4456.26422 - - - 105.2.3 - - - 4.0.11 - - - 2.2.0.19 - - - 2.5.0 - - - - - - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Core/Properties/AssemblyInfo.cs b/src/NzbDrone.Core/Properties/AssemblyInfo.cs index 352317239..9b6339c95 100644 --- a/src/NzbDrone.Core/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Core/Properties/AssemblyInfo.cs @@ -1,14 +1,3 @@ -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("Lidarr.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")] +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Lidarr.Core.Test")] 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.Host.Test/Lidarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj new file mode 100644 index 000000000..8a17b5bb3 --- /dev/null +++ b/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj @@ -0,0 +1,13 @@ + + + net462 + x86 + + + + + + + + + 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.App.Test/app.config b/src/NzbDrone.Host.Test/app.config similarity index 100% rename from src/NzbDrone.App.Test/app.config rename to src/NzbDrone.Host.Test/app.config diff --git a/src/NzbDrone.Host/Lidarr.Host.csproj b/src/NzbDrone.Host/Lidarr.Host.csproj new file mode 100644 index 000000000..4062811fc --- /dev/null +++ b/src/NzbDrone.Host/Lidarr.Host.csproj @@ -0,0 +1,24 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + ..\Libraries\Interop.NetFwTypeLib.dll + True + + + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj deleted file mode 100644 index c40efd19e..000000000 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {95C11A9E-56ED-456A-8447-2C89C1139266} - Library - Properties - NzbDrone.Host - Lidarr.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 - - - - - - - - - ..\Libraries\Interop.NetFwTypeLib.dll - True - - - - - - 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 - - - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V1 - - - {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} - Lidarr.Http - - - - - - - - 2.4.1 - - - 2.4.1 - - - 3.1.0 - - - 3.1.0 - - - 3.1.0 - - - 1.4.4 - - - 1.4.1 - - - 12.0.2 - - - 4.5.4 - - - - - - - - - - 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 f5ca86a7a..000000000 --- a/src/NzbDrone.Host/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("Lidarr.exe")] -[assembly: Guid("87CAF14C-6750-42DB-B6A0-3BB826315E91")] - diff --git a/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj new file mode 100644 index 000000000..051d08dbd --- /dev/null +++ b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj @@ -0,0 +1,13 @@ + + + net462 + x86 + + + + + + + + + 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 e195b363b..000000000 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - Debug - x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB} - Library - Properties - NzbDrone.Integration.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.config - - - - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V1 - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {95C11A9E-56ED-456A-8447-2C89C1139266} - NzbDrone.Host - - - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - NzbDrone.SignalR - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {5370bff7-1bd7-46bc-af06-7d9ea5cda1d6} - Lidarr.Http - - - - - sqlite3.dll - Always - - - - - - - - 4.19.0 - - - 6.2.1 - - - 2.4.1 - - - 3.1.0 - - - 3.1.0 - - - 4.12.0 - - - 1.4.4 - - - 1.4.1 - - - 12.0.2 - - - 4.5.4 - - - 3.11.0 - - - 105.2.3 - - - - - - xcopy /s /y "$(SolutionDir)\..\_output\Lidarr.Mono.*" "$(TargetDir)" - xcopy /s /y "$(SolutionDir)\..\_output\Lidarr.Windows.*" "$(TargetDir)" - - - cp -rv $(SolutionDir)\..\_output\Lidarr.Mono.* $(TargetDir) - cp -rv $(SolutionDir)\..\_output\Lidarr.Windows.* $(TargetDir) - - - - diff --git a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index a53b560c0..000000000 --- a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Smoke.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj new file mode 100644 index 000000000..33985d0a6 --- /dev/null +++ b/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj @@ -0,0 +1,9 @@ + + + net462 + x86 + + + + + 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 5ba75c428..000000000 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - Debug - x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770} - Library - Properties - NzbDrone.Libraries.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - - - - - - 4.19.0 - - - 12.0.2 - - - 3.11.0 - - - - - \ 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 7e777db60..000000000 --- a/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Libraries.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj new file mode 100644 index 000000000..ba380658b --- /dev/null +++ b/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj @@ -0,0 +1,21 @@ + + + net462 + x86 + + + + + + + + + ..\Libraries\Mono.Posix.dll + + + + + PreserveNewest + + + 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 af841fc03..000000000 --- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj +++ /dev/null @@ -1,148 +0,0 @@ - - - - - Debug - AnyCPU - {40D72824-7D02-4A77-9106-8FE0EEA2B997} - Library - Properties - NzbDrone.Mono.Test - Lidarr.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 - - - - False - ..\Libraries\Mono.Posix.dll - - - - - - - - - - - - - - - - - - - - - - Always - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - - - {ff5ee3b6-913b-47ce-9ceb-11c51b4e1205} - NzbDrone.Core - - - {95c11a9e-56ed-456a-8447-2c89c1139266} - NzbDrone.Host - - - {15ad7579-a314-4626-b556-663f51d97cd1} - NzbDrone.Mono - - - {caddfce0-7509-4430-8364-2074e1eefca2} - NzbDrone.Test.Common - - - - - - - - Always - - - - - Always - - - - - - - - 4.19.0 - - - 4.12.0 - - - 3.11.0 - - - - - \ 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 9bacc9f2f..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("Lidarr.Mono.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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/Lidarr.Mono.csproj b/src/NzbDrone.Mono/Lidarr.Mono.csproj new file mode 100644 index 000000000..3d20b6915 --- /dev/null +++ b/src/NzbDrone.Mono/Lidarr.Mono.csproj @@ -0,0 +1,18 @@ + + + net462 + x86 + + + + + + + + + + + ..\Libraries\Mono.Posix.dll + + + diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj deleted file mode 100644 index c9883ac23..000000000 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - - Debug - AnyCPU - {15AD7579-A314-4626-B556-663F51D97CD1} - Library - Properties - NzbDrone.Mono - Lidarr.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 - - - - - - - - - - - False - ..\Libraries\Mono.Posix.dll - - - - - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - - - - - - 4.5.4 - - - 4.0.11 - - - - - \ 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 f9d51f7d9..000000000 --- a/src/NzbDrone.Mono/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Mono")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.SignalR/Lidarr.SignalR.csproj b/src/NzbDrone.SignalR/Lidarr.SignalR.csproj new file mode 100644 index 000000000..4875b908d --- /dev/null +++ b/src/NzbDrone.SignalR/Lidarr.SignalR.csproj @@ -0,0 +1,17 @@ + + + net462 + x86 + + + + + + + + + + + + + diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj deleted file mode 100644 index c90e87486..000000000 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Debug - x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} - Library - Properties - NzbDrone.SignalR - Lidarr.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 - - - - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - - - - - - 2.4.1 - - - 2.4.1 - - - 3.1.0 - - - 3.1.0 - - - 3.1.0 - - - 12.0.2 - - - - - \ 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 9bdb0da6c..000000000 --- a/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +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("Lidarr.SignalR")] -[assembly: Guid("98bd985a-4f23-4201-8ed3-f6f3d7f2a5fe")] - 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/Lidarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj new file mode 100644 index 000000000..4b4765b04 --- /dev/null +++ b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj @@ -0,0 +1,21 @@ + + + net462 + x86 + + + + + + + + + + + + + + + + + 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 121adcf0e..000000000 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ /dev/null @@ -1,129 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - Library - Properties - NzbDrone.Test.Common - Lidarr.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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - Always - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205} - NzbDrone.Core - - - - - 4.19.0 - - - 6.2.1 - - - 4.12.0 - - - 12.0.2 - - - 4.5.4 - - - 3.11.0 - - - 105.2.3 - - - 4.0.11 - - - 4.0.1 - - - - - \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 2bc76a070..4901be8ef 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Test.Common if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "..", "_output", "Lidarr.Console.exe")); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "_output", "Lidarr.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 a73dfabf8..000000000 --- a/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Test.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj new file mode 100644 index 000000000..2da82570e --- /dev/null +++ b/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj @@ -0,0 +1,7 @@ + + + Exe + net462 + x86 + + 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 1145b6175..000000000 --- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj +++ /dev/null @@ -1,65 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {FAFB5948-A222-4CF6-AD14-026BE7564802} - Exe - Properties - NzbDrone.Test.Dummy - Lidarr.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 fe958f227..000000000 --- a/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Test.Dummy")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Lidarr.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")] - 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/Lidarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj new file mode 100644 index 000000000..b67841419 --- /dev/null +++ b/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj @@ -0,0 +1,10 @@ + + + net462 + x86 + + + + + + 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 1c70e3b2d..000000000 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} - Library - Properties - NzbDrone.Update.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - App.config - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} - NzbDrone.Test.Common - - - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} - NzbDrone.Update - - - - - - - - 4.19.0 - - - 4.12.0 - - - 4.0.0 - - - 4.5.4 - - - 3.11.0 - - - - - \ 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 e7a36b7be..000000000 --- a/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("Lidarr.Update.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Lidarr.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")] - diff --git a/src/NzbDrone.Update/Lidarr.Update.csproj b/src/NzbDrone.Update/Lidarr.Update.csproj new file mode 100644 index 000000000..412ce5e94 --- /dev/null +++ b/src/NzbDrone.Update/Lidarr.Update.csproj @@ -0,0 +1,13 @@ + + + WinExe + net462 + x86 + + + + + + + + diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj deleted file mode 100644 index fa639ce8f..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 - Lidarr.Update - v4.6.2 - - - 512 - ..\ - true - - - x86 - true - full - false - ..\..\_output\Lidarr.Update\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - ..\..\_output\Lidarr.Update\ - TRACE - prompt - 4 - false - - - app.manifest - - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} - NzbDrone.Common - - - - - 12.0.2 - - - 4.5.4 - - - - - \ 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 652646236..000000000 --- a/src/NzbDrone.Update/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("Lidarr.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")] - diff --git a/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj new file mode 100644 index 000000000..99384245e --- /dev/null +++ b/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj @@ -0,0 +1,11 @@ + + + net462 + x86 + + + + + + + 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 c4bff1d6b..000000000 --- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Debug - AnyCPU - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA} - Library - Properties - NzbDrone.Windows.Test - Lidarr.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 - - - - - - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - - - {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 - - - - - - - - - - - 4.19.0 - - - 3.11.0 - - - - - \ 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 e4c165eb6..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("Lidarr.Windows.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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/Lidarr.Windows.csproj b/src/NzbDrone.Windows/Lidarr.Windows.csproj new file mode 100644 index 000000000..fc43c72cf --- /dev/null +++ b/src/NzbDrone.Windows/Lidarr.Windows.csproj @@ -0,0 +1,12 @@ + + + net462 + x86 + + + + + + + + diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj deleted file mode 100644 index cbd6d4ec4..000000000 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ /dev/null @@ -1,98 +0,0 @@ - - - - - Debug - AnyCPU - {911284D3-F130-459E-836C-2430B6FBF21D} - Library - Properties - NzbDrone.Windows - Lidarr.Windows - v4.6.2 - 512 - ..\ - true - - - - true - full - false - ..\..\_output\ - DEBUG;TRACE - prompt - 4 - x86 - 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 - - - - - - - - - - - - - - - - - - - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} - NzbDrone.Common - - - - - - - - 4.5.4 - - - 4.0.11 - - - - - \ 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 1ea78db56..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("Lidarr.Windows")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lidarr.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/Lidarr.csproj b/src/NzbDrone/Lidarr.csproj new file mode 100644 index 000000000..878ea4d85 --- /dev/null +++ b/src/NzbDrone/Lidarr.csproj @@ -0,0 +1,29 @@ + + + WinExe + net462 + x86 + + ..\NzbDrone.Host\NzbDrone.ico + app.manifest + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj deleted file mode 100644 index 8bdef82ad..000000000 --- a/src/NzbDrone/NzbDrone.csproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - WinExe - Properties - NzbDrone - Lidarr - 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\NzbDrone.ico - - - NzbDrone.WindowsApp - - - OnOutputUpdated - - - app.manifest - - - - - - - - - - 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 - - - - - app.config - - - - - - 3.1.0 - - - 12.0.2 - - - 4.5.4 - - - - - - - - - - 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 132121d17..000000000 --- a/src/NzbDrone/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("Lidarr.exe")] -[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] - diff --git a/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs b/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs deleted file mode 100644 index 29ef7e071..000000000 --- a/src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +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")] - 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 2a6d7f070..000000000 --- a/src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("UninstallService")] -[assembly: Guid("0a964b21-9de9-40b3-9378-0474fd5f21a8")] - 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/test.sh b/test.sh index 28ecfb08c..062b43992 100755 --- a/test.sh +++ b/test.sh @@ -23,7 +23,7 @@ rm -f "$TEST_LOG_FILE" # Uncomment to log test output to a file instead of the console export LIDARR_TESTS_LOG_OUTPUT="File" -NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe" +NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe" NUNIT_COMMAND="$NUNIT" NUNIT_PARAMS="--workers=1"