From 1af5beff315eb374373b647d592c59051c7f54a0 Mon Sep 17 00:00:00 2001 From: Qstick Date: Thu, 14 Apr 2022 21:06:29 -0500 Subject: [PATCH] Remove old DotNetVersion method and dep --- .../EnvironmentInfo/PlatformInfo.cs | 109 +----------------- src/NzbDrone.Common/Prowlarr.Common.csproj | 1 - 2 files changed, 1 insertion(+), 109 deletions(-) diff --git a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs index 5c28231fe..0c39b4937 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs @@ -1,7 +1,4 @@ -using System; -using System.Reflection; -using System.Text.RegularExpressions; -using Microsoft.Win32; +using System; namespace NzbDrone.Common.EnvironmentInfo { @@ -19,8 +16,6 @@ namespace NzbDrone.Common.EnvironmentInfo public class PlatformInfo : IPlatformInfo { - private static readonly Regex MonoVersionRegex = new Regex(@"(?<=\W|^)(?\d+\.\d+(\.\d+)?(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static PlatformType _platform; private static Version _version; @@ -60,107 +55,5 @@ namespace NzbDrone.Common.EnvironmentInfo { return _version; } - - private static Version GetMonoVersion() - { - try - { - var type = Type.GetType("Mono.Runtime"); - - if (type != null) - { - var displayNameMethod = type.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static); - if (displayNameMethod != null) - { - var displayName = displayNameMethod.Invoke(null, null).ToString(); - var versionMatch = MonoVersionRegex.Match(displayName); - - if (versionMatch.Success) - { - return new Version(versionMatch.Groups["version"].Value); - } - } - } - } - catch (Exception ex) - { - Console.WriteLine("Couldnt get Mono version: " + ex.ToString()); - } - - return new Version(); - } - - private static Version GetDotNetVersion() - { - try - { - const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\"; - using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) - { - if (ndpKey == null) - { - return new Version(4, 0); - } - - var releaseKey = (int)ndpKey.GetValue("Release"); - - if (releaseKey >= 528040) - { - return new Version(4, 8, 0); - } - - if (releaseKey >= 461808) - { - return new Version(4, 7, 2); - } - - if (releaseKey >= 461308) - { - return new Version(4, 7, 1); - } - - if (releaseKey >= 460798) - { - return new Version(4, 7); - } - - if (releaseKey >= 394802) - { - return new Version(4, 6, 2); - } - - if (releaseKey >= 394254) - { - return new Version(4, 6, 1); - } - - if (releaseKey >= 393295) - { - return new Version(4, 6); - } - - if (releaseKey >= 379893) - { - return new Version(4, 5, 2); - } - - if (releaseKey >= 378675) - { - return new Version(4, 5, 1); - } - - if (releaseKey >= 378389) - { - return new Version(4, 5); - } - } - } - catch (Exception ex) - { - Console.WriteLine("Couldnt get .NET framework version: " + ex.ToString()); - } - - return new Version(4, 0); - } } } diff --git a/src/NzbDrone.Common/Prowlarr.Common.csproj b/src/NzbDrone.Common/Prowlarr.Common.csproj index e54678861..0bd5a78ff 100644 --- a/src/NzbDrone.Common/Prowlarr.Common.csproj +++ b/src/NzbDrone.Common/Prowlarr.Common.csproj @@ -18,7 +18,6 @@ -