Merge branch 'main' into development

aaronparker · Jul 16, 2024 · 082aa64 · 082aa64
2 parents d3af7a5 + 85ebed8
commit 082aa64
Show file tree

Hide file tree

Showing 47 changed files with 668 additions and 249 deletions.
diff --git a/Evergreen/Apps/Get-OpenJDK.ps1 → Disabled/Get-OpenJDK.ps1 b/Evergreen/Apps/Get-OpenJDK.ps1 → Disabled/Get-OpenJDK.ps1
diff --git a/Evergreen/Manifests/OpenJDK.json → Disabled/OpenJDK.json b/Evergreen/Manifests/OpenJDK.json → Disabled/OpenJDK.json
diff --git a/Evergreen/Apps/Get-AkeoRufusAlt.ps1 b/Evergreen/Apps/Get-AkeoRufusAlt.ps1
@@ -18,7 +18,7 @@ function Get-AkeoRufusAlt {
     $UpdateFeedLines = $UpdateFeed -split "`n"
 
     # Match the version number
-    $Version = (($UpdateFeedLines | Select-String -Pattern "version").Line -split "=")[-1].Trim()
+    $Version = (($UpdateFeedLines | Select-String -Pattern "^version" -CaseSensitive).Line -split "=")[-1].Trim()
 
     # For each architecture, match the download URL and return to the pipeline
     foreach ($Architecture in $res.Get.Update.Architectures.GetEnumerator()) {

diff --git a/Evergreen/Apps/Get-AmazonCorretto.ps1 b/Evergreen/Apps/Get-AmazonCorretto.ps1
diff --git a/Evergreen/Apps/Get-AmazonCorretto11.ps1 b/Evergreen/Apps/Get-AmazonCorretto11.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto11 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto15.ps1 b/Evergreen/Apps/Get-AmazonCorretto15.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto15 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto16.ps1 b/Evergreen/Apps/Get-AmazonCorretto16.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto16 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto17.ps1 b/Evergreen/Apps/Get-AmazonCorretto17.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto17 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto20.ps1 b/Evergreen/Apps/Get-AmazonCorretto20.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto20 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto21.ps1 b/Evergreen/Apps/Get-AmazonCorretto21.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto21 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto22.ps1 b/Evergreen/Apps/Get-AmazonCorretto22.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto22 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto8.ps1 b/Evergreen/Apps/Get-AmazonCorretto8.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto8 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AtlassianSourcetree.ps1 b/Evergreen/Apps/Get-AtlassianSourcetree.ps1
@@ -38,10 +38,11 @@ Function Get-AtlassianSourcetree {
         ForEach ($item in $res.Get.Download.Uri.GetEnumerator()) {
 
             # Build the output object; Output object to the pipeline
+            $Url = $res.Get.Download.Uri[$item.Key] -replace $res.Get.Download.ReplaceText, $Version
             $PSObject = [PSCustomObject] @{
                 Version = $Version
-                Type    = $item.Name
-                URI     = $res.Get.Download.Uri[$item.Key] -replace $res.Get.Download.ReplaceText, $Version
+                Type    = Get-FileType -File $Url
+                URI     = $Url
             }
             Write-Output -InputObject $PSObject
         }

diff --git a/Evergreen/Apps/Get-AutodeskFusion360.ps1 b/Evergreen/Apps/Get-AutodeskFusion360.ps1
@@ -25,8 +25,8 @@ Function Get-AutodeskFusion360 {
             # Build object and output to the pipeline
             $PSObject = [PSCustomObject] @{
                 Version           = $Versions.'build-version'
-                BuildVersion      = $Versions.'build-version'
-                MajorBuildVersion = $Versions.'major-update-version'
+                #BuildVersion      = $Versions.'build-version'
+                #MajorBuildVersion = $Versions.'major-update-version'
                 Type              = Get-FileType -File $Url
                 Filename          = (Split-Path -Path $Url -Leaf).Replace('%20', ' ')
                 URI               = $Url

diff --git a/Evergreen/Apps/Get-CitrixWorkspaceApp.ps1 b/Evergreen/Apps/Get-CitrixWorkspaceApp.ps1
@@ -33,13 +33,19 @@
 
         # Walk through each node to output details
         foreach ($Installer in $Installers) {
+
+            # Write a warning if Citrix is throttling updates
+            if ($Installer.Version -eq "0.0.0.0") {
+                Write-Warning -Message "$($MyInvocation.MyCommand): Citrix may be throttling availability of updates for $($Installer.ShortDescription -replace ':', '')."
+            }
+
             $PSObject = [PSCustomObject] @{
                 Version = $Installer.Version
-                Title   = $($Installer.ShortDescription -replace ":", "")
+                Stream  = $Installer.Stream
+                Date    = ConvertTo-DateTime -DateTime $Installer.StartDate -Pattern $res.Get.Update.DatePattern
+                #Title   = $($Installer.ShortDescription -replace ":", "")
                 Size    = $(if ($Installer.Size) { $Installer.Size } else { "Unknown" })
                 Hash    = $Installer.Hash
-                Date    = ConvertTo-DateTime -DateTime $Installer.StartDate -Pattern $res.Get.Update.DatePattern
-                Stream  = $Installer.Stream
                 URI     = "$($res.Get.Download.Uri)$($Installer.DownloadURL)"
             }
             Write-Output -InputObject $PSObject

diff --git a/Evergreen/Apps/Get-GoogleChrome.ps1 b/Evergreen/Apps/Get-GoogleChrome.ps1
@@ -55,9 +55,9 @@ function Get-GoogleChrome {
         # Output the version and URI object
         $PSObject = [PSCustomObject] @{
             Version      = $Version
+            Channel      = $Channel
             StartDate    = $Date
             Architecture = Get-Architecture -String $res.Get.Download.Uri.$Channel
-            Channel      = $Channel
             Type         = Get-FileType -File $res.Get.Download.Uri.$Channel
             URI          = $res.Get.Download.Uri.$Channel
         }
@@ -67,9 +67,9 @@ function Get-GoogleChrome {
             # Output the version and URI for the bundle download
             $PSObject = [PSCustomObject] @{
                 Version      = $Version
+                Channel      = $Channel
                 StartDate    = $Date
                 Architecture = Get-Architecture -String $res.Get.Download.Bundle
-                Channel      = $Channel
                 Type         = Get-FileType -File $res.Get.Download.Bundle
                 URI          = $res.Get.Download.Bundle
             }
@@ -80,9 +80,9 @@ function Get-GoogleChrome {
             # Output the version and URI object for the 32-bit version
             $PSObject = [PSCustomObject] @{
                 Version      = $Version
+                Channel      = $Channel
                 StartDate    = $Date
                 Architecture = Get-Architecture -String $($res.Get.Download.Uri.$Channel -replace "64", "")
-                Channel      = $Channel
                 Type         = Get-FileType -File $res.Get.Download.Uri.$Channel
                 URI          = $res.Get.Download.Uri.$Channel -replace "64", ""
             }

diff --git a/Evergreen/Apps/Get-diagrams.net.ps1 → Evergreen/Apps/Get-JGraphDrawIO.ps1 b/Evergreen/Apps/Get-diagrams.net.ps1 → Evergreen/Apps/Get-JGraphDrawIO.ps1
@@ -1,16 +1,16 @@
-Function Get-diagrams.net {
+function Get-JGraphDrawIO {
     <#
         .SYNOPSIS
-            Returns the latest diagrams.net version number and download.
+            Returns the latest JGraph DrawIO / diagrams.net version number and download.
 
         .NOTES
             Author: Aaron Parker
             Twitter: @stealthpuppy
     #>
     [OutputType([System.Management.Automation.PSObject])]
-    [CmdletBinding(SupportsShouldProcess = $False)]
+    [CmdletBinding(SupportsShouldProcess = $false)]
     param (
-        [Parameter(Mandatory = $False, Position = 0)]
+        [Parameter(Mandatory = $false, Position = 0)]
         [ValidateNotNull()]
         [System.Management.Automation.PSObject]
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])

diff --git a/Evergreen/Apps/Get-JabraDirect.ps1 b/Evergreen/Apps/Get-JabraDirect.ps1
@@ -23,7 +23,6 @@ Function Get-JabraDirect {
         $PSObject = [PSCustomObject] @{
             Version       = $Content.WindowsVersion
             Architecture  = "x64"
-            ReleaseNotes  = $Content.WindowsReleaseNotes
             Type          = Get-FileType -File $Content.WindowsDownload
             Sha256        = $Content.WindowsSHA256
             URI           = $Content.WindowsDownload

diff --git a/Evergreen/Apps/Get-MicrosoftOneDrive.ps1 b/Evergreen/Apps/Get-MicrosoftOneDrive.ps1
@@ -38,23 +38,23 @@
                 if ([System.Boolean]($node.PSobject.Properties.name -match "amd64binary")) {
                     [PSCustomObject] @{
                         Version      = $node.currentversion
+                        Ring         = $ring.Name
                         Throttle     = $node.throttle
+                        Sha256       = ConvertFrom-Base64String -Base64String $node.amd64binary.sha256hash
                         Architecture = Get-Architecture -String $node.amd64binary.url
-                        Ring         = $ring.Name
                         Type         = Get-FileType -File $node.amd64binary.url
-                        Sha256       = ConvertFrom-Base64String -Base64String $node.amd64binary.sha256hash
                         URI          = $node.amd64binary.url
                     } | Write-Output
                 }
 
                 if ([System.Boolean]($node.PSobject.Properties.name -match "arm64binary")) {
                     [PSCustomObject] @{
                         Version      = $node.currentversion
+                        Ring         = $ring.Name
                         Throttle     = $node.throttle
+                        Sha256       = ConvertFrom-Base64String -Base64String $node.arm64binary.sha256hash
                         Architecture = Get-Architecture -String $node.arm64binary.url
-                        Ring         = $ring.Name
                         Type         = Get-FileType -File $node.arm64binary.url
-                        Sha256       = ConvertFrom-Base64String -Base64String $node.arm64binary.sha256hash
                         URI          = $node.arm64binary.url
                     } | Write-Output
                 }
@@ -63,11 +63,11 @@
                     # Construct the output for MSIX; Return the custom object to the pipeline
                     [PSCustomObject] @{
                         Version      = $node.currentversion
+                        Ring         = $ring.Name
                         Throttle     = $node.throttle
+                        Sha256       = if ($node.msixbinary.sha256hash) { ConvertFrom-Base64String -Base64String $node.msixbinary.sha256hash } else { "N/A" }
                         Architecture = Get-Architecture -String $node.msixbinary.url
-                        Ring         = $ring.Name
                         Type         = Get-FileType -File $node.msixbinary.url
-                        Sha256       = if ($node.msixbinary.sha256hash) { ConvertFrom-Base64String -Base64String $node.msixbinary.sha256hash } else { "N/A" }
                         URI          = $node.msixbinary.url
                     } | Write-Output
                 }
@@ -76,11 +76,11 @@
                 if ([System.Boolean]($node.PSobject.Properties.name -match "binary")) {
                     $PSObject = [PSCustomObject] @{
                         Version      = $node.currentversion
+                        Ring         = $ring.Name
                         Throttle     = $node.throttle
+                        Sha256       = ConvertFrom-Base64String -Base64String $node.binary.sha256hash
                         Architecture = Get-Architecture -String $node.binary.url
-                        Ring         = $ring.Name
                         Type         = Get-FileType -File $node.binary.url
-                        Sha256       = ConvertFrom-Base64String -Base64String $node.binary.sha256hash
                         URI          = $node.binary.url
                     }
                     Write-Output -InputObject $PSObject

diff --git a/Evergreen/Apps/Get-MozillaFirefox.ps1 b/Evergreen/Apps/Get-MozillaFirefox.ps1
@@ -56,9 +56,9 @@ function Get-MozillaFirefox {
                         # Build object and output to the pipeline
                         $PSObject = [PSCustomObject] @{
                             Version      = $Version
-                            Architecture = Get-Architecture -String $platform
                             Channel      = $channel.Value
                             Language     = $currentLanguage
+                            Architecture = Get-Architecture -String $platform
                             Type         = Get-FileType -File $Url
                             Filename     = (Split-Path -Path $Url -Leaf).Replace('%20', ' ')
                             URI          = $Url