Merge pull request #1528 from microsoft/Dev

Release 1.21.1103.1
microsoft · Nov 3, 2021 · 104b9e9 · 104b9e9
2 parents 95dbd7b + 57b10c5
commit 104b9e9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,19 @@
 # Change log for Microsoft365DSC
 
-# 1.21.1027.1
+# 1.21.1103.1
 
+* TeamsCallingPolicy
+  * Added support for value 'Unanswered' for property
+    BudyOnBusyEnabledType.
+    Fix Issue #1514
 * DEPENDENCIES
+  * Updated Microsoft.PowerApps.Administration.PowerShell to
+    2.0.139;
+  * Updated MSCloudLoginAssistant to version 1.0.75;
 
+# 1.21.1027.1
+
+* DEPENDENCIES
   * Updated Microsoft.Graph.Applications to 1.8.0;
   * Updated Microsoft.Graph.Authentication to 1.8.0;
   * Updated Microsoft.Graph.DeviceManagement to 1.8.0;

diff --git a/...Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 b/...Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1
@@ -187,7 +187,7 @@ function Get-TargetResource
                 InternalSenderAdminAddress             = $MalwareFilterPolicy.InternalSenderAdminAddress
                 MakeDefault                            = $MalwareFilterPolicy.MakeDefault
                 ZapEnabled                             = $MalwareFilterPolicy.ZapEnabled
-                Credential                     = $Credential
+                Credential                             = $Credential
                 Ensure                                 = 'Present'
                 ApplicationId                          = $ApplicationId
                 CertificateThumbprint                  = $CertificateThumbprint

diff --git a/...oft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof b/...oft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof
@@ -12,17 +12,17 @@ class MSFT_EXOMalwareFilterPolicy : OMI_BaseResource
     [Write, Description("The CustomFromName parameter specifies the From name of the custom notification message for malware detections in messages from internal or external senders. If the value contains spaces, enclose the value in quotation marks.")] String CustomFromName;
     [Write, Description("The CustomInternalBody parameter specifies the body of the custom notification message for malware detections in messages from internal senders. If the value contains spaces, enclose the value in quotation marks.")] String CustomInternalBody;
     [Write, Description("The CustomInternalSubject parameter specifies the subject of the custom notification message for malware detections in messages from internal senders. If the value contains spaces, enclose the value in quotation marks.")] String CustomInternalSubject;
-    [Write, Description("The CustomNotifications parameter enables or disables custom notification messages for malware detections in messages from internal or external senders. Valid values are: $true|$false.")] Boolean CustomNotifications;
-    [Write, Description("The EnableExternalSenderAdminNotifications parameter enables or disables sending malware detection notification messages to an administrator for messages from external senders. Valid values are: $true|$false.")] Boolean EnableExternalSenderAdminNotifications;
-    [Write, Description("The EnableExternalSenderNotifications parameter enables or disables notification messages for malware detections in messages from external senders. Valid values are: $true|$false.")] Boolean EnableExternalSenderNotifications;
-    [Write, Description("The EnableFileFilter parameter enables or disables common attachment blocking - also known as the Common Attachment Types Filter.Valid values are: $true|$false.")] Boolean EnableFileFilter;
-    [Write, Description("The EnableInternalSenderAdminNotifications parameter enables or disables sending malware detection notification messages to an administrator for messages from internal senders. Valid values are: $true|$false.")] Boolean EnableInternalSenderAdminNotifications;
-    [Write, Description("The EnableInternalSenderNotifications parameter enables or disables notification messages for malware detections in messages from internal senders. Valid values are: $true|$false.")] Boolean EnableInternalSenderNotifications;
+    [Write, Description("The CustomNotifications parameter enables or disables custom notification messages for malware detections in messages from internal or external senders. Valid values are: $true, $false.")] Boolean CustomNotifications;
+    [Write, Description("The EnableExternalSenderAdminNotifications parameter enables or disables sending malware detection notification messages to an administrator for messages from external senders. Valid values are: $true, $false.")] Boolean EnableExternalSenderAdminNotifications;
+    [Write, Description("The EnableExternalSenderNotifications parameter enables or disables notification messages for malware detections in messages from external senders. Valid values are: $true, $false.")] Boolean EnableExternalSenderNotifications;
+    [Write, Description("The EnableFileFilter parameter enables or disables common attachment blocking - also known as the Common Attachment Types Filter.Valid values are: $true, $false.")] Boolean EnableFileFilter;
+    [Write, Description("The EnableInternalSenderAdminNotifications parameter enables or disables sending malware detection notification messages to an administrator for messages from internal senders. Valid values are: $true, $false.")] Boolean EnableInternalSenderAdminNotifications;
+    [Write, Description("The EnableInternalSenderNotifications parameter enables or disables notification messages for malware detections in messages from internal senders. Valid values are: $true, $false.")] Boolean EnableInternalSenderNotifications;
     [Write, Description("The ExternalSenderAdminAddress parameter specifies the email address of the administrator who will receive notification messages for malware detections in messages from external senders.")] String ExternalSenderAdminAddress;
     [Write, Description("The FileTypes parameter specifies the file types that are automatically blocked by common attachment blocking (also known as the Common Attachment Types Filter), regardless of content.")] String FileTypes[];
     [Write, Description("The InternalSenderAdminAddress parameter specifies the email address of the administrator who will receive notification messages for malware detections in messages from internal senders.")] String InternalSenderAdminAddress;
-    [Write, Description("MakeDefault makes this malware filter policy the default policy. Valid values are: $true|$false.")] Boolean MakeDefault;
-    [Write, Description("The ZapEnabled parameter enables or disables zero-hour auto purge (ZAP) for malware. ZAP detects malware in unread messages that have already been delivered to the user's Inbox. Valid values are: $true|$false.")] Boolean ZapEnabled;
+    [Write, Description("MakeDefault makes this malware filter policy the default policy. Valid values are: $true, $false.")] Boolean MakeDefault;
+    [Write, Description("The ZapEnabled parameter enables or disables zero-hour auto purge (ZAP) for malware. ZAP detects malware in unread messages that have already been delivered to the user's Inbox. Valid values are: $true, $false.")] Boolean ZapEnabled;
     [Write, Description("Specifies if this MalwareFilterPolicy should exist."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1
@@ -47,7 +47,7 @@ function Get-TargetResource
 
         [Parameter()]
         [System.String]
-        [ValidateSet('Enabled', 'Disabled')]
+        [ValidateSet('Enabled', 'Disabled', 'Unanswered')]
         $BusyOnBusyEnabledType = 'Enabled',
 
         [Parameter()]
@@ -217,7 +217,7 @@ function Set-TargetResource
 
         [Parameter()]
         [System.String]
-        [ValidateSet('Enabled', 'Disabled')]
+        [ValidateSet('Enabled', 'Disabled', 'Unanswered')]
         $BusyOnBusyEnabledType = 'Enabled',
 
         [Parameter()]
@@ -351,7 +351,7 @@ function Test-TargetResource
 
         [Parameter()]
         [System.String]
-        [ValidateSet('Enabled', 'Disabled')]
+        [ValidateSet('Enabled', 'Disabled', 'Unanswered')]
         $BusyOnBusyEnabledType = 'Enabled',
 
         [Parameter()]

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof b/...s/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof
@@ -11,7 +11,7 @@ class MSFT_TeamsCallingPolicy : OMI_BaseResource
     [Write, Description("Enables call forwarding or simultaneous ringing of inbound calls to any phone number.")] Boolean AllowCallForwardingToPhone;
     [Write, Description("Allows PSTN calling from the Team web client")] Boolean AllowWebPSTNCalling;
     [Write, Description("Setting this parameter to True will send calls through PSTN and incur charges rather than going through the network and bypassing the tolls.")] Boolean PreventTollBypass;
-    [Write, Description("Setting this parameter lets you configure how incoming calls are handled when a user is already in a call or conference or has a call placed on hold. New or incoming calls will be rejected with a busy signal. Valid options are: Enabled, Disabled."), ValueMap{"Enabled","Disabled"}, Values{"Enabled","Disabled"}] String BusyOnBusyEnabledType;
+    [Write, Description("Setting this parameter lets you configure how incoming calls are handled when a user is already in a call or conference or has a call placed on hold. New or incoming calls will be rejected with a busy signal. Valid options are: Enabled, Disabled and Unanswered."), ValueMap{"Enabled","Disabled","Unanswered"}, Values{"Enabled","Disabled","Unanswered"}] String BusyOnBusyEnabledType;
     [Write, Description("Setting this parameter allows you to turn on or turn off music on hold when a PSTN caller is placed on hold. It is turned on by default. Valid options are: Enabled, Disabled, UserOverride. For now setting the value to UserOverride is the same as Enabled. This setting does not apply to call park and SLA boss delegate features. Valid options are: Enabled, Disabled, UserOverride."), ValueMap{"Enabled","Disabled","UserOverride"}, Values{"Enabled","Disabled","UserOverride"}] String MusicOnHoldEnabledType;
     [Write, Description("This parameter is not available for use. Valid options are: Enabled, Disabled, UserOverride."), ValueMap{"Enabled","Disabled","UserOverride"}, Values{"Enabled","Disabled","UserOverride"}] String SafeTransferEnabled;
     [Write, Description("Setting this parameter to True will allows 1:1 Calls to be recorded.")] Boolean AllowCloudRecordingForCalls;

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2021-10-28
+# Generated on: 2021-11-03
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.21.1027.1'
+    ModuleVersion     = '1.21.1103.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -109,15 +109,15 @@
         },
         @{
             ModuleName      = "Microsoft.PowerApps.Administration.PowerShell"
-            RequiredVersion = "2.0.138"
+            RequiredVersion = "2.0.139"
         },
         @{
             ModuleName      = "MicrosoftTeams"
             RequiredVersion = "2.6.0"
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"
-            RequiredVersion = "1.0.74"
+            RequiredVersion = "1.0.75"
         },
         @{
             ModuleName      = "PnP.PowerShell"
@@ -201,24 +201,14 @@
             IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
             # ReleaseNotes of this module
-            ReleaseNotes = "* DEPENDENCIES
-
-            * Updated Microsoft.Graph.Applications to 1.8.0;
-            * Updated Microsoft.Graph.Authentication to 1.8.0;
-            * Updated Microsoft.Graph.DeviceManagement to 1.8.0;
-            * Updated Microsoft.Graph.DeviceManagement.Administration to 1.8.0;
-            * Updated Microsoft.Graph.DeviceManagement.Enrolment to 1.8.0;
-            * Updated Microsoft.Graph.Devices.CorporateManagement to 1.8.0;
-            * Updated Microsoft.Graph.Groups to 1.8.0;
-            * Updated Microsoft.Graph.Identity.DirectoryManagement to 1.8.0;
-            * Updated Microsoft.Graph.Identity.SignIns to 1.8.0;
-            * Updated Microsoft.Graph.Planner to 1.8.0;
-            * Updated Microsoft.Graph.Teams to 1.8.0;
-            * Updated Microsoft.Graph.Users to 1.8.0;
-            * Updated MSCloudLoginAssistant to version 1.0.74;
-          * MISC
-            * Fixed issue generating delta report containing EXOAvailabilityConfig
-              resources;"
+            ReleaseNotes = "* TeamsCallingPolicy
+            * Added support for value 'Unanswered' for property
+              BudyOnBusyEnabledType.
+              Fix Issue #1514
+          * DEPENDENCIES
+            * Updated Microsoft.PowerApps.Administration.PowerShell to
+              2.0.139;
+            * Updated MSCloudLoginAssistant to version 1.0.75;"
 
             # Flag to indicate whether the module requires explicit user acceptance for install/update
             # RequireLicenseAcceptance = $false