Merge pull request #1827 from microsoft/Dev

microsoft · Mar 16, 2022 · 2b7f7e1 · 2b7f7e1
2 parents 2ac2990 + 9cc31ce
commit 2b7f7e1
Show file tree

Hide file tree

Showing 16 changed files with 2,008 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change log for Microsoft365DSC
 
+# 1.22.316.1
+
+* EXOCASMailboxPlan
+  * Add support for DisplayName as identifier for CAS mailbox plan.
+* EXOTransportSettings
+  * New resource for Exchange Online transport configuration.
+* IntuneAppProtectionPolicyiOS
+  * Add 7 additional parameters to the resource and added parameter
+    descriptions.
+* DEPENDENCIES
+  * Updated DSCParser to 1.3.0.4.
+  * Updated Microsoft.Graph.* to 1.9.3.
+
 # 1.22.309.1
 
 * EXOAcceptedDomain

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1
@@ -85,15 +85,7 @@ function Get-TargetResource
 
     try
     {
-        $CASMailboxPlans = Get-CASMailboxPlan -ErrorAction Stop
-        if ($Identity.Contains('-'))
-        {
-            $CASMailboxPlan = $CASMailboxPlans | Where-Object -FilterScript { $_.Identity -eq $Identity }
-        }
-        else
-        {
-            $CASMailboxPlan = $CASMailboxPlans | Where-Object -FilterScript { $_.Identity -like ($Identity + '-*') }
-        }
+        $CASMailboxPlan = Get-CASMailboxPlan -Identity $Identity -ErrorAction Stop
 
         if ($null -eq $CASMailboxPlan)
         {
@@ -399,7 +391,7 @@ function Export-TargetResource
         {
             Write-Host "    |---[$i/$($CASMailboxPlans.Count)] $($CASMailboxPlan.Identity.Split('-')[0])" -NoNewline
             $Params = @{
-                Identity              = $CASMailboxPlan.Identity
+                Identity              = $CASMailboxPlan.DisplayName
                 Credential            = $Credential
                 ApplicationId         = $ApplicationId
                 TenantId              = $TenantId