Merge pull request #2086 from microsoft/main

Release 5-3-24
microsoft · May 3, 2024 · 9f1e342 · 9f1e342
2 parents db724bd + 3b0c1e4
commit 9f1e342
Show file tree

Hide file tree

Showing 6 changed files with 388 additions and 351 deletions.
diff --git a/Calendar/CalLogHelpers/CalLogCSVFunctions.ps1 b/Calendar/CalLogHelpers/CalLogCSVFunctions.ps1
@@ -182,6 +182,7 @@ function BuildCSV {
             'IsIgnorable'                    = $IsIgnorable
             'SubjectProperty'                = $CalLog.SubjectProperty
             'Client'                         = $ShortClientName
+            'ShortClientInfoString'          = $CalLog.ShortClientInfoString
             'ClientInfoString'               = $CalLog.ClientInfoString
             'TriggerAction'                  = $CalLog.CalendarLogTriggerAction
             'ItemClass'                      = $CalLog.ItemClass

diff --git a/Calendar/CalLogHelpers/Invoke-GetCalLogs.ps1 b/Calendar/CalLogHelpers/Invoke-GetCalLogs.ps1
@@ -23,6 +23,7 @@ $script:CustomPropertyNameList =
 "IsAllDayEvent",
 "IsCancelled",
 "IsMeeting",
+"IsOrganizerProperty",
 "NormalizedSubject",
 "SendMeetingMessagesDiagnostics",
 "SentRepresentingDisplayName",

diff --git a/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1 b/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
@@ -18,7 +18,7 @@ function FindMatch {
 
 $ShortClientNameProcessor = @{
     'Client=Hub Transport'                       = "Transport"
-    'Client=MSExchangeRPC'                       = "Outlook : Desktop"
+    'Client=MSExchangeRPC'                       = "Outlook : Desktop : MAPI"
     'OneOutlook'                                 = "OneOutlook"
     'Lync for Mac'                               = "LyncMac"
     'AppId=00000004-0000-0ff1-ce00-000000000000' = "SkypeMMS"
@@ -124,16 +124,16 @@ function CreateShortClientName {
     if ($ClientInfoString -like "*InternalCalendarSharing*" -and
         $ClientInfoString -like "*OWA*" -and
         $ClientInfoString -notlike "*OneOutlook*") {
-        $ShortClientName = "Owa-ModernCalendarSharing"
+        $ShortClientName = "OWA : REST"
     }
     if ($ClientInfoString -like "*InternalCalendarSharing*" -and $ClientInfoString -like "*MacOutlook*") {
-        $ShortClientName = "MacOutlook-ModernCalendarSharing"
+        $ShortClientName = "MacOutlook : REST"
     }
     if ($ClientInfoString -like "*InternalCalendarSharing*" -and $ClientInfoString -like "*Outlook*") {
-        $ShortClientName = "Outlook-ModernCalendarSharing"
+        $ShortClientName = "Outlook : Desktop : REST"
     }
     if ($ClientInfoString -like "Client=ActiveSync*" -and $ClientInfoString -like "*Outlook*") {
-        $ShortClientName = "Outlook-ModernCalendarSharing"
+        $ShortClientName = "Outlook : ActiveSync"
     }
     if ($ClientInfoString -like "*OneOutlook*") {
         $ShortClientName = "OneOutlook"