This repository has been archived by the owner on Aug 30, 2023. It is now read-only.
feat: Returns better version data than default API #248
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| namespace SharpRaven.Data.Context | ||
| { | ||
| internal static class RuntimeExtensions | ||
| { | ||
| public static bool IsNetFx(this Runtime runtime) => runtime.IsRuntime(".NET Framework"); | ||
| public static bool IsNetCore(this Runtime runtime) => runtime.IsRuntime(".NET Core"); | ||
|
|
||
| private static bool IsRuntime(this Runtime runtime, string runtimeName) | ||
| { | ||
| return runtime?.Name?.StartsWith(runtimeName) == true | ||
| || runtime?.RawDescription?.StartsWith(runtimeName) == true; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,96 @@ | ||
| using System; | ||
| using System.Reflection; | ||
|
|
||
| using SharpRaven.Data.Context; | ||
| #if HAS_RUNTIME_INFORMATION | ||
| using System.Runtime.InteropServices; | ||
| #endif | ||
| #if NET45PLUS_REGISTRY_VERSION | ||
| using Microsoft.Win32; | ||
| #endif | ||
|
|
||
| namespace SharpRaven.Utilities | ||
| { | ||
| internal static class RuntimeInfoHelper | ||
| { | ||
| public static Runtime GetRuntime() | ||
| { | ||
| #if HAS_RUNTIME_INFORMATION // .NET Core 2+, .NET Framework 4.5+ | ||
| // Prefered API: netstandard2.0 and vNext | ||
| // https://github.com/dotnet/corefx/blob/master/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.cs | ||
| // e.g: .NET Framework 4.7.2633.0, .NET Native, WebAssembly | ||
| var runtime = new Runtime | ||
| { | ||
| RawDescription = RuntimeInformation.FrameworkDescription | ||
| }; | ||
| #else | ||
| var runtime = GetFromMono(); | ||
| runtime = runtime | ||
| // Environment.Version: NET Framework 4, 4.5, 4.5.1, 4.5.2 = 4.0.30319.xxxxx | ||
| // .NET Framework 4.6, 4.6.1, 4.6.2, 4.7, 4.7.1 = 4.0.30319.42000 | ||
| // Not recommended on NET45+ | ||
| ?? new Runtime | ||
| { | ||
| Name = ".NET Framework", | ||
| Version = Environment.Version.ToString() | ||
| }; | ||
| #endif | ||
|
|
||
| #if NET45PLUS_REGISTRY_VERSION // .NET Framework 4.5 and later | ||
| if (runtime.IsNetFx()) | ||
| { | ||
| runtime.Build = Get45PlusLatestInstallationFromRegistry()?.ToString(); | ||
| } | ||
| #endif | ||
|
|
||
| #if !NETFX // Non .NET Framework (i.e: netstandard, netcoreapp) | ||
| if (runtime.IsNetCore()) | ||
| { | ||
| // RuntimeInformation.FrameworkDescription returns 4.6 on .NET Core 2.0 which is counter intuitive | ||
| var assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly; | ||
| var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); | ||
| var netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App"); | ||
| if (netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2) | ||
| { | ||
| runtime.Name = ".NET Core"; | ||
| runtime.Version = assemblyPath[netCoreAppIndex + 1]; | ||
| } | ||
| } | ||
| #endif | ||
| return runtime; | ||
| } | ||
|
|
||
| private static Runtime GetFromMono() | ||
| { | ||
| // The implementation of Mono to RuntimeInformation: | ||
| // https://github.com/mono/mono/blob/90b49aa3aebb594e0409341f9dca63b74f9df52e/mcs/class/corlib/System.Runtime.InteropServices.RuntimeInformation/RuntimeInformation.cs | ||
| return Type.GetType("Mono.Runtime", false) | ||
| ?.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static) | ||
| ?.Invoke(null, null) | ||
| is string monoVersion | ||
| ? new Runtime | ||
| { | ||
| // Send complete (raw) and let Sentry parse it. UI can display short version but details are not lost | ||
| // e.g; Mono 5.10.0 (Visual Studio built mono) | ||
| // e.g: Mono 5.10.1.47 (tarball Tue Apr 17 09:23:16 UTC 2018) | ||
| RawDescription = "Mono " + monoVersion | ||
| } | ||
| : null; | ||
| } | ||
|
|
||
| #if NET45PLUS_REGISTRY_VERSION | ||
| // https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed#to-find-net-framework-versions-by-querying-the-registry-in-code-net-framework-45-and-later | ||
| internal static int? Get45PlusLatestInstallationFromRegistry() | ||
| { | ||
| const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\"; | ||
|
|
||
| using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) | ||
| { | ||
| return int.TryParse(ndpKey?.GetValue("Release")?.ToString(), out var releaseId) | ||
| ? releaseId | ||
| : (int?)null; | ||
| } | ||
| } | ||
| #endif | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| using NUnit.Framework; | ||
| using SharpRaven.Utilities; | ||
|
|
||
| namespace SharpRaven.UnitTests.Utilities | ||
| { | ||
| public class RuntimeInfoHelperTests | ||
| { | ||
| [Test] | ||
| public void GetRuntime_NotNull() | ||
| { | ||
| var runtime = RuntimeInfoHelper.GetRuntime(); | ||
| Assert.That(runtime, Is.Not.Null); | ||
| } | ||
| #if NET45PLUS_REGISTRY_VERSION | ||
| [Test] | ||
| public void Get45PlusLatestInstallationFromRegistry_FindsReleaseKey() | ||
| { | ||
| var version = RuntimeInfoHelper.Get45PlusLatestInstallationFromRegistry(); | ||
| Assert.That(version, Is.Not.Null); | ||
| } | ||
| #endif | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The line breaking here is a bit funky. 😄 Perhaps breaking the expression up a bit would make it more readable as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, did reformat a bit to improve readability.
I do believe it might be about getting used to pattern matching syntax a bit.