Merge pull request #9664 from keveleigh/improve-reg-key-lookup

Add fallback reg key in case the default one doesn't work in BuildDeployWindow

Author: keveleigh

Assets/MRTK/Tools/BuildWindow/BuildDeployWindow.cs

@@ -77,6 +77,8 @@ private enum BuildDeployTab
 
         private const string WINDOWS_10_KITS_PATH_REGISTRY_PATH = @"SOFTWARE\Microsoft\Windows Kits\Installed Roots";
 
+        private const string WINDOWS_10_KITS_PATH_ALTERNATE_REGISTRY_PATH = @"SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots";
+
         private const string WINDOWS_10_KITS_PATH_REGISTRY_KEY = "KitsRoot10";
 
         private const string WINDOWS_10_KITS_PATH_POSTFIX = "Lib";
@@ -1419,11 +1421,24 @@ private void LoadWindowsSdkPaths()
             // Try to detect the installation path by checking the registry.
             try
             {
-                var registryKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(WINDOWS_10_KITS_PATH_REGISTRY_PATH);
+                var registryKey = Win32.Registry.LocalMachine.OpenSubKey(WINDOWS_10_KITS_PATH_REGISTRY_PATH);
                 var registryValue = registryKey.GetValue(WINDOWS_10_KITS_PATH_REGISTRY_KEY) as string;
                 win10KitsPath = Path.Combine(registryValue, WINDOWS_10_KITS_PATH_POSTFIX);
+
+                if (!Directory.Exists(win10KitsPath))
+                {
+                    registryKey = Win32.Registry.LocalMachine.OpenSubKey(WINDOWS_10_KITS_PATH_ALTERNATE_REGISTRY_PATH);
+                    registryValue = registryKey.GetValue(WINDOWS_10_KITS_PATH_REGISTRY_KEY) as string;
+                    win10KitsPath = Path.Combine(registryValue, WINDOWS_10_KITS_PATH_POSTFIX);
+
+                    if (!Directory.Exists(win10KitsPath))
+                    {
+                        Debug.LogWarning($"Could not find the Windows 10 SDK installation path via registry. Reverting to default path.");
+                        win10KitsPath = WINDOWS_10_KITS_DEFAULT_PATH;
+                    }
+                }
             }
-            catch (System.Exception e)
+            catch (Exception e)
             {
                 Debug.LogWarning($"Could not find the Windows 10 SDK installation path via registry. Reverting to default path. {e}");
                 win10KitsPath = WINDOWS_10_KITS_DEFAULT_PATH;