Merge pull request #428 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListStandardsCompare.ps1

@@ -17,7 +17,8 @@ function Invoke-ListStandardsCompare {
         $Table.Filter = "PartitionKey eq '{0}'" -f $TenantFilter
     }
 
-    $Standards = Get-CIPPAzDataTableEntity @Table
+    $Tenants = Get-Tenants -IncludeErrors
+    $Standards = Get-CIPPAzDataTableEntity @Table | Where-Object { $_.PartitionKey -in $Tenants.defaultDomainName }
 
     #in the results we have objects starting with "standards." All these have to be converted from JSON. Do not do this is its a boolean
     <#$Results | ForEach-Object {
@@ -57,7 +58,7 @@ function Invoke-ListStandardsCompare {
             $HexEncodedName = $Matches[2]
             $Chars = [System.Collections.Generic.List[char]]::new()
             for ($i = 0; $i -lt $HexEncodedName.Length; $i += 2) {
-                $Chars.Add([char][Convert]::ToInt32($HexEncodedName.Substring($i,2),16))
+                $Chars.Add([char][Convert]::ToInt32($HexEncodedName.Substring($i, 2), 16))
             }
             $FieldName = "$Prefix$(-join $Chars)"
         }

Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1

@@ -58,7 +58,8 @@ function Get-CIPPTenantAlignment {
         $Standards = if ($TenantFilter) {
             $AllStandards | Where-Object { $_.PartitionKey -eq $TenantFilter }
         } else {
-            $AllStandards
+            $Tenants = Get-Tenants -IncludeErrors
+            $AllStandards | Where-Object { $_.PartitionKey -in $Tenants.defaultDomainName }
         }
 
         # Build tenant standards data structure

profile.ps1

@@ -43,11 +43,13 @@ if (!$LastStartup -or $CurrentVersion -ne $LastStartup.Version) {
     Write-Information "Version has changed from $($LastStartup.Version ?? 'None') to $CurrentVersion"
     if ($LastStartup) {
         $LastStartup.Version = $CurrentVersion
+        $LastStartup | Add-Member -MemberType NoteProperty -Name 'PSVersion' -Value $PSVersionTable.PSVersion.ToString()
     } else {
         $LastStartup = [PSCustomObject]@{
             PartitionKey = 'Version'
             RowKey       = $env:WEBSITE_SITE_NAME
             Version      = $CurrentVersion
+            PSVersion    = $PSVersionTable.PSVersion.ToString()
         }
     }
     Update-AzDataTableEntity @Table -Entity $LastStartup -Force -ErrorAction SilentlyContinue