Merge branch 'main' into AV

microsoft · Aug 4, 2023 · c6f1837 · c6f1837
2 parents a5391e5 + 9f48e13
commit c6f1837
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Calendar/Get-RBASummary.ps1 b/Calendar/Get-RBASummary.ps1
@@ -310,6 +310,7 @@ function RBADelegateSettings {
     Write-Host "`t ForwardRequestsToDelegates:      "$RbaSettings.ForwardRequestsToDelegates
     Write-Host
 
+    # Check for known configuration issues to warn about:
     if ($RbaSettings.ResourceDelegates.Count -gt 0) {
         if ($RbaSettings.AddNewRequestsTentatively -eq $true) {
             Write-Host "In-policy meetings will be marked tentative and the meeting request will be sent to the Resource Delegates to be accepted or rejected. Default"
@@ -361,6 +362,11 @@ function RBAPostProcessing {
     `t EnableAutoRelease:                    $($RbaSettings.EnableAutoRelease)
     `t AddAdditionalResponse:                $($RbaSettings.AddAdditionalResponse)
 "@
+
+    # Warning about the DeleteComments setting and Teams:
+    if ($RbaSettings.DeleteComments -eq $true) {
+        Write-Host -ForegroundColor Yellow "Warning: DeleteComments is set to true. This will remove the Teams information which is in the meeting body."
+    }
 }
 
 # RBA Verbose PostProcessing Steps

diff --git a/Diagnostics/HealthChecker/Features/Get-HealthCheckerData.ps1 b/Diagnostics/HealthChecker/Features/Get-HealthCheckerData.ps1
@@ -34,8 +34,8 @@ function Get-HealthCheckerData {
             }
 
             Invoke-Command -ComputerName $ComputerName -ScriptBlock { Get-Date } -ErrorAction Stop | Out-Null
-            $reg = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey(“LocalMachine”, $ComputerName)
-            $reg.OpenSubKey(“SOFTWARE\Microsoft\Windows NT\CurrentVersion”) | Out-Null
+            $reg = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey("LocalMachine", $ComputerName)
+            $reg.OpenSubKey("SOFTWARE\Microsoft\Windows NT\CurrentVersion") | Out-Null
             Write-Verbose "Returning true back"
             return $true
         } catch {