Merge Development for 3.11.0

Fix silent bulk compare crash: op_Addition on PSObject

Extensions/Compare.psm1

@@ -706,7 +706,7 @@ function Start-BulkCompareExportObjects
                 $objName = Get-GraphObjectName (?? $compObj.Object1 $compObj.Object2) $item.ObjectType
                 foreach($compValue in $compObj.Result)
                 {
-                    $compValue += [PSCustomObject]@{
+                    $compResultValue = [PSCustomObject]@{
                         ObjectName = $objName
                         Id = $compObj.Id
                         Type = $compObj.ObjectType.Title
@@ -719,23 +719,23 @@ function Start-BulkCompareExportObjects
                         Match = $compValue.Match
                     }
 
-                    if($global:chkBulkCompareRemoveOData.IsChecked -and ($compValue.Value1 -like "@odata*" -or $compValue.Value2 -like "@odata*")) {
+                    if($global:chkBulkCompareRemoveOData.IsChecked -and ($compResultValue.Value1 -like "@odata*" -or $compResultValue.Value2 -like "@odata*")) {
                         foreach($prop in $('Value1','Value2'))
                         {
                             $tmpValue1 = ""
                             $tmpValue2 = ""
-                            $vauleString = $compValue.$prop
+                            $vauleString = $compResultValue.$prop
                             if($vauleString -is [String]) {
-                                $vauleString = $vauleString -replace $compValue.Id, ""
+                                $vauleString = $vauleString -replace $compResultValue.Id, ""
-                                $tmpObj = $compValue.$prop | ConvertFrom-Json
+                                $tmpObj = $compResultValue.$prop | ConvertFrom-Json
-                                if($compValue.$prop -and $compValue.$prop -like "@odata*") {
+                                if($compResultValue.$prop -and $compResultValue.$prop -like "@odata*") {
                                     Remove-GraphODataProperties $tmpObj.$prop | ConvertTo-Json -Depth 50  | Set-Variable -Name "tmp$prop"
                                 }
                             }
                         }
-                        $compValue.Match = $tmpValue1 -eq $tmpValue2
+                        $compResultValue.Match = $tmpValue1 -eq $tmpValue2
                     }
-                    $compResultValues += $compValue
+                    $compResultValues += $compResultValue
                 }
             }
 

Extensions/MSGraph.psm1

@@ -886,7 +886,7 @@ function Show-GraphObjects
         {
             $requiredPermissions = ""
         }
-        $global:txtNotLoggedIn.Content = "You don't have the required permissons to access $($global:curObjectType.Title).$($requiredPermissions)`n`Missing perimssons: $missingScopes`n`nRequest consent from the 'Request Consent' link in the user login info`nor`nDisable the 'Use Default Permissions' setting to trigger consent prompt.`nNote: Changing the 'Use Default Permissions' setting will require a restart of the app`nand a 'manual' login" 
+        $global:txtNotLoggedIn.Content = "You don't have the required permissions to access $($global:curObjectType.Title).$($requiredPermissions)`n`Missing permissions: $missingScopes`n`nRequest consent from the 'Request Consent' link in the user login info`nor`nDisable the 'Use Default Permissions' setting to trigger consent prompt.`nNote: Changing the 'Use Default Permissions' setting will require a restart of the app`nand a 'manual' login" 
         $global:grdNotLoggedIn.Visibility = "Visible"
         $global:grdData.Visibility = "Collapsed"
         return
@@ -4898,4 +4898,4 @@ function ConvertTo-JsonSortedGraph {
     )
     $sorted = Invoke-SortJsonGraphObject $InputObject
     return $sorted | ConvertTo-Json -Depth $Depth
-}
+}