Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Sources/Winget-AutoUpdate/WAU-Policies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) {
$configChanged = $false

#Check if LogOn trigger setting has changed
$hasLogonTrigger = $currentTriggers | Where-Object { $_.TriggerType -eq "LogOn" }
$hasLogonTrigger = $currentTriggers | Where-Object { $_.CimClass.CimClassName -eq "MSFT_TaskLogonTrigger" }
if (($WAUConfig.WAU_UpdatesAtLogon -eq 1 -and -not $hasLogonTrigger) -or
($WAUConfig.WAU_UpdatesAtLogon -ne 1 -and $hasLogonTrigger)) {
$configChanged = $true
Expand All @@ -57,27 +57,27 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) {
#Check if schedule type has changed
$currentIntervalType = "None"
foreach ($trigger in $currentTriggers) {
if ($trigger.TriggerType -eq "Daily" -and $trigger.DaysInterval -eq 1) {
if ($trigger.CimClass.CimClassName -eq "MSFT_TaskDailyTrigger" -and $trigger.DaysInterval -eq 1) {
$currentIntervalType = "Daily"
break
}
elseif ($trigger.TriggerType -eq "Daily" -and $trigger.DaysInterval -eq 2) {
elseif ($trigger.CimClass.CimClassName -eq "MSFT_TaskDailyTrigger" -and $trigger.DaysInterval -eq 2) {
$currentIntervalType = "BiDaily"
break
}
elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 1) {
elseif ($trigger.CimClass.CimClassName -eq "MSFT_TaskWeeklyTrigger" -and $trigger.WeeksInterval -eq 1) {
$currentIntervalType = "Weekly"
break
}
elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 2) {
elseif ($trigger.CimClass.CimClassName -eq "MSFT_TaskWeeklyTrigger" -and $trigger.WeeksInterval -eq 2) {
$currentIntervalType = "BiWeekly"
break
}
elseif ($trigger.TriggerType -eq "Weekly" -and $trigger.WeeksInterval -eq 4) {
elseif ($trigger.CimClass.CimClassName -eq "MSFT_TaskWeeklyTrigger" -and $trigger.WeeksInterval -eq 4) {
$currentIntervalType = "Monthly"
break
}
elseif ($trigger.TriggerType -eq "Once" -and [DateTime]::Parse($trigger.StartBoundary) -lt (Get-Date)) {
elseif ($trigger.CimClass.CimClassName -eq "MSFT_TaskTimeTrigger" -and [DateTime]::Parse($trigger.StartBoundary) -lt (Get-Date)) {
$currentIntervalType = "Never"
break
}
Expand All @@ -89,7 +89,7 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) {

#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
$timeTrigger = $currentTriggers | Where-Object { $_.CimClass.CimClassName -ne "MSFT_TaskLogonTrigger" } | Select-Object -First 1
if ($timeTrigger) {
$currentTime = [DateTime]::Parse($timeTrigger.StartBoundary).ToString("HH:mm:ss")
if ($currentTime -ne $WAUConfig.WAU_UpdatesAtTime) {
Expand Down Expand Up @@ -132,7 +132,7 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) {
Set-ScheduledTask -TaskPath $WAUTask.TaskPath -TaskName $WAUTask.TaskName -Trigger $tasktriggers | Out-Null
}
}

#Log latest applied config
Add-Content -Path $GPOLogFile -Value "`nLatest applied settings:"
$WAUConfig.PSObject.Properties | Where-Object { $_.Name -like "WAU_*" } | Select-Object Name, Value | Out-File -Encoding default -FilePath $GPOLogFile -Append
Expand Down
Loading