From 2a6b0f48eeccf8dd1ce80bbe6c88500e04db8dd3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 16 Mar 2023 18:27:26 +0100
Subject: [PATCH] Fix System.Management wminet_utils.dll lookup code for arm64

---
 .../src/System/Management/ManagementScope.cs                | 6 ++++--
 src/libraries/System.Management/tests/WmiTestHelper.cs      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Management/src/System/Management/ManagementScope.cs b/src/libraries/System.Management/src/System/Management/ManagementScope.cs
index 1453d84fe5cac..26e27474858d5 100644
--- 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
index 0496626b5b186..75460d826d125 100644
--- 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;