diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 83a4ed3de..7a6e73d10 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -96,10 +96,6 @@ stages:
artifact: WindowsCoreTests
displayName: Publish Windows Test Package
condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- - publish: '$(testsFolder)/net472/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
@@ -243,14 +239,6 @@ stages:
tarCompression: 'gz'
includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/macos/net5.0
- - task: ArchiveFiles@2
- displayName: Create Linux Mono tar
- inputs:
- archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux.tar.gz'
- archiveType: 'tar'
- tarCompression: 'gz'
- includeRootFolder: false
- rootFolderOrFile: $(artifactsFolder)/linux-x64/net472
- task: ArchiveFiles@2
displayName: Create Linux Core tar
inputs:
@@ -379,14 +367,6 @@ stages:
- powershell: Set-Service SCardSvr -StartupType Manual
displayName: Enable Windows Test Service
condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- - 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'))
- bash: find ${TESTSFOLDER} -name "Prowlarr.Test.Dummy" -exec chmod a+x {} \;
displayName: Make Test Dummy Executable
condition: and(succeeded(), ne(variables['osName'], 'Windows'))
@@ -410,18 +390,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
@@ -506,14 +474,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:
@@ -559,21 +519,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: 'Prowlarr.**.linux.tar.gz'
- mono610:
- testName: 'Mono 6.10'
- artifactName: LinuxTests
- containerImage: ghcr.io/servarr/testimages:mono-6.10
- pattern: 'Prowlarr.**.linux.tar.gz'
- mono612:
- testName: 'Mono 6.12'
- artifactName: LinuxTests
- containerImage: ghcr.io/servarr/testimages:mono-6.12
- pattern: 'Prowlarr.**.linux.tar.gz'
alpine:
testName: 'Musl Net Core'
artifactName: LinuxMuslCoreTests
diff --git a/build.sh b/build.sh
index 4ee31bb7a..2b4e01874 100755
--- a/build.sh
+++ b/build.sh
@@ -136,11 +136,6 @@ PackageMacOS()
PackageFiles "$folder" "$framework" "osx-x64"
- if [ "$framework" = "net472" ]; then
- echo "Adding Startup script"
- cp macOS/Prowlarr $folder
- fi
-
echo "Removing Service helpers"
rm -f $folder/ServiceUninstall.*
rm -f $folder/ServiceInstall.*
@@ -322,7 +317,6 @@ then
PackageTests "net5.0" "linux-x64"
PackageTests "net5.0" "linux-musl-x64"
PackageTests "net5.0" "osx-x64"
- PackageTests "net472" "linux-x64"
else
PackageTests "$FRAMEWORK" "$RID"
fi
@@ -357,7 +351,6 @@ then
Package "net5.0" "linux-musl-arm64"
Package "net5.0" "linux-arm"
Package "net5.0" "osx-x64"
- Package "net472" "linux-x64"
else
Package "$FRAMEWORK" "$RID"
fi
diff --git a/package.json b/package.json
index baa1aaa3e..0a8d4c354 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"@fortawesome/free-regular-svg-icons": "5.15.0",
"@fortawesome/free-solid-svg-icons": "5.15.0",
"@fortawesome/react-fontawesome": "0.1.11",
- "@microsoft/signalr": "5.0.1",
+ "@microsoft/signalr": "5.0.3",
"@sentry/browser": "5.24.2",
"@sentry/integrations": "5.24.2",
"ansi-colors": "4.1.1",
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 173c317cd..256b9eabd 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,7 +6,6 @@
AnyCPU
true
win-x64;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64
- win-x64:net472;osx-x64:net472;linux-arm:net472;linux-arm64:net472;linux-musl-x64:net472;linux-musl-arm64:net472
$(MSBuildThisFileDirectory)..\
@@ -83,14 +82,6 @@
$(MSBuildProjectName.Replace('Prowlarr','NzbDrone'))
-
-
-
- all
- runtime; build; native; contentfiles; analyzers
-
-
-
false
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index c5681e6b2..7aee50cf7 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,9 +1,4 @@
-
-
- full
-
-
diff --git a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj
index 4e7b682a4..6f5b6ff06 100644
--- a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj
+++ b/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj
@@ -1,14 +1,14 @@
- net5.0;net472
+ net5.0
-
+
-
+
diff --git a/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj
index 238fd5a6b..ee1ae1f0c 100644
--- a/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj
@@ -1,14 +1,12 @@
- net5.0;net472
+ net5.0
-
+
-
-
@@ -16,7 +14,4 @@
-
-
-
diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs
index 7bfe051f2..efe887f5c 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 ? "Prowlarr.Windows" : "Prowlarr.Mono");
assemblies.Add("Prowlarr.Common");
-#if !NETCOREAPP
- foreach (var assembly in assemblies)
- {
- _loadedTypes.AddRange(Assembly.Load(assembly).GetExportedTypes());
- }
-#else
var startupPath = AppDomain.CurrentDomain.BaseDirectory;
foreach (var assemblyName in assemblies)
@@ -44,14 +35,12 @@ namespace NzbDrone.Common.Composition
toRegisterResolver.AddRange(assemblies.Intersect(new[] { "Prowlarr.Core" }));
RegisterNativeResolver(toRegisterResolver);
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler);
-#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);
@@ -103,7 +92,6 @@ namespace NzbDrone.Common.Composition
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/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
index 5f6eff146..acf844abd 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
@@ -23,7 +23,6 @@ namespace NzbDrone.Common.EnvironmentInfo
serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) &&
serviceProvider.GetStatus(ServiceProvider.SERVICE_NAME) == ServiceControllerStatus.StartPending;
-#if NETCOREAPP
// net5.0 will return Radarr.dll for entry assembly, we need the actual
// executable name (Radarr on linux). On mono this will return the location of
// the mono executable itself, which is not what we want.
@@ -34,12 +33,6 @@ namespace NzbDrone.Common.EnvironmentInfo
ExecutingApplication = entry.FileName;
IsWindowsTray = OsInfo.IsWindows && entry.ModuleName == $"{ProcessProvider.PROWLARR_PROCESS_NAME}.exe";
}
-#else
- // On mono we need to get the location of the Radarr assembly, not Mono.
- // Can't be running tray app in mono.
- ExecutingApplication = Assembly.GetEntryAssembly()?.Location;
-#endif
-
}
static RuntimeInfo()
diff --git a/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs b/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs
index aa29245e3..7f0fe06ce 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/Http/HttpAccept.cs b/src/NzbDrone.Common/Http/HttpAccept.cs
index fc0eab894..b0b5c59b4 100644
--- a/src/NzbDrone.Common/Http/HttpAccept.cs
+++ b/src/NzbDrone.Common/Http/HttpAccept.cs
@@ -4,11 +4,8 @@
{
public static readonly HttpAccept Rss = new HttpAccept("application/rss+xml, text/rss+xml, application/xml, text/xml");
public static readonly HttpAccept Json = new HttpAccept("application/json");
-#if NETCOREAPP
public static readonly HttpAccept JsonCharset = new HttpAccept("application/json; charset=utf-8");
-#else
- public static readonly HttpAccept JsonCharset = new HttpAccept("application/json;charset=utf-8");
-#endif
+
public static readonly HttpAccept Html = new HttpAccept("text/html");
public string Value { get; private set; }
diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs
index 97d3918c1..b55668200 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/Prowlarr.Common.csproj b/src/NzbDrone.Common/Prowlarr.Common.csproj
index 5d5d86354..8a8615142 100644
--- a/src/NzbDrone.Common/Prowlarr.Common.csproj
+++ b/src/NzbDrone.Common/Prowlarr.Common.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
ISMUSL
@@ -11,17 +11,12 @@
-
-
-
-
-
True
diff --git a/src/NzbDrone.Console/Prowlarr.Console.csproj b/src/NzbDrone.Console/Prowlarr.Console.csproj
index 1575c985f..16f42bea3 100644
--- a/src/NzbDrone.Console/Prowlarr.Console.csproj
+++ b/src/NzbDrone.Console/Prowlarr.Console.csproj
@@ -1,7 +1,7 @@
Exe
- net5.0;net472
+ net5.0
..\NzbDrone.Host\Prowlarr.ico
app.manifest
diff --git a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj
index 55d0e0071..2214a73c5 100644
--- a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj
@@ -1,9 +1,9 @@
- net5.0;net472
+ net5.0
-
+
@@ -11,8 +11,6 @@
-
-
diff --git a/src/NzbDrone.Core/Prowlarr.Core.csproj b/src/NzbDrone.Core/Prowlarr.Core.csproj
index 1c9f1f4dd..a0449fe2f 100644
--- a/src/NzbDrone.Core/Prowlarr.Core.csproj
+++ b/src/NzbDrone.Core/Prowlarr.Core.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
@@ -16,7 +16,7 @@
-
+
@@ -24,10 +24,6 @@
-
-
-
-
Resources\Logo\64.png
diff --git a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj
index 367403714..281698511 100644
--- a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj
+++ b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj
@@ -1,21 +1,16 @@
- net5.0;net472
+ net5.0
-
+
-
-
-
-
-
diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
index ce7bddd66..2b8154dfa 100644
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -24,11 +24,7 @@ namespace Prowlarr.Host
try
{
Logger.Info("Starting Prowlarr - {0} - Version {1}",
-#if NETCOREAPP
Process.GetCurrentProcess().MainModule.FileName,
-#else
- Assembly.GetCallingAssembly().Location,
-#endif
Assembly.GetExecutingAssembly().GetName().Version);
if (!PlatformValidation.IsValidate(userAlert))
diff --git a/src/NzbDrone.Host/Prowlarr.Host.csproj b/src/NzbDrone.Host/Prowlarr.Host.csproj
index aa176563a..edea3d00d 100644
--- a/src/NzbDrone.Host/Prowlarr.Host.csproj
+++ b/src/NzbDrone.Host/Prowlarr.Host.csproj
@@ -1,19 +1,11 @@
- net5.0;net472
+ net5.0
Library
-
-
-
-
-
-
-
-
-
-
+
+
@@ -30,7 +22,4 @@
True
-
-
-
diff --git a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs
index b1b98f895..0c6218c5c 100644
--- a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs
+++ b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs
@@ -57,17 +57,10 @@ namespace Prowlarr.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 18460363e..a3847290a 100644
--- a/src/NzbDrone.Host/WebHost/WebHostController.cs
+++ b/src/NzbDrone.Host/WebHost/WebHostController.cs
@@ -107,24 +107,14 @@ namespace Prowlarr.Host
{
services
.AddSignalR()
-#if !NETCOREAPP
- .AddJsonProtocol(options =>
- {
- options.PayloadSerializerSettings = Json.GetSerializerSettings();
- });
-#else
.AddNewtonsoftJsonProtocol(options =>
{
options.PayloadSerializerSettings = Json.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/Prowlarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj
index 5c105dd9a..085e15c52 100644
--- a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj
@@ -1,19 +1,14 @@
- net5.0;net472
+ net5.0
Library
-
+
-
-
-
-
-
-
+
diff --git a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj
index d348f2aa8..a4d90b8f2 100644
--- a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj
+++ b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj
@@ -1,14 +1,12 @@
- net5.0;net472
+ net5.0
-
+
-
-
diff --git a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj
index ea71dfe53..2521fba54 100644
--- a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj
+++ b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj
@@ -1,21 +1,12 @@
- net5.0;net472
+ net5.0
-
+
-
-
-
-
-
-
diff --git a/src/NzbDrone.Mono/Prowlarr.Mono.csproj b/src/NzbDrone.Mono/Prowlarr.Mono.csproj
index 7906fa35e..b08c5fe6e 100644
--- a/src/NzbDrone.Mono/Prowlarr.Mono.csproj
+++ b/src/NzbDrone.Mono/Prowlarr.Mono.csproj
@@ -1,15 +1,8 @@
- net5.0;net472
+ net5.0
-
-
-
-
-
+
diff --git a/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj b/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj
index fa07e64bb..316e17154 100644
--- a/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj
+++ b/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj
@@ -1,12 +1,8 @@
- net5.0;net472
+ net5.0
Library
-
-
-
-
diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
index 1018310b0..2d191ad53 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
@@ -152,9 +152,7 @@ namespace NzbDrone.Test.Common.AutoMoq
_registeredMocks = new Dictionary();
AddTheAutoMockingContainerExtensionToTheContainer(container);
-#if NETCOREAPP
ContainerBuilderBase.RegisterNativeResolver(new[] { "System.Data.SQLite", "Prowlarr.Core" });
-#endif
}
private static void AddTheAutoMockingContainerExtensionToTheContainer(IUnityContainer container)
diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs
index 4dd304ca4..30135f975 100644
--- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs
+++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs
@@ -55,7 +55,7 @@ namespace NzbDrone.Test.Common
if (BuildInfo.IsDebug)
{
- var frameworkFolder = PlatformInfo.IsNetCore ? "net5.0" : "net472";
+ var frameworkFolder = "net5.0";
Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", frameworkFolder, consoleExe));
}
else
diff --git a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj
index 09496cdcb..31b753d99 100644
--- a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
diff --git a/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj
index 0340998df..244fa2aeb 100644
--- a/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj
+++ b/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj
@@ -1,6 +1,6 @@
Exe
- net5.0;net472
+ net5.0
\ No newline at end of file
diff --git a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj
index 08b9e0710..16ec28383 100644
--- a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj
+++ b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj
@@ -1,14 +1,12 @@
- net5.0;net472
+ net5.0
-
+
-
-
diff --git a/src/NzbDrone.Update/Prowlarr.Update.csproj b/src/NzbDrone.Update/Prowlarr.Update.csproj
index 6b572ebe4..0fee09900 100644
--- a/src/NzbDrone.Update/Prowlarr.Update.csproj
+++ b/src/NzbDrone.Update/Prowlarr.Update.csproj
@@ -1,7 +1,7 @@
WinExe
- net5.0;net472
+ net5.0
diff --git a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj
index 24037a280..1ad39a63b 100644
--- a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj
+++ b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj
@@ -1,14 +1,12 @@
- net5.0;net472
+ net5.0
-
+
-
-
diff --git a/src/NzbDrone.Windows/Prowlarr.Windows.csproj b/src/NzbDrone.Windows/Prowlarr.Windows.csproj
index 9a82b6c40..29034e372 100644
--- a/src/NzbDrone.Windows/Prowlarr.Windows.csproj
+++ b/src/NzbDrone.Windows/Prowlarr.Windows.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
diff --git a/src/NzbDrone/Prowlarr.csproj b/src/NzbDrone/Prowlarr.csproj
index 9f5fe12c2..0918993ca 100644
--- a/src/NzbDrone/Prowlarr.csproj
+++ b/src/NzbDrone/Prowlarr.csproj
@@ -1,7 +1,7 @@
WinExe
- net5.0-windows;net472
+ net5.0-windows
win-x64
true
..\NzbDrone.Host\Prowlarr.ico
@@ -14,9 +14,6 @@
-
-
-
True
diff --git a/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj b/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj
index f1b80579a..dadbf858d 100644
--- a/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj
+++ b/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
@@ -8,8 +8,6 @@
-
-
diff --git a/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj
index 51f39c2e7..0259406e6 100644
--- a/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj
+++ b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
diff --git a/src/Prowlarr.Http/Prowlarr.Http.csproj b/src/Prowlarr.Http/Prowlarr.Http.csproj
index eeec5c4c8..2fd0ac196 100644
--- a/src/Prowlarr.Http/Prowlarr.Http.csproj
+++ b/src/Prowlarr.Http/Prowlarr.Http.csproj
@@ -1,6 +1,6 @@
- net5.0;net472
+ net5.0
diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
index 7aafe20c1..cfe8281cc 100644
--- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
+++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
@@ -1,9 +1,9 @@
WinExe
- net5.0;net472
+ net5.0
-
+
diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
index 7aafe20c1..cfe8281cc 100644
--- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
+++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
@@ -1,9 +1,9 @@
WinExe
- net5.0;net472
+ 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)
diff --git a/yarn.lock b/yarn.lock
index 62064625b..c0810a9c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1089,10 +1089,10 @@
normalize-path "^2.0.1"
through2 "^2.0.3"
-"@microsoft/signalr@5.0.1":
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-5.0.1.tgz#5dfc056a2876e28f12e07ed18611b1e54b6b23a3"
- integrity sha512-qk5xMEpEqvxmj2/7ZRkHpWyt33gGXiNTkM+iIFr0QYEaynsbwGUxyV5WhuxcOP9LyXgUx6IXBer2HVAGOC4zpw==
+"@microsoft/signalr@5.0.3":
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-5.0.3.tgz#562762d750333c2154951af5db2327365a655003"
+ integrity sha512-/+8DeefKxsz29+OgLBpMH6xs/akEzFrGTCsBhwQV67x0GR+uN03I74vn8X7FunXWO8BApamOjF2DLmLGU83SFw==
dependencies:
abort-controller "^3.0.0"
eventsource "^1.0.7"