microsoft · NikCharlebois · Sep 22, 2025 · Apr 19, 2025 · Sep 17, 2025 · Sep 22, 2025
@@ -26,6 +26,10 @@
     on update.
   * [BREAKING] Renamed the UnifiedGroupWelcomeMessageEnabled parameter to
     WelcomeMessageEnabled.
+* EXOHostedContentFilterPolicy
+  * [BREAKING CHANGE] Remove deprecated properties `DownloadLink`, `EnableEndUserSpamNotifications`,
+    `EndUserSpamNotificationCustomSubject`, `EndUserSpamNotificationFrequency` and `EndUserSpamNotificationLanguage`.
+    FIXES [#4958](https://github.com/microsoft/Microsoft365DSC/issues/4958)
 * EXOMailboxAutoReplyConfiguration
   * Added conditional user lookup.
 * EXOMailboxCalendarFolder

@@ -48,15 +48,6 @@ function Get-TargetResource
         [uint32]
         $BulkThreshold = 7,
 
-        [Parameter()]
-        [System.Boolean]
-        $DownloadLink = $false,
-
-        #DEPRECATED
-        [Parameter()]
-        [System.Boolean]
-        $EnableEndUserSpamNotifications = $false,
-
         [Parameter()]
         [System.Boolean]
         $EnableLanguageBlockList = $false,
@@ -65,20 +56,6 @@ function Get-TargetResource
         [System.Boolean]
         $EnableRegionBlockList = $false,
 
-        [Parameter()]
-        [System.String]
-        $EndUserSpamNotificationCustomSubject,
-
-        [Parameter()]
-        [ValidateRange(1, 15)]
-        [uint32]
-        $EndUserSpamNotificationFrequency = 3,
-
-        [Parameter()]
-        [ValidateSet('Default', 'English', 'French', 'German', 'Italian', 'Japanese', 'Spanish', 'Korean', 'Portuguese', 'Russian', 'ChineseSimplified', 'ChineseTraditional', 'Amharic', 'Arabic', 'Bulgarian', 'BengaliIndia', 'Catalan', 'Czech', 'Cyrillic', 'Danish', 'Greek', 'Estonian', 'Basque', 'Farsi', 'Finnish', 'Filipino', 'Galician', 'Gujarati', 'Hebrew', 'Hindi', 'Croatian', 'Hungarian', 'Indonesian', 'Icelandic', 'Kazakh', 'Kannada', 'Lithuanian', 'Latvian', 'Malayalam', 'Marathi', 'Malay', 'Dutch', 'NorwegianNynorsk', 'Norwegian', 'Oriya', 'Polish', 'PortuguesePortugal', 'Romanian', 'Slovak', 'Slovenian', 'SerbianCyrillic', 'Serbian', 'Swedish', 'Swahili', 'Tamil', 'Telugu', 'Thai', 'Turkish', 'Ukrainian', 'Urdu', 'Vietnamese')]
-        [System.String]
-        $EndUserSpamNotificationLanguage = 'Default',
-
         [Parameter()]
         [ValidateSet('MoveToJmf', 'Redirect', 'Quarantine')]
         [System.String]
@@ -357,15 +334,8 @@ function Get-TargetResource
                 BulkQuarantineTag                    = $HostedContentFilterPolicy.BulkQuarantineTag
                 BulkSpamAction                       = $HostedContentFilterPolicy.BulkSpamAction
                 BulkThreshold                        = $HostedContentFilterPolicy.BulkThreshold
-                DownloadLink                         = $HostedContentFilterPolicy.DownloadLink
-                #Deprecated
-                #EnableEndUserSpamNotifications       = $HostedContentFilterPolicy.EnableEndUserSpamNotifications
                 EnableLanguageBlockList              = $HostedContentFilterPolicy.EnableLanguageBlockList
                 EnableRegionBlockList                = $HostedContentFilterPolicy.EnableRegionBlockList
-                #Deprecated
-                #EndUserSpamNotificationCustomSubject = $HostedContentFilterPolicy.EndUserSpamNotificationCustomSubject
-                #EndUserSpamNotificationFrequency     = $HostedContentFilterPolicy.EndUserSpamNotificationFrequency
-                #EndUserSpamNotificationLanguage      = $HostedContentFilterPolicy.EndUserSpamNotificationLanguage
                 HighConfidencePhishAction            = $HostedContentFilterPolicy.HighConfidencePhishAction
                 HighConfidencePhishQuarantineTag     = $HostedContentFilterPolicy.HighConfidencePhishQuarantineTag
                 HighConfidenceSpamAction             = $HostedContentFilterPolicy.HighConfidenceSpamAction
@@ -482,14 +452,6 @@ function Set-TargetResource
         [uint32]
         $BulkThreshold = 7,
 
-        [Parameter()]
-        [System.Boolean]
-        $DownloadLink = $false,
-
-        [Parameter()]
-        [System.Boolean]
-        $EnableEndUserSpamNotifications = $false,
-
         [Parameter()]
         [System.Boolean]
         $EnableLanguageBlockList = $false,
@@ -498,20 +460,6 @@ function Set-TargetResource
         [System.Boolean]
         $EnableRegionBlockList = $false,
 
-        [Parameter()]
-        [System.String]
-        $EndUserSpamNotificationCustomSubject,
-
-        [Parameter()]
-        [ValidateRange(1, 15)]
-        [uint32]
-        $EndUserSpamNotificationFrequency = 3,
-
-        [Parameter()]
-        [ValidateSet('Default', 'English', 'French', 'German', 'Italian', 'Japanese', 'Spanish', 'Korean', 'Portuguese', 'Russian', 'ChineseSimplified', 'ChineseTraditional', 'Amharic', 'Arabic', 'Bulgarian', 'BengaliIndia', 'Catalan', 'Czech', 'Cyrillic', 'Danish', 'Greek', 'Estonian', 'Basque', 'Farsi', 'Finnish', 'Filipino', 'Galician', 'Gujarati', 'Hebrew', 'Hindi', 'Croatian', 'Hungarian', 'Indonesian', 'Icelandic', 'Kazakh', 'Kannada', 'Lithuanian', 'Latvian', 'Malayalam', 'Marathi', 'Malay', 'Dutch', 'NorwegianNynorsk', 'Norwegian', 'Oriya', 'Polish', 'PortuguesePortugal', 'Romanian', 'Slovak', 'Slovenian', 'SerbianCyrillic', 'Serbian', 'Swedish', 'Swahili', 'Tamil', 'Telugu', 'Thai', 'Turkish', 'Ukrainian', 'Urdu', 'Vietnamese')]
-        [System.String]
-        $EndUserSpamNotificationLanguage = 'Default',
-
         [Parameter()]
         [ValidateSet('MoveToJmf', 'Redirect', 'Quarantine')]
         [System.String]
@@ -828,14 +776,6 @@ function Test-TargetResource
         [uint32]
         $BulkThreshold = 7,
 
-        [Parameter()]
-        [System.Boolean]
-        $DownloadLink = $false,
-
-        [Parameter()]
-        [System.Boolean]
-        $EnableEndUserSpamNotifications = $false,
-
         [Parameter()]
         [System.Boolean]
         $EnableLanguageBlockList = $false,
@@ -844,20 +784,6 @@ function Test-TargetResource
         [System.Boolean]
         $EnableRegionBlockList = $false,
 
-        [Parameter()]
-        [System.String]
-        $EndUserSpamNotificationCustomSubject,
-
-        [Parameter()]
-        [ValidateRange(1, 15)]
-        [uint32]
-        $EndUserSpamNotificationFrequency = 3,
-
-        [Parameter()]
-        [ValidateSet('Default', 'English', 'French', 'German', 'Italian', 'Japanese', 'Spanish', 'Korean', 'Portuguese', 'Russian', 'ChineseSimplified', 'ChineseTraditional', 'Amharic', 'Arabic', 'Bulgarian', 'BengaliIndia', 'Catalan', 'Czech', 'Cyrillic', 'Danish', 'Greek', 'Estonian', 'Basque', 'Farsi', 'Finnish', 'Filipino', 'Galician', 'Gujarati', 'Hebrew', 'Hindi', 'Croatian', 'Hungarian', 'Indonesian', 'Icelandic', 'Kazakh', 'Kannada', 'Lithuanian', 'Latvian', 'Malayalam', 'Marathi', 'Malay', 'Dutch', 'NorwegianNynorsk', 'Norwegian', 'Oriya', 'Polish', 'PortuguesePortugal', 'Romanian', 'Slovak', 'Slovenian', 'SerbianCyrillic', 'Serbian', 'Swedish', 'Swahili', 'Tamil', 'Telugu', 'Thai', 'Turkish', 'Ukrainian', 'Urdu', 'Vietnamese')]
-        [System.String]
-        $EndUserSpamNotificationLanguage = 'Default',
-
         [Parameter()]
         [ValidateSet('MoveToJmf', 'Redirect', 'Quarantine')]
         [System.String]
@@ -1083,10 +1009,6 @@ function Test-TargetResource
     Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)"
 
     $ValuesToCheck = $PSBoundParameters
-    $ValuesToCheck.Remove('EnableEndUserSpamNotifications') | Out-Null
-    $ValuesToCheck.Remove('EndUserSpamNotificationLanguage') | Out-Null
-    $ValuesToCheck.Remove('EndUserSpamNotificationFrequency') | Out-Null
-    $ValuesToCheck.Remove('EndUserSpamNotificationCustomSubject') | Out-Null
 
     if ($CurrentValues.IntraOrgFilterState -ne $IntraOrgFilterState -and $IntraOrgFilterState -eq 'Default')
     {

@@ -11,13 +11,8 @@ class MSFT_EXOHostedContentFilterPolicy : OMI_BaseResource
     [Write, Description("The BulkQuarantineTag parameter specifies the quarantine policy that's used on messages that are quarantined as bulk email.")] String BulkQuarantineTag;
     [Write, Description("The BulkSpamAction parameter specifies the action to take on messages that are classified as bulk email."), ValueMap{"MoveToJmf","AddXHeader","ModifySubject","Redirect","Delete","Quarantine", "NoAction"}, Values{"MoveToJmf","AddXHeader","ModifySubject","Redirect","Delete","Quarantine","NoAction"}] String BulkSpamAction;
     [Write, Description("The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7.")] UInt32 BulkThreshold;
-    [Write, Description("The DownloadLink parameter shows or hides a link in end-user spam notification messages to download the Junk Email Reporting Tool plugin for Outlook. Valid input for this parameter is $true or $false. The default value is $false.")] Boolean DownloadLink;
-    [Write, Description("The EnableEndUserSpamNotification parameter enables for disables sending end-user spam quarantine notification messages. Valid input for this parameter is $true or $false. The default value is $false.")] Boolean EnableEndUserSpamNotifications;
     [Write, Description("The EnableLanguageBlockList parameter enables or disables blocking email messages that are written in specific languages, regardless of the message contents. Valid input for this parameter is $true or $false. The default value is $false.")] Boolean EnableLanguageBlockList;
     [Write, Description("The EnableRegionBlockList parameter enables or disables blocking email messages that are sent from specific countries or regions, regardless of the message contents. Valid input for this parameter is $true or $false. The default value is $false.")] Boolean EnableRegionBlockList;
-    [Write, Description("The EndUserSpamNotificationCustomSubject parameter specifies a custom subject for end-user spam notification messages.")] String EndUserSpamNotificationCustomSubject;
-    [Write, Description("The EndUserSpamNotificationFrequency parameter specifies the repeat interval in days that end-user spam notification messages are sent. Valid input for this parameter is an integer between 1 and 15. The default value is 3.")] UInt32 EndUserSpamNotificationFrequency;
-    [Write, Description("The EndUserSpamNotificationLanguage parameter specifies the language of end-user spam notification messages. The default value is Default. This means the default language of end-user spam notification messages is the default language of the cloud-based organization."), ValueMap{"Default","English","French","German","Italian","Japanese","Spanish","Korean","Portuguese","Russian","ChineseSimplified","ChineseTraditional","Amharic","Arabic","Bulgarian","BengaliIndia","Catalan","Czech","Cyrillic","Danish","Greek","Estonian","Basque","Farsi","Finnish","Filipino","Galician","Gujarati","Hebrew","Hindi","Croatian","Hungarian","Indonesian","Icelandic","Kazakh","Kannada","Lithuanian","Latvian","Malayalam","Marathi","Malay","Dutch","NorwegianNynorsk","Norwegian","Oriya","Polish","PortuguesePortugal","Romanian","Slovak","Slovenian","SerbianCyrillic","Serbian","Swedish","Swahili","Tamil","Telugu","Thai","Turkish","Ukrainian","Urdu","Vietnamese"}, Values{"Default","English","French","German","Italian","Japanese","Spanish","Korean","Portuguese","Russian","ChineseSimplified","ChineseTraditional","Amharic","Arabic","Bulgarian","BengaliIndia","Catalan","Czech","Cyrillic","Danish","Greek","Estonian","Basque","Farsi","Finnish","Filipino","Galician","Gujarati","Hebrew","Hindi","Croatian","Hungarian","Indonesian","Icelandic","Kazakh","Kannada","Lithuanian","Latvian","Malayalam","Marathi","Malay","Dutch","NorwegianNynorsk","Norwegian","Oriya","Polish","PortuguesePortugal","Romanian","Slovak","Slovenian","SerbianCyrillic","Serbian","Swedish","Swahili","Tamil","Telugu","Thai","Turkish","Ukrainian","Urdu","Vietnamese"}] String EndUserSpamNotificationLanguage;
     [Write, Description("The HighConfidencePhishAction parameter specifies the action to take on messages that are marked as high confidence phishing"), ValueMap{"MoveToJmf","Redirect","Quarantine"}, Values{"MoveToJmf","Redirect","Quarantine"}] String HighConfidencePhishAction;
     [Write, Description("The HighConfidencePhishQuarantineTag parameter specifies the quarantine policy that's used on messages that are quarantined as high confidence phishing.")] String HighConfidencePhishQuarantineTag;
     [Write, Description("The HighConfidenceSpamAction parameter specifies the action to take on messages that are classified as high confidence spam."), ValueMap{"MoveToJmf","AddXHeader","ModifySubject","Redirect","Delete","Quarantine","NoAction"}, Values{"MoveToJmf","AddXHeader","ModifySubject","Redirect","Delete","Quarantine","NoAction"}] String HighConfidenceSpamAction;

@@ -29,7 +29,6 @@ Configuration Example
             AdminDisplayName                     = ""
             BulkSpamAction                       = "MoveToJmf"
             BulkThreshold                        = 7
-            DownloadLink                         = $False
             EnableLanguageBlockList              = $False
             EnableRegionBlockList                = $False
             HighConfidencePhishAction            = "Quarantine"

@@ -28,8 +28,7 @@ Configuration Example
             AddXHeaderValue                      = ""
             AdminDisplayName                     = ""
             BulkSpamAction                       = "MoveToJmf"
-            BulkThreshold                        = 7
-            DownloadLink                         = $True # Updated Property
+            BulkThreshold                        = 8 # Updated Property
             EnableLanguageBlockList              = $False
             EnableRegionBlockList                = $False
             HighConfidencePhishAction            = "Quarantine"