Sync main to dev

.github/workflows/GA_Mega-linter.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
       # MegaLinter
@@ -48,7 +48,7 @@ jobs:
           # All available variables are described in documentation
           # https://megalinter.github.io/configuration/
           VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Validates all source when push on main, else just the git diff with main. Override with true if you always want to lint all sources
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
           SPELL_CSPELL_CONFIG_FILE: .github/cspell.json
           POWERSHELL_POWERSHELL_CONFIG_FILE: .github/.powershell-psscriptanalyzer.psd1
           DISABLE_ERRORS_LINTERS: REPOSITORY_DEVSKIM,REPOSITORY_CHECKOV,REPOSITORY_GIT_DIFF,SPELL_CSPELL,SPELL_PROSELINT,COPYPASTE_JSCPD,MARKDOWN_MARKDOWN_LINK_CHECK

Sources/Winget-AutoUpdate/WAU-Policies.ps1

@@ -44,35 +44,93 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) {
     $WAUTask = Get-ScheduledTask -TaskName 'Winget-AutoUpdate' -ErrorAction SilentlyContinue
 
     #Update 'Winget-AutoUpdate' scheduled task settings
-    $taskTriggers = @()
-    if ($WAUConfig.WAU_UpdatesAtLogon -eq 1) {
-        $tasktriggers += New-ScheduledTaskTrigger -AtLogOn
-    }
-    if ($WAUConfig.WAU_UpdatesInterval -eq "Daily") {
-        $tasktriggers += New-ScheduledTaskTrigger -Daily -At $WAUConfig.WAU_UpdatesAtTime
-    }
-    elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiDaily") {
-        $tasktriggers += New-ScheduledTaskTrigger -Daily -At $WAUConfig.WAU_UpdatesAtTime -DaysInterval 2
-    }
-    elseif ($WAUConfig.WAU_UpdatesInterval -eq "Weekly") {
-        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2
+    $currentTriggers = $WAUTask.Triggers
+    $configChanged = $false
+
+    #Check if LogOn trigger setting has changed
+    $hasLogonTrigger = $currentTriggers | Where-Object { $_.TriggerType -eq "LogOn" }
+    if (($WAUConfig.WAU_UpdatesAtLogon -eq 1 -and -not $hasLogonTrigger) -or 
+        ($WAUConfig.WAU_UpdatesAtLogon -ne 1 -and $hasLogonTrigger)) {
+        $configChanged = $true
     }
-    elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiWeekly") {
-        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 2
+
+    #Check if schedule type has changed
+    $currentIntervalType = "None"
+    foreach ($trigger in $currentTriggers) {
+        if ($trigger.TriggerType -eq "Daily" -and $trigger.DaysInterval -eq 1) {
+            $currentIntervalType = "Daily"
+            break
+        }
+        elseif ($trigger.TriggerType -eq "Daily" -and $trigger.DaysInterval -eq 2) {
+            $currentIntervalType = "BiDaily"
+            break
+        }
+        elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 1) {
+            $currentIntervalType = "Weekly"
+            break
+        }
+        elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 2) {
+            $currentIntervalType = "BiWeekly"
+            break
+        }
+        elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 4) {
+            $currentIntervalType = "Monthly"
+            break
+        }
+        elseif ($trigger.TriggerType -eq "Once" -and [DateTime]::Parse($trigger.StartBoundary) -lt (Get-Date)) {
+            $currentIntervalType = "Never"
+            break
+        }
     }
-    elseif ($WAUConfig.WAU_UpdatesInterval -eq "Monthly") {
-        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 4
+
+    if ($currentIntervalType -ne $WAUConfig.WAU_UpdatesInterval) {
+        $configChanged = $true
     }
-    #If trigger(s) set
-    if ($taskTriggers) {
-        #Edit scheduled task
-        Set-ScheduledTask -TaskPath $WAUTask.TaskPath -TaskName $WAUTask.TaskName -Trigger $taskTriggers | Out-Null
+
+    #Check if schedule time has changed
+    if ($currentIntervalType -ne "None" -and $currentIntervalType -ne "Never") {
+        $timeTrigger = $currentTriggers | Where-Object { $_.TriggerType -ne "LogOn" } | Select-Object -First 1
+        if ($timeTrigger) {
+            $currentTime = [DateTime]::Parse($timeTrigger.StartBoundary).ToString("HH:mm:ss")
+            if ($currentTime -ne $WAUConfig.WAU_UpdatesAtTime) {
+                $configChanged = $true
+            }
+        }
     }
-    #If not, remove trigger(s)
-    else {
-        #Remove by setting past due date
-        $tasktriggers = New-ScheduledTaskTrigger -Once -At "01/01/1970"
-        Set-ScheduledTask -TaskPath $WAUTask.TaskPath -TaskName $WAUTask.TaskName -Trigger $taskTriggers | Out-Null
+
+    #Only update triggers if configuration has changed
+    if ($configChanged) {
+        $taskTriggers = @()
+        if ($WAUConfig.WAU_UpdatesAtLogon -eq 1) {
+            $tasktriggers += New-ScheduledTaskTrigger -AtLogOn
+        }
+        if ($WAUConfig.WAU_UpdatesInterval -eq "Daily") {
+            $tasktriggers += New-ScheduledTaskTrigger -Daily -At $WAUConfig.WAU_UpdatesAtTime
+        }
+        elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiDaily") {
+            $tasktriggers += New-ScheduledTaskTrigger -Daily -At $WAUConfig.WAU_UpdatesAtTime -DaysInterval 2
+        }
+        elseif ($WAUConfig.WAU_UpdatesInterval -eq "Weekly") {
+            $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2
+        }
+        elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiWeekly") {
+            $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 2
+        }
+        elseif ($WAUConfig.WAU_UpdatesInterval -eq "Monthly") {
+            $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $WAUConfig.WAU_UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 4
+        }
+
+        #If trigger(s) set
+        if ($taskTriggers) {
+            #Edit scheduled task
+            Set-ScheduledTask -TaskPath $WAUTask.TaskPath -TaskName $WAUTask.TaskName -Trigger $taskTriggers | Out-Null
+        }
+        #If not, remove trigger(s)
+        else {
+            #Remove by setting past due date
+            $tasktriggers = New-ScheduledTaskTrigger -Once -At "01/01/1970"
+            Set-ScheduledTask -TaskPath $WAUTask.TaskPath -TaskName $WAUTask.TaskName -Trigger $tasktriggers | Out-Null
+        }
     }
 
     #Log latest applied config