Merge pull request #1197 from microsoft/Dev

Release 1.21.505.1
microsoft · May 6, 2021 · 03b08ac · 03b08ac
2 parents 60f648b + 743de65
commit 03b08ac
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change log for Microsoft365DSC
 
+# 1.21.505.1
+
+* EXOTransportRule
+  * Adding ExceptIfSCLOver and SCLOver.
+  * Fixes SubjectOrBodyContainsWords parameter not being an array.
+  * Fixes DateTime formating on ExpiryDate and ActivationDate
+
 # 1.21.428.2
 
 * EXOTransportRule

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1
@@ -353,6 +353,10 @@ function Get-TargetResource
         [System.String[]]
         $ExceptIfRecipientInSenderList,
 
+        [Parameter()]
+        [System.String]
+        $ExceptIfSCLOver,
+
         [Parameter()]
         [System.String[]]
         $ExceptIfSenderADAttributeContainsWords,
@@ -599,6 +603,10 @@ function Get-TargetResource
         [System.String]
         $RuleSubType,
 
+        [Parameter()]
+        [System.String]
+        $SCLOver,
+
         [Parameter()]
         [System.String[]]
         $SenderADAttributeContainsWords,
@@ -672,7 +680,7 @@ function Get-TargetResource
         $SubjectMatchesPatterns,
 
         [Parameter()]
-        [System.String]
+        [System.String[]]
         $SubjectOrBodyContainsWords,
 
         [Parameter()]
@@ -839,6 +847,7 @@ function Get-TargetResource
             ExceptIfRecipientAddressMatchesPatterns       = $TransportRule.ExceptIfRecipientAddressMatchesPatterns
             ExceptIfRecipientDomainIs                     = $TransportRule.ExceptIfRecipientDomainIs
             ExceptIfRecipientInSenderList                 = $TransportRule.ExceptIfRecipientInSenderList
+            ExceptIfSCLOver                               = $TransportRule.ExceptIfSCLOver
             ExceptIfSenderADAttributeContainsWords        = $TransportRule.ExceptIfSenderADAttributeContainsWords
             ExceptIfSenderADAttributeMatchesPatterns      = $TransportRule.ExceptIfSenderADAttributeMatchesPatterns
             ExceptIfSenderDomainIs                        = $TransportRule.ExceptIfSenderDomainIs
@@ -898,6 +907,7 @@ function Get-TargetResource
             RouteMessageOutboundRequireTls                = $TransportRule.RouteMessageOutboundRequireTls
             RuleErrorAction                               = $TransportRule.RuleErrorAction
             RuleSubType                                   = $TransportRule.RuleSubType
+            SCLOver                                       = $TransportRule.SCLOver
             SenderADAttributeContainsWords                = $TransportRule.SenderADAttributeContainsWords
             SenderADAttributeMatchesPatterns              = $TransportRule.SenderADAttributeMatchesPatterns
             SenderAddressLocation                         = $TransportRule.SenderAddressLocation
@@ -927,6 +937,16 @@ function Get-TargetResource
             TenantId                                      = $TenantId
         }
 
+        # Formats DateTime as String
+        if ($null -ne $result.ActivationDate)
+        {
+            $result.ActivationDate = $TransportRule.ActivationDate.ToUniversalTime().ToString()
+        }
+        if ($null -ne $result.ExpiryDate)
+        {
+            $result.ExpiryDate = $TransportRule.ExpiryDate.ToUniversalTime().ToString()
+        }
+
         Write-Verbose -Message "Found Transport Rule $($Name)"
         return $result
     }
@@ -1286,6 +1306,10 @@ function Set-TargetResource
         [System.String[]]
         $ExceptIfRecipientInSenderList,
 
+        [Parameter()]
+        [System.String]
+        $ExceptIfSCLOver,
+
         [Parameter()]
         [System.String[]]
         $ExceptIfSenderADAttributeContainsWords,
@@ -1532,6 +1556,10 @@ function Set-TargetResource
         [System.String]
         $RuleSubType,
 
+        [Parameter()]
+        [System.String]
+        $SCLOver,
+
         [Parameter()]
         [System.String[]]
         $SenderADAttributeContainsWords,
@@ -1605,7 +1633,7 @@ function Set-TargetResource
         $SubjectMatchesPatterns,
 
         [Parameter()]
-        [System.String]
+        [System.String[]]
         $SubjectOrBodyContainsWords,
 
         [Parameter()]
@@ -2051,6 +2079,10 @@ function Test-TargetResource
         [System.String[]]
         $ExceptIfRecipientInSenderList,
 
+        [Parameter()]
+        [System.String]
+        $ExceptIfSCLOver,
+
         [Parameter()]
         [System.String[]]
         $ExceptIfSenderADAttributeContainsWords,
@@ -2297,6 +2329,10 @@ function Test-TargetResource
         [System.String]
         $RuleSubType,
 
+        [Parameter()]
+        [System.String]
+        $SCLOver,
+
         [Parameter()]
         [System.String[]]
         $SenderADAttributeContainsWords,
@@ -2370,7 +2406,7 @@ function Test-TargetResource
         $SubjectMatchesPatterns,
 
         [Parameter()]
-        [System.String]
+        [System.String[]]
         $SubjectOrBodyContainsWords,
 
         [Parameter()]

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.schema.mof
@@ -86,6 +86,7 @@ class MSFT_EXOTransportRule : OMI_BaseResource
     [Write, Description("The ExceptIfRecipientAddressMatchesPatterns parameter specifies an exception that looks for text patterns in recipient email addresses by using regular expressions.")] String ExceptIfRecipientAddressMatchesPatterns[];
     [Write, Description("The ExceptIfRecipientDomainIs parameter specifies an exception that looks for recipients with email address in the specified domains.")] String ExceptIfRecipientDomainIs[];
     [Write, Description("This parameter is reserved for internal Microsoft use.")] String ExceptIfRecipientInSenderList[];
+    [Write, Description("The ExceptIfSCLOver parameter specifies an exception that looks for the SCL value of messages")] String ExceptIfSCLOver;
     [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[];
@@ -145,6 +146,7 @@ class MSFT_EXOTransportRule : OMI_BaseResource
     [Write, Description("The RouteMessageOutboundRequireTls parameter specifies an action that uses Transport Layer Security (TLS) encryption to deliver messages outside your organization.")] Boolean RouteMessageOutboundRequireTls;
     [Write, Description("The RuleErrorAction parameter specifies what to do if rule processing can't be completed on messages."), ValueMap{"Ignore","Defer"}, Values{"Ignore","Defer"}] String RuleErrorAction;
     [Write, Description("The RuleSubType parameter specifies the rule type."), ValueMap{"Dlp","None"}, Values{"Dlp","None"}] String RuleSubType;
+    [Write, Description("The SCLOver parameter specifies a condition that looks for the SCL value of messages")] String SCLOver;
     [Write, Description("The SenderADAttributeContainsWords parameter specifies a condition that looks for words in Active Directory attributes of message senders.")] String SenderADAttributeContainsWords[];
     [Write, Description("The SenderADAttributeMatchesPatterns parameter specifies a condition that looks for text patterns in Active Directory attributes of message senders by using regular expressions.")] String SenderADAttributeMatchesPatterns[];
     [Write, Description("The SenderAddressLocation parameter specifies where to look for sender addresses in conditions and exceptions that examine sender email addresses."), ValueMap{"Header","Envelope","HeaderOrEnvelope"}, Values{"Header","Envelope","HeaderOrEnvelope"}] String SenderAddressLocation;

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2021-04-28
+# Generated on: 2021-05-06
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.21.428.1'
+    ModuleVersion     = '1.21.505.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -177,21 +177,9 @@
 
             # ReleaseNotes of this module
             ReleaseNotes = "* EXOTransportRule
-              * Fixed typo in accepted value for ApplyHtmlDisclaimerLocation;
-          * IntuneAppConfigurationPolicy
-            * Revamp of Telemetry;
-            * Using shorter cmdlets names;
-          * IntuneDeviceCompliancePolicyAndroid
-            * Initial Release;
-          * IntuneDeviceCompliancePolicyAndroidWorkProfile
-            * InitialRelease
-          * IntuneDeviceCompliancePolicyiOs
-            * Using shorter cmdlet names;
-          * IntuneDeviceConfigurationPolicyiOS
-            * Using shorter cmdlet names;
-          * IntuneDeviceEnrollmentPlatformRestriction
-            * Revamp of Telemetry;
-            * Using Shorter cmdlet names;"
+              * Adding ExceptIfSCLOver and SCLOver.
+              * Fixes SubjectOrBodyContainsWords parameter not being an array.
+              * Fixes DateTime formating on ExpiryDate and ActivationDate"
 
             # Flag to indicate whether the module requires explicit user acceptance for install/update
             # RequireLicenseAcceptance = $false