From 354ddcfee5fc7e6702256b04b4cf1af33ea8e69d Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Fri, 30 Aug 2019 20:39:34 +0200 Subject: [PATCH] Fixed: Removed .Net update notice on Windows LTSB 2015 --- .../HealthCheck/Checks/DotnetVersionCheckFixture.cs | 12 ++++++++++++ .../HealthCheck/Checks/DotnetVersionCheck.cs | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/DotnetVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/DotnetVersionCheckFixture.cs index b797a1ee9..2f7386b48 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DotnetVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DotnetVersionCheckFixture.cs @@ -53,5 +53,17 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks Subject.Check().ShouldBeError(); } + + [Test] + public void should_return_ok_for_net462_on_Win1511() + { + Mocker.GetMock() + .SetupGet(v => v.Version) + .Returns("10.0.14392"); + + GivenOutput("4.6.2"); + + Subject.Check().ShouldBeOk(); + } } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DotnetVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DotnetVersionCheck.cs index d238d7bee..4736e670b 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/DotnetVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/DotnetVersionCheck.cs @@ -7,11 +7,13 @@ namespace NzbDrone.Core.HealthCheck.Checks public class DotnetVersionCheck : HealthCheckBase { private readonly IPlatformInfo _platformInfo; + private readonly IOsInfo _osInfo; private readonly Logger _logger; - public DotnetVersionCheck(IPlatformInfo platformInfo, Logger logger) + public DotnetVersionCheck(IPlatformInfo platformInfo, IOsInfo osInfo, Logger logger) { _platformInfo = platformInfo; + _osInfo = osInfo; _logger = logger; } @@ -26,6 +28,12 @@ namespace NzbDrone.Core.HealthCheck.Checks // Target .Net version, which would allow us to increase our target framework var targetVersion = new Version("4.7.2"); + if (Version.TryParse(_osInfo.Version, out var osVersion) && osVersion < new Version("10.0.14393")) + { + // Windows 10 LTSB 1511 and before do not support 4.7.x + targetVersion = new Version("4.6.2"); + } + if (dotnetVersion >= targetVersion) { _logger.Debug("Dotnet version is {0} or better: {1}", targetVersion, dotnetVersion);