From fb130fd0e916262651a8ce97f4263f05117b91cc Mon Sep 17 00:00:00 2001 From: ta264 Date: Wed, 10 Feb 2021 21:52:49 +0000 Subject: [PATCH] New: Drop mono support --- azure-pipelines.yml | 62 +------------------ build.sh | 7 --- macOS/Readarr | 62 ------------------- src/Directory.Build.props | 9 --- src/Directory.Build.targets | 5 -- src/NzbDrone.Api.Test/Readarr.Api.Test.csproj | 2 +- .../Readarr.Automation.Test.csproj | 2 +- .../Readarr.Common.Test.csproj | 7 +-- .../Composition/ContainerBuilderBase.cs | 18 +----- .../EnvironmentInfo/PlatformInfo.cs | 13 ---- .../Extensions/DictionaryExtensions.cs | 8 --- .../Processes/ProcessProvider.cs | 4 -- src/NzbDrone.Common/Readarr.Common.csproj | 7 +-- src/NzbDrone.Console/Readarr.Console.csproj | 2 +- .../Readarr.Core.Test.csproj | 2 +- src/NzbDrone.Core/Readarr.Core.csproj | 6 +- .../Readarr.Host.Test.csproj | 7 +-- src/NzbDrone.Host/Readarr.Host.csproj | 15 +---- .../WebHost/Middleware/SignalRMiddleware.cs | 7 --- .../WebHost/WebHostController.cs | 9 --- .../Readarr.Integration.Test.csproj | 7 +-- .../Readarr.Libraries.Test.csproj | 2 +- .../Readarr.Mono.Test.csproj | 13 +--- src/NzbDrone.Mono/Readarr.Mono.csproj | 11 +--- src/NzbDrone.SignalR/Readarr.SignalR.csproj | 6 +- src/NzbDrone.SignalR/SignalRMessage.cs | 4 -- src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs | 2 - src/NzbDrone.Test.Common/NzbDroneRunner.cs | 3 +- .../Readarr.Test.Common.csproj | 2 +- .../Readarr.Test.Dummy.csproj | 2 +- .../Readarr.Update.Test.csproj | 2 +- src/NzbDrone.Update/Readarr.Update.csproj | 2 +- .../Readarr.Windows.Test.csproj | 2 +- src/NzbDrone.Windows/Readarr.Windows.csproj | 2 +- src/NzbDrone/Readarr.csproj | 5 +- src/Readarr.Api.V1/Readarr.Api.V1.csproj | 2 +- src/Readarr.Http/Readarr.Http.csproj | 2 +- .../ServiceInstall/ServiceInstall.csproj | 2 +- .../ServiceUninstall/ServiceUninstall.csproj | 2 +- src/Targets/PublishAllRids.targets | 2 - 40 files changed, 33 insertions(+), 296 deletions(-) delete mode 100644 macOS/Readarr diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 821788768..f6dcec190 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -107,10 +107,6 @@ stages: artifact: WindowsCoreTests displayName: Publish Windows Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net462/linux-x64/publish' - artifact: LinuxTests - displayName: Publish Linux Mono Test Package - condition: and(succeeded(), eq(variables['osName'], 'Windows')) - publish: '$(testsFolder)/net5.0/linux-x64/publish' artifact: LinuxCoreTests displayName: Publish Linux Test Package @@ -270,14 +266,6 @@ stages: tarCompression: 'gz' includeRootFolder: false rootFolderOrFile: $(artifactsFolder)/macos/net5.0 - - task: ArchiveFiles@2 - displayName: Create Linux Mono tar - inputs: - archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux.tar.gz' - archiveType: 'tar' - tarCompression: 'gz' - includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x64/net462 - task: ArchiveFiles@2 displayName: Create Linux Core tar inputs: @@ -422,20 +410,9 @@ stages: displayName: Enable Windows Test Service condition: and(succeeded(), eq(variables['osName'], 'Windows')) - bash: | - wget https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz - sudo tar xf chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz --strip-components=1 --directory /usr/bin - chmod a+x _tests/fpcalc - displayName: Install fpcalc - condition: and(succeeded(), eq(variables['osName'], 'Linux')) - - bash: | - SYMLINK=6_6_0 - MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK - echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX" - echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH" - echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH" chmod a+x _tests/fpcalc - displayName: Set Mono Version and make fpcalc Executable - condition: and(succeeded(), eq(variables['osName'], 'Mac')) + displayName: Make fpcalc Executable + condition: and(succeeded(), or(eq(variables['osName'], 'Mac'), eq(variables['testName'], 'LinuxCore'))) - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \; displayName: Make Test Dummy Executable condition: and(succeeded(), ne(variables['osName'], 'Windows')) @@ -459,18 +436,6 @@ stages: condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0')) strategy: matrix: - mono520: - testName: 'Mono 5.20' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-5.20 - mono610: - testName: 'Mono 6.10' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-6.10 - mono612: - testName: 'Mono 6.12' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-6.12 alpine: testName: 'Musl Net Core' artifactName: LinuxMuslCoreTests @@ -554,14 +519,6 @@ stages: vmImage: $(imageName) steps: - - bash: | - SYMLINK=6_6_0 - MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK - echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX" - echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH" - 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' inputs: @@ -653,21 +610,6 @@ stages: condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0')) strategy: matrix: - mono520: - testName: 'Mono 5.20' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-5.20 - pattern: 'Readarr.*.linux.tar.gz' - mono610: - testName: 'Mono 6.10' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-6.10 - pattern: 'Readarr.*.linux.tar.gz' - mono612: - testName: 'Mono 6.12' - artifactName: LinuxTests - containerImage: ghcr.io/servarr/testimages:mono-6.12 - pattern: 'Readarr.*.linux.tar.gz' alpine: testName: 'Musl Net Core' artifactName: LinuxMuslCoreTests diff --git a/build.sh b/build.sh index f0735d969..fdcbf410c 100755 --- a/build.sh +++ b/build.sh @@ -150,11 +150,6 @@ PackageMacOS() PackageFiles "$folder" "$framework" "osx-x64" - if [ "$framework" = "net462" ]; then - echo "Adding Startup script" - cp macOS/Readarr $folder - fi - echo "Removing Service helpers" rm -f $folder/ServiceUninstall.* rm -f $folder/ServiceInstall.* @@ -339,7 +334,6 @@ then PackageTests "net5.0" "linux-x64" PackageTests "net5.0" "linux-musl-x64" PackageTests "net5.0" "osx-x64" - PackageTests "net462" "linux-x64" if [ "$ENABLE_BSD" = "YES" ]; then PackageTests "net5.0" "freebsd-x64" @@ -379,7 +373,6 @@ then Package "net5.0" "linux-musl-arm64" Package "net5.0" "linux-arm" Package "net5.0" "osx-x64" - Package "net462" "linux-x64" if [ "$ENABLE_BSD" = "YES" ]; then Package "net5.0" "freebsd-x64" diff --git a/macOS/Readarr b/macOS/Readarr deleted file mode 100644 index b62fc4548..000000000 --- a/macOS/Readarr +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -#get the bundle's MacOS directory full path -DIR=$(cd "$(dirname "$0")"; pwd) - -#change these values to match your app -EXE_PATH="$DIR/Readarr.exe" -APPNAME="Readarr" - -#set up environment -if [[ -x '/opt/local/bin/mono' ]]; then - # Macports and mono-supplied installer path - export PATH="/opt/local/bin:$PATH" -elif [[ -x '/usr/local/bin/mono' ]]; then - # Homebrew-supplied path to mono - export PATH="/usr/local/bin:$PATH" -fi - -export DYLD_FALLBACK_LIBRARY_PATH="$DIR" - -if [ -e /Library/Frameworks/Mono.framework ]; then - MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current - export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib" -fi - -if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then - export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH" -fi - -export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib" - -#mono version check -REQUIRED_MAJOR=4 -REQUIRED_MINOR=6 - -VERSION_TITLE="Cannot launch $APPNAME" -VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later." -DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac" - -MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' | cut -f5 -d\ )" -# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi - - -MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)" -MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)" -if [ -z "$MONO_VERSION" ] \ - || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \ - || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] -then - osascript \ - -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \ - -e "if button returned of question is equal to \"Download...\" then open location \"$DOWNLOAD_URL\"" - echo "$VERSION_TITLE" - echo "$VERSION_MSG" - exit 1 -fi - -MONO_EXEC="exec mono --debug" - -#run app using mono -$MONO_EXEC "$EXE_PATH" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index d95986bd2..65099c75e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -6,7 +6,6 @@ AnyCPU true win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64 - win-x64:net462;win-x86:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462 $(MSBuildThisFileDirectory)..\ @@ -83,14 +82,6 @@ $(MSBuildProjectName.Replace('Readarr','NzbDrone')) - - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index e8efeb5ec..7aee50cf7 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,9 +1,4 @@ - - - full - - diff --git a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj index 1b50ef165..cbb9f3e18 100644 --- a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj index 4d8b8c59f..0b96a5671 100644 --- a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj index 695313384..f888fde4f 100644 --- a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 @@ -10,8 +10,6 @@ all - - @@ -19,7 +17,4 @@ - - - diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs index a25834f1b..c5896ea3b 100644 --- a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs +++ b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs @@ -1,17 +1,14 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.InteropServices; +using System.Runtime.Loader; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Messaging; using TinyIoC; -#if NETCOREAPP -using System.IO; -using System.Runtime.InteropServices; -using System.Runtime.Loader; -#endif - namespace NzbDrone.Common.Composition { public abstract class ContainerBuilderBase @@ -27,12 +24,6 @@ namespace NzbDrone.Common.Composition assemblies.Add(OsInfo.IsWindows ? "Readarr.Windows" : "Readarr.Mono"); assemblies.Add("Readarr.Common"); -#if !NETCOREAPP - foreach (var assembly in assemblies) - { - _loadedTypes.AddRange(Assembly.Load(assembly).GetTypes()); - } -#else var startupPath = AppDomain.CurrentDomain.BaseDirectory; foreach (var assemblyName in assemblies) @@ -42,14 +33,12 @@ namespace NzbDrone.Common.Composition AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler); RegisterSQLiteResolver(); -#endif Container = new Container(new TinyIoCContainer(), _loadedTypes); AutoRegisterInterfaces(); Container.Register(args); } -#if NETCOREAPP private static Assembly ContainerResolveEventHandler(object sender, ResolveEventArgs args) { var resolver = new AssemblyDependencyResolver(args.RequestingAssembly.Location); @@ -86,7 +75,6 @@ namespace NzbDrone.Common.Composition var mappedName = OsInfo.IsLinux && libraryName == "sqlite3" ? "libsqlite3.so.0" : libraryName; return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath); } -#endif private void AutoRegisterInterfaces() { diff --git a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs index 0a0ac17c9..5c28231fe 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs @@ -26,21 +26,8 @@ namespace NzbDrone.Common.EnvironmentInfo static PlatformInfo() { -#if NETCOREAPP _platform = PlatformType.NetCore; _version = Environment.Version; -#else - if (Type.GetType("Mono.Runtime") != null) - { - _platform = PlatformType.Mono; - _version = GetMonoVersion(); - } - else - { - _platform = PlatformType.DotNet; - _version = GetDotNetVersion(); - } -#endif } public static PlatformType Platform => _platform; diff --git a/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs b/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs index 0c32d49c7..dc9c20b5a 100644 --- a/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs +++ b/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs @@ -6,14 +6,6 @@ namespace NzbDrone.Common.Extensions { public static class DictionaryExtensions { -#if !NETCOREAPP - public static TValue GetValueOrDefault(this IReadOnlyDictionary dictionary, TKey key, TValue defaultValue = default(TValue)) - { - TValue value; - return dictionary.TryGetValue(key, out value) ? value : defaultValue; - } -#endif - public static Dictionary Merge(this Dictionary first, Dictionary second) { if (first == null) diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs index a9638392a..b44e43472 100644 --- a/src/NzbDrone.Common/Processes/ProcessProvider.cs +++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs @@ -44,11 +44,7 @@ namespace NzbDrone.Common.Processes public static int GetCurrentProcessId() { -#if NETCOREAPP return Environment.ProcessId; -#else - return Process.GetCurrentProcess().Id; -#endif } public ProcessInfo GetCurrentProcess() diff --git a/src/NzbDrone.Common/Readarr.Common.csproj b/src/NzbDrone.Common/Readarr.Common.csproj index cabbb7a50..5d6a3a634 100644 --- a/src/NzbDrone.Common/Readarr.Common.csproj +++ b/src/NzbDrone.Common/Readarr.Common.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 en ISMUSL @@ -14,16 +14,11 @@ - - - - - True diff --git a/src/NzbDrone.Console/Readarr.Console.csproj b/src/NzbDrone.Console/Readarr.Console.csproj index 2be694ddd..2b0a8292e 100644 --- a/src/NzbDrone.Console/Readarr.Console.csproj +++ b/src/NzbDrone.Console/Readarr.Console.csproj @@ -1,7 +1,7 @@  Exe - net462;net5.0 + net5.0 ..\NzbDrone.Host\Readarr.ico app.manifest diff --git a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj index 498c716c7..0a8fe30e3 100644 --- a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Core/Readarr.Core.csproj b/src/NzbDrone.Core/Readarr.Core.csproj index d80d4f727..22f9bed56 100644 --- a/src/NzbDrone.Core/Readarr.Core.csproj +++ b/src/NzbDrone.Core/Readarr.Core.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 @@ -26,10 +26,6 @@ - - - - Resources\Logo\64.png diff --git a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj index a2268a9dc..b420dc2fd 100644 --- a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 @@ -10,15 +10,10 @@ all - - - - - diff --git a/src/NzbDrone.Host/Readarr.Host.csproj b/src/NzbDrone.Host/Readarr.Host.csproj index 7373da28b..0af87f14a 100644 --- a/src/NzbDrone.Host/Readarr.Host.csproj +++ b/src/NzbDrone.Host/Readarr.Host.csproj @@ -1,18 +1,10 @@  - net462;net5.0 + net5.0 Library - - - - - - - - - + @@ -28,7 +20,4 @@ True - - - diff --git a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs index 07badd229..84d967076 100644 --- a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs +++ b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs @@ -55,17 +55,10 @@ namespace NzbDrone.Host.Middleware } }); -#if NETCOREAPP appBuilder.UseEndpoints(x => { x.MapHub(URL_BASE + "/signalr/messages"); }); -#else - appBuilder.UseSignalR(x => - { - x.MapHub("/signalr/messages"); - }); -#endif // This is a side effect of haing multiple IoC containers, TinyIoC and whatever // Kestrel/SignalR is using. Ideally we'd have one IoC container, but that's non-trivial with TinyIoC diff --git a/src/NzbDrone.Host/WebHost/WebHostController.cs b/src/NzbDrone.Host/WebHost/WebHostController.cs index 3c7245275..af3a75c4e 100644 --- a/src/NzbDrone.Host/WebHost/WebHostController.cs +++ b/src/NzbDrone.Host/WebHost/WebHostController.cs @@ -90,23 +90,14 @@ namespace NzbDrone.Host { services .AddSignalR() -#if !NETCOREAPP - .AddJsonProtocol(options => - { - options.PayloadSerializerSettings = Json.GetSerializerSettings(); - }); -#else .AddJsonProtocol(options => { options.PayloadSerializerOptions = STJson.GetSerializerSettings(); }); -#endif }) .Configure(app => { -#if NETCOREAPP app.UseRouting(); -#endif app.Properties["host.AppName"] = BuildInfo.AppName; app.UsePathBase(_configFileProvider.UrlBase); diff --git a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj index d3807c6fa..cd6b655a0 100644 --- a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 Library @@ -11,11 +11,6 @@ all - - - - - diff --git a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj index f43c7b2e5..8e65e062e 100644 --- a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj index 22a3729f0..604fb5c68 100644 --- a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 @@ -10,16 +10,7 @@ all - - - - - - - + diff --git a/src/NzbDrone.Mono/Readarr.Mono.csproj b/src/NzbDrone.Mono/Readarr.Mono.csproj index f33f4ca69..f21cfbff8 100644 --- a/src/NzbDrone.Mono/Readarr.Mono.csproj +++ b/src/NzbDrone.Mono/Readarr.Mono.csproj @@ -1,19 +1,10 @@  - net462;net5.0 + net5.0 - - - - - - diff --git a/src/NzbDrone.SignalR/Readarr.SignalR.csproj b/src/NzbDrone.SignalR/Readarr.SignalR.csproj index f54a5c70d..b748236da 100644 --- a/src/NzbDrone.SignalR/Readarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Readarr.SignalR.csproj @@ -1,12 +1,8 @@  - net462;net5.0 + net5.0 Library - - - - diff --git a/src/NzbDrone.SignalR/SignalRMessage.cs b/src/NzbDrone.SignalR/SignalRMessage.cs index 81a0a2b2c..4b468477c 100644 --- a/src/NzbDrone.SignalR/SignalRMessage.cs +++ b/src/NzbDrone.SignalR/SignalRMessage.cs @@ -7,11 +7,7 @@ namespace NzbDrone.SignalR public object Body { get; set; } public string Name { get; set; } -#if !NETCOREAPP - [Newtonsoft.Json.JsonIgnore] -#else [System.Text.Json.Serialization.JsonIgnore] -#endif public ModelAction Action { get; set; } } } diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs index 6d71cab07..a670c1821 100644 --- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs +++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs @@ -164,9 +164,7 @@ namespace NzbDrone.Test.Common.AutoMoq RegisterPlatformLibrary(container); AddTheAutoMockingContainerExtensionToTheContainer(container); -#if NETCOREAPP ContainerBuilderBase.RegisterSQLiteResolver(); -#endif } private static void AddTheAutoMockingContainerExtensionToTheContainer(IUnityContainer container) diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 31f141a4f..6a69a2190 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -57,8 +57,7 @@ namespace NzbDrone.Test.Common _startupLog = new List(); if (BuildInfo.IsDebug) { - var frameworkFolder = PlatformInfo.IsNetCore ? "net5.0" : "net462"; - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", frameworkFolder, readarrConsoleExe)); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", "net5.0", readarrConsoleExe)); } else { diff --git a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj index 08d05d467..f362cf7a8 100644 --- a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj index c1cce723b..6be4dabce 100644 --- a/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj @@ -1,6 +1,6 @@  Exe - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj index 459251638..c9bca7a22 100644 --- a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Update/Readarr.Update.csproj b/src/NzbDrone.Update/Readarr.Update.csproj index 9a7b9f5db..de048dbf0 100644 --- a/src/NzbDrone.Update/Readarr.Update.csproj +++ b/src/NzbDrone.Update/Readarr.Update.csproj @@ -1,7 +1,7 @@  WinExe - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj index f1912f10c..644c1c54c 100644 --- a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone.Windows/Readarr.Windows.csproj b/src/NzbDrone.Windows/Readarr.Windows.csproj index 010f23fef..69b38ca2b 100644 --- a/src/NzbDrone.Windows/Readarr.Windows.csproj +++ b/src/NzbDrone.Windows/Readarr.Windows.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/NzbDrone/Readarr.csproj b/src/NzbDrone/Readarr.csproj index 91c5c8972..aef264faa 100644 --- a/src/NzbDrone/Readarr.csproj +++ b/src/NzbDrone/Readarr.csproj @@ -1,7 +1,7 @@  WinExe - net462;net5.0-windows + net5.0-windows win-x64;win-x86 true ..\NzbDrone.Host\Readarr.ico @@ -14,9 +14,6 @@ - - - True diff --git a/src/Readarr.Api.V1/Readarr.Api.V1.csproj b/src/Readarr.Api.V1/Readarr.Api.V1.csproj index 5d72f9bce..c262c1695 100644 --- a/src/Readarr.Api.V1/Readarr.Api.V1.csproj +++ b/src/Readarr.Api.V1/Readarr.Api.V1.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/Readarr.Http/Readarr.Http.csproj b/src/Readarr.Http/Readarr.Http.csproj index 3aa601fe0..798f10bc6 100644 --- a/src/Readarr.Http/Readarr.Http.csproj +++ b/src/Readarr.Http/Readarr.Http.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0 diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index 5742cc397..6d9973657 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,7 +1,7 @@  WinExe - net462;net5.0 + net5.0 diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index db304ed6d..af4ca6489 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,7 +1,7 @@  WinExe - net462;net5.0 + net5.0 diff --git a/src/Targets/PublishAllRids.targets b/src/Targets/PublishAllRids.targets index e43dd7bfe..98f1b2de9 100644 --- a/src/Targets/PublishAllRids.targets +++ b/src/Targets/PublishAllRids.targets @@ -21,8 +21,6 @@ %(Framework) - - RuntimeIdentifier=%(Renamed.Runtime);TargetFramework=%(Renamed.Framework)