From c96ffafe5067738694b0b8330e21bb3a2adea090 Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 12 Aug 2020 22:07:23 -0400 Subject: [PATCH] Bump minimum Mono version to 5.18 Fixes #4722 --- .../Checks/MonoVersionCheckFixture.cs | 10 +++++++--- .../HealthCheck/Checks/MonoVersionCheck.cs | 18 ++++++++---------- src/NzbDrone.Core/Localization/Core/en.json | 3 +++ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs index 999ca159c..74d0bace8 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs @@ -30,6 +30,7 @@ private void GivenOutput(string version) [TestCase("5.18")] [TestCase("5.20")] + [TestCase("6.4")] public void should_return_ok(string version) { GivenOutput(version); @@ -37,7 +38,6 @@ public void should_return_ok(string version) Subject.Check().ShouldBeOk(); } - [TestCase("5.16")] public void should_return_notice(string version) { GivenOutput(version); @@ -45,8 +45,6 @@ public void should_return_notice(string version) Subject.Check().ShouldBeNotice(); } - [TestCase("5.4")] - [TestCase("5.8")] public void should_return_warning(string version) { GivenOutput(version); @@ -67,6 +65,12 @@ public void should_return_warning(string version) [TestCase("4.2")] [TestCase("4.4.0")] [TestCase("4.4.1")] + [TestCase("5.4")] + [TestCase("5.8")] + [TestCase("5.10")] + [TestCase("5.12")] + [TestCase("5.14")] + [TestCase("5.16")] public void should_return_error(string version) { GivenOutput(version); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index d17b122ac..c0f2d93ac 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -46,30 +46,28 @@ public override HealthCheck Check() } // Stable Mono versions - var stableVersion = new Version("5.16"); + var stableVersion = new Version("5.18"); if (monoVersion >= stableVersion) { _logger.Debug("Mono version is {0} or better: {1}", stableVersion, monoVersion); return new HealthCheck(GetType(), HealthCheckResult.Notice, - $"Currently installed Mono version {monoVersion} is supported but upgrading to {bestVersion} is recommended.", + string.Format(_localizationService.GetLocalizedString("MonoVersionCheckUpgradeRecommendedMessage"), monoVersion, bestVersion), "#currently-installed-mono-version-is-supported-but-upgrading-is-recommended"); } - // Old but supported Mono versions, there are known bugs - var supportedVersion = new Version("5.4"); - if (monoVersion >= supportedVersion) + var oldVersion = new Version("5.4"); + if (monoVersion >= oldVersion) { - _logger.Debug("Mono version is {0} or better: {1}", supportedVersion, monoVersion); return new HealthCheck(GetType(), - HealthCheckResult.Warning, - $"Currently installed Mono version {monoVersion} is supported but has some known issues. Please upgrade Mono to version {bestVersion}.", - "#currently-installed-mono-version-is-supported-but-upgrading-is-recommended"); + HealthCheckResult.Error, + string.Format(_localizationService.GetLocalizedString("MonoVersionCheckUpgradeRecommendedMessage"), monoVersion, bestVersion), + "#currently-installed-mono-version-is-old-and-unsupported"); } return new HealthCheck(GetType(), HealthCheckResult.Error, - $"Currently installed Mono version {monoVersion} is old and unsupported. Please upgrade Mono to version {bestVersion}.", + string.Format(_localizationService.GetLocalizedString("MonoVersionCheckUpgradeRecommendedMessage"), monoVersion, bestVersion), "#currently-installed-mono-version-is-old-and-unsupported"); } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index ddbda324f..c585b1852 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -143,6 +143,9 @@ "MonitoredOnly": "Monitored Only", "MonoNotNetCoreCheckMessage": "Please upgrade to the .NET Core version of Radarr", "MonoTlsCheckMessage": "Radarr Mono 4.x tls workaround still enabled, consider removing MONO_TLS_PROVIDER=legacy environment option", + "MonoVersionCheckNotSupportedMessage": "Currently installed Mono version {0} is no longer supported. Please upgrade Mono to version {1}.", + "MonoVersionCheckOldNotSupportedMessage": "Currently installed Mono version {0} is old and unsupported. Please upgrade Mono to version {1}.", + "MonoVersionCheckUpgradeRecommendedMessage": "Currently installed Mono version {0} is supported but upgrading to {1} is recommended.", "Month": "Month", "MoreInfo": "More Info", "MountCheckMessage": "Mount containing a movie path is mounted read-only: ",