Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandardsApplyBatch.ps1

@@ -7,7 +7,13 @@ function Push-CIPPStandardsApplyBatch {
 
     try {
         # Aggregate all standards from all tenants
-        $AllStandards = @($Item.Results | Where-Object { $_ -and $_.FunctionName -eq 'CIPPStandard' })
+        $AllStandards = $Item.Results | ForEach-Object {
+            foreach ($Standard in $_) {
+                if ($Standard -and $Standard.FunctionName -eq 'CIPPStandard') {
+                    $Standard
+                }
+            }
+        }
 
         if ($AllStandards.Count -eq 0) {
             Write-Information 'No standards to apply across all tenants'

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -240,10 +240,9 @@ function Receive-CippOrchestrationTrigger {
                 $Output = $Output | Where-Object { $_.GetType().Name -eq 'ActivityInvocationTask' }
                 if (($Output | Measure-Object).Count -gt 0) {
                     Write-Information "Waiting for ($($Output.Count)) activity functions to complete..."
-                    foreach ($Task in $Output) {
-                        #Write-Information ($Task | ConvertTo-Json -Depth 10 -Compress)
+                    $Results = foreach ($Task in $Output) {
                         try {
-                            $Results = Wait-ActivityFunction -Task $Task
+                            Wait-ActivityFunction -Task $Task
                         } catch {}
                     }
                 } else {