Skip to content

Commit

Permalink
Remove old DotNetVersion method and dep
Browse files Browse the repository at this point in the history
  • Loading branch information
Qstick committed Apr 16, 2022
1 parent 18189d0 commit 1af5bef
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 109 deletions.
109 changes: 1 addition & 108 deletions src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Reflection;
using System.Text.RegularExpressions;
using Microsoft.Win32;
using System;

namespace NzbDrone.Common.EnvironmentInfo
{
Expand All @@ -19,8 +16,6 @@ public interface IPlatformInfo

public class PlatformInfo : IPlatformInfo
{
private static readonly Regex MonoVersionRegex = new Regex(@"(?<=\W|^)(?<version>\d+\.\d+(\.\d+)?(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase);

private static PlatformType _platform;
private static Version _version;

Expand Down Expand Up @@ -60,107 +55,5 @@ public static Version GetVersion()
{
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);
}
}
}
1 change: 0 additions & 1 deletion src/NzbDrone.Common/Prowlarr.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="EnsureThat\Resources\ExceptionMessages.Designer.cs">
Expand Down

0 comments on commit 1af5bef

Please sign in to comment.