Skip to content

Commit

Permalink
Merge pull request #3887 from NikCharlebois/Various-fixes-for-new-cha…
Browse files Browse the repository at this point in the history
…nges

Various Fixes for new Intune Changes
  • Loading branch information
NikCharlebois authored Nov 13, 2023
2 parents 9e7005b + 15da509 commit 6eefa6d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ function Export-TargetResource
Managedidentity = $ManagedIdentity.IsPresent
}

$Results = Get-TargetResource @params -Verbose
$Results = Get-TargetResource @params

if ($Results.Ensure -eq 'Present')
{
Expand Down Expand Up @@ -1178,7 +1178,6 @@ function Update-DeviceManagementConfigurationPolicy
'templateReference' = $templateReference
'settings' = $Settings
}
# Write-Verbose ($policy | ConvertTo-Json -Depth 20) -Verbose
Invoke-MgGraphRequest -Method PUT `
-Uri $Uri `
-ContentType 'application/json' `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,8 @@ function Export-TargetResource
$currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray
}

$currentDSCBlock = $currentDSCBlock.Replace("`r`n `");", "`r`n );")

$dscContent += $currentDSCBlock
Save-M365DSCPartialExport -Content $currentDSCBlock `
-FileName $Global:PartialExportFileName
Expand Down
1 change: 0 additions & 1 deletion Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ function Compare-PSCustomObjectArrays
[System.Object[]]
$CurrentValues
)
$VerbosePreference = 'Continue'
$DriftedProperties = @()
foreach ($DesiredEntry in $DesiredValues)
{
Expand Down

0 comments on commit 6eefa6d

Please sign in to comment.