Merge branch 'Dev' into fix3892

William-Francillette · Nov 28, 2023 · 19d3354 · 19d3354
2 parents 09cad26 + 4a4380b
commit 19d3354
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,24 +2,27 @@
 
 # UNRELEASED
 
-* M365DSCDRGUtil
-  * Added ConvertFrom-IntunePolicyAssignment and ConvertTo-IntunePolicyAssignment
-  FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
-* IntuneWindowsAutopilotDeploymentProfileAzureADJoined
+* IntuneDeviceConfigurationPolicyWindows10
   * Modified assigned to use sdk instead of API call and added logic to use groupDisplayName in assignment
-  FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
+  FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
+* IntuneDeviceEnrollmentStatusPageWindows10
+  * Fixed assignments using API call
+  FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
 * IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined
   * Modified assigned to use sdk instead of API call and added logic to use groupDisplayName in assignment
   FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
-* IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10
+* IntuneWindowsAutopilotDeploymentProfileAzureADJoined
   * Modified assigned to use sdk instead of API call and added logic to use groupDisplayName in assignment
   FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
-* IntuneDeviceConfigurationPolicyWindows10
+* IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10
   * Modified assigned to use sdk instead of API call and added logic to use groupDisplayName in assignment
-  FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
-* IntuneDeviceEnrollmentStatusPageWindows10
-  * Fixed assignments using API call
-  FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
+  FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
+* M365DSCDRGUtil
+  * Added ConvertFrom-IntunePolicyAssignment and ConvertTo-IntunePolicyAssignment
+  FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
+* DEPENDENCIES
+  * Updated Microsoft.Graph to version 2.10.0.
+  * Updated MSCloudLoginAssistant to version 1.1.0.
 
 # 1.23.1122.1
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1
@@ -920,33 +920,6 @@ function Convert-M365DSCPlannerTaskChecklistToCIMArray
     return $StringContent
 }
 
-function Get-M365DSCPlannerPlansFromGroup
-{
-    [CmdletBinding()]
-    [OutputType([System.Collections.Hashtable[]])]
-    Param(
-        [Parameter(Mandatory = $true)]
-        [System.String]
-        $GroupId,
-
-        [Parameter(Mandatory = $true)]
-        [System.Management.Automation.PSCredential]
-        $Credential
-    )
-    $results = @()
-    $uri = "https://graph.microsoft.com/v1.0/groups/$GroupId/planner/plans"
-    $taskResponse = Invoke-MSCloudLoginMicrosoftGraphAPI -CloudCredential $Credential `
-        -Uri $uri `
-        -Method Get
-    foreach ($plan in $taskResponse.value)
-    {
-        $results += @{
-            Id    = $plan.id
-            Title = $plan.title
-        }
-    }
-    return $results
-}
 
 function Get-M365DSCPlannerTasksFromPlan
 {

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

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -4063,8 +4063,8 @@ function Test-M365DSCModuleValidity
 
     $InformationPreference = 'Continue'
 
-    # validate only one installation of the module is present (and it's the latest version available from the psgallery)
-    $latestVersion = (Find-Module -Name 'Microsoft365DSC' -Repository 'PSGallery' -Includes 'DSCResource').Version
+    # validate only one installation of the module is present (and it's the latest version available)
+    $latestVersion = (Find-Module -Name 'Microsoft365DSC' -Includes 'DSCResource').Version
     $localVersion = (Get-Module -Name 'Microsoft365DSC').Version
 
     if ($latestVersion -gt $localVersion)