Fix System.Management wminet_utils.dll lookup code for arm64

dotnet · Mar 16, 2023 · 2a6b0f4 · 2a6b0f4
1 parent 5bdc36e
commit 2a6b0f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/libraries/System.Management/src/System/Management/ManagementScope.cs b/src/libraries/System.Management/src/System/Management/ManagementScope.cs
@@ -290,8 +290,10 @@ internal enum APTTYPE
         static WmiNetUtilsHelper()
         {
             RegistryKey netFrameworkSubKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework\");
-            string netFrameworkInstallRoot = (string)netFrameworkSubKey?.GetValue("InstallRoot");
-
+            string netFrameworkInstallRoot = (string)netFrameworkSubKey?.GetValue(RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ?
+                "InstallRootArm64" :
+                "InstallRoot");
+
             if (netFrameworkInstallRoot == null)
             {
                 // In some Windows versions, like Nano Server, the .NET Framework is not installed by default.

diff --git a/src/libraries/System.Management/tests/WmiTestHelper.cs b/src/libraries/System.Management/tests/WmiTestHelper.cs
@@ -11,7 +11,7 @@ public static class WmiTestHelper
         private static readonly bool s_isElevated = AdminHelpers.IsProcessElevated();
         private static readonly bool s_isWmiSupported =
                                             PlatformDetection.IsWindows &&
-                                            PlatformDetection.IsNotArmNorArm64Process &&
+                                            PlatformDetection.IsNotArmProcess &&
                                             PlatformDetection.IsNotWindowsNanoServer &&
                                             PlatformDetection.IsNotWindowsIoTCore &&
                                             !PlatformDetection.IsInAppContainer;