From 17c92d6e45d46b94d3752032bae99a7b890c67ec Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 13:01:15 +0100 Subject: [PATCH 1/6] managed device cache --- Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1 b/Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1 index 3e41edab2337..ee724f9343af 100644 --- a/Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1 +++ b/Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1 @@ -15,6 +15,7 @@ function Set-CIPPDBCacheManagedDevices { try { Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching managed devices' -sev Debug $ManagedDevices = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/managedDevices?$top=999&$select=id,deviceName,operatingSystem,osVersion,complianceState,managedDeviceOwnerType,enrolledDateTime,lastSyncDateTime' -tenantid $TenantFilter + if (!$ManagedDevices) { $ManagedDevices = @() } Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'ManagedDevices' -Data $ManagedDevices Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'ManagedDevices' -Data $ManagedDevices -Count $ManagedDevices = $null From 2ddf931505389626a2f835d484263e9b4e1f8ebd Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 13:43:02 +0100 Subject: [PATCH 2/6] Pushy-cippTest --- .../Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1 index 7492a7c15abc..844c8ff80695 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1 @@ -22,6 +22,8 @@ function Push-CIPPTest { Write-Information "Executing $FunctionName for $TenantFilter" & $FunctionName -Tenant $TenantFilter + Write-Host "Returning true, test has run for $tenantFilter" + return @{ testRun = $true } } catch { $ErrorMessage = Get-CippException -Exception $_ From e01d6af29303b63664b65000d392f093fd54b47f Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 14:02:07 +0100 Subject: [PATCH 3/6] rerun protection --- .../Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 | 8 ++++++++ Modules/CIPPCore/Public/Test-CIPPRerun.ps1 | 1 + 2 files changed, 9 insertions(+) diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 index af97857c8e67..ffcc15fa808a 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 @@ -13,6 +13,14 @@ function Invoke-CIPPTestsRun { Write-Information "Starting tests run for tenant: $TenantFilter" + Write-Host 'Checking rerun protection' + $RerunParams = @{ + TenantFilter = $TenantFilter + Type = 'CippTests' + API = 'CippTests' + } + $Rerun = Test-CIPPRerun @RerunParams + if ($Rerun -eq $true) { return $true } try { $AllTests = Get-Command -Name 'Invoke-CippTest*' -Module CIPPCore | Select-Object -ExpandProperty Name | ForEach-Object { $_ -replace '^Invoke-CippTest', '' diff --git a/Modules/CIPPCore/Public/Test-CIPPRerun.ps1 b/Modules/CIPPCore/Public/Test-CIPPRerun.ps1 index 87caf6fc8950..ac19ef9039e2 100644 --- a/Modules/CIPPCore/Public/Test-CIPPRerun.ps1 +++ b/Modules/CIPPCore/Public/Test-CIPPRerun.ps1 @@ -20,6 +20,7 @@ function Test-CIPPRerun { $EstimatedDifference = switch ($Type) { 'Standard' { 9800 } # 2 hours 45 minutes ish. 'BPA' { 85000 } # 24 hours ish. + 'CippTests' { 85000 } # 24 hours ish. default { throw "Unknown type: $Type" } } } From 6bc3245f897d2e37f692b3b006c1edac5121568f Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 14:08:03 +0100 Subject: [PATCH 4/6] eleviation --- .../Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 index ffcc15fa808a..8a407db9b3b9 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 @@ -20,7 +20,10 @@ function Invoke-CIPPTestsRun { API = 'CippTests' } $Rerun = Test-CIPPRerun @RerunParams - if ($Rerun -eq $true) { return $true } + if ($Rerun -eq $true) { + Write-Host "rerun is true for $($TenantFilter)" + return $true + } try { $AllTests = Get-Command -Name 'Invoke-CippTest*' -Module CIPPCore | Select-Object -ExpandProperty Name | ForEach-Object { $_ -replace '^Invoke-CippTest', '' From 03ef8e6d10db8f449a1bbf851a36a3a1e2e19793 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 14:14:04 +0100 Subject: [PATCH 5/6] Fix for db rerun --- .../Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 | 2 +- .../Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 | 2 +- .../Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 | 4 ++-- .../Orchestrator Functions/Start-TestsOrchestrator.ps1 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 index dca6a6e87de8..6bdf8f889ddf 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 @@ -183,7 +183,7 @@ function Push-CIPPDBCacheData { if ($Item.TestRun -eq $true) { $InputObject | Add-Member -NotePropertyName PostExecution -NotePropertyValue @{ - FunctionName = 'CIPPTestsRun' + FunctionName = 'CIPPDBTestsRun' Parameters = @{ TenantFilter = $TenantFilter } diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 index 8a407db9b3b9..7c30210d90a3 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 @@ -1,4 +1,4 @@ -function Invoke-CIPPTestsRun { +function Invoke-CIPPDBTestsRun { <# .FUNCTIONALITY Entrypoint diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 index 7bea0f014457..c9f43f7211da 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 @@ -1,4 +1,4 @@ -function Push-CIPPTestsRun { +function Push-CIPPDBTestsRun { <# .SYNOPSIS PostExecution function to run tests after data collection completes @@ -13,7 +13,7 @@ function Push-CIPPTestsRun { Write-LogMessage -API 'Tests' -tenant $TenantFilter -message 'Starting test run after data collection' -sev Info # Call the test run function - $Result = Invoke-CIPPTestsRun -TenantFilter $TenantFilter + $Result = Invoke-CIPPDBTestsRun -TenantFilter $TenantFilter Write-LogMessage -API 'Tests' -tenant $TenantFilter -message "Test run started. Instance ID: $($Result.InstanceId)" -sev Info Write-Information "PostExecution: Tests started with Instance ID: $($Result.InstanceId)" diff --git a/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-TestsOrchestrator.ps1 b/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-TestsOrchestrator.ps1 index da22c521107e..87cf8c2c38cb 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-TestsOrchestrator.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-TestsOrchestrator.ps1 @@ -11,6 +11,6 @@ function Start-TestsOrchestrator { if ($PSCmdlet.ShouldProcess('Start-TestsOrchestrator', 'Starting Tests Orchestrator')) { Write-LogMessage -API 'Tests' -message 'Starting Tests Schedule' -sev Info - Invoke-CIPPTestsRun -TenantFilter 'allTenants' + Invoke-CIPPDBTestsRun -TenantFilter 'allTenants' } } From 8f2fc705170ad1dbd2f3e45a1d9325e2cb1ecabe Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 22 Jan 2026 14:19:09 +0100 Subject: [PATCH 6/6] v up --- host.json | 2 +- version_latest.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host.json b/host.json index 03a1061b6423..ff513b12d0ea 100644 --- a/host.json +++ b/host.json @@ -16,7 +16,7 @@ "distributedTracingEnabled": false, "version": "None" }, - "defaultVersion": "10.0.4", + "defaultVersion": "10.0.5", "versionMatchStrategy": "Strict", "versionFailureStrategy": "Fail" } diff --git a/version_latest.txt b/version_latest.txt index 6b48f258c7a4..2681b301aa6c 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -10.0.4 +10.0.5