From 4e22df1700ac5cd5d1489877b7f27b37e5002991 Mon Sep 17 00:00:00 2001 From: phillip-haydon Date: Mon, 27 Nov 2023 09:36:45 +0800 Subject: [PATCH 1/2] removed rando Microsoft.Win32.Registry dependency --- .../Builders/EnvironmentProviders/OSProvider.cs | 16 +--------------- .../EnvironmentProviders/ProcessorInfo.cs | 15 ++------------- .../Mindscape.Raygun4Net.NetCore.Common.csproj | 1 - 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/OSProvider.cs b/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/OSProvider.cs index 29d3bbf4..2537959f 100644 --- a/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/OSProvider.cs +++ b/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/OSProvider.cs @@ -1,9 +1,7 @@ #nullable enable -using System; using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.Win32; namespace Mindscape.Raygun4Net.EnvironmentProviders { @@ -38,19 +36,7 @@ public static string GetOSInformation() private static string? GetForWindows() { - string? productName = null; - - var registryKey = - Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Windows NT\\CurrentVersion"); - var result = registryKey?.GetValue("productName") as string; - - if (result != null) - { - var osVersion = Environment.OSVersion.VersionString; - productName = $"{result} ({osVersion})"; - } - - return productName; + return RuntimeInformation.OSDescription; } private static string? GetForLinux() diff --git a/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/ProcessorInfo.cs b/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/ProcessorInfo.cs index d3d40e0e..ca4fa88d 100644 --- a/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/ProcessorInfo.cs +++ b/Mindscape.Raygun4Net.NetCore.Common/Builders/EnvironmentProviders/ProcessorInfo.cs @@ -1,8 +1,8 @@ #nullable enable +using System; using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using Microsoft.Win32; namespace Mindscape.Raygun4Net.EnvironmentProviders { @@ -37,18 +37,7 @@ internal static class ProcessorProvider private static string? GetOnWindows() { - string? cpuName = null; - - var processorNameKey = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0", - RegistryKeyPermissionCheck.ReadSubTree); - - if (processorNameKey != null) - { - cpuName = (string)processorNameKey.GetValue("ProcessorNameString"); - processorNameKey.Close(); - } - - return cpuName; + return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER"); } private static string? GetOnLinux() diff --git a/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj b/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj index e611f403..68865a17 100644 --- a/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj +++ b/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj @@ -35,6 +35,5 @@ - \ No newline at end of file From c1026bf34e73c797a40019e755f79ca032d4110e Mon Sep 17 00:00:00 2001 From: phillip-haydon Date: Tue, 28 Nov 2023 10:49:24 +0800 Subject: [PATCH 2/2] added change log --- CHANGE-LOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGE-LOG.md b/CHANGE-LOG.md index da78baae..a612da00 100644 --- a/CHANGE-LOG.md +++ b/CHANGE-LOG.md @@ -1,5 +1,8 @@ # Full Change Log for Raygun4Net.* packages +### v8.0.1 +- Removed dependency on Microsoft.Win32.Registry for `Mindscape.Raygun4Net.NetCore.Common` package + ### v8.0.0 - This release fixes the strong naming and ensures the Assembly version is fixed to the Major version