Add support for Microsoft JDKs in Set-JavaVersion.ps1 (Azure#35867)

roryp · Jul 13, 2023 · 8fb2f52 · 8fb2f52
1 parent 18778bd
commit 8fb2f52
Showing 1 changed file with 40 additions and 12 deletions.
diff --git a/eng/scripts/Set-JavaVersion.ps1 b/eng/scripts/Set-JavaVersion.ps1
@@ -25,6 +25,7 @@ if ("" -eq $JdkPath) {
     $registryBase = "HKLM:\SOFTWARE"
     $azulJdks = "$registryBase\Azul Systems\Zulu"
     $eclipseJdks = "$registryBase\Eclipse Adoptium\JDK"
+    $microsoftJdks = "$registryBase\Microsoft\JDK"
 
     # Collect all available JDK installations in the following format
     #
@@ -60,12 +61,14 @@ if ("" -eq $JdkPath) {
     # Select the installs in the following format
     #
     # Zulu | <MajorVersion> | <CurrentVersion> | <InstallationPath>
-    foreach ($jdk in Get-ChildItem -Path $azulJdks) {
-        $jdkHKeyPath = $jdk.Name
-        $values = Get-ItemProperty -Path "Registry::$jdkHKeyPath"
+    if (Test-Path -Path $azulJdks) {
+        foreach ($jdk in Get-ChildItem -Path $azulJdks) {
+            $jdkHKeyPath = $jdk.Name
+            $values = Get-ItemProperty -Path "Registry::$jdkHKeyPath"
 
-        [void]$jdkOptions.Rows.Add($choiceNumber, "Zulu", $values.MajorVersion, $values.CurrentVersion, $values.InstallationPath)
-        $choiceNumber++
+            [void]$jdkOptions.Rows.Add($choiceNumber, "Zulu", $values.MajorVersion, $values.CurrentVersion, $values.InstallationPath)
+            $choiceNumber++
+        }
     }
 
     # Eclipse uses a registry key pattern of
@@ -80,21 +83,46 @@ if ("" -eq $JdkPath) {
     # Select the installs in the following format
     #
     # Eclipse | <First number segment in Current Version> | <Current Version> | <Path>
-    foreach ($jdk in Get-ChildItem -Path $eclipseJdks) {
-        $jdkHKeyPath = $jdk.Name
-        $jdkFullVersion = $jdk.PSChildName
-        $jdkChoicePath = (Get-ItemProperty -Path "Registry::$jdkHKeyPath\hotspot\MSI").Path
+    if (Test-Path -Path $eclipseJdks) {
+        foreach ($jdk in Get-ChildItem -Path $eclipseJdks) {
+            $jdkHKeyPath = $jdk.Name
+            $jdkFullVersion = $jdk.PSChildName
+            $jdkChoicePath = (Get-ItemProperty -Path "Registry::$jdkHKeyPath\hotspot\MSI").Path
+
+            [void]$jdkOptions.Rows.Add($choiceNumber, "Eclipse", $jdkFullVersion.split(".")[0], $jdkFullVersion, $jdkChoicePath)
+            $choiceNumber++
+        }
+    }
 
-        [void]$jdkOptions.Rows.Add($choiceNumber, "Eclipse", $jdkFullVersion.split(".")[0], $jdkFullVersion, $jdkChoicePath)
-        $choiceNumber++
+    # Microsoft uses a registry key pattern of
+    #
+    # <Current Version> (ex 17.0.7.7)
+    # - \ <Implementation> (ex hotspot)
+    #     - \ <MSI>
+    #         - \ <Path> (ex C:\Program Files\Microsoft\jdk-17.0.7.7-hotspot\)
+    #
+    # There are additional properties that aren't needed and aren't included above.
+    #
+    # Select the installs in the following format
+    #
+    # Microsoft | <First number segment in Current Version> | <Current Version> | <Path>
+    if (Test-Path -Path $microsoftJdks) {
+        foreach ($jdk in Get-ChildItem -Path $microsoftJdks) {
+            $jdkHKeyPath = $jdk.Name
+            $jdkFullVersion = $jdk.PSChildName
+            $jdkChoicePath = (Get-ItemProperty -Path "Registry::$jdkHKeyPath\hotspot\MSI").Path
+
+            [void]$jdkOptions.Rows.Add($choiceNumber, "Microsoft", $jdkFullVersion.split(".")[0], $jdkFullVersion, $jdkChoicePath)
+            $choiceNumber++
+        }
     }
 
     $choiceNumber--
     $selection = $null
 
     while ($null -eq $selection) {
         $jdkOptions | Format-Table -AutoSize
-        $selection = Read-Host "Select the JDK to set (or select no JDK by entering no option)"
+        $selection = Read-Host "Select the JDK to set (or keep current JDK by entering no option)"
 
         if ($null -ne $selection) {
             if ($selection.Trim() -eq "") {