From 6235225f7df6dcc5c4c65ee777d0e93fe44f5d8f Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 5 Dec 2019 21:41:55 +0000 Subject: [PATCH] New: Bump to .NET Core 3.1 --- azure-pipelines.yml | 44 ++++++++----------- build.sh | 26 +++++------ package.json | 2 +- src/Directory.Build.props | 2 +- src/NzbDrone.Api.Test/Radarr.Api.Test.csproj | 4 +- src/NzbDrone.Api/Radarr.Api.csproj | 6 +-- .../Radarr.Automation.Test.csproj | 8 ++-- .../Radarr.Common.Test.csproj | 4 +- .../Composition/ContainerBuilderBase.cs | 6 +-- .../EnvironmentInfo/PlatformInfo.cs | 4 +- .../EnvironmentInfo/RuntimeInfo.cs | 4 +- .../Extensions/DictionaryExtensions.cs | 2 +- src/NzbDrone.Common/Http/HttpAccept.cs | 2 +- src/NzbDrone.Common/Radarr.Common.csproj | 18 ++++---- src/NzbDrone.Console/Radarr.Console.csproj | 2 +- .../Radarr.Core.Test.csproj | 4 +- src/NzbDrone.Core/Radarr.Core.csproj | 10 ++--- .../Radarr.Host.Test.csproj | 4 +- src/NzbDrone.Host/Radarr.Host.csproj | 10 ++--- .../WebHost/Middleware/SignalRMiddleware.cs | 2 +- .../WebHost/WebHostController.cs | 4 +- .../Radarr.Integration.Test.csproj | 8 ++-- .../Radarr.Libraries.Test.csproj | 4 +- .../Radarr.Mono.Test.csproj | 6 +-- src/NzbDrone.Mono/Radarr.Mono.csproj | 6 +-- src/NzbDrone.SignalR/Radarr.SignalR.csproj | 4 +- src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs | 2 +- src/NzbDrone.Test.Common/NzbDroneRunner.cs | 2 +- .../Radarr.Test.Common.csproj | 8 ++-- .../Radarr.Test.Dummy.csproj | 2 +- .../Radarr.Update.Test.csproj | 4 +- src/NzbDrone.Update/Radarr.Update.csproj | 4 +- .../Radarr.Windows.Test.csproj | 4 +- src/NzbDrone.Windows/Radarr.Windows.csproj | 6 +-- src/NzbDrone/Radarr.csproj | 4 +- src/NzbDrone/SysTray/SysTrayApp.cs | 10 ++--- src/Radarr.Api.V3/Radarr.Api.V3.csproj | 8 ++-- src/Radarr.Http/Radarr.Http.csproj | 8 ++-- .../ServiceInstall/ServiceInstall.csproj | 6 +-- .../ServiceUninstall/ServiceUninstall.csproj | 6 +-- yarn.lock | 8 ++-- 41 files changed, 136 insertions(+), 142 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e36bba0d..37b4f29d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ variables: radarrVersion: '$(majorVersion).$(minorVersion)' buildName: '$(Build.SourceBranchName).$(radarrVersion)' sentryOrg: 'radarr' - dotnetVersion: '3.0.x' + dotnetVersion: '3.1.x' trigger: branches: @@ -52,10 +52,9 @@ stages: submodules: true fetchDepth: 1 - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - bash: ./build.sh --backend displayName: Build Radarr Backend - bash: | @@ -69,7 +68,7 @@ stages: artifact: '$(osName)Backend' displayName: Publish Backend condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/netcoreapp3.0/win-x64/publish' + - publish: '$(testsFolder)/netcoreapp3.1/win-x64/publish' artifact: WindowsCoreTests displayName: Publish Windows Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) @@ -77,11 +76,11 @@ stages: artifact: LinuxTests displayName: Publish Linux Mono Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/netcoreapp3.0/linux-x64/publish' + - publish: '$(testsFolder)/netcoreapp3.1/linux-x64/publish' artifact: LinuxCoreTests displayName: Publish Linux Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/netcoreapp3.0/osx-x64/publish' + - publish: '$(testsFolder)/netcoreapp3.1/osx-x64/publish' artifact: MacCoreTests displayName: Publish MacOS Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) @@ -149,8 +148,8 @@ stages: - bash: ./build.sh --packages displayName: Create Packages - bash: | - setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.0 - cp setup/output/Radarr.*windows.netcoreapp3.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe + setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 + cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe displayName: Create .NET Core Windows installer - publish: $(Build.ArtifactStagingDirectory) artifact: 'WindowsInstaller' @@ -192,14 +191,14 @@ stages: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/windows/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/windows/netcoreapp3.1 - task: ArchiveFiles@2 displayName: Create MacOS Core app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos-app/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/macos-app/netcoreapp3.1 - task: ArchiveFiles@2 displayName: Create MacOS Core tar inputs: @@ -207,7 +206,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/macos/netcoreapp3.1 - task: ArchiveFiles@2 displayName: Create Linux Mono tar inputs: @@ -223,7 +222,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x64/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/linux-x64/netcoreapp3.1 - task: ArchiveFiles@2 displayName: Create ARM32 Linux Core tar inputs: @@ -231,7 +230,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm/netcoreapp3.1 - task: ArchiveFiles@2 displayName: Create ARM64 Linux Core tar inputs: @@ -239,7 +238,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm64/netcoreapp3.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm64/netcoreapp3.1 - publish: $(Build.ArtifactStagingDirectory) artifact: 'Packages' displayName: Publish Packages @@ -286,10 +285,9 @@ stages: steps: - checkout: none - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact inputs: @@ -380,10 +378,9 @@ stages: - bash: mono --version displayName: Check Mono version - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact @@ -443,10 +440,9 @@ stages: displayName: Set Mono Version condition: and(succeeded(), eq(variables['osName'], 'Mac')) - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact @@ -530,10 +526,9 @@ stages: - bash: mono --version displayName: Check Mono version - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact @@ -601,10 +596,9 @@ stages: steps: - task: UseDotNet@2 - displayName: 'Install .net core 3.0' + displayName: 'Install .net core' inputs: version: $(dotnetVersion) - condition: ne(variables['osName'], 'Windows') - checkout: none - task: DownloadPipelineArtifact@2 displayName: Download Test Artifact @@ -718,7 +712,7 @@ stages: # - checkout: self # Need history for Sonar analysis # submodules: true # - task: UseDotNet@2 - # displayName: 'Install .net core 3.0' + # displayName: 'Install .net core' # inputs: # version: $(dotnetVersion) # - task: SonarCloudPrepare@1 diff --git a/build.sh b/build.sh index 78ce37dce..1386293b6 100755 --- a/build.sh +++ b/build.sh @@ -131,7 +131,7 @@ PackageLinux() echo "Adding Radarr.Mono to UpdatePackage" cp $folder/Radarr.Mono.* $folder/Radarr.Update - if [ "$framework" = "netcoreapp3.0" ]; then + if [ "$framework" = "netcoreapp3.1" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update cp $folder/libMonoPosixHelper.* $folder/Radarr.Update fi @@ -163,7 +163,7 @@ PackageMacOS() echo "Adding Radarr.Mono to UpdatePackage" cp $folder/Radarr.Mono.* $folder/Radarr.Update - if [ "$framework" = "netcoreapp3.0" ]; then + if [ "$framework" = "netcoreapp3.1" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update cp $folder/libMonoPosixHelper.* $folder/Radarr.Update fi @@ -198,16 +198,16 @@ PackageTests() ProgressStart 'Creating Test Package' cp test.sh $testPackageFolder/net462/linux-x64/publish - cp test.sh $testPackageFolder/netcoreapp3.0/win-x64/publish - cp test.sh $testPackageFolder/netcoreapp3.0/linux-x64/publish - cp test.sh $testPackageFolder/netcoreapp3.0/osx-x64/publish + cp test.sh $testPackageFolder/netcoreapp3.1/win-x64/publish + cp test.sh $testPackageFolder/netcoreapp3.1/linux-x64/publish + cp test.sh $testPackageFolder/netcoreapp3.1/osx-x64/publish rm -f $testPackageFolder/*.log.config # 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" + curl -Lo gecko.zip "https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-win64.zip" unzip -o gecko.zip - cp geckodriver.exe $testPackageFolder/netcoreapp3.0/win-x64/publish + cp geckodriver.exe $testPackageFolder/netcoreapp3.1/win-x64/publish CleanFolder $testPackageFolder @@ -319,11 +319,11 @@ fi if [ "$PACKAGES" = "YES" ]; then UpdateVersionNumber - PackageWindows "netcoreapp3.0" + PackageWindows "netcoreapp3.1" PackageLinux "net462" "linux-x64" - PackageLinux "netcoreapp3.0" "linux-x64" - PackageLinux "netcoreapp3.0" "linux-arm64" - PackageLinux "netcoreapp3.0" "linux-arm" - PackageMacOS "netcoreapp3.0" - PackageMacOSApp "netcoreapp3.0" + PackageLinux "netcoreapp3.1" "linux-x64" + PackageLinux "netcoreapp3.1" "linux-arm64" + PackageLinux "netcoreapp3.1" "linux-arm" + PackageMacOS "netcoreapp3.1" + PackageMacOSApp "netcoreapp3.1" fi diff --git a/package.json b/package.json index 73af5ab96..2a4a5a7bf 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@fortawesome/free-regular-svg-icons": "5.9.0", "@fortawesome/free-solid-svg-icons": "5.9.0", "@fortawesome/react-fontawesome": "0.1.4", - "@microsoft/signalr": "3.0.0", + "@microsoft/signalr": "3.1.0", "@sentry/browser": "5.5.0", "@sentry/integrations": "5.5.0", "ansi-colors": "4.1.1", diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ce4cd0a49..c678268bd 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -86,7 +86,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj index fffc08a0e..e3aebbce5 100644 --- a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj @@ -1,9 +1,9 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Api/Radarr.Api.csproj b/src/NzbDrone.Api/Radarr.Api.csproj index edd2f7140..f46f55109 100644 --- a/src/NzbDrone.Api/Radarr.Api.csproj +++ b/src/NzbDrone.Api/Radarr.Api.csproj @@ -1,14 +1,14 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + - + diff --git a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj index 110f60fd1..6cc6bccc8 100644 --- a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj @@ -1,16 +1,16 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + - + - \ No newline at end of file + diff --git a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj index 948bc26c5..bdbb47b09 100644 --- a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs index 40e4cc752..6575f9236 100644 --- a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs +++ b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs @@ -6,7 +6,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Messaging; using TinyIoC; -#if NETCOREAPP3_0 +#if NETCOREAPP using System.IO; using System.Runtime.Loader; using System.Runtime.InteropServices; @@ -27,7 +27,7 @@ namespace NzbDrone.Common.Composition assemblies.Add(OsInfo.IsWindows ? "Radarr.Windows" : "Radarr.Mono"); assemblies.Add("Radarr.Common"); -#if !NETCOREAPP3_0 +#if !NETCOREAPP foreach (var assembly in assemblies) { _loadedTypes.AddRange(Assembly.Load(assembly).GetTypes()); @@ -51,7 +51,7 @@ namespace NzbDrone.Common.Composition Container.Register(args); } -#if NETCOREAPP3_0 +#if NETCOREAPP private static Assembly ContainerResolveEventHandler(object sender, ResolveEventArgs args) { var _resolver = new AssemblyDependencyResolver(args.RequestingAssembly.Location); diff --git a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs index 85fdb2f8a..f13d6bbc3 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs @@ -27,9 +27,9 @@ namespace NzbDrone.Common.EnvironmentInfo static PlatformInfo() { -#if NETCOREAPP3_0 +#if NETCOREAPP _platform = PlatformType.NetCore; - _version = new Version("3.0"); + _version = Environment.Version; #else if (Type.GetType("Mono.Runtime") != null) { diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index a4ecbaa03..6cf21fdde 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs @@ -7,7 +7,7 @@ using System.ServiceProcess; using NLog; using NzbDrone.Common.Processes; -#if NETCOREAPP3_0 +#if NETCOREAPP using Microsoft.Extensions.Hosting.WindowsServices; #endif @@ -59,7 +59,7 @@ namespace NzbDrone.Common.EnvironmentInfo } } -#if !NETCOREAPP3_0 +#if !NETCOREAPP public static bool IsUserInteractive => Environment.UserInteractive; #else // Note that Environment.UserInteractive is always true on net core: https://stackoverflow.com/a/57325783 diff --git a/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs b/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs index e2b7529c3..59933243d 100644 --- a/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs +++ b/src/NzbDrone.Common/Extensions/DictionaryExtensions.cs @@ -6,7 +6,7 @@ namespace NzbDrone.Common.Extensions { public static class DictionaryExtensions { -#if !NETCOREAPP3_0 +#if !NETCOREAPP public static TValue GetValueOrDefault(this IReadOnlyDictionary dictionary, TKey key, TValue defaultValue = default(TValue)) { TValue value; diff --git a/src/NzbDrone.Common/Http/HttpAccept.cs b/src/NzbDrone.Common/Http/HttpAccept.cs index 686057fcb..aaae55348 100644 --- a/src/NzbDrone.Common/Http/HttpAccept.cs +++ b/src/NzbDrone.Common/Http/HttpAccept.cs @@ -4,7 +4,7 @@ { 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 NETCOREAPP3_0 +#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"); diff --git a/src/NzbDrone.Common/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj index 6582f3827..0d52f085f 100644 --- a/src/NzbDrone.Common/Radarr.Common.csproj +++ b/src/NzbDrone.Common/Radarr.Common.csproj @@ -1,23 +1,23 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - - + + - - - + + + - - - + + + diff --git a/src/NzbDrone.Console/Radarr.Console.csproj b/src/NzbDrone.Console/Radarr.Console.csproj index f63ae2cb4..7ebff1857 100644 --- a/src/NzbDrone.Console/Radarr.Console.csproj +++ b/src/NzbDrone.Console/Radarr.Console.csproj @@ -1,7 +1,7 @@ Exe - net462;netcoreapp3.0 + net462;netcoreapp3.1 ..\NzbDrone.Host\Radarr.ico app.manifest diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj index 48ca1043a..debfc8dd1 100644 --- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj @@ -1,9 +1,9 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj index 96a453bed..254dd81ce 100644 --- a/src/NzbDrone.Core/Radarr.Core.csproj +++ b/src/NzbDrone.Core/Radarr.Core.csproj @@ -1,16 +1,16 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + - + - - + + diff --git a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj index 1de7aa10b..665668278 100644 --- a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Host/Radarr.Host.csproj b/src/NzbDrone.Host/Radarr.Host.csproj index 267d0bc51..2a9558a22 100644 --- a/src/NzbDrone.Host/Radarr.Host.csproj +++ b/src/NzbDrone.Host/Radarr.Host.csproj @@ -1,6 +1,6 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 Library @@ -9,12 +9,12 @@ - - - + + + - + diff --git a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs index df038c204..326f358d7 100644 --- a/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs +++ b/src/NzbDrone.Host/WebHost/Middleware/SignalRMiddleware.cs @@ -57,7 +57,7 @@ namespace Radarr.Host.Middleware } }); -#if NETCOREAPP3_0 +#if NETCOREAPP appBuilder.UseEndpoints(x => { x.MapHub(URL_BASE + "/signalr/messages"); diff --git a/src/NzbDrone.Host/WebHost/WebHostController.cs b/src/NzbDrone.Host/WebHost/WebHostController.cs index d72c254bf..2ad8f7691 100644 --- a/src/NzbDrone.Host/WebHost/WebHostController.cs +++ b/src/NzbDrone.Host/WebHost/WebHostController.cs @@ -91,7 +91,7 @@ namespace Radarr.Host { services .AddSignalR() -#if !NETCOREAPP3_0 +#if !NETCOREAPP .AddJsonProtocol( #else .AddNewtonsoftJsonProtocol( @@ -103,7 +103,7 @@ namespace Radarr.Host }) .Configure(app => { -#if NETCOREAPP3_0 +#if NETCOREAPP app.UseRouting(); #endif app.Properties["host.AppName"] = BuildInfo.AppName; diff --git a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj index 68985f2f2..da5003c08 100644 --- a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj @@ -1,10 +1,10 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 Library - + @@ -12,8 +12,8 @@ - - + + diff --git a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj index 9db9f16b6..0f11c4123 100644 --- a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj index 908ffdc70..9ed767e22 100644 --- a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + @@ -15,7 +15,7 @@ The netstandard veresion here doesn't work in net framework See https://github.com/xamarin/XamarinComponents/issues/282 --> - + diff --git a/src/NzbDrone.Mono/Radarr.Mono.csproj b/src/NzbDrone.Mono/Radarr.Mono.csproj index 25ca39fd6..9161eab91 100644 --- a/src/NzbDrone.Mono/Radarr.Mono.csproj +++ b/src/NzbDrone.Mono/Radarr.Mono.csproj @@ -1,6 +1,6 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 @@ -9,9 +9,9 @@ The netstandard veresion here doesn't work in net framework See https://github.com/xamarin/XamarinComponents/issues/282 --> - + - + diff --git a/src/NzbDrone.SignalR/Radarr.SignalR.csproj b/src/NzbDrone.SignalR/Radarr.SignalR.csproj index c2a688b0c..8ef92ed29 100644 --- a/src/NzbDrone.SignalR/Radarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Radarr.SignalR.csproj @@ -1,11 +1,11 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 Library - + diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs index f8e063bb4..3988dc9aa 100644 --- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs +++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs @@ -142,7 +142,7 @@ namespace NzbDrone.Test.Common.AutoMoq _registeredMocks = new Dictionary(); AddTheAutoMockingContainerExtensionToTheContainer(container); -#if NETCOREAPP3_0 +#if NETCOREAPP ContainerBuilderBase.RegisterNativeResolver(new [] {"System.Data.SQLite", "Radarr.Core"}); #endif } diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index b5fb40967..ee88e6e2c 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -52,7 +52,7 @@ namespace NzbDrone.Test.Common if (BuildInfo.IsDebug) { - var frameworkFolder = PlatformInfo.IsNetCore ? "netcoreapp3.0" : "net462"; + var frameworkFolder = PlatformInfo.IsNetCore ? "netcoreapp3.1" : "net462"; Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", frameworkFolder, consoleExe)); } else diff --git a/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj index f5764f83c..2d00d0f77 100644 --- a/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj @@ -1,12 +1,12 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - - - + + + diff --git a/src/NzbDrone.Test.Dummy/Radarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Radarr.Test.Dummy.csproj index dc605c838..fd7be4d0f 100644 --- a/src/NzbDrone.Test.Dummy/Radarr.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/Radarr.Test.Dummy.csproj @@ -1,6 +1,6 @@ Exe - net462;netcoreapp3.0 + net462;netcoreapp3.1 \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/Radarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Radarr.Update.Test.csproj index 566d44f83..c4214bc6b 100644 --- a/src/NzbDrone.Update.Test/Radarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Radarr.Update.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Update/Radarr.Update.csproj b/src/NzbDrone.Update/Radarr.Update.csproj index f9111166d..abc04c2a9 100644 --- a/src/NzbDrone.Update/Radarr.Update.csproj +++ b/src/NzbDrone.Update/Radarr.Update.csproj @@ -1,10 +1,10 @@  WinExe - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Windows.Test/Radarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Radarr.Windows.Test.csproj index 9b337d5a9..6e54240d0 100644 --- a/src/NzbDrone.Windows.Test/Radarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Radarr.Windows.Test.csproj @@ -1,9 +1,9 @@ - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + diff --git a/src/NzbDrone.Windows/Radarr.Windows.csproj b/src/NzbDrone.Windows/Radarr.Windows.csproj index 91fc236b5..ddf81339c 100644 --- a/src/NzbDrone.Windows/Radarr.Windows.csproj +++ b/src/NzbDrone.Windows/Radarr.Windows.csproj @@ -1,10 +1,10 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - - + + diff --git a/src/NzbDrone/Radarr.csproj b/src/NzbDrone/Radarr.csproj index 6c6b3f333..5f7fa927f 100644 --- a/src/NzbDrone/Radarr.csproj +++ b/src/NzbDrone/Radarr.csproj @@ -1,7 +1,7 @@  WinExe - net462;netcoreapp3.0 + net462;netcoreapp3.1 win-x64 true ..\NzbDrone.Host\Radarr.ico @@ -9,7 +9,7 @@ true - + diff --git a/src/NzbDrone/SysTray/SysTrayApp.cs b/src/NzbDrone/SysTray/SysTrayApp.cs index c4415d496..3c27e993b 100644 --- a/src/NzbDrone/SysTray/SysTrayApp.cs +++ b/src/NzbDrone/SysTray/SysTrayApp.cs @@ -20,7 +20,7 @@ namespace NzbDrone.SysTray private readonly IProcessProvider _processProvider; private readonly NotifyIcon _trayIcon = new NotifyIcon(); - private readonly ContextMenu _trayMenu = new ContextMenu(); + private readonly ContextMenuStrip _trayMenu = new ContextMenuStrip(); public SystemTrayApp(IBrowserService browserService, IRuntimeInfo runtimeInfo, IProcessProvider processProvider) { @@ -34,14 +34,14 @@ namespace NzbDrone.SysTray Application.ThreadException += OnThreadException; Application.ApplicationExit += OnApplicationExit; - _trayMenu.MenuItems.Add("Launch Browser", LaunchBrowser); - _trayMenu.MenuItems.Add("-"); - _trayMenu.MenuItems.Add("Exit", OnExit); + _trayMenu.Items.Add(new ToolStripMenuItem("Launch Browser", null, LaunchBrowser)); + _trayMenu.Items.Add(new ToolStripMenuItem("-")); + _trayMenu.Items.Add(new ToolStripMenuItem("Exit", null, OnExit)); _trayIcon.Text = string.Format("Radarr - {0}", BuildInfo.Version); _trayIcon.Icon = Properties.Resources.Radarr; - _trayIcon.ContextMenu = _trayMenu; + _trayIcon.ContextMenuStrip = _trayMenu; _trayIcon.Visible = true; _trayIcon.DoubleClick += LaunchBrowser; diff --git a/src/Radarr.Api.V3/Radarr.Api.V3.csproj b/src/Radarr.Api.V3/Radarr.Api.V3.csproj index d0dd579df..fd9c89c98 100644 --- a/src/Radarr.Api.V3/Radarr.Api.V3.csproj +++ b/src/Radarr.Api.V3/Radarr.Api.V3.csproj @@ -1,15 +1,15 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + - - + + diff --git a/src/Radarr.Http/Radarr.Http.csproj b/src/Radarr.Http/Radarr.Http.csproj index 1bf06c350..cd352d988 100644 --- a/src/Radarr.Http/Radarr.Http.csproj +++ b/src/Radarr.Http/Radarr.Http.csproj @@ -1,14 +1,14 @@  - net462;netcoreapp3.0 + net462;netcoreapp3.1 - + - - + + diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index 8a735f3bf..e45e49618 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,9 +1,9 @@  WinExe - net462;netcoreapp3.0 + net462;netcoreapp3.1 - - + + diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index 8a735f3bf..e45e49618 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,9 +1,9 @@  WinExe - net462;netcoreapp3.0 + net462;netcoreapp3.1 - - + + diff --git a/yarn.lock b/yarn.lock index 516f43533..cbe8f625d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -923,10 +923,10 @@ normalize-path "^2.0.1" through2 "^2.0.3" -"@microsoft/signalr@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-3.0.0.tgz#df03564f900957db0a62469cad576eb573368c9d" - integrity sha512-M0KMWvJ62yZuizPxFLZakitJb4aOZkJH6epXTLvp5LednJZdzacRDxWT3La7Cexp1cHxVbldBFtc3jrdfwmtxw== +"@microsoft/signalr@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-3.1.0.tgz#2ed5ab78de1ae252d3c18504355ca74814c62284" + integrity sha512-ZAScxodI15jr1MF359jwelhrr/fkvCCTWUB5awRO+ibPyBvMS6KsSzWfN/AObc0EqvJPmYtjJgCBWR62nInlCg== dependencies: eventsource "^1.0.7" request "^2.88.0"