Merge pull request #63 from EUCPilots/microsoft-openjdk

aaronparker · web-flow · commit 407d0af92428 · 2025-11-23T11:50:50.000+11:00
Add support for Microsoft OpenJDK installer downloads
diff --git a/Apps/Get-MicrosoftOpenJDK11.ps1 b/Apps/Get-MicrosoftOpenJDK11.ps1
@@ -13,6 +13,25 @@ function Get-MicrosoftOpenJDK11 {
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
     )
 
+    # Output the results from Get-AdoptiumTemurin
     $Output = Get-AdoptiumTemurin -res $res
     Write-Output -InputObject $Output
+
+    if ($Output -and $Output.Count -gt 0) {
+        # Capture the version number from the first output object
+        $Output[0].Version -match $res.Get.Download.VersionPattern | Out-Null
+        $Version = $Matches[0]
+
+        # Output the download links for additional file types
+        foreach ($Uri in $res.Get.Download.Uri) {
+            [PSCustomObject]@{
+                Version      = $Output[0].Version
+                Date         = $Output[0].Date
+                ImageType    = $Output[0].ImageType
+                Architecture = Get-Architecture -String $Uri
+                Type         = Get-FileType -File $Uri
+                URI          = (Resolve-SystemNetWebRequest -Uri ($Uri -replace "#version", $Version)).ResponseUri.AbsoluteUri
+            }
+        }
+    }
 }
diff --git a/Apps/Get-MicrosoftOpenJDK17.ps1 b/Apps/Get-MicrosoftOpenJDK17.ps1
@@ -13,6 +13,25 @@ function Get-MicrosoftOpenJDK17 {
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
     )
 
+    # Output the results from Get-AdoptiumTemurin
     $Output = Get-AdoptiumTemurin -res $res
     Write-Output -InputObject $Output
+
+    if ($Output -and $Output.Count -gt 0) {
+        # Capture the version number from the first output object
+        $Output[0].Version -match $res.Get.Download.VersionPattern | Out-Null
+        $Version = $Matches[0]
+
+        # Output the download links for additional file types
+        foreach ($Uri in $res.Get.Download.Uri) {
+            [PSCustomObject]@{
+                Version      = $Output[0].Version
+                Date         = $Output[0].Date
+                ImageType    = $Output[0].ImageType
+                Architecture = Get-Architecture -String $Uri
+                Type         = Get-FileType -File $Uri
+                URI          = (Resolve-SystemNetWebRequest -Uri ($Uri -replace "#version", $Version)).ResponseUri.AbsoluteUri
+            }
+        }
+    }
 }
diff --git a/Apps/Get-MicrosoftOpenJDK21.ps1 b/Apps/Get-MicrosoftOpenJDK21.ps1
@@ -13,6 +13,25 @@ function Get-MicrosoftOpenJDK21 {
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
     )
 
+    # Output the results from Get-AdoptiumTemurin
     $Output = Get-AdoptiumTemurin -res $res
     Write-Output -InputObject $Output
+
+    if ($Output -and $Output.Count -gt 0) {
+        # Capture the version number from the first output object
+        $Output[0].Version -match $res.Get.Download.VersionPattern | Out-Null
+        $Version = $Matches[0]
+
+        # Output the download links for additional file types
+        foreach ($Uri in $res.Get.Download.Uri) {
+            [PSCustomObject]@{
+                Version      = $Output[0].Version
+                Date         = $Output[0].Date
+                ImageType    = $Output[0].ImageType
+                Architecture = Get-Architecture -String $Uri
+                Type         = Get-FileType -File $Uri
+                URI          = (Resolve-SystemNetWebRequest -Uri ($Uri -replace "#version", $Version)).ResponseUri.AbsoluteUri
+            }
+        }
+    }
 }
diff --git a/Apps/Get-MicrosoftOpenJDK25.ps1 b/Apps/Get-MicrosoftOpenJDK25.ps1
@@ -13,6 +13,25 @@ function Get-MicrosoftOpenJDK25 {
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
     )
 
+    # Output the results from Get-AdoptiumTemurin
     $Output = Get-AdoptiumTemurin -res $res
     Write-Output -InputObject $Output
+
+    if ($Output -and $Output.Count -gt 0) {
+        # Capture the version number from the first output object
+        $Output[0].Version -match $res.Get.Download.VersionPattern | Out-Null
+        $Version = $Matches[0]
+
+        # Output the download links for additional file types
+        foreach ($Uri in $res.Get.Download.Uri) {
+            [PSCustomObject]@{
+                Version      = $Output[0].Version
+                Date         = $Output[0].Date
+                ImageType    = $Output[0].ImageType
+                Architecture = Get-Architecture -String $Uri
+                Type         = Get-FileType -File $Uri
+                URI          = (Resolve-SystemNetWebRequest -Uri ($Uri -replace "#version", $Version)).ResponseUri.AbsoluteUri
+            }
+        }
+    }
 }
diff --git a/Manifests/MicrosoftOpenJDK11.json b/Manifests/MicrosoftOpenJDK11.json
@@ -7,6 +7,13 @@
             "ContentType": "application/json",
             "MatchImage": "jdk|jre",
             "ResolveUri": true
+        },
+        "Download": {
+            "Uri": [
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-x64.exe",
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-aarch64.exe"
+            ],
+            "VersionPattern": "^(.*?)(?=\\+)"
         }
     },
     "Install": {
diff --git a/Manifests/MicrosoftOpenJDK17.json b/Manifests/MicrosoftOpenJDK17.json
@@ -7,6 +7,13 @@
             "ContentType": "application/json",
             "MatchImage": "jdk|jre",
             "ResolveUri": true
+        },
+        "Download": {
+            "Uri": [
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-x64.exe",
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-aarch64.exe"
+            ],
+            "VersionPattern": "^(.*?)(?=\\+)"
         }
     },
     "Install": {
diff --git a/Manifests/MicrosoftOpenJDK21.json b/Manifests/MicrosoftOpenJDK21.json
@@ -8,6 +8,12 @@
             "ContentType": "application/json",
             "MatchImage": "jdk|jre",
             "ResolveUri": true
+        },
+        "Download": {
+            "Uri": [
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-x64.exe"
+            ],
+            "VersionPattern": "^(.*?)(?=\\+)"
         }
     },
     "Install": {
diff --git a/Manifests/MicrosoftOpenJDK25.json b/Manifests/MicrosoftOpenJDK25.json
@@ -1,4 +1,3 @@
-
 {
     "Name": "Microsoft OpenJDK 25",
     "Source": "https://www.microsoft.com/openjdk",
@@ -8,6 +7,12 @@
             "ContentType": "application/json",
             "MatchImage": "jdk|jre",
             "ResolveUri": true
+        },
+        "Download": {
+            "Uri": [
+                "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-x64.exe"
+            ],
+            "VersionPattern": "^(.*?)(?=\\+)"
         }
     },
     "Install": {
@@ -21,4 +26,4 @@
             "PostInstall": []
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`{`
`3`	`2`	`"Name": "Microsoft OpenJDK 25",`
`4`	`3`	`"Source": "https://www.microsoft.com/openjdk",`
`@@ -8,6 +7,12 @@`
`8`	`7`	`"ContentType": "application/json",`
`9`	`8`	`"MatchImage": "jdk\|jre",`
`10`	`9`	`"ResolveUri": true`
	`10`	`+ },`
	`11`	`+ "Download": {`
	`12`	`+ "Uri": [`
	`13`	`+ "https://aka.ms/download-jdk/microsoft-jdk-#version-windows-x64.exe"`
	`14`	`+ ],`
	`15`	`+ "VersionPattern": "^(.*?)(?=\\+)"`
`11`	`16`	`}`
`12`	`17`	`},`
`13`	`18`	`"Install": {`
`@@ -21,4 +26,4 @@`
`21`	`26`	`"PostInstall": []`
`22`	`27`	`}`
`23`	`28`	`}`
`24`		`-}`
	`29`	`+}`