Merge pull request #3485 from NikCharlebois/Release-1.23.719.1

Release 1.23.719.1
microsoft · Jul 19, 2023 · 8b4905c · 8b4905c
2 parents e9c2b29 + f859b25
commit 8b4905c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,22 @@
 # Change log for Microsoft365DSC
 
-# UNRELEASED
+# 1.23.719.1
 
 * EXOSharedMailbox
   * Added capability to change the PrimarySMTPAddress of a Shared Mailbox
 * SPOExternalUserExpireInDays
   * Added the External User Expiration setting in the config.
 * MISC
   * Updated AAD, EXO and Teams settings file to describe required roles.
-  * Added a new personas documentation page to describe the targeted personas for the project.
-  * Added a more meaningful exception message to Update-M365DSCDependencies if the module is not installed or imported successfully
+  * Added a new personas documentation page to describe the targeted personas
+    for the project.
+  * Added a more meaningful exception message to Update-M365DSCDependencies if
+    the module is not installed or imported successfully
+  * Fixes an issue with the reporting where the wrong key parameter was sometimes
+    used when a component was missing in the source tenant.
 * DEPENDENCIES
   * Updated the Microsoft.Graph.* dependencies to version 2.1.0.
+  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.168.
   * Updated MicrosoftTeams to version 5.4.0.
   * Updated MSCloudLoginAssistant to version 1.0.117.
 

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -74,7 +74,7 @@
         },
         @{
             ModuleName      = 'Microsoft.PowerApps.Administration.PowerShell'
-            RequiredVersion = '2.0.167'
+            RequiredVersion = '2.0.168'
         },
         @{
             ModuleName      = 'MicrosoftTeams'

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2023-07-12
+# Generated on: 2023-07-19
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.23.712.1'
+  ModuleVersion     = '1.23.719.1'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -140,21 +140,23 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '* SPOApp
-      * Fixes an issue where the extraction was complaining about op_addition failing.
-    * DEPENDENCIES
-      * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.167.
-    * DRG
-      * General cleanup from generated resources from DRG
-        * Added module M365DSCDRGUtil.psm1
-        * Fix issues on several resources
-        * Fix assignment from several resources
-        * Fix unit test on several resources
-        * Removed helper resources centralized in M365DSCDRGUtil from all resources
-          FIXES [#3309](https://github.com/microsoft/Microsoft365DSC/issues/3309)
+      ReleaseNotes = '* EXOSharedMailbox
+      * Added capability to change the PrimarySMTPAddress of a Shared Mailbox
+    * SPOExternalUserExpireInDays
+      * Added the External User Expiration setting in the config.
     * MISC
-      * Fixes cmdlet to use Get-MgBetaOrganization in the Get-M365DSCTenantDomain function.
-        FIXES [#3449](https://github.com/microsoft/Microsoft365DSC/issues/3449)'
+      * Updated AAD, EXO and Teams settings file to describe required roles.
+      * Added a new personas documentation page to describe the targeted personas
+        for the project.
+      * Added a more meaningful exception message to Update-M365DSCDependencies if
+        the module is not installed or imported successfully
+      * Fixes an issue with the reporting where the wrong key parameter was sometimes
+        used when a component was missing in the source tenant.
+    * DEPENDENCIES
+      * Updated the Microsoft.Graph.* dependencies to version 2.1.0.
+      * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.168.
+      * Updated MicrosoftTeams to version 5.4.0.
+      * Updated MSCloudLoginAssistant to version 1.0.117.'
 
       # Flag to indicate whether the module requires explicit user acceptance for install/update
       # RequireLicenseAcceptance = $false

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1
@@ -673,7 +673,7 @@ function Compare-M365DSCConfigurations
             {
                 $drift = @{
                     ResourceName         = $sourceResource.ResourceName
-                    ResourceInstanceName = $destinationResource.ResourceInstanceName
+                    ResourceInstanceName = $sourceResource.ResourceInstanceName
                     Key                  = $keyName
                     KeyValue             = $SourceKeyValue
                     Properties           = @(@{
@@ -1026,8 +1026,8 @@ function Compare-M365DSCConfigurations
                     $drift = @{
                         ResourceName         = $currentDestinationResource.ResourceName
                         ResourceInstanceName = $currentDestinationResource.ResourceInstanceName
-                        Key                  = $keyName
-                        KeyValue             = $currentDestinationResource."$keyName"
+                        Key                  = $key
+                        KeyValue             = $currentDestinationResource."$key"
                         Properties           = @(@{
                             ParameterName      = '_IsInConfiguration_'
                             ValueInSource      = 'Absent'

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -3228,7 +3228,7 @@ function Get-M365DSCExportContentForResource
 
     # Check to see if a resource with this exact name was already exported, if so, append a number to the end.
     $i = 2
-    $tempName = $instanceName
+    $tempName = $instanceName.Replace('"', '')
     while ($null -ne $Global:M365DSCExportedResourceInstancesNames -and `
            $Global:M365DSCExportedResourceInstancesNames.Contains($tempName))
     {