Merge branch 'microsoft:Dev' into fix/TeamsComplianceRecordingPolicy

swisscom · Oct 3, 2023 · d9865a3 · d9865a3
2 parents 691e5d6 + 533d3ef
commit d9865a3
Show file tree

Hide file tree

Showing 30 changed files with 4,799 additions and 4,473 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,34 @@
 
 # UNRELEASED
 
+* EXOCalendarProcessing
+  * Initial release.
+* EXOMailboxAutoReplyConfiguration
+  * Initial release.
+* EXOPlace
+  * Initial release.
+* DEPENDENCIES
+  * Updated MSCloudLoginAssistant to version 1.0.121.
+
+# 1.23.927.1
+
 * AADApplication
   * Added support for restoring soft deleted instances.
+* AADRoleSetting
+  * Fixed issue with export where ApplicationSecret was not returned.
+    FIXES [#3695](https://github.com/microsoft/Microsoft365DSC/issues/3695)
 * M365DSCRuleEvaluation
   * Improvements to how rules are evaluated and how drifts are logged.
 * O365OrgSettings
   * Changes to how ToDo discrepencies are being fixed in the SET method.
+* M365DSCDRGUtil
+  * Added support for Intune URIs to be dynamic based on target 
+    cloud instance (Commercial, GCC-H..etc) 
 * DEPENDENCIES
   * Updated Microsoft.Graph to version 2.6.1.
   * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.117.
+* MISC
+  * Fixed handling of Graph connection in Update-M365DSCAllowedGraphScopes
 
 # 1.23.920.2
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1
@@ -370,6 +370,7 @@ function Get-TargetResource
             ApplicationId                                             = $ApplicationId
             TenantId                                                  = $TenantId
             CertificateThumbprint                                     = $CertificateThumbprint
+            ApplicationSecret                                         = $ApplicationSecret
             Credential                                                = $Credential
             ManagedIdentity                                           = $ManagedIdentity.IsPresent
         }
@@ -1302,11 +1303,6 @@ function Test-TargetResource
     Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)"
 
     $ValuesToCheck = $PSBoundParameters
-    $ValuesToCheck.Remove('ApplicationId') | Out-Null
-    $ValuesToCheck.Remove('TenantId') | Out-Null
-    $ValuesToCheck.Remove('ApplicationSecret') | Out-Null
-    $ValuesToCheck.Remove('Id') | Out-Null
-    $ValuesToCheck.Remove('ManagedIdentity') | Out-Null
 
     $TestResult = Test-M365DSCParameterState -CurrentValues $CurrentValues `
         -Source $($MyInvocation.MyCommand.Source) `