Release 1.21.526.1

.vscode/settings.json

@@ -14,7 +14,6 @@
     "powershell.codeFormatting.ignoreOneLineBlock": false,
     "powershell.codeFormatting.alignPropertyValuePairs": true,
     "powershell.codeFormatting.preset": "Custom",
-    "editor.formatOnSave": true,
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,
     "files.exclude": {

CHANGELOG.md

@@ -1,4 +1,18 @@
 # Change log for Microsoft365DSC
+1.21.526.1
+*  EXOSafeAttachmentRule
+  * Fixed issue #1213 Policy X already has rule Y associated with it
+    if rule exists already
+* MSFT_IntuneDeviceCompliancePolicyAndroid
+  * New resource
+* MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile
+  * New resource
+* MSFT_IntuneDeviceCompliancePolicyMacOS
+  * New resource
+* MSFT_IntuneDeviceCompliancePolicyiOs
+  * New resource
+* EXOTransportRule
+  * Fix #1230 Changed ExceptIfSenderInRecipientList to array
 
 1.21.519.2
 

Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1

@@ -285,7 +285,15 @@ function Set-TargetResource
     {
         $MalwareFilterRuleParams.Remove('Enabled') | Out-Null
         Write-Verbose -Message "Setting MalwareFilterRule $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $MalwareFilterRuleParams)"
-        Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
+        if ($MalwareFilterRuleParams.MalwareFilterPolicy -ne $MalwareFilterRule.MalwareFilterPolicy)
+        {
+            Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
+        }
+        else
+        {
+            $MalwareFilterRuleParams.Remove('MalwareFilterPolicy')
+            Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
+        } 
     }
     elseif (('Absent' -eq $Ensure ) -and ($null -ne $MalwareFilterRule))
     {

Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1

@@ -283,31 +283,46 @@ function Set-TargetResource
         -InboundParameters $PSBoundParameters
 
     $SafeAttachmentRules = Get-SafeAttachmentRule
-
     $SafeAttachmentRule = $SafeAttachmentRules | Where-Object -FilterScript { $_.Identity -eq $Identity }
+    $SafeAttachmentRuleParams = [System.Collections.Hashtable]($PSBoundParameters)
+    $SafeAttachmentRuleParams.Remove('Ensure') | Out-Null
+    $SafeAttachmentRuleParams.Remove('GlobalAdminAccount') | Out-Null
+    $SafeAttachmentRuleParams.Remove('ApplicationId') | Out-Null
+    $SafeAttachmentRuleParams.Remove('TenantId') | Out-Null
+    $SafeAttachmentRuleParams.Remove('CertificateThumbprint') | Out-Null
+    $SafeAttachmentRuleParams.Remove('CertificatePath') | Out-Null
+    $SafeAttachmentRuleParams.Remove('CertificatePassword') | Out-Null 
 
     if (('Present' -eq $Ensure ) -and (-not $SafeAttachmentRule))
     {
         New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
     }
 
-    if (('Present' -eq $Ensure ) -and ($SafeAttachmentRule))
+    elseif (('Present' -eq $Ensure ) -and ($SafeAttachmentRule))
     {
-        if ($PSBoundParameters.Enabled -and ('Disabled' -eq $SafeAttachmentRule.State))
+         if ($SafeAttachmentRuleParams.Enabled -and ('Disabled' -eq $SafeAttachmentRule.State))
         {
             # New-SafeAttachmentRule has the Enabled parameter, Set-SafeAttachmentRule does not.
             # There doesn't appear to be any way to change the Enabled state of a rule once created.
             Write-Verbose -Message "Removing SafeAttachmentRule $($Identity) in order to change Enabled state."
             Remove-SafeAttachmentRule -Identity $Identity -Confirm:$false
-            New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
+            New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
         }
         else
         {
-            Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
-        }
+            if ($SafeAttachmentRuleParams.SafeAttachmentPolicy -ne $SafeAttachmentRule.SafeAttachmentPolicy)
+            {
+                Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
+            }
+            else
+            {
+                $SafeAttachmentRuleParams.Remove('SafeAttachmentPolicy')
+                Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
+            }
+        } 
     }
 
-    if (('Absent' -eq $Ensure ) -and ($SafeAttachmentRule))
+    elseif (('Absent' -eq $Ensure ) -and ($SafeAttachmentRule))
     {
         Write-Verbose -Message "Removing SafeAttachmentRule $($Identity)"
         Remove-SafeAttachmentRule -Identity $Identity -Confirm:$false

Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1

@@ -272,8 +272,16 @@ function Set-TargetResource
         -InboundParameters $PSBoundParameters
 
     $SafeLinksRules = Get-SafeLinksRule
-
     $SafeLinksRule = $SafeLinksRules | Where-Object -FilterScript { $_.Identity -eq $Identity }
+    $SafeLinksRuleParams = [System.Collections.Hashtable]($PSBoundParameters)
+    $SafeLinksRuleParams.Remove('Ensure') | Out-Null
+    $SafeLinksRuleParams.Remove('GlobalAdminAccount') | Out-Null
+    $SafeLinksRuleParams.Remove('ApplicationId') | Out-Null
+    $SafeLinksRuleParams.Remove('TenantId') | Out-Null
+    $SafeLinksRuleParams.Remove('CertificateThumbprint') | Out-Null
+    $SafeLinksRuleParams.Remove('CertificatePath') | Out-Null
+    $SafeLinksRuleParams.Remove('CertificatePassword') | Out-Null 
+
 
     if (('Present' -eq $Ensure ) -and (-not $SafeLinksRule))
     {
@@ -292,7 +300,15 @@ function Set-TargetResource
         }
         else
         {
-            Set-EXOSafeLinksRule -SafeLinksRuleParams $PSBoundParameters
+            if ($SafeLinksRuleParams.SafeLinksPolicy -ne $SafeLinksRule.SafeLinksPolicy)
+            {
+                Set-EXOSafeLinksRule -SafeLinksRuleParams $SafeLinksRuleParams
+            }
+            else
+            {
+                $SafeLinksRuleParams.Remove('SafeLinksPolicy')
+                Set-EXOSafeLinksRule -SafeLinksRuleParams $SafeLinksRuleParams
+            } 
         }
     }
 

Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.schema.mof

@@ -90,7 +90,7 @@ class MSFT_EXOTransportRule : OMI_BaseResource
     [Write, Description("The ExceptIfSenderADAttributeContainsWords parameter specifies an exception that looks for words in Active Directory attributes of message senders.")] String ExceptIfSenderADAttributeContainsWords[];
     [Write, Description("The ExceptIfSenderADAttributeMatchesPatterns parameter specifies an exception that looks for text patterns in Active Directory attributes of message senders by using regular expressions.")] String ExceptIfSenderADAttributeMatchesPatterns[];
     [Write, Description("The ExceptIfSenderDomainIs parameter specifies an exception that looks for senders with email address in the specified domains.")] String ExceptIfSenderDomainIs[];
-    [Write, Description("This parameter is reserved for internal Microsoft use.")] String ExceptIfSenderInRecipientList;
+    [Write, Description("This parameter is reserved for internal Microsoft use.")] String ExceptIfSenderInRecipientList[];
     [Write, Description("The ExceptIfSenderIpRanges parameter specifies an exception that looks for senders whose IP addresses matches the specified value, or fall within the specified ranges.")] String ExceptIfSenderIpRanges[];
     [Write, Description("The ExceptIfSenderManagementRelationship parameter specifies an exception that looks for the relationship between the sender and recipients in messages."), ValueMap{"Manager","DirectReport"}, Values{"Manager","DirectReport"}] String ExceptIfSenderManagementRelationship;
     [Write, Description("The ExceptIfSentTo parameter specifies an exception that looks for recipients in messages. You can use any value that uniquely identifies the recipient.")] String ExceptIfSentTo[];

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroid/MSFT_IntuneDeviceCompliancePolicyAndroid.psm1

@@ -412,7 +412,7 @@ function Set-TargetResource
             -FilterScript { ($_.deviceCompliancePolicyODataType) -eq 'microsoft.graph.androidCompliancePolicy' -and `
                 $_.displayName -eq $($DisplayName) }
         Update-IntuneDeviceCompliancePolicy -ODataType 'microsoft.graph.androidCompliancePolicy' `
-            -deviceCompliancePolicyId $configDeviceAndroidPolicy.deviceCompliancePolicyId @PSBoundParameters
+            -deviceCompliancePolicyId $configDeviceAndroidPolicy.Id @PSBoundParameters
     }
     elseif ($Ensure -eq 'Absent' -and $currentDeviceAndroidPolicy.Ensure -eq 'Present')
     {
@@ -422,7 +422,7 @@ function Set-TargetResource
             -FilterScript { ($_.deviceCompliancePolicyODataType) -eq 'microsoft.graph.androidCompliancePolicy' -and `
                 $_.displayName -eq $($DisplayName) }
 
-        Remove-IntuneDeviceCompliancePolicy -deviceCompliancePolicyId $configDeviceAndroidPolicy.deviceCompliancePolicyId
+        Remove-IntuneDeviceCompliancePolicy -deviceCompliancePolicyId $configDeviceAndroidPolicy.Id
     }
 }