Skip to content

Commit

Permalink
Merge branch 'Dev' into fix3958
Browse files Browse the repository at this point in the history
  • Loading branch information
NikCharlebois authored Dec 6, 2023
2 parents fee8d25 + 8bcd5ae commit 891b27b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

* IntuneAntivirusPolicyWindows10SettingCatalog
* Fix condition in Test-TargetResource to check if resource was removed or not
FIXES [#3958](https://github.com/microsoft/Microsoft365DSC/issues/3958)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,10 @@ function Export-TargetResource
[OutputType([System.String])]
param
(
[Parameter()]
[System.String]
$Filter,

[Parameter()]
[System.Management.Automation.PSCredential]
$Credential,
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ function Set-TargetResource
}
foreach ($assignment in $intuneAssignments)
{
New-MgBetaDeviceManagementDeviceConfigurationAssignmentAssignment `
New-MgBetaDeviceManagementDeviceConfigurationAssignment `
-DeviceConfigurationAssignmentId $policy.id `
-BodyParameter $assignment
}
Expand Down

0 comments on commit 891b27b

Please sign in to comment.