Skip to content

Commit bf218c6

Browse files
Merge pull request #6979 from FabienTschanz/fix/sensitivity-label-settings
Fix apply of AdvancedSettings
2 parents 1437b3b + 8541d81 commit bf218c6

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@
1818
* IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10
1919
* Fixed an issue with value handling when creating or updating policies.
2020
FIXES [#6955](https://github.com/microsoft/Microsoft365DSC/issues/6955)
21+
* SCLabelPolicy
22+
* Fixed an issue where setting `AdvancedSettings` failed.
23+
FIXES [#6973](https://github.com/microsoft/Microsoft365DSC/issues/6973)
24+
* SCSensitivityLabel
25+
* Fixed an issue where setting `AdvancedSettings` failed.
26+
FIXES [#6973](https://github.com/microsoft/Microsoft365DSC/issues/6973)
2127
* TeamsEmergencyCallingPolicy
2228
* Added explicit cast to string for `ExternalLocationLookupMode`.
2329
* M365DSCUtil
2430
* Removed the internal `Sync-M365DSCParameter` function.
2531
* MISC
2632
* Fixed an issue where hardcoded Azure urls were used in multiple resources.
27-
FIXES [#6957](https://github.com/microsoft/Microsoft365DSC/issues/6957
33+
FIXES [#6957](https://github.com/microsoft/Microsoft365DSC/issues/6957)
2834
* M365DSCDocGenerator
2935
* Fixed an issue where no distinction between read and update
3036
was done for EXO resources.

Modules/Microsoft365DSC/DSCResources/MSFT_SCLabelPolicy/MSFT_SCLabelPolicy.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ function Convert-CIMToAdvancedSettings
975975
$AdvancedSettings
976976
)
977977

978-
$entry = [ordered]@{}
978+
$entry = [PSCustomObject]@{}
979979
foreach ($obj in $AdvancedSettings)
980980
{
981981
$settingsValues = ''
@@ -1006,7 +1006,7 @@ function Convert-CIMToAdvancedSettings
10061006
$settingsValues += ','
10071007
}
10081008
}
1009-
$entry[$obj.Key] = $settingsValues.TrimEnd(',')
1009+
$entry | Add-Member -MemberType NoteProperty -Name $obj.Key -Value $settingsValues.TrimEnd(',') -Force
10101010
}
10111011

10121012
return $entry

Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,7 +1737,7 @@ function Convert-JSONToLocaleSettings
17371737
foreach ($localeSetting in $localeSettings)
17381738
{
17391739
$result = [ordered]@{
1740-
localeKey = $localeSetting.LocaleKey
1740+
LocaleKey = $localeSetting.LocaleKey
17411741
}
17421742
foreach ($setting in $localeSetting.Settings)
17431743
{
@@ -1804,7 +1804,7 @@ function Convert-CIMToAdvancedSettings
18041804
$AdvancedSettings
18051805
)
18061806

1807-
$entry = [ordered]@{}
1807+
$entry = [PSCustomObject]@{}
18081808
foreach ($obj in $AdvancedSettings)
18091809
{
18101810
$settingsValues = ''
@@ -1813,7 +1813,7 @@ function Convert-CIMToAdvancedSettings
18131813
$settingsValues += $objVal
18141814
$settingsValues += ','
18151815
}
1816-
$entry[$obj.Key] = $settingsValues.Substring(0, ($settingsValues.Length - 1))
1816+
$entry | Add-Member -MemberType NoteProperty -Name $obj.Key -Value $settingsValues.Substring(0, ($settingsValues.Length - 1)) -Force
18171817
}
18181818

18191819
return $entry

0 commit comments

Comments
 (0)