From 51adc3a5d54810aacd9d9db20f52a8e0b2d7b13c Mon Sep 17 00:00:00 2001
From: Aaron Parker <aaron@stealthpuppy.com>
Date: Tue, 4 Jun 2024 23:44:37 +1000
Subject: [PATCH] Update to Get-EvergreenAppFromApi

---
 New-Win32Package.ps1                                  | 2 +-
 docs/app.md                                           | 2 +-
 packages/App/AdobeAcrobatReaderDC/App.json            | 2 +-
 packages/App/AdobeAcrobatReaderDCMUI/App.json         | 2 +-
 packages/App/AdobeAcrobatReaderDCMUIVDI/App.json      | 2 +-
 packages/App/Audacity/App.json                        | 2 +-
 packages/App/CitrixWorkspaceAppCurrent/App.json       | 2 +-
 packages/App/CitrixWorkspaceAppLTSR/App.json          | 2 +-
 packages/App/Cyberduck/App.json                       | 2 +-
 packages/App/FoxitReader/App.json                     | 2 +-
 packages/App/GoogleChrome/App.json                    | 2 +-
 packages/App/Greenshot/App.json                       | 2 +-
 packages/App/ImageCustomise/App.json                  | 2 +-
 packages/App/ImageGlass/App.json                      | 2 +-
 packages/App/Microsoft.NETLTS/App.json                | 2 +-
 packages/App/Microsoft.NETSTS/App.json                | 2 +-
 packages/App/MicrosoftAzurePipelinesAgent/App.json    | 2 +-
 packages/App/MicrosoftEdge/App.json                   | 2 +-
 packages/App/MicrosoftEdgeWebView2/App.json           | 2 +-
 packages/App/MicrosoftFSLogixApps/App.json            | 2 +-
 packages/App/MicrosoftOneDrive/App.json               | 2 +-
 packages/App/MicrosoftOneDriveVDI/App.json            | 2 +-
 packages/App/MicrosoftPowerShell/App.json             | 2 +-
 packages/App/MicrosoftPowerToys/App.json              | 2 +-
 packages/App/MicrosoftSsmsEnu/App.json                | 2 +-
 packages/App/MicrosoftTeams/App.json                  | 2 +-
 packages/App/MicrosoftTeamsVDI/App.json               | 2 +-
 packages/App/MicrosoftVisualStudioCode/App.json       | 2 +-
 packages/App/MicrosoftWvdRemoteDesktop/App.json       | 2 +-
 packages/App/MozillaFirefox/App.json                  | 2 +-
 packages/App/Notepad++/App.json                       | 2 +-
 packages/App/PaintDotNetOfflineInstaller/App.json     | 2 +-
 packages/App/RemoteDisplayAnalyzer/App.json           | 2 +-
 packages/App/TrackerSoftwarePDFXChangeEditor/App.json | 2 +-
 packages/App/VideoLanVlcPlayer/App.json               | 2 +-
 packages/App/ZoomMeetings/App.json                    | 2 +-
 packages/App/ZoomRooms/App.json                       | 2 +-
 packages/Update/AdobeAcrobatReaderDCMUIx64/App.json   | 2 +-
 packages/Update/AdobeAcrobatReaderDCMUIx86/App.json   | 2 +-
 packages/Update/MicrosoftVisualStudioCode/App.json    | 2 +-
 packages/Update/MicrosoftWvdRemoteDesktop/App.json    | 2 +-
 packages/Update/ZoomMeetings/App.json                 | 2 +-
 template/App.json                                     | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/New-Win32Package.ps1 b/New-Win32Package.ps1
index 616798b7..73825af1 100644
--- a/New-Win32Package.ps1
+++ b/New-Win32Package.ps1
@@ -238,7 +238,7 @@ process {
 
                     # Download the application installer or run command in .Filter
                     Write-Msg -Msg "Invoke filter: '$($Manifest.Application.Filter)'"
-                    if ($Manifest.Application.Filter -match "Invoke-EvergreenApp|Get-EvergreenApp") {
+                    if ($Manifest.Application.Filter -match "Get-EvergreenAppFromApi|Get-EvergreenApp") {
                         # Evergreen
                         Write-Msg -Msg "Downloading with Evergreen to: '$SourcePath'"
                         $Result = Invoke-Expression -Command $Manifest.Application.Filter | Save-EvergreenApp -LiteralPath $SourcePath
diff --git a/docs/app.md b/docs/app.md
index 9899290e..b6c7d761 100644
--- a/docs/app.md
+++ b/docs/app.md
@@ -18,7 +18,7 @@ Here's an example `App.json` for Adobe Acrobat Reader DC:
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDC",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Adobe Acrobat Reader DC",
     "Language": "English",
     "Architecture": "x64"
diff --git a/packages/App/AdobeAcrobatReaderDC/App.json b/packages/App/AdobeAcrobatReaderDC/App.json
index be2979c7..102459bf 100644
--- a/packages/App/AdobeAcrobatReaderDC/App.json
+++ b/packages/App/AdobeAcrobatReaderDC/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDC",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Adobe Acrobat Reader DC",
     "Language": "English",
     "Architecture": "x64"
diff --git a/packages/App/AdobeAcrobatReaderDCMUI/App.json b/packages/App/AdobeAcrobatReaderDCMUI/App.json
index b9260c4a..165c0583 100644
--- a/packages/App/AdobeAcrobatReaderDCMUI/App.json
+++ b/packages/App/AdobeAcrobatReaderDCMUI/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDC",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Adobe Acrobat Reader DC",
     "Language": "English",
     "Architecture": "x64"
diff --git a/packages/App/AdobeAcrobatReaderDCMUIVDI/App.json b/packages/App/AdobeAcrobatReaderDCMUIVDI/App.json
index a8f1c867..20e8a22c 100644
--- a/packages/App/AdobeAcrobatReaderDCMUIVDI/App.json
+++ b/packages/App/AdobeAcrobatReaderDCMUIVDI/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDC",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Adobe Acrobat Reader DC (VDI install)",
     "PrePackageCmd": " -sfx_o\"#Path\" -sfx_ne",
     "Language": "English",
diff --git a/packages/App/Audacity/App.json b/packages/App/Audacity/App.json
index 7d07e21b..b2430247 100644
--- a/packages/App/Audacity/App.json
+++ b/packages/App/Audacity/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Audacity",
-    "Filter": "Invoke-EvergreenApp -Name \"Audacity\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Audacity\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Audacity",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/CitrixWorkspaceAppCurrent/App.json b/packages/App/CitrixWorkspaceAppCurrent/App.json
index 65301006..77d6d51a 100644
--- a/packages/App/CitrixWorkspaceAppCurrent/App.json
+++ b/packages/App/CitrixWorkspaceAppCurrent/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "CitrixWorkspaceApp",
-    "Filter": "Invoke-EvergreenApp -Name \"CitrixWorkspaceApp\" | Where-Object { $_.Stream -eq \"Current\" -and $_.Title -match \"Citrix Workspace\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"CitrixWorkspaceApp\" | Where-Object { $_.Stream -eq \"Current\" -and $_.Title -match \"Citrix Workspace\" } | Select-Object -First 1",
     "Title": "Citrix Workspace app Current Release",
     "Language": "en-US",
     "Architecture": "x86"
diff --git a/packages/App/CitrixWorkspaceAppLTSR/App.json b/packages/App/CitrixWorkspaceAppLTSR/App.json
index 16554334..239cda47 100644
--- a/packages/App/CitrixWorkspaceAppLTSR/App.json
+++ b/packages/App/CitrixWorkspaceAppLTSR/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "CitrixWorkspaceApp",
-    "Filter": "Invoke-EvergreenApp -Name \"CitrixWorkspaceApp\" | Where-Object { $_.Stream -eq \"LTSR\" -and $_.Title -match \"Citrix Workspace\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"CitrixWorkspaceApp\" | Where-Object { $_.Stream -eq \"LTSR\" -and $_.Title -match \"Citrix Workspace\" } | Select-Object -First 1",
     "Title": "Citrix Workspace app LTSR",
     "Language": "en-US",
     "Architecture": "x86"
diff --git a/packages/App/Cyberduck/App.json b/packages/App/Cyberduck/App.json
index 5dec8edb..9cdd7e79 100644
--- a/packages/App/Cyberduck/App.json
+++ b/packages/App/Cyberduck/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Cyberduck",
-    "Filter": "Invoke-EvergreenApp -Name \"Cyberduck\"",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Cyberduck\"",
     "Title": "Cyberduck",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/FoxitReader/App.json b/packages/App/FoxitReader/App.json
index e66cef49..a589288d 100644
--- a/packages/App/FoxitReader/App.json
+++ b/packages/App/FoxitReader/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "FoxitReader",
-    "Filter": "Invoke-EvergreenApp -Name \"FoxitReader\" | Where-Object { $_.Language -eq \"English\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"FoxitReader\" | Where-Object { $_.Language -eq \"English\" } | Select-Object -First 1",
     "Title": "Foxit PDF Reader",
     "Language": "en-US",
     "Architecture": "x86"
diff --git a/packages/App/GoogleChrome/App.json b/packages/App/GoogleChrome/App.json
index 738f86b9..69cb6f01 100644
--- a/packages/App/GoogleChrome/App.json
+++ b/packages/App/GoogleChrome/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "GoogleChrome",
-    "Filter": "Invoke-EvergreenApp -Name \"GoogleChrome\" | Where-Object { $_.Channel -eq \"stable\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"GoogleChrome\" | Where-Object { $_.Channel -eq \"stable\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Google Chrome",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/Greenshot/App.json b/packages/App/Greenshot/App.json
index f639d12a..13af5d86 100644
--- a/packages/App/Greenshot/App.json
+++ b/packages/App/Greenshot/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Greenshot",
-    "Filter": "Invoke-EvergreenApp -Name \"Greenshot\" | Where-Object { $_.Architecture -eq \"x86\" -and $_.Uri -match \"Greenshot-INSTALLER-\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Greenshot\" | Where-Object { $_.Architecture -eq \"x86\" -and $_.Uri -match \"Greenshot-INSTALLER-\" } | Select-Object -First 1",
     "Title": "Greenshot",
     "Language": "en-US",
     "Architecture": "x86"
diff --git a/packages/App/ImageCustomise/App.json b/packages/App/ImageCustomise/App.json
index 99485fe0..06bfa4b2 100644
--- a/packages/App/ImageCustomise/App.json
+++ b/packages/App/ImageCustomise/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "ImageCustomise",
-    "Filter": "Invoke-EvergreenApp -Name \"stealthpuppyWindowsCustomisedDefaults\" | Where-Object { $_.Type -eq \"zip\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"stealthpuppyWindowsCustomisedDefaults\" | Where-Object { $_.Type -eq \"zip\" } | Select-Object -First 1",
     "Title": "Windows Customised Defaults",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/ImageGlass/App.json b/packages/App/ImageGlass/App.json
index 6c5d0d10..418ee640 100644
--- a/packages/App/ImageGlass/App.json
+++ b/packages/App/ImageGlass/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "ImageGlass",
-    "Filter": "Invoke-EvergreenApp -Name \"ImageGlass\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Uri -match \"x64.msi$\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"ImageGlass\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Uri -match \"x64.msi$\" } | Select-Object -First 1",
     "Title": "ImageGlass",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/Microsoft.NETLTS/App.json b/packages/App/Microsoft.NETLTS/App.json
index 594a4467..600b0774 100644
--- a/packages/App/Microsoft.NETLTS/App.json
+++ b/packages/App/Microsoft.NETLTS/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Microsoft.NETLTS",
-    "Filter": "Invoke-EvergreenApp -Name \"Microsoft.NET\" | Where-Object { $_.Installer -eq \"windowsdesktop\" -and $_.Architecture -eq \"x64\" -and $_.Channel -eq \"LTS\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Microsoft.NET\" | Where-Object { $_.Installer -eq \"windowsdesktop\" -and $_.Architecture -eq \"x64\" -and $_.Channel -eq \"LTS\" } | Select-Object -First 1",
     "Title": "Microsoft .NET Desktop Runtime LTS",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/Microsoft.NETSTS/App.json b/packages/App/Microsoft.NETSTS/App.json
index 18e232f8..040651af 100644
--- a/packages/App/Microsoft.NETSTS/App.json
+++ b/packages/App/Microsoft.NETSTS/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Microsoft.NETCurrent",
-    "Filter": "Invoke-EvergreenApp -Name \"Microsoft.NET\" | Where-Object { $_.Installer -eq \"windowsdesktop\" -and $_.Architecture -eq \"x64\" -and $_.Channel -eq \"STS\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Microsoft.NET\" | Where-Object { $_.Installer -eq \"windowsdesktop\" -and $_.Architecture -eq \"x64\" -and $_.Channel -eq \"STS\" } | Select-Object -First 1",
     "Title": "Microsoft .NET Desktop Runtime Current",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftAzurePipelinesAgent/App.json b/packages/App/MicrosoftAzurePipelinesAgent/App.json
index 3b201e5e..f5411b54 100644
--- a/packages/App/MicrosoftAzurePipelinesAgent/App.json
+++ b/packages/App/MicrosoftAzurePipelinesAgent/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftAzurePipelinesAgent",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftAzurePipelinesAgent\" | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftAzurePipelinesAgent\" | Select-Object -First 1",
     "Title": "Microsoft Azure Pipelines Agent",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftEdge/App.json b/packages/App/MicrosoftEdge/App.json
index 0e200bb4..e41b1db0 100644
--- a/packages/App/MicrosoftEdge/App.json
+++ b/packages/App/MicrosoftEdge/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftEdge",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftEdge\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Channel -eq \"Stable\" -and $_.Release -eq \"Enterprise\" } | Sort-Object -Property @{ Expression = { [System.Version]$_.Version }; Descending = $true } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftEdge\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Channel -eq \"Stable\" -and $_.Release -eq \"Enterprise\" } | Sort-Object -Property @{ Expression = { [System.Version]$_.Version }; Descending = $true } | Select-Object -First 1",
     "Title": "Microsoft Edge",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftEdgeWebView2/App.json b/packages/App/MicrosoftEdgeWebView2/App.json
index d76ae036..5c32577f 100644
--- a/packages/App/MicrosoftEdgeWebView2/App.json
+++ b/packages/App/MicrosoftEdgeWebView2/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftEdgeWebView2Runtime",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftEdgeWebView2Runtime\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Channel -eq \"Stable\" } | Sort-Object -Property @{ Expression = { [System.Version]$_.Version }; Descending = $true } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftEdgeWebView2Runtime\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Channel -eq \"Stable\" } | Sort-Object -Property @{ Expression = { [System.Version]$_.Version }; Descending = $true } | Select-Object -First 1",
     "Title": "Microsoft Edge WebView2 Runtime",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftFSLogixApps/App.json b/packages/App/MicrosoftFSLogixApps/App.json
index 114d0b48..5fa602da 100644
--- a/packages/App/MicrosoftFSLogixApps/App.json
+++ b/packages/App/MicrosoftFSLogixApps/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftFSLogixApps",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftFSLogixApps\" | Where-Object { $_.Channel -eq \"Production\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftFSLogixApps\" | Where-Object { $_.Channel -eq \"Production\" } | Select-Object -First 1",
     "Title": "Microsoft FSLogix Apps",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftOneDrive/App.json b/packages/App/MicrosoftOneDrive/App.json
index 4ee252e0..48c7ec97 100644
--- a/packages/App/MicrosoftOneDrive/App.json
+++ b/packages/App/MicrosoftOneDrive/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftOneDrive",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftOneDrive\" | Where-Object { $_.Architecture -eq \"AMD64\" -and $_.Ring -eq \"Production\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftOneDrive\" | Where-Object { $_.Architecture -eq \"AMD64\" -and $_.Ring -eq \"Production\" } | Select-Object -First 1",
     "Title": "Microsoft OneDrive",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftOneDriveVDI/App.json b/packages/App/MicrosoftOneDriveVDI/App.json
index a4531a50..2c9f0a7c 100644
--- a/packages/App/MicrosoftOneDriveVDI/App.json
+++ b/packages/App/MicrosoftOneDriveVDI/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftOneDrive",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftOneDrive\" | Where-Object { $_.Architecture -eq \"AMD64\" -and $_.Ring -eq \"Production\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftOneDrive\" | Where-Object { $_.Architecture -eq \"AMD64\" -and $_.Ring -eq \"Production\" } | Select-Object -First 1",
     "Title": "Microsoft OneDrive (VDI install)",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftPowerShell/App.json b/packages/App/MicrosoftPowerShell/App.json
index 6a4ef8dd..69ace6ae 100644
--- a/packages/App/MicrosoftPowerShell/App.json
+++ b/packages/App/MicrosoftPowerShell/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftPowerShell",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftPowerShell\" | Where-Object { $_.Release -eq \"Stable\" -and $_.Architecture -eq \"x64\" }",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftPowerShell\" | Where-Object { $_.Release -eq \"Stable\" -and $_.Architecture -eq \"x64\" }",
     "Title": "Microsoft PowerShell",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftPowerToys/App.json b/packages/App/MicrosoftPowerToys/App.json
index b7f38bcc..cec3fe02 100644
--- a/packages/App/MicrosoftPowerToys/App.json
+++ b/packages/App/MicrosoftPowerToys/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftPowerToys",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftPowerToys\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftPowerToys\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Microsoft PowerToys",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftSsmsEnu/App.json b/packages/App/MicrosoftSsmsEnu/App.json
index 3c10d4ff..c26508e8 100644
--- a/packages/App/MicrosoftSsmsEnu/App.json
+++ b/packages/App/MicrosoftSsmsEnu/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftSsmsEnu",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftSsms\" | Where-Object { $_.Language -eq \"English\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftSsms\" | Where-Object { $_.Language -eq \"English\" } | Select-Object -First 1",
     "Title": "Microsoft SQL Server Management Studio",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftTeams/App.json b/packages/App/MicrosoftTeams/App.json
index 001f192f..b510f961 100644
--- a/packages/App/MicrosoftTeams/App.json
+++ b/packages/App/MicrosoftTeams/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftTeams",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftTeams\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Ring -eq \"General\" -and $_.Type -eq \"msi\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftTeams\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Ring -eq \"General\" -and $_.Type -eq \"msi\" } | Select-Object -First 1",
     "Title": "Microsoft Teams",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftTeamsVDI/App.json b/packages/App/MicrosoftTeamsVDI/App.json
index 276b8e5f..bafba42b 100644
--- a/packages/App/MicrosoftTeamsVDI/App.json
+++ b/packages/App/MicrosoftTeamsVDI/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftTeamsVDI",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftTeams\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Ring -eq \"General\" -and $_.Type -eq \"msi\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftTeams\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Ring -eq \"General\" -and $_.Type -eq \"msi\" } | Select-Object -First 1",
     "Title": "Microsoft Teams (VDI install)",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftVisualStudioCode/App.json b/packages/App/MicrosoftVisualStudioCode/App.json
index 0a0a7ef4..2acd3184 100644
--- a/packages/App/MicrosoftVisualStudioCode/App.json
+++ b/packages/App/MicrosoftVisualStudioCode/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftVisualStudioCode",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftVisualStudioCode\" | Where-Object { $_.Channel -eq \"Stable\" -and $_.Architecture -eq \"x64\" -and $_.Platform -eq \"win32-x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftVisualStudioCode\" | Where-Object { $_.Channel -eq \"Stable\" -and $_.Architecture -eq \"x64\" -and $_.Platform -eq \"win32-x64\" } | Select-Object -First 1",
     "Title": "Microsoft Visual Studio Code",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MicrosoftWvdRemoteDesktop/App.json b/packages/App/MicrosoftWvdRemoteDesktop/App.json
index 308b9966..2771e097 100644
--- a/packages/App/MicrosoftWvdRemoteDesktop/App.json
+++ b/packages/App/MicrosoftWvdRemoteDesktop/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftWvdRemoteDesktop",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftWvdRemoteDesktop\" | Where-Object { $_.Channel -eq \"Public\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftWvdRemoteDesktop\" | Where-Object { $_.Channel -eq \"Public\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Microsoft Remote Desktop",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/MozillaFirefox/App.json b/packages/App/MozillaFirefox/App.json
index 84a8d863..130673fd 100644
--- a/packages/App/MozillaFirefox/App.json
+++ b/packages/App/MozillaFirefox/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MozillaFirefox",
-    "Filter": "Invoke-EvergreenApp -Name \"MozillaFirefox\" -ErrorAction \"SilentlyContinue\" -WarningAction \"SilentlyContinue\" | Where-Object { $_.Channel -eq \"Current\" -and $_.Architecture -eq \"x64\" -and $_.Type -eq \"msi\" -and $_.Language -eq \"en-GB\" }",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MozillaFirefox\" -ErrorAction \"SilentlyContinue\" -WarningAction \"SilentlyContinue\" | Where-Object { $_.Channel -eq \"Current\" -and $_.Architecture -eq \"x64\" -and $_.Type -eq \"msi\" -and $_.Language -eq \"en-GB\" }",
     "Title": "Mozilla Firefox",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/Notepad++/App.json b/packages/App/Notepad++/App.json
index 8ed3406b..68548491 100644
--- a/packages/App/Notepad++/App.json
+++ b/packages/App/Notepad++/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "NotepadPlusPlus",
-    "Filter": "Invoke-EvergreenApp -Name \"NotepadPlusPlus\" -ErrorAction \"SilentlyContinue\" -WarningAction \"SilentlyContinue\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Type -eq \"exe\" }",
+    "Filter": "Get-EvergreenAppFromApi -Name \"NotepadPlusPlus\" -ErrorAction \"SilentlyContinue\" -WarningAction \"SilentlyContinue\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Type -eq \"exe\" }",
     "Title": "Notepad++",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/PaintDotNetOfflineInstaller/App.json b/packages/App/PaintDotNetOfflineInstaller/App.json
index 9d38f53e..9dccc19c 100644
--- a/packages/App/PaintDotNetOfflineInstaller/App.json
+++ b/packages/App/PaintDotNetOfflineInstaller/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "PaintDotNetOfflineInstaller",
-    "Filter": "Invoke-EvergreenApp -Name \"PaintDotNetOfflineInstaller\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.URI -match \"winmsi\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"PaintDotNetOfflineInstaller\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.URI -match \"winmsi\" } | Select-Object -First 1",
     "Title": "Paint.NET",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/RemoteDisplayAnalyzer/App.json b/packages/App/RemoteDisplayAnalyzer/App.json
index bc780b7d..5d691cfb 100644
--- a/packages/App/RemoteDisplayAnalyzer/App.json
+++ b/packages/App/RemoteDisplayAnalyzer/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "RemoteDisplayAnalyzer",
-    "Filter": "Invoke-EvergreenApp -Name \"RDAnalyzer\" | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"RDAnalyzer\" | Select-Object -First 1",
     "Title": "Remote Display Analyzer",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/TrackerSoftwarePDFXChangeEditor/App.json b/packages/App/TrackerSoftwarePDFXChangeEditor/App.json
index d8a9cbcc..d7781fb9 100644
--- a/packages/App/TrackerSoftwarePDFXChangeEditor/App.json
+++ b/packages/App/TrackerSoftwarePDFXChangeEditor/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "TrackerSoftwarePDFXChangeEditor",
-    "Filter": "Invoke-EvergreenApp -Name \"TrackerSoftwarePDFXChangeEditor\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"TrackerSoftwarePDFXChangeEditor\" | Where-Object { $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Tracker Software PDF-XChange Editor",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/VideoLanVlcPlayer/App.json b/packages/App/VideoLanVlcPlayer/App.json
index 6870af10..ce8b3ad7 100644
--- a/packages/App/VideoLanVlcPlayer/App.json
+++ b/packages/App/VideoLanVlcPlayer/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "VideoLanVlcPlayer",
-    "Filter": "Invoke-EvergreenApp -Name \"VideoLanVlcPlayer\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Type -eq \"MSI\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"VideoLanVlcPlayer\" | Where-Object { $_.Architecture -eq \"x64\" -and $_.Type -eq \"MSI\" } | Select-Object -First 1",
     "Title": "VideoLAN VLC media player",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/ZoomMeetings/App.json b/packages/App/ZoomMeetings/App.json
index a3c9853a..c59aa212 100644
--- a/packages/App/ZoomMeetings/App.json
+++ b/packages/App/ZoomMeetings/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Zoom Meetings",
-    "Filter": "Invoke-EvergreenApp -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Desktop\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Desktop\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Zoom Meetings Client",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/App/ZoomRooms/App.json b/packages/App/ZoomRooms/App.json
index 7f89a7fd..08dd7f54 100644
--- a/packages/App/ZoomRooms/App.json
+++ b/packages/App/ZoomRooms/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Zoom Rooms",
-    "Filter": "Invoke-EvergreenApp -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Rooms\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Rooms\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Zoom Meetings Client",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/Update/AdobeAcrobatReaderDCMUIx64/App.json b/packages/Update/AdobeAcrobatReaderDCMUIx64/App.json
index 44aa6364..0342f6f6 100644
--- a/packages/Update/AdobeAcrobatReaderDCMUIx64/App.json
+++ b/packages/Update/AdobeAcrobatReaderDCMUIx64/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDCMUIUpdates",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobat\" | Where-Object { $_.Track -eq \"DC\" -and $_.Product -eq \"Reader\" -and $_.Language -eq \"Multi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobat\" | Where-Object { $_.Track -eq \"DC\" -and $_.Product -eq \"Reader\" -and $_.Language -eq \"Multi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Update for Adobe Acrobat Reader DC MUI",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/Update/AdobeAcrobatReaderDCMUIx86/App.json b/packages/Update/AdobeAcrobatReaderDCMUIx86/App.json
index 115f1467..b401b597 100644
--- a/packages/Update/AdobeAcrobatReaderDCMUIx86/App.json
+++ b/packages/Update/AdobeAcrobatReaderDCMUIx86/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "AdobeAcrobatReaderDCMUIUpdates",
-    "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobat\" | Where-Object { $_.Track -eq \"DC\" -and $_.Product -eq \"Reader\" -and $_.Language -eq \"Multi\" -and $_.Architecture -eq \"x86\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobat\" | Where-Object { $_.Track -eq \"DC\" -and $_.Product -eq \"Reader\" -and $_.Language -eq \"Multi\" -and $_.Architecture -eq \"x86\" } | Select-Object -First 1",
     "Title": "Update for Adobe Acrobat Reader DC MUI",
     "Language": "en-US",
     "Architecture": "x86"
diff --git a/packages/Update/MicrosoftVisualStudioCode/App.json b/packages/Update/MicrosoftVisualStudioCode/App.json
index 7e06221a..6d6db576 100644
--- a/packages/Update/MicrosoftVisualStudioCode/App.json
+++ b/packages/Update/MicrosoftVisualStudioCode/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftVisualStudioCode",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftVisualStudioCode\" | Where-Object { $_.Channel -eq \"Stable\" -and $_.Architecture -eq \"x64\" -and $_.Platform -eq \"win32-x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftVisualStudioCode\" | Where-Object { $_.Channel -eq \"Stable\" -and $_.Architecture -eq \"x64\" -and $_.Platform -eq \"win32-x64\" } | Select-Object -First 1",
     "Title": "Update for Microsoft Visual Studio Code",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/Update/MicrosoftWvdRemoteDesktop/App.json b/packages/Update/MicrosoftWvdRemoteDesktop/App.json
index 8aafc311..c34f4881 100644
--- a/packages/Update/MicrosoftWvdRemoteDesktop/App.json
+++ b/packages/Update/MicrosoftWvdRemoteDesktop/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "MicrosoftWvdRemoteDesktop",
-    "Filter": "Invoke-EvergreenApp -Name \"MicrosoftWvdRemoteDesktop\" | Where-Object { $_.Channel -eq \"Public\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"MicrosoftWvdRemoteDesktop\" | Where-Object { $_.Channel -eq \"Public\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Update for Microsoft Remote Desktop",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/packages/Update/ZoomMeetings/App.json b/packages/Update/ZoomMeetings/App.json
index 182d56bd..42bda381 100644
--- a/packages/Update/ZoomMeetings/App.json
+++ b/packages/Update/ZoomMeetings/App.json
@@ -1,7 +1,7 @@
 {
   "Application": {
     "Name": "Zoom Meetings",
-    "Filter": "Invoke-EvergreenApp -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Meetings\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+    "Filter": "Get-EvergreenAppFromApi -Name \"Zoom\" | Where-Object { $_.Platform -eq \"Meetings\" -and $_.Type -eq \"msi\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
     "Title": "Zoom Meetings Client",
     "Language": "en-US",
     "Architecture": "x64"
diff --git a/template/App.json b/template/App.json
index 48284b03..0b41c319 100644
--- a/template/App.json
+++ b/template/App.json
@@ -1,7 +1,7 @@
 {
     "Application": {
         "Name": "Application name",
-        "Filter": "Invoke-EvergreenApp -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
+        "Filter": "Get-EvergreenAppFromApi -Name \"AdobeAcrobatReaderDC\" | Where-Object { $_.Language -eq \"MUI\" -and $_.Architecture -eq \"x64\" } | Select-Object -First 1",
         "Title": "Application name/title used in the Intune package",
         "Language": "English",
         "Architecture": "x64"