Merge pull request #998 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 084bbee81645 · 2026-06-05T12:41:08.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Push-ListMailQuarantineAllTenants.ps1 b/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Push-ListMailQuarantineAllTenants.ps1
@@ -11,7 +11,14 @@
     Write-Host "PowerShell queue trigger function processed work item: $($Tenant.defaultDomainName)"
 
     try {
-        $quarantineMessages = New-ExoRequest -tenantid $domainName -cmdlet 'Get-QuarantineMessage' -cmdParams @{ 'PageSize' = 1000 } | Select-Object -ExcludeProperty *data.type*
+        $Page = 1
+        $PageSize = 1000
+        $quarantineMessages = [System.Collections.Generic.List[object]]::new()
+        do {
+            $Results = New-ExoRequest -tenantid $domainName -cmdlet 'Get-QuarantineMessage' -cmdParams @{ PageSize = $PageSize; Page = $Page } | Select-Object -ExcludeProperty *data.type*
+            if ($Results) { $quarantineMessages.AddRange(@($Results)) }
+            $Page++
+        } while (@($Results).Count -eq $PageSize)
         foreach ($message in $quarantineMessages) {
             $messageData = @{
                 QuarantineMessage = [string]($message | ConvertTo-Json -Depth 10 -Compress)
diff --git a/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1 b/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1
@@ -21,7 +21,7 @@ function Push-CIPPStandard {
         $API = "$($Standard)_$($Item.TemplateId)"
     }
 
-    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API
+    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API -BaseTime ([int64]$Item.QueuedTime)
     if ($Rerun) {
         Write-Information 'Detected rerun. Exiting cleanly'
         return
diff --git a/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandardsList.ps1 b/Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandardsList.ps1
@@ -281,13 +281,15 @@ function Push-CIPPStandardsList {
 
         Write-Host "Returning $($ComputedStandards.Count) standards for tenant $TenantFilter after filtering."
         # Return filtered standards
+        $QueuedTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
         $FilteredStandards = $ComputedStandards.Values | ForEach-Object {
             [PSCustomObject]@{
                 Tenant       = $_.Tenant
                 Standard     = $_.Standard
                 Settings     = $_.Settings
                 TemplateId   = $_.TemplateId
                 FunctionName = 'CIPPStandard'
+                QueuedTime   = $QueuedTime
             }
         }
         Write-Host "Sending back $($FilteredStandards.Count) standards"
diff --git a/Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1 b/Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1
@@ -80,6 +80,16 @@ function Get-CIPPTenantAlignment {
                 $TemplatesByPackage[$t.Package].Add($t)
             }
         }
+        $CATagTemplates = Get-CIPPAzDataTableEntity @TemplateTable -Filter "PartitionKey eq 'CATemplate'"
+        $CATemplatesByPackage = @{}
+        foreach ($t in $CATagTemplates) {
+            if ($t.Package) {
+                if (-not $CATemplatesByPackage.ContainsKey($t.Package)) {
+                    $CATemplatesByPackage[$t.Package] = [System.Collections.Generic.List[object]]::new()
+                }
+                $CATemplatesByPackage[$t.Package].Add($t)
+            }
+        }
         # Build tenant standards data structure
         $tenantData = @{}
         foreach ($Standard in $Standards) {
@@ -245,7 +255,8 @@ function Get-CIPPTenantAlignment {
                                 Write-Host "Processing CA Tag: $($Tag.value)"
                                 $CAActions = if ($CATemplate.action) { $CATemplate.action } else { @() }
                                 $CAReportingEnabled = ($CAActions | Where-Object { $_.value -and ($_.value.ToLower() -eq 'report' -or $_.value.ToLower() -eq 'remediate') }).Count -gt 0
-                                $TagTemplate = $TagTemplates | Where-Object -Property package -EQ $Tag.value
+                                $TagValue = if ($Tag.value) { $Tag.value } else { $Tag }
+                                $TagTemplate = if ($CATemplatesByPackage.ContainsKey($TagValue)) { $CATemplatesByPackage[$TagValue] } else { @() }
                                 $TagTemplate | ForEach-Object {
                                     $TagStandardId = "standards.ConditionalAccessTemplate.$($_.GUID)"
                                     [PSCustomObject]@{
@@ -438,8 +449,7 @@ function Get-CIPPTenantAlignment {
                                 $DeniedDeviationsCount++
                             }
                         }
-                    }
-                    elseif ($item.ComplianceStatus -eq 'License Missing') { $LicenseMissingStandards++ }
+                    } elseif ($item.ComplianceStatus -eq 'License Missing') { $LicenseMissingStandards++ }
                     if ($item.ReportingDisabled) { $ReportingDisabledStandardsCount++ }
                 }
 
diff --git a/Modules/CIPPCore/Public/Get-CIPPDrift.ps1 b/Modules/CIPPCore/Public/Get-CIPPDrift.ps1
@@ -65,6 +65,16 @@ function Get-CIPPDrift {
     # Load CA templates with GUID hashtable
     $RawCATemplates = Get-CIPPAzDataTableEntity @IntuneTable -Filter "PartitionKey eq 'CATemplate'"
     $CATemplatesByGuid = @{}
+    # Build a hashtable indexed by Package for O(1) CA tag lookup
+    $CATemplatesByPackage = @{}
+    foreach ($t in $RawCATemplates) {
+        if ($t.Package) {
+            if (-not $CATemplatesByPackage.ContainsKey($t.Package)) {
+                $CATemplatesByPackage[$t.Package] = [System.Collections.Generic.List[object]]::new()
+            }
+            $CATemplatesByPackage[$t.Package].Add($t)
+        }
+    }
     $AllCATemplates = foreach ($RawTemplate in $RawCATemplates) {
         try {
             $data = $RawTemplate.JSON | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
@@ -279,9 +289,15 @@ function Get-CIPPDrift {
                         if ($Template.TemplateList.value) {
                             $CATemplateIds.Add($Template.TemplateList.value)
                         }
-                        if ($Template.'TemplateList-Tags'.rawData.templates) {
-                            foreach ($TagTemplate in $Template.'TemplateList-Tags'.rawData.templates) {
-                                $CATemplateIds.Add($TagTemplate.GUID)
+                        if ($Template.'TemplateList-Tags') {
+                            $TagValue = if ($Template.'TemplateList-Tags'.value) { $Template.'TemplateList-Tags'.value } else { $null }
+                            if ($TagValue) {
+                                $ResolvedCATagTemplates = if ($CATemplatesByPackage.ContainsKey($TagValue)) { $CATemplatesByPackage[$TagValue] } else { @() }
+                                foreach ($ResolvedTemplate in $ResolvedCATagTemplates) {
+                                    if ($ResolvedTemplate.RowKey -and $ResolvedTemplate.RowKey -notin $CATemplateIds) {
+                                        $CATemplateIds.Add($ResolvedTemplate.RowKey)
+                                    }
+                                }
                             }
                         }
                     }
@@ -396,12 +412,12 @@ function Get-CIPPDrift {
                 if (-not $ExistingDriftStates.ContainsKey($Deviation.standardName)) {
                     $RowKey = $Deviation.standardName -replace '\.', '_'
                     $NewDriftEntities.Add(@{
-                        PartitionKey = $TenantFilter
-                        RowKey       = $RowKey
-                        StandardName = $Deviation.standardName
-                        Status       = 'New'
-                        LastModified = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
-                    })
+                            PartitionKey = $TenantFilter
+                            RowKey       = $RowKey
+                            StandardName = $Deviation.standardName
+                            Status       = 'New'
+                            LastModified = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
+                        })
                 }
             }
             if ($NewDriftEntities.Count -gt 0) {
diff --git a/Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1 b/Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1
@@ -49,7 +49,7 @@ function Get-CIPPStandards {
             $IsArray = $StandardValue -is [System.Collections.IEnumerable] -and -not ($StandardValue -is [string])
 
             if ($IsArray) {
-                $NewArray = foreach ($Item in $StandardValue) {
+                $NewArray = @(foreach ($Item in $StandardValue) {
                     if ($Item.'TemplateList-Tags'.value) {
                         $HasExpansions = $true
                         $Table = Get-CippTable -tablename 'templates'
@@ -60,6 +60,7 @@ function Get-CIPPStandards {
                         }
                         $Filter = "PartitionKey eq '$PartitionKey'"
                         $TemplatesList = Get-CIPPAzDataTableEntity @Table -Filter $Filter | Where-Object -Property package -EQ $Item.'TemplateList-Tags'.value
+                        Write-Information "Expanding $StandardName tag '$($Item.'TemplateList-Tags'.value)' from partition '$PartitionKey': found $(@($TemplatesList).Count) templates"
 
                         foreach ($TemplateItem in $TemplatesList) {
                             $TemplateJSON = $TemplateItem.JSON | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
@@ -77,8 +78,10 @@ function Get-CIPPStandards {
                         $Item | Add-Member -NotePropertyName TemplateId -NotePropertyValue $Template.GUID -Force
                         $Item
                     }
+                })
+                if ($NewArray.Count -gt 0) {
+                    $ExpandedStandards[$StandardName] = $NewArray
                 }
-                $ExpandedStandards[$StandardName] = $NewArray
             } else {
                 if ($StandardValue.'TemplateList-Tags'.value) {
                     $HasExpansions = $true
@@ -139,6 +142,7 @@ function Get-CIPPStandards {
 
             foreach ($StandardName in $Standards.PSObject.Properties.Name) {
                 $Value = $Standards.$StandardName
+                if ($null -eq $Value) { continue }
                 $IsArray = $Value -is [System.Collections.IEnumerable] -and -not ($Value -is [string])
 
                 if ($IsArray) {
@@ -282,6 +286,7 @@ function Get-CIPPStandards {
 
                 foreach ($StandardName in $Standards.PSObject.Properties.Name) {
                     $Value = $Standards.$StandardName
+                    if ($null -eq $Value) { continue }
                     $IsArray = $Value -is [System.Collections.IEnumerable] -and -not ($Value -is [string])
 
                     if ($IsArray) {
@@ -351,6 +356,7 @@ function Get-CIPPStandards {
 
                 foreach ($StandardName in $Standards.PSObject.Properties.Name) {
                     $Value = $Standards.$StandardName
+                    if ($null -eq $Value) { continue }
                     $IsArray = $Value -is [System.Collections.IEnumerable] -and -not ($Value -is [string])
 
                     if ($IsArray) {
@@ -430,6 +436,7 @@ function Get-CIPPStandards {
 
                 foreach ($StandardName in $Standards.PSObject.Properties.Name) {
                     $Value = $Standards.$StandardName
+                    if ($null -eq $Value) { continue }
                     $IsArray = $Value -is [System.Collections.IEnumerable] -and -not ($Value -is [string])
 
                     if ($IsArray) {
diff --git a/Modules/CIPPCore/Public/Tools/Push-ExecGenerateReportBuilderReport.ps1 b/Modules/CIPPCore/Public/Tools/Push-ExecGenerateReportBuilderReport.ps1
@@ -60,8 +60,7 @@ function Push-ExecGenerateReportBuilderReport {
                     if ($TestResult) {
                         if ($TestResult.TestType -eq 'Custom' -and $TestResult.ResultDataJson -and $TestResult.MarkdownTemplate) {
                             $Block.content = $TestResult.MarkdownTemplate
-                        }
-                        if (-not $Block.content -and $TestResult.ResultMarkdown) {
+                        } elseif ($TestResult.ResultMarkdown) {
                             $Block | Add-Member -NotePropertyName 'content' -NotePropertyValue $TestResult.ResultMarkdown -Force
                         }
                     }
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-ListMailQuarantine.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-ListMailQuarantine.ps1
@@ -14,7 +14,15 @@ function Invoke-ListMailQuarantine {
 
     try {
         $GraphRequest = if ($TenantFilter -ne 'AllTenants') {
-            New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-QuarantineMessage' -cmdParams @{ 'PageSize' = 1000 } | Select-Object -ExcludeProperty *data.type*
+            $Page = 1
+            $PageSize = 1000
+            $AllMessages = [System.Collections.Generic.List[object]]::new()
+            do {
+                $Results = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-QuarantineMessage' -cmdParams @{ PageSize = $PageSize; Page = $Page } | Select-Object -ExcludeProperty *data.type*
+                if ($Results) { $AllMessages.AddRange(@($Results)) }
+                $Page++
+            } while (@($Results).Count -eq $PageSize)
+            $AllMessages
         } else {
             $Table = Get-CIPPTable -TableName cacheQuarantineMessages
             $PartitionKey = 'QuarantineMessage'
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListStandardsCompare.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListStandardsCompare.ps1
@@ -19,7 +19,7 @@ function Invoke-ListStandardsCompare {
     $StandardParams = @{}
     if ($TemplateFilter) { $StandardParams.TemplateId = $TemplateFilter }
     if ($TenantFilter) { $StandardParams.TenantFilter = $TenantFilter }
-    $StandardList = Get-CIPPStandards @StandardParams
+    $StandardList = @(Get-CIPPStandards @StandardParams) + @(Get-CIPPStandards @StandardParams -runManually $true)
 
     $ScopedTemplateGuids = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
     $ScopedQuarantineNames = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-listStandardTemplates.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-listStandardTemplates.ps1
@@ -45,13 +45,28 @@ function Invoke-listStandardTemplates {
                     $Items = if ($StandardConfig -is [System.Collections.IEnumerable] -and $StandardConfig -isnot [string]) { $StandardConfig } else { @($StandardConfig) }
                     foreach ($Item in $Items) {
                         if ($Item.'TemplateList-Tags' -and $Item.'TemplateList-Tags'.value) {
-                            if (-not $IntuneTemplatesCache) {
-                                $IntuneTable = Get-CippTable -tablename 'templates'
-                                $IntuneFilter = "PartitionKey eq 'IntuneTemplate'"
-                                $IntuneTemplatesCache = Get-CIPPAzDataTableEntity @IntuneTable -Filter $IntuneFilter
+                            $PartitionKey = switch ($StandardName) {
+                                'ConditionalAccessTemplate' { 'CATemplate' }
+                                'IntuneTemplate' { 'IntuneTemplate' }
+                                default { 'IntuneTemplate' }
+                            }
+                            if ($PartitionKey -eq 'CATemplate') {
+                                if (-not $CATemplatesCache) {
+                                    $CATable = Get-CippTable -tablename 'templates'
+                                    $CAFilter = "PartitionKey eq 'CATemplate'"
+                                    $CATemplatesCache = Get-CIPPAzDataTableEntity @CATable -Filter $CAFilter
+                                }
+                                $TemplatesCache = $CATemplatesCache
+                            } else {
+                                if (-not $IntuneTemplatesCache) {
+                                    $IntuneTable = Get-CippTable -tablename 'templates'
+                                    $IntuneFilter = "PartitionKey eq 'IntuneTemplate'"
+                                    $IntuneTemplatesCache = Get-CIPPAzDataTableEntity @IntuneTable -Filter $IntuneFilter
+                                }
+                                $TemplatesCache = $IntuneTemplatesCache
                             }
                             $PackageName = $Item.'TemplateList-Tags'.value
-                            $LiveExpanded = @($IntuneTemplatesCache | Where-Object package -EQ $PackageName | ForEach-Object {
+                            $LiveExpanded = @($TemplatesCache | Where-Object package -EQ $PackageName | ForEach-Object {
                                     $TplJson = $_.JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
                                     [pscustomobject]@{
                                         GUID        = $_.RowKey
diff --git a/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1 b/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1
@@ -141,7 +141,9 @@ function Invoke-CIPPStandardConditionalAccessTemplate {
                 return
             }
             if (!$Compare) {
-                Set-CIPPStandardsCompareField -FieldName "standards.ConditionalAccessTemplate.$($Settings.TemplateList.value)" -FieldValue $true -Tenant $Tenant
+                $ExpectedValue = @{ 'Differences' = 'No Differences found' }
+                $CurrentValue = @{ 'Differences' = 'No Differences found' }
+                Set-CIPPStandardsCompareField -FieldName "standards.ConditionalAccessTemplate.$($Settings.TemplateList.value)" -FieldValue $true -CurrentValue $CurrentValue -ExpectedValue $ExpectedValue -Tenant $Tenant
             } else {
                 #this can still be prettified but is for later.
                 $ExpectedValue = @{ 'Differences' = @() }
diff --git a/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest004.ps1 b/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest004.ps1
@@ -63,13 +63,13 @@ function Invoke-CippTestGenericTest004 {
 
         $DisplayUsers = $Users | Sort-Object DisplayName | Select-Object -First 100
         foreach ($User in $DisplayUsers) {
-            $Name = $User.DisplayName
+            $Name = ($User.DisplayName -replace '\|', '\|')
             $Registered = if ($User.MFARegistration -eq $true) { '✅ Yes' } else { '❌ No' }
             $Methods = if ($User.MFAMethods) {
                 $MethodList = if ($User.MFAMethods -is [string]) {
                     try { ($User.MFAMethods | ConvertFrom-Json) -join ', ' } catch { $User.MFAMethods }
                 } else { ($User.MFAMethods) -join ', ' }
-                $MethodList -replace 'microsoftAuthenticator', 'Authenticator' -replace 'phoneAuthentication', 'Phone' -replace 'fido2', 'FIDO2' -replace 'softwareOneTimePasscode', 'Software OTP' -replace 'emailAuthentication', 'Email' -replace 'windowsHelloForBusiness', 'Windows Hello' -replace 'temporaryAccessPass', 'Temp Pass'
+                ($MethodList -replace 'microsoftAuthenticator', 'Authenticator' -replace 'phoneAuthentication', 'Phone' -replace 'fido2', 'FIDO2' -replace 'softwareOneTimePasscode', 'Software OTP' -replace 'emailAuthentication', 'Email' -replace 'windowsHelloForBusiness', 'Windows Hello' -replace 'temporaryAccessPass', 'Temp Pass') -replace '\|', '\|'
             } else { 'None' }
             $Protection = if ($User.CoveredByCA -like 'Enforced*') { "Conditional Access" }
             elseif ($User.CoveredBySD -eq $true) { 'Security Defaults' }
diff --git a/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest005.ps1 b/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest005.ps1
@@ -46,13 +46,13 @@ function Invoke-CippTestGenericTest005 {
         $null = $Result.Append("|-------------|----------------|------------|--------------|-----------------|`n")
 
         foreach ($Admin in ($Admins | Sort-Object DisplayName)) {
-            $Name = $Admin.DisplayName
+            $Name = ($Admin.DisplayName -replace '\|', '\|')
             $Registered = if ($Admin.MFARegistration -eq $true) { '✅ Yes' } else { '❌ No' }
             $Methods = if ($Admin.MFAMethods) {
                 $MethodList = if ($Admin.MFAMethods -is [string]) {
                     try { ($Admin.MFAMethods | ConvertFrom-Json) -join ', ' } catch { $Admin.MFAMethods }
                 } else { ($Admin.MFAMethods) -join ', ' }
-                $MethodList -replace 'microsoftAuthenticator', 'Authenticator' -replace 'phoneAuthentication', 'Phone' -replace 'fido2', 'FIDO2' -replace 'softwareOneTimePasscode', 'Software OTP' -replace 'emailAuthentication', 'Email' -replace 'windowsHelloForBusiness', 'Windows Hello' -replace 'temporaryAccessPass', 'Temp Pass'
+                ($MethodList -replace 'microsoftAuthenticator', 'Authenticator' -replace 'phoneAuthentication', 'Phone' -replace 'fido2', 'FIDO2' -replace 'softwareOneTimePasscode', 'Software OTP' -replace 'emailAuthentication', 'Email' -replace 'windowsHelloForBusiness', 'Windows Hello' -replace 'temporaryAccessPass', 'Temp Pass') -replace '\|', '\|'
             } else { 'None' }
             $Protection = if ($Admin.CoveredByCA -like 'Enforced*') { "Conditional Access" }
             elseif ($Admin.CoveredBySD -eq $true) { 'Security Defaults' }
diff --git a/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest006.ps1 b/Modules/CIPPTests/Public/Tests/GenericTests/Identity/Invoke-CippTestGenericTest006.ps1

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function Push-CIPPStandard {`
`21`	`21`	`$API = "$($Standard)_$($Item.TemplateId)"`
`22`	`22`	`}`
`23`	`23`
`24`		`- $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API`
	`24`	`+ $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API -BaseTime ([int64]$Item.QueuedTime)`
`25`	`25`	`if ($Rerun) {`
`26`	`26`	`Write-Information 'Detected rerun. Exiting cleanly'`
`27`	`27`	`return`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ function Push-ExecGenerateReportBuilderReport {`
`60`	`60`	`if ($TestResult) {`
`61`	`61`	`if ($TestResult.TestType -eq 'Custom' -and $TestResult.ResultDataJson -and $TestResult.MarkdownTemplate) {`
`62`	`62`	`$Block.content = $TestResult.MarkdownTemplate`
`63`		`- }`
`64`		`- if (-not $Block.content -and $TestResult.ResultMarkdown) {`
	`63`	`+ } elseif ($TestResult.ResultMarkdown) {`
`65`	`64`	`$Block \| Add-Member -NotePropertyName 'content' -NotePropertyValue $TestResult.ResultMarkdown -Force`
`66`	`65`	`}`
`67`	`66`	`}`