WAU Install Constants and WinGet Version

Author: KnifMelti

Sources/Winget-AutoUpdate/WAU-Settings-GUI.ps1

@@ -73,7 +73,7 @@ function Add-Shortcut ($Shortcut, $Target, $StartIn, $Arguments, $Icon, $Descrip
     [System.Runtime.Interopservices.Marshal]::ReleaseComObject($ShortcutObj) | Out-Null
     [System.Runtime.Interopservices.Marshal]::ReleaseComObject($WScriptShell) | Out-Null
 }
-function Test-WAUInstalledIcon {
+function Test-InstalledWAU {
     param (
         [Parameter(Mandatory=$true)]
         [string]$displayName
@@ -89,7 +89,7 @@ function Test-WAUInstalledIcon {
                 try {
                     $properties = Get-ItemProperty -Path $subKey.PSPath -ErrorAction Stop
                     if ($properties.DisplayName -like "$displayName") {
-                        # $matchingApps += $properties.DisplayName
+                        $matchingApps += $properties.DisplayVersion
                         $parentKeyName = Split-Path -Path $subKey.PSPath -Leaf
                         $matchingApps += $parentKeyName
                     }
@@ -279,8 +279,7 @@ function Set-WAUConfig {
         }
 
         # Find current WAU installation icon
-        $GUID = Test-WAUInstalledIcon -DisplayName "Winget-AutoUpdate"
-        $icon = "${env:SystemRoot}\Installer\${GUID}\icon.ico"
+        $icon = $Script:WAU_ICON
 
         # Handle Start Menu shortcuts
         if ($Settings.ContainsKey('WAU_StartMenuShortcut')) {
@@ -534,19 +533,22 @@ function Update-WAUGUIFromConfig {
     }
 
     # Update information section
-    $Controls.VersionText.Text = "Version: $($updatedConfig.ProductVersion) |"
+    $Controls.VersionText.Text = "WAU Version: $Script:WAU_VERSION | "
+    #$Controls.VersionText.Text = "WAU Version: $($updatedConfig.ProductVersion) | "
+
     # Get last run time for the scheduled task 'Winget-AutoUpdate'
     try {
         $task = Get-ScheduledTask -TaskName 'Winget-AutoUpdate' -ErrorAction Stop
         $lastRunTime = $task | Get-ScheduledTaskInfo | Select-Object -ExpandProperty LastRunTime
         if ($lastRunTime -and $lastRunTime -ne [datetime]::MinValue) {
-            $Controls.RunDate.Text = " Latest Run: $($lastRunTime.ToString('yyyy-MM-dd HH:mm'))"
+            $Controls.RunDate.Text = "Last Run: $($lastRunTime.ToString('yyyy-MM-dd HH:mm')) | "
         } else {
-            $Controls.RunDate.Text = " Latest Run: Never"
+            $Controls.RunDate.Text = "Last Run: Never | "
         }
     } catch {
-        $Controls.RunDate.Text = " Latest Run: Unknown"
+        $Controls.RunDate.Text = "Last Run: Unknown | "
     }
+    $Controls.WinGetVersion.Text = "WinGet Version: $Script:WINGET_VERSION"
     $Controls.InstallLocationText.Text = "Install Location: $($updatedConfig.InstallLocation)"
 
     # Update WAU AutoUpdate status
@@ -842,8 +844,9 @@ function Show-WAUSettingsGUI {
     <GroupBox Grid.Row="7" Header="Information" Margin="0,0,0,10">
         <StackPanel Margin="10">
             <StackPanel Orientation="Horizontal">
-                <TextBlock x:Name="VersionText" Text="Version: " FontSize="9"/>
-                <TextBlock x:Name="RunDate" Text="Latest Run: " FontSize="9"/>
+                <TextBlock x:Name="VersionText" Text="WAU Version: " FontSize="9"/>
+                <TextBlock x:Name="RunDate" Text="Last Run: " FontSize="9"/>
+                <TextBlock x:Name="WinGetVersion" Text="WinGet Version: " FontSize="9"/>
             </StackPanel>
             <TextBlock x:Name="InstallLocationText" Text="Install Location: " FontSize="9"/>
             <TextBlock x:Name="WAUAutoUpdateText" Text="WAU AutoUpdate: " FontSize="9"/>
@@ -1187,5 +1190,20 @@ $null = cmd /c ''
 $ProgressPreference = 'SilentlyContinue'
 $IconBase64 = [Convert]::FromBase64String("iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAApDSURBVFhHbVYLcFTVGT7ZR3azr+wru9nsM9m8Q0ISwrM8ROkIojNiddQO1tJ0alB8AaW+KPiWpD4rBQXbkemM2hbnNooFo4CMIgbtiIKBAJIAtkEDCqgMRP36/Wd3A1rvzrf33Hv/83/f/zjnXpWsGq9S1UTNhPbS2p90ldVN7EyPmGSU1082KhqmaFSOPM+oapxqVDedb9Q0X6DPufEPkXsmkDkyV3yIP/rtpP8u8rSTj7wTlEpUjRMRSNaMB2+CD0Ej0BicBE4eBp2BTrM4H1VNBMck+x7ELgfxIRB/4lf8C48gWTmOAirGtnMwfPPHRJwLEZIeMZnP5VlGVOXIjCg9bjhP24htjlDO55JLsMnq8RBuFS8f08WBvpFiJs4VIRAR5woprZ2ISFkLSuvGo7iUZ16fmyURJQKZWYRSzQjGG1GSHp3xX02/hPAkGHS8YkyXiqVHd1KEqJGUZAyzIlJZEamas1HEaRdMNGGIvynTf4ZwapS2yT2XzMTpxxmswqQZV6L1+oWweNLaTkqdqmT09CF8wq2iZS0GB8iJEGWisLRqAuKMIpYegwgjlSgSFeNQQkeXz54LOTZvfR2hZDOinFvdfL4mjleOhTtcC3uwRtvIESWppbCcGRuV4SCEj7yGFkDIRUZEecYgWjYagWgD8qneWzKCqWxGYWQEI2mG2ZHAmMmXQJkjKGI2ZlHQtn+/ixDHXtqovGJ8tGdXll6OE1D5CTh8VYgwAOESlJSOMpT8iYBzEYo3ocBbAaXCuPXOu7WLQ5/sg9lVpgnCqSb4SurpoEVH7WXEgVg9CovroCwRPLp8lZ4DfE18p0c9PdvpLwB3sJoimLUMV0YAoW/IgwAd59kT8Ecb0fefvXry6TOf8/9b7D3QSwENiJJ4uFfYVEmWJszoza4Uy9Om58gxcKQX+3d3Z6+A1c+s1kH5KFS4CEMVJ5uM7AWCTLmpIIGxky/OTgEGj32CXft7MXDiM+w9chCNEy5ChHWXMummlY7mOBCpx7iJM/WcL84cw5xHhKyBqMTktqXYPXBIP7vx5t/Bzn4IxUdCuIcFhLlcHN5y1rQRe48e0cZSuw1bt+Gjw/24ftFSOnNqGxEqJQhGR+oyxNgvsXQLOt/pxqw7n0ToglaocfdDXfYm1C17oEJXIDTlWjTNuQcbduxEOTexolgDs9ZoKPkj4Jf6qSDaVz+LT48P4gCj3dzdjfXb30WsvIXPFBspgsJQDSzOUrTNXyxNxJrWZLLHRlWmoowdYe3og30d4Lx3Bywdh7L3TcizhFHIJRqKjZQsGIpKDFHj8KZZ+5iOe99/+7FmwxY89OyLuKz1pmFyNydanCmuipHarq9vF58FKIpNSAEFhaUwW4LaPrD2JPwvDyH29E6kTkLfM+X54PKlmbl6XQItgBdGIFIHqy2C1rkLtOMd+/fh3d278Njf13Oii8uqCB6SO3zlvPag9+OPtZ0cc35DgVx2Lj53ByrgcMVgJpnnHydRtORtVAwAxV8CVt4rsBfDU1SpBUjQErxi6gx/uBr5ygs1i0vu1Al8ffwQuvfswTUL7tbKCwrLOLGa4xCuW7g4S/0VkVliFheF5ceYoUp4CpOwcI795k2oPXAG8aNAZX9GgNsV5ZKt1tnKwlDy56cqu7JDPb8V0UWb6PI4znz7JcZPmUlSG/eENEwsjzTfd9yCTw8dxWubX6fdKS3g/Q+6aWdneZJwOGNadOqVXpRxG2g++A08yw7CyedebxL+SKZcZwVE6gxfsIICLIi/uBXKGMLDf3iBbr/CP/+1js7yCGkuB954732cOHUURz8/DE/9TLQt6qBdJgu/lFJIuViiOl8xageBuuNA+BcvwPIm4GaG/f5SktZ9X4AvXGN4A+VagP/Xj8Oz8QhUy3KcOtyrRVx/4wI6VZg9dxGOnBzE4YF+LHniabTeuwLJGXPRf3A/7b7RUHlhbfvGpo3ws/FK2p6D7b4DKFp3BA4G4veXcb+ggOgI+CnAF6k1lDdUbXgCafaAFcXzVyD0Hjv2wZ3wJK6jUxYQX6KOHxkf9vVh577d2Pj2W/jVA08hGK7CBdcuwMSf30EbOU7jta5XcMutt+PV/n5YH9oCVfMY6v70DqoOggEqLcBPAQJfcS37ocZQhUVVhtsvAgoQunIhYl8ADu7A6vev4sLp8+j4GLZ+8CE2bd+O7R/uwDV3PILW2x7QkSrOmfHbR7HqhZdodwqnvxrA4OE9uG/VWqjEHCReOgTv20Bsy3EtwEceX3FNjjwjwKMFlCPf5ENhYgJGU20D3UWJwv1fY82mN7FyzVqs27QZ9658FgtXPE9iJ+EhbEi3zED9lczC0Oea/K316zDpuS2w9QBBBpLuAyL3bGAJbJBSZ4m5d1TDE6oyFJeO4eHysbN783RU05GYOQ/T2FtNFFF8cAjzFz+GNWs7cdXix1Ez5kLaOGB1JpBnjXCsMH3uUsxb8iQGendgwioDNgZRegyoeORl2Krnw+JuhMsWhJerTYhzkOCZgUpD1q/Dm4LJVMg32liosmV0PBXJu/6GKm4kdd19uOLqGzH7piWa0GQKwuFOIb9AllwBhbsx64b7MbP9GeR/CoQe3oB87v+qfiksV6/hvmCCuzBB0ipNLHxuinGRW2fAFaAA7nJWRwQmZYat5SGopuVQF3ZAVd+K4veP4aLNPagorc0IICxMqVkv0czeP2nqpQhtGUQ+d7+8O3rgvW8AxatPwcrdz27jdwDTz4g1RADJ5WwoV6CCAirgZB/YPSmY8/0w5znhvNiAacwKWFNtKGpdDjffps0syYRdn2Ha7h40P/wEpi9bgea/bsRPuR81Ss9sOwP/ovWILuxE4dKtMBc1aKFO7o5SZh15Fnrr/qEA2fHyXXGm2M1slMI+9Y+wnPdnmKI3INEzBNuDe+D94DuEL+nApSQcT1RxC3B2vAXHlGUouekvCN3zInz3dyEwe5HuKVtBBC76lnfA9wQw68KtSGwIucDBN5Wd+77VEUVenpuptsLinQzluRzB5qvg3wb4F2+Gun0bLPZpGLtrEHUUEeGmE2bXW6Y+zrV/G0viJ0zItxXD6SvTL6lc6jPkFRpOf0ZAZ05ARgRLwdeqhavCZA1ShIMlCbPjx6LkkrtgW9yHwMqPYZr2FEn4zT9vJUZwuXmb2mByjtL9YGJT5heUsLHLhsl+iCxfp2LUXRJ5jlzOUgqbp5TlSMJMRyJElp44t/CdnscPF2Wu5NYrr2e3vi/I4/5gtYVhcyfpoyxH8n84y5fuUjRsF2O5KcQylgyIACsFWLjezY44zHauEEsR+8PHDwsvzGaezX5eCwJs3jAsjpieJ36klPKRI34lE7mxU67PokMyICKyxDmIAK5zRmJ1JfSmo0Vw3ZvtUQ1LQQaZcYxC41qwCJC5NvHjEYigjH8N3s+NKYzbCP+oWNBO4i6ik06MfHfKoMNhWBxxg0SZszOhx1YBrwUsl7YjucESGHbOZzDDII/BZd4pHBy3U4hyeMvU/wCIL/+Sfv0j3gAAAABJRU5ErkJggg==")
 
+# Get WAU installation info once and store as constants
+$Script:WAU_INSTALL_INFO = Test-InstalledWAU -DisplayName "Winget-AutoUpdate"
+$Script:WAU_VERSION = if ($Script:WAU_INSTALL_INFO.Count -ge 1) { $Script:WAU_INSTALL_INFO[0] } else { "Unknown" }
+# Get WinGet version by running 'winget -v'
+try {
+    $wingetVersionOutput = winget -v 2>$null
+    $Script:WINGET_VERSION = $wingetVersionOutput.Trim()
+} catch {
+    $Script:WINGET_VERSION = "Unknown"
+}
+$Script:WAU_GUID = if ($Script:WAU_INSTALL_INFO.Count -ge 2) { $Script:WAU_INSTALL_INFO[1] } else { $null }
+$Script:WAU_ICON = "${env:SystemRoot}\Installer\${Script:WAU_GUID}\icon.ico"
+
+#winget -v
+
 # Show the GUI
 Show-WAUSettingsGUI