Merge pull request #3504 from andikrueger/andikrueger/issue3454_1

Updated Update-M365DSCDependency function to fix issues with MaxFunctionCount
microsoft · Jul 26, 2023 · 8a59d1a · 8a59d1a
2 parents 278eee3 + f4c37c1
commit 8a59d1a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/CodeCoverage.yml b/.github/workflows/CodeCoverage.yml
@@ -25,15 +25,15 @@ jobs:
         shell: pwsh
         run: |
           Import-Module './Tests/TestHarness.psm1' -Force;
-          $MaximumFunctionCount = 9999
+          $MaximumFunctionCount = 32767
 
           try
           {
               $results = Invoke-QualityChecksHarness
           }
           catch
           {
-              $MaximumFunctionCount = 9999
+              $MaximumFunctionCount = 32767
               Import-Module './Tests/TestHarness.psm1' -Force;
               $results = Invoke-QualityChecksHarness
           }
@@ -45,15 +45,15 @@ jobs:
         shell: pwsh
         run: |
           Import-Module './Tests/TestHarness.psm1' -Force;
-          $MaximumFunctionCount = 9999
+          $MaximumFunctionCount = 32767
 
           try
           {
               $results = Invoke-TestHarness
           }
           catch
           {
-              $MaximumFunctionCount = 9999
+              $MaximumFunctionCount = 32767
               Import-Module './Tests/TestHarness.psm1' -Force;
               $results = Invoke-TestHarness
           }

diff --git a/.github/workflows/Unit Tests.yml b/.github/workflows/Unit Tests.yml
@@ -27,15 +27,15 @@ jobs:
         shell: pwsh
         run: |
           Import-Module './Tests/TestHarness.psm1' -Force;
-          $MaximumFunctionCount = 9999
+          $MaximumFunctionCount = 32767
 
           try
           {
               $results = Invoke-QualityChecksHarness
           }
           catch
           {
-              $MaximumFunctionCount = 9999
+              $MaximumFunctionCount = 32767
               Import-Module './Tests/TestHarness.psm1' -Force;
               $results = Invoke-QualityChecksHarness
           }
@@ -47,15 +47,15 @@ jobs:
         shell: pwsh
         run: |
           Import-Module './Tests/TestHarness.psm1' -Force;
-          $MaximumFunctionCount = 9999
+          $MaximumFunctionCount = 32767
 
           try
           {
               $results = Invoke-TestHarness -IgnoreCodeCoverage
           }
           catch
           {
-              $MaximumFunctionCount = 9999
+              $MaximumFunctionCount = 32767
               Import-Module './Tests/TestHarness.psm1' -Force;
               $results = Invoke-TestHarness -IgnoreCodeCoverage
           }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Change log for Microsoft365DSC
 
 # UNRELEASED
+
 * AADGroup
   * Fix issue setting MemberOf property.
     FIXES [#3496](https://github.com/microsoft/Microsoft365DSC/issues/3496)
+* MISC
+  * Improved Update-M365DSCDependencies function to properly install all Microsoft.Graph.* modules.
+    FIXES [#3454](https://github.com/microsoft/Microsoft365DSC/issues/3454)
 
 # 1.23.719.1
 * AADCrossTenant

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -1155,7 +1155,7 @@ function Export-M365DSCConfiguration
         $Validate
     )
 
-    $Global:MaximumFunctionCount = 16000
+    $Global:MaximumFunctionCount = 32767
 
     # Define the exported resource instances' names Global variable
     $Global:M365DSCExportedResourceInstancesNames = @()
@@ -1661,7 +1661,7 @@ function New-M365DSCConnection
         $SkipModuleReload = $false
     )
 
-    $Global:MaximumFunctionCount = 16000
+    $Global:MaximumFunctionCount = 32767
 
     if ($Workload -eq 'MicrosoftTeams')
     {
@@ -2757,6 +2757,7 @@ function Update-M365DSCDependencies
         $ValidateOnly
     )
 
+    $Global:MaximumFunctionCount = 32767
 
     $InformationPreference = 'Continue'
     $currentPath = Join-Path -Path $PSScriptRoot -ChildPath '..\' -Resolve
@@ -2782,8 +2783,12 @@ function Update-M365DSCDependencies
                 {
                     Write-Information -MessageData "Installing $($dependency.ModuleName) version {$($dependency.RequiredVersion)}"
                     Remove-Module $dependency.ModuleName -Force -ErrorAction SilentlyContinue
+                    if ($dependency.ModuleName -like 'Microsoft.Graph*')
+                    {
+                        Remove-Module 'Microsoft.Graph.Authentication' -Force -ErrorAction SilentlyContinue
+                    }
+                    Remove-Module $dependency.ModuleName -Force -ErrorAction SilentlyContinue
                     Install-Module $dependency.ModuleName -RequiredVersion $dependency.RequiredVersion -AllowClobber -Force -Scope 'AllUsers'
-                    Import-Module $dependency.ModuleName -Force
                 }
                 else
                 {
@@ -2801,6 +2806,7 @@ function Update-M365DSCDependencies
             Write-Host "Could not update or import {$($dependency.ModuleName)}"
             Write-Host "Error-Mesage: $($_.Exception.Message)"
         }
+
         $i++
     }
 

diff --git a/Tests/TestHarness.psm1 b/Tests/TestHarness.psm1
@@ -18,7 +18,7 @@ function Invoke-TestHarness
 
     $sw = [System.Diagnostics.StopWatch]::startnew()
 
-    $MaximumFunctionCount = 9999
+    $MaximumFunctionCount = 32767
     Write-Host -Object 'Running all Microsoft365DSC Unit Tests'
 
     $repoDir = Join-Path -Path $PSScriptRoot -ChildPath '..\' -Resolve