From b1349213f22b109d5e781eef840ac5b92a2b36cf Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 17 Oct 2019 21:42:49 +0100 Subject: [PATCH] New: Use dotnet tooling, produce 64bit build on windows --- azure-pipelines.yml | 67 ++++- build.sh | 247 ++++++--------- macOS/Lidarr | 0 setup/lidarr.iss | 4 +- src/Directory.Build.props | 55 +++- src/Directory.Build.targets | 4 + src/Lidarr.Api.V1/Lidarr.Api.V1.csproj | 3 +- src/Lidarr.Http/Lidarr.Http.csproj | 3 +- src/Lidarr.Posix.sln | 210 +++++++++++++ src/Lidarr.Windows.sln | 219 ++++++++++++++ src/Lidarr.sln | 280 ------------------ src/Marr.Data/Marr.Data.csproj | 3 +- src/MonoFacades.targets | 43 +++ src/MonoTorrent/MonoTorrent.csproj | 3 +- src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj | 3 +- .../Lidarr.Automation.Test.csproj | 3 +- .../Lidarr.Common.Test.csproj | 3 +- src/NzbDrone.Common/Lidarr.Common.csproj | 3 +- src/NzbDrone.Console/Lidarr.Console.csproj | 6 +- .../Lidarr.Core.Test.csproj | 15 +- .../Configuration/ConfigFileProvider.cs | 2 +- src/NzbDrone.Core/Lidarr.Core.csproj | 27 +- .../Notifications/Email/EmailService.cs | 3 - .../Lidarr.Host.Test.csproj | 3 +- src/NzbDrone.Host/Lidarr.Host.csproj | 3 +- .../Lidarr.Integration.Test.csproj | 3 +- .../Lidarr.Libraries.Test.csproj | 3 +- .../Lidarr.Mono.Test.csproj | 3 +- src/NzbDrone.Mono/Lidarr.Mono.csproj | 3 +- src/NzbDrone.SignalR/Lidarr.SignalR.csproj | 3 +- .../Lidarr.Test.Common.csproj | 3 +- src/NzbDrone.Test.Common/NzbDroneRunner.cs | 3 +- .../Lidarr.Test.Dummy.csproj | 3 +- .../Lidarr.Update.Test.csproj | 3 +- src/NzbDrone.Update/Lidarr.Update.csproj | 3 +- .../Lidarr.Windows.Test.csproj | 3 +- src/NzbDrone.Windows/Lidarr.Windows.csproj | 3 +- src/NzbDrone/Lidarr.csproj | 9 +- src/PublishAllRids.targets | 37 +++ .../ServiceInstall/ServiceInstall.csproj | 3 +- .../ServiceUninstall/ServiceUninstall.csproj | 3 +- 41 files changed, 779 insertions(+), 521 deletions(-) mode change 100644 => 100755 macOS/Lidarr create mode 100644 src/Directory.Build.targets create mode 100644 src/Lidarr.Posix.sln create mode 100644 src/Lidarr.Windows.sln delete mode 100644 src/Lidarr.sln create mode 100644 src/MonoFacades.targets create mode 100644 src/PublishAllRids.targets diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8fcb8f6c8..c168ca80b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,7 @@ variables: macOsTar: 'Lidarr.$(buildName).osx.tar.gz' linuxTar: 'Lidarr.$(buildName).linux.tar.gz' sentryOrg: 'lidarr' + dotnetVersion: '3.0.100' trigger: branches: @@ -54,15 +55,34 @@ stages: - checkout: self submodules: true fetchDepth: 1 + - task: UseDotNet@2 + displayName: 'Install .net core 3.0' + inputs: + version: $(dotnetVersion) - bash: ./build.sh --backend displayName: Build Lidarr Backend + - bash: | + find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \; + find ${OUTPUTFOLDER} -depth -empty -type d -exec rm -r "{}" \; + find ${TESTSFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \; + find ${TESTSFOLDER} -depth -empty -type d -exec rm -r "{}" \; + ls -lR + displayName: Clean up intermediate output - publish: $(outputFolder) artifact: '$(osName)Backend' displayName: Publish Backend condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: $(testsFolder) - artifact: '$(osName)Tests' - displayName: Publish Test Package + - publish: '$(testsFolder)/net462/win-x64/publish' + artifact: WindowsTests + displayName: Publish Windows Test Package + condition: and(succeeded(), eq(variables['osName'], 'Windows')) + - publish: '$(testsFolder)/net462/linux-x64/publish' + artifact: LinuxTests + displayName: Publish Linux Test Package + condition: and(succeeded(), eq(variables['osName'], 'Windows')) + - publish: '$(testsFolder)/net462/osx-x64/publish' + artifact: MacTests + displayName: Publish MacOS Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - stage: Build_Frontend @@ -162,10 +182,8 @@ stages: - bash: ./build.sh --packages displayName: Create Packages - bash: | - chmod a+x $(artifactsFolder)/macos/Lidarr/fpcalc - chmod a+x $(artifactsFolder)/macos/Lidarr/Lidarr - chmod a+x $(artifactsFolder)/macos-app/Lidarr.app/Contents/MacOS/fpcalc - chmod a+x $(artifactsFolder)/macos-app/Lidarr.app/Contents/MacOS/Lidarr + find . -name "fpcalc" -exec chmod a+x {} \; + find . -name "Lidarr" -exec chmod a+x {} \; displayName: Set Mac executable bits - task: ArchiveFiles@2 displayName: Create Windows zip @@ -173,14 +191,14 @@ stages: archiveFile: '$(Build.ArtifactStagingDirectory)/$(windowsZip)' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/windows + rootFolderOrFile: $(artifactsFolder)/windows/net462 - task: ArchiveFiles@2 displayName: Create MacOS app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/$(macOsApp)' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos-app + rootFolderOrFile: $(artifactsFolder)/macos-app/net462 - task: ArchiveFiles@2 displayName: Create MacOS tar inputs: @@ -188,7 +206,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos + rootFolderOrFile: $(artifactsFolder)/macos/net462 - task: ArchiveFiles@2 displayName: Create Linux tar inputs: @@ -196,7 +214,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux + rootFolderOrFile: $(artifactsFolder)/linux/net462 - publish: $(Build.ArtifactStagingDirectory) artifact: 'Packages' displayName: Publish Packages @@ -241,11 +259,15 @@ stages: steps: - checkout: none + - task: UseDotNet@2 + displayName: 'Install .net core 3.0' + inputs: + version: $(dotnetVersion) - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact inputs: buildType: 'current' - artifactName: WindowsTests + artifactName: '$(osName)Tests' targetPath: $(testsFolder) - powershell: Set-Service SCardSvr -StartupType Manual displayName: Enable Windows Test Service @@ -259,6 +281,8 @@ stages: chmod a+x _tests/fpcalc displayName: Set Mono Version and make fpcalc Executable condition: and(succeeded(), eq(variables['osName'], 'Mac')) + - bash: find ${TESTSFOLDER} -name "Lidarr.Test.Dummy" -exec chmod a+x {} \; + displayName: Make Test Dummy Executable - task: Bash@3 displayName: Run Tests env: @@ -349,12 +373,16 @@ stages: echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH" displayName: Set Mono Version condition: and(succeeded(), eq(variables['osName'], 'Mac')) + - task: UseDotNet@2 + displayName: 'Install .net core 3.0' + inputs: + version: $(dotnetVersion) - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact inputs: buildType: 'current' - artifactName: WindowsTests + artifactName: '$(osName)Tests' targetPath: $(testsFolder) - task: DownloadPipelineArtifact@2 displayName: Download Build Artifact @@ -482,12 +510,16 @@ stages: vmImage: $(imageName) steps: + - task: UseDotNet@2 + displayName: 'Install .net core 3.0' + inputs: + version: $(dotnetVersion) - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact inputs: buildType: 'current' - artifactName: WindowsTests + artifactName: '$(osName)Tests' targetPath: $(testsFolder) - task: DownloadPipelineArtifact@2 displayName: Download Build Artifact @@ -605,8 +637,11 @@ stages: sonar.coverage.exclusions=**/Lidarr.Api.V1/**/*,**/MonoTorrent/**/*,**/Marr.Data/**/* sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/_tests/CoverageResults/coverage.opencover.xml sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml - - bash: ./build.sh --backend - displayName: Build Lidarr Backend + - task: DotNetCoreCLI@2 + displayName: Build backend + inputs: + command: 'build' + projects: 'src/Lidarr.Windows.sln' - task: Bash@3 displayName: Coverage Unit Tests inputs: diff --git a/build.sh b/build.sh index 5756f1b00..212a3df87 100755 --- a/build.sh +++ b/build.sh @@ -1,24 +1,12 @@ #! /bin/bash -msBuildVersion='15.0' outputFolder='./_output' -outputFolderLinux='./_output_linux' -outputFolderMacOS='./_output_macos' -outputFolderMacOSApp='./_output_macos_app' testPackageFolder='./_tests/' sourceFolder='./src' -slnFile=$sourceFolder/Lidarr.sln -updateFolder=$outputFolder/Lidarr.Update -updateFolderMono=$outputFolderLinux/Lidarr.Update #Artifact variables artifactsFolder="./_artifacts"; -artifactsFolderWindows=$artifactsFolder/windows -artifactsFolderLinux=$artifactsFolder/linux -artifactsFolderMacOS=$artifactsFolder/macos -artifactsFolderMacOSApp=$artifactsFolder/macos-app nuget='tools/nuget/nuget.exe'; -vswhere='tools/vswhere/vswhere.exe'; CheckExitCode() { @@ -54,14 +42,9 @@ UpdateVersionNumber() CleanFolder() { local path=$1 - local keepConfigFiles=$2 find $path -name "*.transform" -exec rm "{}" \; - if [ $keepConfigFiles != true ] ; then - find $path -name "*.dll.config" -exec rm "{}" \; - fi - echo "Removing FluentValidation.Resources files" find $path -name "FluentValidation.resources.dll" -exec rm "{}" \; find $path -name "App.config" -exec rm "{}" \; @@ -69,39 +52,10 @@ CleanFolder() echo "Removing vshost files" find $path -name "*.vshost.exe" -exec rm "{}" \; - echo "Removing dylib files" - find $path -name "*.dylib" -exec rm "{}" \; - echo "Removing Empty folders" find $path -depth -empty -type d -exec rm -r "{}" \; } -BuildWithMSBuild() -{ - installationPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -property installationPath` - installationPath=${installationPath/C:\\/\/c\/} - installationPath=${installationPath//\\/\/} - msBuild="$installationPath/MSBuild/$msBuildVersion/Bin" - echo $msBuild - - export PATH=$msBuild:$PATH - CheckExitCode MSBuild.exe $slnFile //p:Configuration=Debug //p:Platform=x86 //t:Clean //m - CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m - $nuget locals all -clear - $nuget restore $slnFile - CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb -} - -BuildWithXbuild() -{ - export MONO_IOMAP=case - CheckExitCode msbuild /p:Configuration=Debug /t:Clean $slnFile - CheckExitCode msbuild /p:Configuration=Release /t:Clean $slnFile - mono $nuget locals all -clear - mono $nuget restore $slnFile - CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile -} - LintUI() { ProgressStart 'ESLint' @@ -109,7 +63,7 @@ LintUI() ProgressEnd 'ESLint' ProgressStart 'Stylelint' - if [ $runtime = "dotnet" ] ; then + if [ "$os" = "windows" ]; then CheckExitCode yarn stylelint-windows else CheckExitCode yarn stylelint-linux @@ -124,19 +78,15 @@ Build() rm -rf $outputFolder rm -rf $testPackageFolder - if [ $runtime = "dotnet" ] ; then - BuildWithMSBuild + if [ $os = "windows" ]; then + slnFile=$sourceFolder/Lidarr.Windows.sln else - BuildWithXbuild + slnFile=$sourceFolder/Lidarr.Posix.sln fi - CleanFolder $outputFolder false - - echo "Removing Mono.Posix.dll" - rm $outputFolder/Mono.Posix.dll - - echo "Adding LICENSE.md" - cp LICENSE.md $outputFolder + CheckExitCode dotnet clean $slnFile -c Debug + CheckExitCode dotnet clean $slnFile -c Release + CheckExitCode dotnet msbuild -restore $slnFile -p:Configuration=Release -t:PublishAllRids ProgressEnd 'Build' } @@ -156,83 +106,91 @@ RunGulp() ProgressEnd 'Running gulp' } -PackageMono() +PackageFiles() { - ProgressStart 'Creating Mono Package' + local folder="$1" + local framework="$2" + local runtime="$3" - rm -rf $outputFolderLinux + rm -rf $folder + mkdir -p $folder + cp -r $outputFolder/$framework/$runtime/publish/* $folder + cp -r $outputFolder/Lidarr.Update/$framework/$runtime/publish $folder/Lidarr.Update + cp -r $outputFolder/UI $folder - echo "Copying Binaries" - cp -r $outputFolder $outputFolderLinux + CleanFolder $folder - echo "Replacing System.Numerics.Vectors.dll" - cp $sourceFolder/Libraries/Mono/System.Numerics.Vectors.dll $outputFolderLinux + echo "Adding LICENSE" + cp LICENSE.md $folder +} - echo "Removing Service helpers" - rm -f $outputFolderLinux/ServiceUninstall.* - rm -f $outputFolderLinux/ServiceInstall.* +PackageLinux() +{ + local framework="$1" + + ProgressStart "Creating Linux Package for $framework" - echo "Removing native windows binaries Sqlite, fpcalc" - rm -f $outputFolderLinux/sqlite3.* - rm -f $outputFolderLinux/fpcalc* + local folder=$artifactsFolder/linux/$framework/Lidarr - echo "Renaming Lidarr.Console.exe to Lidarr.exe" - rm $outputFolderLinux/Lidarr.exe* - for file in $outputFolderLinux/Lidarr.Console.exe*; do - mv "$file" "${file//.Console/}" - done + PackageFiles "$folder" $framework $runtime "linux-x64" + + echo "Removing Service helpers" + rm -f $folder/ServiceUninstall.* + rm -f $folder/ServiceInstall.* echo "Removing Lidarr.Windows" - rm $outputFolderLinux/Lidarr.Windows.* + rm $folder/Lidarr.Windows.* echo "Adding Lidarr.Mono to UpdatePackage" - cp $outputFolderLinux/Lidarr.Mono.* $updateFolderMono + cp $folder/Lidarr.Mono.* $folder/Lidarr.Update - ProgressEnd 'Creating Mono Package' + ProgressEnd "Creating Linux Package for $framework" } PackageMacOS() { - ProgressStart 'Creating MacOS Package' + local framework="$1" + + ProgressStart "Creating MacOS Package for $framework" - rm -rf $outputFolderMacOS - mkdir $outputFolderMacOS + local folder=$artifactsFolder/macos/$framework/Lidarr + + PackageFiles "$folder" "$framework" "osx-x64" echo "Adding Startup script" - cp ./macOS/Lidarr $outputFolderMacOS + cp ./macOS/Lidarr $folder - echo "Copying Binaries" - cp -r $outputFolderLinux/* $outputFolderMacOS - cp $outputFolder/fpcalc $outputFolderMacOS + echo "Removing Service helpers" + rm -f $folder/ServiceUninstall.* + rm -f $folder/ServiceInstall.* + + echo "Removing Lidarr.Windows" + rm $folder/Lidarr.Windows.* - echo "Adding sqlite dylibs" - cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOS + echo "Adding Lidarr.Mono to UpdatePackage" + cp $folder/Lidarr.Mono.* $folder/Lidarr.Update ProgressEnd 'Creating MacOS Package' } PackageMacOSApp() { - ProgressStart 'Creating macOS App Package' + local framework="$1" + + ProgressStart "Creating macOS App Package for $framework" - rm -rf $outputFolderMacOSApp - mkdir $outputFolderMacOSApp - cp -r ./macOS/Lidarr.app $outputFolderMacOSApp - mkdir -p $outputFolderMacOSApp/Lidarr.app/Contents/MacOS + local folder=$artifactsFolder/macos-app/$framework - echo "Adding Startup script" - cp ./macOS/Lidarr $outputFolderMacOSApp/Lidarr.app/Contents/MacOS - dos2unix $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr + rm -rf $folder + mkdir -p $folder + cp -r ./macOS/Lidarr.app $folder + mkdir -p $folder/Lidarr.app/Contents/MacOS echo "Copying Binaries" - cp -r $outputFolderLinux/* $outputFolderMacOSApp/Lidarr.app/Contents/MacOS - cp $outputFolder/fpcalc $outputFolderMacOSApp/Lidarr.app/Contents/MacOS - - echo "Adding sqlite dylibs" - cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOSApp/Lidarr.app/Contents/MacOS + cp -r $artifactsFolder/macos/$framework/Lidarr/* $folder/Lidarr.app/Contents/MacOS echo "Removing Update Folder" - rm -r $outputFolderMacOSApp/Lidarr.app/Contents/MacOS/Lidarr.Update + rm -r $folder/Lidarr.app/Contents/MacOS/Lidarr.Update ProgressEnd 'Creating macOS App Package' } @@ -241,70 +199,60 @@ PackageTests() { ProgressStart 'Creating Test Package' - if [ $runtime = "dotnet" ] ; then - $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder + cp ./test.sh $testPackageFolder/net462/win-x64/publish + cp ./test.sh $testPackageFolder/net462/linux-x64/publish + cp ./test.sh $testPackageFolder/net462/osx-x64/publish + + if [ $os = "windows" ] ; then + $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/win-x64/publish + $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/linux-x64/publish + $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/osx-x64/publish else - mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder + mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/win-x64/publish + mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/linux-x64/publish + mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder/net462/osx-x64/publish fi - - cp ./test.sh $testPackageFolder - + rm -f $testPackageFolder/*.log.config - CleanFolder $testPackageFolder true + # geckodriver.exe isn't copied by dotnet publish + curl -Lo gecko.zip "https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-win64.zip" + unzip -o gecko.zip + cp geckodriver.exe $testPackageFolder/net462/win-x64/publish - echo "Adding sqlite dylibs" - cp $sourceFolder/Libraries/Sqlite/*.dylib $testPackageFolder + CleanFolder $testPackageFolder ProgressEnd 'Creating Test Package' } -CleanupWindowsPackage() +PackageWindows() { - ProgressStart 'Cleaning Windows Package' + local framework="$1" + + ProgressStart "Creating Windows Package for $framework" + + local folder=$artifactsFolder/windows/$framework/Lidarr + + PackageFiles "$folder" "$framework" "win-x64" echo "Removing Lidarr.Mono" - rm -f $outputFolder/Lidarr.Mono.* + rm -f $folder/Lidarr.Mono.* echo "Adding Lidarr.Windows to UpdatePackage" - cp $outputFolder/Lidarr.Windows.* $updateFolder - - echo "Removing MacOS fpcalc" - rm $outputFolder/fpcalc - - ProgressEnd 'Cleaning Windows Package' -} + cp $folder/Lidarr.Windows.* $folder/Lidarr.Update -PackageArtifacts() -{ - echo "Creating Artifact Directories" - - rm -rf $artifactsFolder - mkdir $artifactsFolder - - mkdir $artifactsFolderWindows - mkdir $artifactsFolderMacOS - mkdir $artifactsFolderLinux - mkdir $artifactsFolderWindows/Lidarr - mkdir $artifactsFolderMacOS/Lidarr - mkdir $artifactsFolderLinux/Lidarr - mkdir $artifactsFolderMacOSApp - - cp -r $outputFolder/* $artifactsFolderWindows/Lidarr - cp -r $outputFolderMacOSApp/* $artifactsFolderMacOSApp - cp -r $outputFolderMacOS/* $artifactsFolderMacOS/Lidarr - cp -r $outputFolderLinux/* $artifactsFolderLinux/Lidarr + ProgressEnd 'Creating Windows Package' } # Use mono or .net depending on OS case "$(uname -s)" in CYGWIN*|MINGW32*|MINGW64*|MSYS*) # on windows, use dotnet - runtime="dotnet" + os="windows" ;; *) # otherwise use mono - runtime="mono" + os="posix" ;; esac @@ -354,20 +302,20 @@ esac done set -- "${POSITIONAL[@]}" # restore positional parameters -if [ "$BACKEND" == "YES" ]; +if [ "$BACKEND" = "YES" ]; then UpdateVersionNumber Build PackageTests fi -if [ "$FRONTEND" == "YES" ]; +if [ "$FRONTEND" = "YES" ]; then YarnInstall RunGulp fi -if [ "$LINT" == "YES" ]; +if [ "$LINT" = "YES" ]; then if [ -z "$FRONTEND" ]; then @@ -377,12 +325,11 @@ then LintUI fi -if [ "$PACKAGES" == "YES" ]; +if [ "$PACKAGES" = "YES" ]; then UpdateVersionNumber - PackageMono - PackageMacOS - PackageMacOSApp - CleanupWindowsPackage - PackageArtifacts + PackageWindows "net462" + PackageLinux "net462" + PackageMacOS "net462" + PackageMacOSApp "net462" fi diff --git a/macOS/Lidarr b/macOS/Lidarr old mode 100644 new mode 100755 diff --git a/setup/lidarr.iss b/setup/lidarr.iss index c519c8c35..e263a8c03 100644 --- a/setup/lidarr.iss +++ b/setup/lidarr.iss @@ -48,8 +48,8 @@ Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked [Files] -Source: "..\_output\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\_artifacts\windows\net462\Lidarr\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\_artifacts\windows\net462\Lidarr\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9abe30564..8ea3a8c5f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,6 +3,10 @@ true + AnyCPU + true + win-x64;osx-x64;linux-x64 + $(MSBuildThisFileDirectory)..\ @@ -75,10 +79,55 @@ - - false - $(MSBuildProjectName.Replace('Lidarr','NzbDrone')) + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + true + + + + + true + + + + + true + + + + + + <_UsingDefaultRuntimeIdentifier>true + win-x64 + + + + <_UsingDefaultRuntimeIdentifier>true + linux-x64 + + + + <_UsingDefaultRuntimeIdentifier>true + osx-x64 + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 000000000..85b899ff1 --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj index 6cd9d916b..8c605d1f5 100644 --- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj +++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/Lidarr.Http/Lidarr.Http.csproj b/src/Lidarr.Http/Lidarr.Http.csproj index c97ef1277..f903baf19 100644 --- a/src/Lidarr.Http/Lidarr.Http.csproj +++ b/src/Lidarr.Http/Lidarr.Http.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/Lidarr.Posix.sln b/src/Lidarr.Posix.sln new file mode 100644 index 000000000..ba37c58c6 --- /dev/null +++ b/src/Lidarr.Posix.sln @@ -0,0 +1,210 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test.Common", "Test.Common", "{47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServiceHelpers", "WindowsServiceHelpers", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{F6E3A728-AE77-4D02-BAC8-82FBC1402DDA}" +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}") = "Lidarr.Api.V1", "Lidarr.Api.V1\Lidarr.Api.V1.csproj", "{D1D48E1D-9EEB-470B-992C-3954F90FB014}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Http", "Lidarr.Http\Lidarr.Http.csproj", "{F8A02FD4-A7A4-40D0-BB81-6319105A3302}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marr.Data", "Marr.Data\Marr.Data.csproj", "{8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoTorrent", "MonoTorrent\MonoTorrent.csproj", "{BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Api.Test", "NzbDrone.Api.Test\Lidarr.Api.Test.csproj", "{E2EA47B1-6996-417D-A6EC-28C4F202715C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Automation.Test", "NzbDrone.Automation.Test\Lidarr.Automation.Test.csproj", "{2356C987-F992-4084-9DA2-5DAD1DA35E85}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Common.Test", "NzbDrone.Common.Test\Lidarr.Common.Test.csproj", "{A628FEA4-75CC-4039-8823-27258C55D2BF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Common", "NzbDrone.Common\Lidarr.Common.csproj", "{74BF1D46-710C-42C1-82DD-34B42C58F843}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Console", "NzbDrone.Console\Lidarr.Console.csproj", "{AEA9EE9A-19BF-45CB-93D9-52CA443FD313}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Core.Test", "NzbDrone.Core.Test\Lidarr.Core.Test.csproj", "{04ECC74F-C340-4987-863E-757FB62D27C9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Core", "NzbDrone.Core\Lidarr.Core.csproj", "{82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Host.Test", "NzbDrone.Host.Test\Lidarr.Host.Test.csproj", "{6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Host", "NzbDrone.Host\Lidarr.Host.csproj", "{B6913970-FB88-4F6F-83F9-00728218E3FD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Integration.Test", "NzbDrone.Integration.Test\Lidarr.Integration.Test.csproj", "{6D5618FB-45B9-44AE-BF99-8EF37519CB30}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Libraries.Test", "NzbDrone.Libraries.Test\Lidarr.Libraries.Test.csproj", "{1969394D-3181-404F-8E2C-E3E71A5BAD30}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Mono.Test", "NzbDrone.Mono.Test\Lidarr.Mono.Test.csproj", "{CCE9ABBC-96BA-425B-8140-DC8102290BE3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Mono", "NzbDrone.Mono\Lidarr.Mono.csproj", "{504CD0A8-523B-4A0E-99BE-C179DECA9B76}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.SignalR", "NzbDrone.SignalR\Lidarr.SignalR.csproj", "{B30BE76E-4D20-47AA-9E03-E32613D888CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Test.Common", "NzbDrone.Test.Common\Lidarr.Test.Common.csproj", "{B8706292-5BE8-4099-94CA-F26DDD3757E0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Test.Dummy", "NzbDrone.Test.Dummy\Lidarr.Test.Dummy.csproj", "{AFA7F48E-DB81-4E39-843B-78715C6ADF0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Update.Test", "NzbDrone.Update.Test\Lidarr.Update.Test.csproj", "{A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Update", "NzbDrone.Update\Lidarr.Update.csproj", "{4FBA2CBC-B022-41D6-B6DA-3166991B9172}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Windows.Test", "NzbDrone.Windows.Test\Lidarr.Windows.Test.csproj", "{7BEDCC1E-0763-4553-B32B-0430B334ACBB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Windows", "NzbDrone.Windows\Lidarr.Windows.csproj", "{3F076242-A6FA-4657-8606-AF1D150367FC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceInstall", "ServiceHelpers\ServiceInstall\ServiceInstall.csproj", "{7DA231E8-A31D-4F53-8760-820861B6CE65}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUninstall", "ServiceHelpers\ServiceUninstall\ServiceUninstall.csproj", "{0E2B067C-4A97-430C-8767-D19ACB09A63A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Release|Any CPU.Build.0 = Release|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Release|Any CPU.Build.0 = Release|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Release|Any CPU.Build.0 = Release|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Release|Any CPU.Build.0 = Release|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Release|Any CPU.Build.0 = Release|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Release|Any CPU.Build.0 = Release|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Release|Any CPU.Build.0 = Release|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Release|Any CPU.Build.0 = Release|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Release|Any CPU.Build.0 = Release|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Release|Any CPU.Build.0 = Release|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Release|Any CPU.Build.0 = Release|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Release|Any CPU.Build.0 = Release|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Release|Any CPU.Build.0 = Release|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Release|Any CPU.Build.0 = Release|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Release|Any CPU.Build.0 = Release|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Release|Any CPU.Build.0 = Release|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Release|Any CPU.Build.0 = Release|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Release|Any CPU.Build.0 = Release|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Release|Any CPU.Build.0 = Release|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Release|Any CPU.Build.0 = Release|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Release|Any CPU.Build.0 = Release|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Release|Any CPU.Build.0 = Release|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Release|Any CPU.Build.0 = Release|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Release|Any CPU.Build.0 = Release|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Release|Any CPU.Build.0 = Release|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} + {B8706292-5BE8-4099-94CA-F26DDD3757E0} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} + {04ECC74F-C340-4987-863E-757FB62D27C9} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {A628FEA4-75CC-4039-8823-27258C55D2BF} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {E2EA47B1-6996-417D-A6EC-28C4F202715C} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {1969394D-3181-404F-8E2C-E3E71A5BAD30} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {6D5618FB-45B9-44AE-BF99-8EF37519CB30} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {2356C987-F992-4084-9DA2-5DAD1DA35E85} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {7DA231E8-A31D-4F53-8760-820861B6CE65} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} + {0E2B067C-4A97-430C-8767-D19ACB09A63A} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313} = {486ADF86-DD89-4E19-B805-9D94F19800D9} + {B6913970-FB88-4F6F-83F9-00728218E3FD} = {486ADF86-DD89-4E19-B805-9D94F19800D9} + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} + {504CD0A8-523B-4A0E-99BE-C179DECA9B76} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} + {3F076242-A6FA-4657-8606-AF1D150367FC} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} + {4EACDBBC-BCD7-4765-A57B-3E08331E4749} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {7BEDCC1E-0763-4553-B32B-0430B334ACBB} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} + {CCE9ABBC-96BA-425B-8140-DC8102290BE3} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} + EndGlobalSection +EndGlobal diff --git a/src/Lidarr.Windows.sln b/src/Lidarr.Windows.sln new file mode 100644 index 000000000..12b4ee0ff --- /dev/null +++ b/src/Lidarr.Windows.sln @@ -0,0 +1,219 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test.Common", "Test.Common", "{47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServiceHelpers", "WindowsServiceHelpers", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceHelpers", "ServiceHelpers", "{CF5BF374-71E4-485E-A74C-39B581323D9A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{F6E3A728-AE77-4D02-BAC8-82FBC1402DDA}" +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}") = "Lidarr.Api.V1", "Lidarr.Api.V1\Lidarr.Api.V1.csproj", "{D1D48E1D-9EEB-470B-992C-3954F90FB014}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Http", "Lidarr.Http\Lidarr.Http.csproj", "{F8A02FD4-A7A4-40D0-BB81-6319105A3302}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marr.Data", "Marr.Data\Marr.Data.csproj", "{8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoTorrent", "MonoTorrent\MonoTorrent.csproj", "{BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Api.Test", "NzbDrone.Api.Test\Lidarr.Api.Test.csproj", "{E2EA47B1-6996-417D-A6EC-28C4F202715C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Automation.Test", "NzbDrone.Automation.Test\Lidarr.Automation.Test.csproj", "{2356C987-F992-4084-9DA2-5DAD1DA35E85}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Common.Test", "NzbDrone.Common.Test\Lidarr.Common.Test.csproj", "{A628FEA4-75CC-4039-8823-27258C55D2BF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Common", "NzbDrone.Common\Lidarr.Common.csproj", "{74BF1D46-710C-42C1-82DD-34B42C58F843}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Console", "NzbDrone.Console\Lidarr.Console.csproj", "{AEA9EE9A-19BF-45CB-93D9-52CA443FD313}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Core.Test", "NzbDrone.Core.Test\Lidarr.Core.Test.csproj", "{04ECC74F-C340-4987-863E-757FB62D27C9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Core", "NzbDrone.Core\Lidarr.Core.csproj", "{82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Host.Test", "NzbDrone.Host.Test\Lidarr.Host.Test.csproj", "{6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Host", "NzbDrone.Host\Lidarr.Host.csproj", "{B6913970-FB88-4F6F-83F9-00728218E3FD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Integration.Test", "NzbDrone.Integration.Test\Lidarr.Integration.Test.csproj", "{6D5618FB-45B9-44AE-BF99-8EF37519CB30}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Libraries.Test", "NzbDrone.Libraries.Test\Lidarr.Libraries.Test.csproj", "{1969394D-3181-404F-8E2C-E3E71A5BAD30}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Mono.Test", "NzbDrone.Mono.Test\Lidarr.Mono.Test.csproj", "{CCE9ABBC-96BA-425B-8140-DC8102290BE3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Mono", "NzbDrone.Mono\Lidarr.Mono.csproj", "{504CD0A8-523B-4A0E-99BE-C179DECA9B76}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.SignalR", "NzbDrone.SignalR\Lidarr.SignalR.csproj", "{B30BE76E-4D20-47AA-9E03-E32613D888CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Test.Common", "NzbDrone.Test.Common\Lidarr.Test.Common.csproj", "{B8706292-5BE8-4099-94CA-F26DDD3757E0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Test.Dummy", "NzbDrone.Test.Dummy\Lidarr.Test.Dummy.csproj", "{AFA7F48E-DB81-4E39-843B-78715C6ADF0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Update.Test", "NzbDrone.Update.Test\Lidarr.Update.Test.csproj", "{A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Update", "NzbDrone.Update\Lidarr.Update.csproj", "{4FBA2CBC-B022-41D6-B6DA-3166991B9172}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Windows.Test", "NzbDrone.Windows.Test\Lidarr.Windows.Test.csproj", "{7BEDCC1E-0763-4553-B32B-0430B334ACBB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Windows", "NzbDrone.Windows\Lidarr.Windows.csproj", "{3F076242-A6FA-4657-8606-AF1D150367FC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr", "NzbDrone\Lidarr.csproj", "{0DC43D36-6680-4237-BE39-D5D094DBCE29}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceInstall", "ServiceHelpers\ServiceInstall\ServiceInstall.csproj", "{7DA231E8-A31D-4F53-8760-820861B6CE65}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUninstall", "ServiceHelpers\ServiceUninstall\ServiceUninstall.csproj", "{0E2B067C-4A97-430C-8767-D19ACB09A63A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1D48E1D-9EEB-470B-992C-3954F90FB014}.Release|Any CPU.Build.0 = Release|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8A02FD4-A7A4-40D0-BB81-6319105A3302}.Release|Any CPU.Build.0 = Release|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A}.Release|Any CPU.Build.0 = Release|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80}.Release|Any CPU.Build.0 = Release|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2EA47B1-6996-417D-A6EC-28C4F202715C}.Release|Any CPU.Build.0 = Release|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2356C987-F992-4084-9DA2-5DAD1DA35E85}.Release|Any CPU.Build.0 = Release|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A628FEA4-75CC-4039-8823-27258C55D2BF}.Release|Any CPU.Build.0 = Release|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74BF1D46-710C-42C1-82DD-34B42C58F843}.Release|Any CPU.Build.0 = Release|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313}.Release|Any CPU.Build.0 = Release|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04ECC74F-C340-4987-863E-757FB62D27C9}.Release|Any CPU.Build.0 = Release|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82EBE37B-E3A7-4365-9B06-FA647BCC7AF0}.Release|Any CPU.Build.0 = Release|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92}.Release|Any CPU.Build.0 = Release|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6913970-FB88-4F6F-83F9-00728218E3FD}.Release|Any CPU.Build.0 = Release|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D5618FB-45B9-44AE-BF99-8EF37519CB30}.Release|Any CPU.Build.0 = Release|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1969394D-3181-404F-8E2C-E3E71A5BAD30}.Release|Any CPU.Build.0 = Release|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCE9ABBC-96BA-425B-8140-DC8102290BE3}.Release|Any CPU.Build.0 = Release|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {504CD0A8-523B-4A0E-99BE-C179DECA9B76}.Release|Any CPU.Build.0 = Release|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B30BE76E-4D20-47AA-9E03-E32613D888CC}.Release|Any CPU.Build.0 = Release|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B8706292-5BE8-4099-94CA-F26DDD3757E0}.Release|Any CPU.Build.0 = Release|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D}.Release|Any CPU.Build.0 = Release|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3}.Release|Any CPU.Build.0 = Release|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FBA2CBC-B022-41D6-B6DA-3166991B9172}.Release|Any CPU.Build.0 = Release|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7BEDCC1E-0763-4553-B32B-0430B334ACBB}.Release|Any CPU.Build.0 = Release|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F076242-A6FA-4657-8606-AF1D150367FC}.Release|Any CPU.Build.0 = Release|Any CPU + {0DC43D36-6680-4237-BE39-D5D094DBCE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DC43D36-6680-4237-BE39-D5D094DBCE29}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DC43D36-6680-4237-BE39-D5D094DBCE29}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DC43D36-6680-4237-BE39-D5D094DBCE29}.Release|Any CPU.Build.0 = Release|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DA231E8-A31D-4F53-8760-820861B6CE65}.Release|Any CPU.Build.0 = Release|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E2B067C-4A97-430C-8767-D19ACB09A63A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {AFA7F48E-DB81-4E39-843B-78715C6ADF0D} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} + {B8706292-5BE8-4099-94CA-F26DDD3757E0} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} + {04ECC74F-C340-4987-863E-757FB62D27C9} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {6D4DE6D5-9594-4AE4-85E0-41C7FFCCED92} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {A76441EE-AB2E-4E9D-8CD3-58BE5A8514D3} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {A628FEA4-75CC-4039-8823-27258C55D2BF} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {E2EA47B1-6996-417D-A6EC-28C4F202715C} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {1969394D-3181-404F-8E2C-E3E71A5BAD30} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {6D5618FB-45B9-44AE-BF99-8EF37519CB30} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {2356C987-F992-4084-9DA2-5DAD1DA35E85} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {7DA231E8-A31D-4F53-8760-820861B6CE65} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} + {0E2B067C-4A97-430C-8767-D19ACB09A63A} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} + {AEA9EE9A-19BF-45CB-93D9-52CA443FD313} = {486ADF86-DD89-4E19-B805-9D94F19800D9} + {B6913970-FB88-4F6F-83F9-00728218E3FD} = {486ADF86-DD89-4E19-B805-9D94F19800D9} + {0DC43D36-6680-4237-BE39-D5D094DBCE29} = {486ADF86-DD89-4E19-B805-9D94F19800D9} + {8D7D5F17-96BB-4EDD-A6E6-3BCA2D6B401A} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} + {504CD0A8-523B-4A0E-99BE-C179DECA9B76} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} + {3F076242-A6FA-4657-8606-AF1D150367FC} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} + {4EACDBBC-BCD7-4765-A57B-3E08331E4749} = {57A04B72-8088-4F75-A582-1158CF8291F7} + {7BEDCC1E-0763-4553-B32B-0430B334ACBB} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} + {CCE9ABBC-96BA-425B-8140-DC8102290BE3} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} + {BE8533CC-A1ED-46A6-811F-2FA29CC6AD80} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} + EndGlobalSection +EndGlobal diff --git a/src/Lidarr.sln b/src/Lidarr.sln deleted file mode 100644 index a2322292b..000000000 --- a/src/Lidarr.sln +++ /dev/null @@ -1,280 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2002 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" -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\Lidarr.Test.Dummy.csproj", "{FAFB5948-A222-4CF6-AD14-026BE7564802}" -EndProject -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\Lidarr.Core.Test.csproj", "{193ADD3B-792B-4173-8E4C-5A3F8F0237F0}" -EndProject -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\Lidarr.Update.Test.csproj", "{35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}" -EndProject -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\Lidarr.Api.Test.csproj", "{D18A5DEB-5102-4775-A1AF-B75DAAA8907B}" -EndProject -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\Lidarr.Integration.Test.csproj", "{8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}" -EndProject -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 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceInstall", "ServiceHelpers\ServiceInstall\ServiceInstall.csproj", "{6BCE712F-846D-4846-9D1B-A66B858DA755}" -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\Lidarr.Core.csproj", "{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}" -EndProject -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\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 - .nuget\NuGet.exe = .nuget\NuGet.exe - EndProjectSection -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\Lidarr.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}" -EndProject -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\Lidarr.csproj", "{D12F7F2F-8A3C-415F-88FA-6DD061A84869}" -EndProject -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\Lidarr.Mono.csproj", "{15AD7579-A314-4626-B556-663F51D97CD1}" -EndProject -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\Lidarr.Windows.Test.csproj", "{80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}" -EndProject -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 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Http", "Lidarr.Http\Lidarr.Http.csproj", "{5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Api.V1", "Lidarr.Api.V1\Lidarr.Api.V1.csproj", "{7140FF1F-79BE-492F-9188-B21A050BF708}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Mono|x86 = Mono|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Debug|x86.ActiveCfg = Debug|x86 - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Debug|x86.Build.0 = Debug|x86 - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Mono|x86.ActiveCfg = Release|x86 - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Mono|x86.Build.0 = Release|x86 - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Release|x86.ActiveCfg = Release|x86 - {FAFB5948-A222-4CF6-AD14-026BE7564802}.Release|x86.Build.0 = Release|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Debug|x86.ActiveCfg = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Debug|x86.Build.0 = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.ActiveCfg = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Mono|x86.Build.0 = Debug|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Release|x86.ActiveCfg = Release|x86 - {CADDFCE0-7509-4430-8364-2074E1EEFCA2}.Release|x86.Build.0 = Release|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Debug|x86.ActiveCfg = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Debug|x86.Build.0 = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.ActiveCfg = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Mono|x86.Build.0 = Debug|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x86.ActiveCfg = Release|x86 - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x86.Build.0 = Release|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.ActiveCfg = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Debug|x86.Build.0 = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.ActiveCfg = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Mono|x86.Build.0 = Debug|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.ActiveCfg = Release|x86 - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}.Release|x86.Build.0 = Release|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Debug|x86.ActiveCfg = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Debug|x86.Build.0 = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.ActiveCfg = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Mono|x86.Build.0 = Debug|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Release|x86.ActiveCfg = Release|x86 - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97}.Release|x86.Build.0 = Release|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Debug|x86.ActiveCfg = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Debug|x86.Build.0 = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.ActiveCfg = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Mono|x86.Build.0 = Debug|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Release|x86.ActiveCfg = Release|x86 - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997}.Release|x86.Build.0 = Release|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Debug|x86.ActiveCfg = Debug|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Debug|x86.Build.0 = Debug|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Mono|x86.ActiveCfg = Release|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Mono|x86.Build.0 = Release|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Release|x86.ActiveCfg = Release|x86 - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B}.Release|x86.Build.0 = Release|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Debug|x86.ActiveCfg = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Debug|x86.Build.0 = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.ActiveCfg = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Mono|x86.Build.0 = Debug|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Release|x86.ActiveCfg = Release|x86 - {CBF6B8B0-A015-413A-8C86-01238BB45770}.Release|x86.Build.0 = Release|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Debug|x86.ActiveCfg = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Debug|x86.Build.0 = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.ActiveCfg = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Mono|x86.Build.0 = Debug|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Release|x86.ActiveCfg = Release|x86 - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB}.Release|x86.Build.0 = Release|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Debug|x86.ActiveCfg = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Debug|x86.Build.0 = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.ActiveCfg = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Mono|x86.Build.0 = Debug|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Release|x86.ActiveCfg = Release|x86 - {CC26800D-F67E-464B-88DE-8EB1A0C227A3}.Release|x86.Build.0 = Release|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Debug|x86.ActiveCfg = Debug|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Debug|x86.Build.0 = Debug|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Mono|x86.ActiveCfg = Debug|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Release|x86.ActiveCfg = Release|x86 - {6BCE712F-846D-4846-9D1B-A66B858DA755}.Release|x86.Build.0 = Release|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Debug|x86.ActiveCfg = Debug|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Debug|x86.Build.0 = Debug|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Mono|x86.ActiveCfg = Debug|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Release|x86.ActiveCfg = Release|x86 - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4}.Release|x86.Build.0 = Release|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Debug|x86.ActiveCfg = Debug|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Debug|x86.Build.0 = Debug|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Mono|x86.ActiveCfg = Release|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Mono|x86.Build.0 = Release|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Release|x86.ActiveCfg = Release|x86 - {FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}.Release|x86.Build.0 = Release|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Debug|x86.ActiveCfg = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Debug|x86.Build.0 = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.ActiveCfg = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Mono|x86.Build.0 = Debug|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Release|x86.ActiveCfg = Release|x86 - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7}.Release|x86.Build.0 = Release|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Debug|x86.ActiveCfg = Debug|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Debug|x86.Build.0 = Debug|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Mono|x86.ActiveCfg = Release|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Mono|x86.Build.0 = Release|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Release|x86.ActiveCfg = Release|x86 - {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}.Release|x86.Build.0 = Release|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Debug|x86.ActiveCfg = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Debug|x86.Build.0 = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.ActiveCfg = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Mono|x86.Build.0 = Debug|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Release|x86.ActiveCfg = Release|x86 - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Release|x86.Build.0 = Release|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.ActiveCfg = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.Build.0 = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.ActiveCfg = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Mono|x86.Build.0 = Debug|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.ActiveCfg = Release|x86 - {95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.Build.0 = Release|x86 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.ActiveCfg = Debug|x86 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.Build.0 = Debug|x86 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Mono|x86.ActiveCfg = Release|x86 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.ActiveCfg = Release|x86 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Release|x86.Build.0 = Release|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Debug|x86.ActiveCfg = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Debug|x86.Build.0 = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.ActiveCfg = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Mono|x86.Build.0 = Debug|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Release|x86.ActiveCfg = Release|x86 - {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}.Release|x86.Build.0 = Release|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x86.ActiveCfg = Debug|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x86.Build.0 = Debug|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Mono|x86.ActiveCfg = Release|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Mono|x86.Build.0 = Release|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x86.ActiveCfg = Release|x86 - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x86.Build.0 = Release|x86 - {15AD7579-A314-4626-B556-663F51D97CD1}.Debug|x86.ActiveCfg = Debug|x86 - {15AD7579-A314-4626-B556-663F51D97CD1}.Debug|x86.Build.0 = Debug|x86 - {15AD7579-A314-4626-B556-663F51D97CD1}.Mono|x86.ActiveCfg = Release|x86 - {15AD7579-A314-4626-B556-663F51D97CD1}.Release|x86.ActiveCfg = Release|x86 - {15AD7579-A314-4626-B556-663F51D97CD1}.Release|x86.Build.0 = Release|x86 - {911284D3-F130-459E-836C-2430B6FBF21D}.Debug|x86.ActiveCfg = Debug|x86 - {911284D3-F130-459E-836C-2430B6FBF21D}.Debug|x86.Build.0 = Debug|x86 - {911284D3-F130-459E-836C-2430B6FBF21D}.Mono|x86.ActiveCfg = Release|x86 - {911284D3-F130-459E-836C-2430B6FBF21D}.Release|x86.ActiveCfg = Release|x86 - {911284D3-F130-459E-836C-2430B6FBF21D}.Release|x86.Build.0 = Release|x86 - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Debug|x86.ActiveCfg = Debug|x86 - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Debug|x86.Build.0 = Debug|x86 - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Mono|x86.ActiveCfg = Release|x86 - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Release|x86.ActiveCfg = Release|x86 - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA}.Release|x86.Build.0 = Release|x86 - {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Debug|x86.ActiveCfg = Debug|x86 - {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Debug|x86.Build.0 = Debug|x86 - {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Mono|x86.ActiveCfg = Release|x86 - {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Release|x86.ActiveCfg = Release|x86 - {40D72824-7D02-4A77-9106-8FE0EEA2B997}.Release|x86.Build.0 = Release|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Debug|x86.ActiveCfg = Debug|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Debug|x86.Build.0 = Debug|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Mono|x86.ActiveCfg = Release|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Mono|x86.Build.0 = Release|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Release|x86.ActiveCfg = Release|x86 - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8}.Release|x86.Build.0 = Release|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Debug|x86.ActiveCfg = Debug|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Debug|x86.Build.0 = Debug|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Mono|x86.ActiveCfg = Release|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Mono|x86.Build.0 = Release|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.ActiveCfg = Release|x86 - {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.Build.0 = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.ActiveCfg = Debug|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.Build.0 = Debug|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.ActiveCfg = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.Build.0 = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.ActiveCfg = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {FAFB5948-A222-4CF6-AD14-026BE7564802} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97} - {193ADD3B-792B-4173-8E4C-5A3F8F0237F0} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {35388E8E-0CDB-4A84-AD16-E4B6EFDA5D97} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {BEC74619-DDBB-4FBA-B517-D3E20AFC9997} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {D18A5DEB-5102-4775-A1AF-B75DAAA8907B} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {CBF6B8B0-A015-413A-8C86-01238BB45770} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {8CEFECD0-A6C2-498F-98B1-3FBE5820F9AB} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {CC26800D-F67E-464B-88DE-8EB1A0C227A3} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {6BCE712F-846D-4846-9D1B-A66B858DA755} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} - {700D0B95-95CD-43F3-B6C9-FAA0FC1358D4} = {F9E67978-5CD6-4A5F-827B-4249711C0B02} - {3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} = {486ADF86-DD89-4E19-B805-9D94F19800D9} - {95C11A9E-56ED-456A-8447-2C89C1139266} = {486ADF86-DD89-4E19-B805-9D94F19800D9} - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} = {486ADF86-DD89-4E19-B805-9D94F19800D9} - {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} - {15AD7579-A314-4626-B556-663F51D97CD1} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} - {911284D3-F130-459E-836C-2430B6FBF21D} = {0F0D4998-8F5D-4467-A909-BB192C4B3B4B} - {4EACDBBC-BCD7-4765-A57B-3E08331E4749} = {57A04B72-8088-4F75-A582-1158CF8291F7} - {80B51429-7A0E-46D6-BEE3-C80DCB1C4EAA} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} - {40D72824-7D02-4A77-9106-8FE0EEA2B997} = {4EACDBBC-BCD7-4765-A57B-3E08331E4749} - {411A9E0E-FDC6-4E25-828A-0C2CD1CD96F8} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2C047BC5-490F-4DCE-962F-141370D23765} - EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.4.0.1\lib\net45;packages\Unity.4.0.1\lib\net45 - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = NzbDrone.Console\Lidarr.Console.csproj - EndGlobalSection - GlobalSection(JSLint) = preSolution - SolutionConfigurationLocation = JSLintOptions.xml - EndGlobalSection -EndGlobal diff --git a/src/Marr.Data/Marr.Data.csproj b/src/Marr.Data/Marr.Data.csproj index e57aa9941..a1180d1b4 100644 --- a/src/Marr.Data/Marr.Data.csproj +++ b/src/Marr.Data/Marr.Data.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 3.17.0.0 false diff --git a/src/MonoFacades.targets b/src/MonoFacades.targets new file mode 100644 index 000000000..733bd3b6d --- /dev/null +++ b/src/MonoFacades.targets @@ -0,0 +1,43 @@ + + + + + + $(MSBuildThisFileDirectory)Libraries\Mono\ + + + + + + + + + + + + + + + %(ResolvedFileToPublish.Identity) + $(MonoFacadesPath)%(Filename)%(Extension) + + + + + + + + + + + + diff --git a/src/MonoTorrent/MonoTorrent.csproj b/src/MonoTorrent/MonoTorrent.csproj index 8fb49e77b..13621bc33 100644 --- a/src/MonoTorrent/MonoTorrent.csproj +++ b/src/MonoTorrent/MonoTorrent.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 9.0.21022 diff --git a/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj index 1b89309dd..b70ceb000 100644 --- a/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Lidarr.Api.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj index 126a44b19..291e37581 100644 --- a/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj index b5db0b483..8cd5bed59 100644 --- a/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Lidarr.Common.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Common/Lidarr.Common.csproj b/src/NzbDrone.Common/Lidarr.Common.csproj index d64c0cc09..01cab6c91 100644 --- a/src/NzbDrone.Common/Lidarr.Common.csproj +++ b/src/NzbDrone.Common/Lidarr.Common.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Console/Lidarr.Console.csproj b/src/NzbDrone.Console/Lidarr.Console.csproj index 9f416b8a2..8ffeed355 100644 --- a/src/NzbDrone.Console/Lidarr.Console.csproj +++ b/src/NzbDrone.Console/Lidarr.Console.csproj @@ -1,12 +1,14 @@  Exe - net462 - x86 + net462 ..\NzbDrone.Host\NzbDrone.ico app.manifest + + Lidarr + diff --git a/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj index 95d286310..6ca51176b 100644 --- a/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Lidarr.Core.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 @@ -24,4 +23,16 @@ PreserveNewest + + + + + + + + + + + + diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index 6f054f4c9..75e3be2fe 100644 --- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs +++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs @@ -201,7 +201,7 @@ namespace NzbDrone.Core.Configuration } } - public string UiFolder => GetValue("UiFolder", "UI", false); + public string UiFolder => BuildInfo.IsDebug ? Path.Combine("..", "UI") : "UI"; public bool UpdateAutomatically => GetValueBoolean("UpdateAutomatically", false, false); diff --git a/src/NzbDrone.Core/Lidarr.Core.csproj b/src/NzbDrone.Core/Lidarr.Core.csproj index 9ffef813a..319c9d5e0 100644 --- a/src/NzbDrone.Core/Lidarr.Core.csproj +++ b/src/NzbDrone.Core/Lidarr.Core.csproj @@ -1,9 +1,9 @@  - net462 - x86 + net462 + @@ -13,7 +13,7 @@ - + @@ -35,14 +35,17 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + + + + + + + + + diff --git a/src/NzbDrone.Core/Notifications/Email/EmailService.cs b/src/NzbDrone.Core/Notifications/Email/EmailService.cs index 68b11043c..7cd8bf0c5 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailService.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailService.cs @@ -51,10 +51,7 @@ namespace NzbDrone.Core.Notifications.Email private void Send(MailMessage email, string server, int port, bool ssl, NetworkCredential credentials) { - //TODO: This is marked obsolete in mono, will not be necessary once we build with net core instead -#pragma warning disable CS0618 var smtp = new SmtpClient(server, port); -#pragma warning restore CS0618 smtp.EnableSsl = ssl; smtp.Credentials = credentials; diff --git a/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj index 8a17b5bb3..ffcea820d 100644 --- a/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Lidarr.Host.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Host/Lidarr.Host.csproj b/src/NzbDrone.Host/Lidarr.Host.csproj index fb0cfbd48..e793c0830 100644 --- a/src/NzbDrone.Host/Lidarr.Host.csproj +++ b/src/NzbDrone.Host/Lidarr.Host.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj index c88f4c6f1..65ac8dd8f 100644 --- a/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj index 33985d0a6..f4d526455 100644 --- a/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Lidarr.Libraries.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj index ba380658b..c04c9dd3a 100644 --- a/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Lidarr.Mono.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Mono/Lidarr.Mono.csproj b/src/NzbDrone.Mono/Lidarr.Mono.csproj index 7ee5ce2b9..b55247a38 100644 --- a/src/NzbDrone.Mono/Lidarr.Mono.csproj +++ b/src/NzbDrone.Mono/Lidarr.Mono.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.SignalR/Lidarr.SignalR.csproj b/src/NzbDrone.SignalR/Lidarr.SignalR.csproj index 4875b908d..bf05f1024 100644 --- a/src/NzbDrone.SignalR/Lidarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Lidarr.SignalR.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj index 8b630671e..009f3b32f 100644 --- a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 284e45dba..de7752232 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -35,10 +35,11 @@ namespace NzbDrone.Test.Common GenerateConfigFile(); var lidarrConsoleExe = OsInfo.IsWindows ? "Lidarr.Console.exe" : "Lidarr.exe"; + var frameworkFolder = "net462"; if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "_output", "Lidarr.Console.exe")); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", frameworkFolder, lidarrConsoleExe)); } else { diff --git a/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj index 2da82570e..8c54330b4 100644 --- a/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/Lidarr.Test.Dummy.csproj @@ -1,7 +1,6 @@  Exe - net462 - x86 + net462 diff --git a/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj index b67841419..bda20ae5b 100644 --- a/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Lidarr.Update.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Update/Lidarr.Update.csproj b/src/NzbDrone.Update/Lidarr.Update.csproj index 87ba8f890..246ca8b4b 100644 --- a/src/NzbDrone.Update/Lidarr.Update.csproj +++ b/src/NzbDrone.Update/Lidarr.Update.csproj @@ -1,8 +1,7 @@  WinExe - net462 - x86 + net462 diff --git a/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj index 99384245e..36e633f66 100644 --- a/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Lidarr.Windows.Test.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone.Windows/Lidarr.Windows.csproj b/src/NzbDrone.Windows/Lidarr.Windows.csproj index 128d6b338..108ebd993 100644 --- a/src/NzbDrone.Windows/Lidarr.Windows.csproj +++ b/src/NzbDrone.Windows/Lidarr.Windows.csproj @@ -1,7 +1,6 @@  - net462 - x86 + net462 diff --git a/src/NzbDrone/Lidarr.csproj b/src/NzbDrone/Lidarr.csproj index 878ea4d85..3edb903d1 100644 --- a/src/NzbDrone/Lidarr.csproj +++ b/src/NzbDrone/Lidarr.csproj @@ -1,12 +1,15 @@  WinExe - net462 - x86 - + net462 + win-x64 ..\NzbDrone.Host\NzbDrone.ico app.manifest + true + + + diff --git a/src/PublishAllRids.targets b/src/PublishAllRids.targets new file mode 100644 index 000000000..c6c99be98 --- /dev/null +++ b/src/PublishAllRids.targets @@ -0,0 +1,37 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + true + + + + + + + + + + %(Runtimes.Identity) + + + + %(Frameworks.Identity) + + + + + RuntimeIdentifier=%(Combined2.Runtime);TargetFramework=%(Combined2.Framework) + + + + + + + diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index 2da82570e..8c54330b4 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,7 +1,6 @@  Exe - net462 - x86 + net462 diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index 2da82570e..8c54330b4 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,7 +1,6 @@  Exe - net462 - x86 + net462