Merge pull request #3708 from microsoft/Dev

Release 1.23.920.2
microsoft · Sep 20, 2023 · 9ded092 · 9ded092
2 parents faaa4f3 + 9ad6b54
commit 9ded092
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change log for Microsoft365DSC
 
+# 1.23.920.2
+
+* DEPENDENCIES
+  * Rolled back Microsoft.Graph to version 2.5.0.
+* MISC
+  * M365DSCDRGUtil: Write properties properly indented and in new line
+    FIXES [#3634](https://github.com/microsoft/Microsoft365DSC/issues/3634)
+
 # 1.23.920.1
 
 * O365OrgSettings

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -10,71 +10,71 @@
         },
         @{
             ModuleName      = 'Microsoft.Graph.Applications'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Authentication'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Devices.CorporateManagement'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Administration'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Enrollment'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.DirectoryManagement'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.Governance'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.SignIns'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Reports'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Teams'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement.Administration'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DirectoryObjects'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Groups'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Planner'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users.Actions'
-            RequiredVersion = '2.6.0'
+            RequiredVersion = '2.5.0'
         },
         @{
             ModuleName      = 'Microsoft.PowerApps.Administration.PowerShell'

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -11,7 +11,7 @@
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.23.920.1'
+  ModuleVersion     = '1.23.920.2'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -140,7 +140,8 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '* O365OrgSettings
+      ReleaseNotes = '** 1.23.920.2 rolls back the Graph dependencies to version 2.5.0
+      * O365OrgSettings
       * Fixes and issue where a the wrong url was being used in some of the API
         calls, resulting in null returns for some properties in the Get method.
     * SPOSharingSettings

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1
@@ -400,7 +400,7 @@ function Get-M365DSCDRGComplexTypeToString
                 $currentValue = $ComplexObject[$key]
                 if ($currentValue.GetType().Name -eq 'String')
                 {
-                    $currentValue = $ComplexObject[$key].Replace("'", "''").Replace("", "''")
+                    $currentValue = $ComplexObject[$key].Replace("'", "''").Replace("�", "''")
                 }
                 $currentProperty += Get-M365DSCDRGSimpleObjectTypeToString -Key $key -Value $currentValue -Space ($indent)
             }
@@ -430,17 +430,17 @@ function Get-M365DSCDRGComplexTypeToString
     }
 
     $currentProperty += "$indent}"
-    #if ($isArray -or $IndentLevel -gt 4)
-    #{
-        #$currentProperty += "`r`n"
-    #}
+    if ($isArray -or $IndentLevel -gt 4)
+    {
+        $currentProperty += "`r`n"
+    }
 
-    #Indenting last parenthese when the cim instance is an array
-    <#if ($IndentLevel -eq 5)
+    #Indenting last parenthesis when the cim instance is an array
+    if ($IndentLevel -eq 5)
     {
         $indent = '    ' * ($IndentLevel -2)
         $currentProperty += $indent
-    }#>
+    }
 
     $emptyCIM = $currentProperty.replace(' ', '').replace("`r`n", '')
     if ($emptyCIM -eq "MSFT_$CIMInstanceName{}")