Merge pull request microsoft#4006 from microsoft/Dev

Release 1.23.1206.1
William-Francillette · Dec 6, 2023 · dde39dd · dde39dd
2 parents f412344 + 98c5932
commit dde39dd
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Change log for Microsoft365DSC
 
+# 1.23.1206.1
+
+* IntuneAntivirusPolicyWindows10SettingCatalog
+  * Fix condition in Test-TargetResource to check if resource was removed or not
+    FIXES [#3958](https://github.com/microsoft/Microsoft365DSC/issues/3958)
+* IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10
+  * Fix typo in assignment cmdlet
+    FIXES [#3996](https://github.com/microsoft/Microsoft365DSC/issues/3996)
+* DEPENDENCIES
+  * Updated MSCloudLoginAssistant to version 1.1.2.
+* MISC
+  * Fix Compare-M365DSCConfigurations to exclude resources correctly
+    FIXES [#4000](https://github.com/microsoft/Microsoft365DSC/issues/4000)
+
 # 1.23.1129.1
 
 * AADRoleSetting

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1
@@ -949,6 +949,10 @@ function Export-TargetResource
     [OutputType([System.String])]
     param
     (
+        [Parameter()]
+        [System.String]
+        $Filter,
+
         [Parameter()]
         [System.Management.Automation.PSCredential]
         $Credential,
@@ -989,12 +993,14 @@ function Export-TargetResource
     Add-M365DSCTelemetryEvent -Data $data
     #endregion
 
+
+
+
     try
     {
         $Script:ExportMode = $true
         #region resource generator code
-        [array] $Script:exportedInstances = Get-MgBetaDirectoryAdministrativeUnit -All `
-            -ErrorAction Stop
+        [array] $Script:exportedInstances = Get-MgBetaDirectoryAdministrativeUnit -Filter $Filter -All:$true -ErrorAction Stop
         #endregion
 
         $i = 1

diff --git a/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 b/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1
@@ -1286,9 +1286,9 @@ function Test-TargetResource
     $ValuesToCheck = ([Hashtable]$PSBoundParameters).clone()
     $ValuesToCheck.Remove('Identity') | Out-Null
 
-    if ($CurrentValues.Ensure -eq 'Absent')
+    if ($CurrentValues.Ensure -ne $PSBoundParameters.Ensure)
     {
-        Write-Verbose -Message 'The policy was not found'
+        Write-Verbose -Message "Test-TargetResource returned $false"
         return $false
     }
     $testResult = $true

diff --git a/...UpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1 b/...UpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1
@@ -684,7 +684,7 @@ function Set-TargetResource
         }
         foreach ($assignment in $intuneAssignments)
         {
-            New-MgBetaDeviceManagementDeviceConfigurationAssignmentAssignment `
+            New-MgBetaDeviceManagementDeviceConfigurationAssignment `
                 -DeviceConfigurationAssignmentId $policy.id `
                 -BodyParameter $assignment
         }

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -86,7 +86,7 @@
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"
-            RequiredVersion = "1.1.0"
+            RequiredVersion = "1.1.2"
         },
         @{
             ModuleName      = 'PnP.PowerShell'

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2023-11-30
+# Generated on: 2023-12-06
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.23.1129.1'
+  ModuleVersion     = '1.23.1206.1'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -140,63 +140,17 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '* AADRoleSetting
-      * Export sorted by DisplayName for better comparison
-      * Enable Filter property to be used on export
-        FIXES [#3919](https://github.com/microsoft/Microsoft365DSC/issues/3919)
-    * AADUser
-      * Added the MemberOf Property.
-    * IntuneAntivirusPolicyWindows10SettingCatalog
-      * Skipped settingValueTemplateReference and settingInstanceTemplateReference
-        for severethreats, highseveritythreats, moderateseveritythreats,
-        lowseveritythreats as per API requirements observed in the Intune portal.
-        FIXES [#3818](https://github.com/microsoft/Microsoft365DSC/issues/3818)
-        FIXES [#3955](https://github.com/microsoft/Microsoft365DSC/issues/3955)
-    * IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy,
-      IntuneAccountProtectionLocalUserGroupMembershipPolicy,
-      IntuneAccountProtectionPolicy,
-      * Fixes export if Assignments is set on existing policies
-        FIXES [3913](https://github.com/microsoft/Microsoft365DSC/issues/3913)
-      * Add groupDisplayName to Assignments embedded instance
-    * IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10,
-      IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10,
-      IntuneDeviceConfigurationIdentityProtectionPolicyWindows10,
-      IntuneDeviceConfigurationEndpointProtectionPolicyWindows10,
-      IntuneDeviceEnrollmentStatusPageWindows10,
-      IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined,
-      IntuneWindowsAutopilotDeploymentProfileAzureADJoined
-      * Removed Id and all authentication parameters from PSBoundParameters in Test-TargetResource
-        FIXES [#3888](https://github.com/microsoft/Microsoft365DSC/issues/3888)
-    * IntuneWindowsAutopilotDeploymentProfileAzureADJoined
-      * 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)
-    * 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)
-    * 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)
+      ReleaseNotes = '* IntuneAntivirusPolicyWindows10SettingCatalog
+      * Fix condition in Test-TargetResource to check if resource was removed or not
+        FIXES [#3958](https://github.com/microsoft/Microsoft365DSC/issues/3958)
     * IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10
-      * Modified assigned to use sdk instead of API call and added logic to use groupDisplayName in assignment
-    * IntuneDeviceConfigurationPolicyWindows10
-        FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
-    * IntuneDeviceEnrollmentStatusPageWindows10
-      * Fixed assignments using API call
-        FIXES [#3921](https://github.com/microsoft/Microsoft365DSC/issues/3921)
-    * TeamsTeam
-      * Fixes incompatible type for ComplianceRecordingApplications, expected string[] but receive object[]
-        FIXES: [#3890](https://github.com/microsoft/Microsoft365DSC/issues/3890)
+      * Fix typo in assignment cmdlet
+        FIXES [#3996](https://github.com/microsoft/Microsoft365DSC/issues/3996)
     * DEPENDENCIES
-      * Updated DSCParser to version 1.4.0.1.
-      * Updated Microsoft.Graph to version 2.10.0.
-      * Updated MSCloudLoginAssistant to version 1.1.0.
+      * Updated MSCloudLoginAssistant to version 1.1.2.
     * MISC
-      * M365DSCDRGUtil
-        * Added ConvertFrom-IntunePolicyAssignment and ConvertTo-IntunePolicyAssignment
-          FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)'
+      * Fix Compare-M365DSCConfigurations to exclude resources correctly
+        FIXES [#4000](https://github.com/microsoft/Microsoft365DSC/issues/4000)'
 
       # 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
@@ -645,16 +645,17 @@ function Compare-M365DSCConfigurations
         [Array] $DestinationObject = Initialize-M365DSCReporting -ConfigurationPath $Destination
     }
 
+    if ($ExcludedResources.Count -gt 0)
+    {
+        [Array]$SourceObject = $SourceObject | Where-Object -FilterScript { $_.ResourceName -notin $ExcludedResources }
+        [Array]$DestinationObject = $DestinationObject | Where-Object -FilterScript { $_.ResourceName -notin $ExcludedResources }
+    }
+
     $dscResourceInfo = Get-DSCResource -Module 'Microsoft365DSC'
     # Loop through all items in the source array
     $i = 1
     foreach ($sourceResource in $SourceObject)
     {
-        if ($sourceResource.ResourceName -in $ExcludedResources)
-        {
-            continue
-        }
-
         try
         {
             [array]$key = Get-M365DSCResourceKey -Resource $sourceResource -DSCResourceInfo $dscResourceInfo