From 452be9889c7efd014249aa6fc2702200e80600b4 Mon Sep 17 00:00:00 2001 From: menswearUK <98314167+menswearUK@users.noreply.github.com> Date: Tue, 14 Mar 2023 11:04:02 +0000 Subject: [PATCH 1/2] amended output --- Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 index c4f67680e1..db6b4984f3 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 @@ -170,7 +170,7 @@ function Convert-M365DscHashtableToString } [array]::Sort($values) - return ($values -join '; ') + return ($values -join "`r`n") } <# From fbf53f894df867583135fa3490f351e826f43f6b Mon Sep 17 00:00:00 2001 From: menswearUK <98314167+menswearUK@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:12:21 +0000 Subject: [PATCH 2/2] amended changelog and removed in config 'r'n in android app policy --- CHANGELOG.md | 2 ++ .../MSFT_IntuneAppProtectionPolicyAndroid.psm1 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d98d037910..8561ab63bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ FIXES [#3050](https://github.com/microsoft/Microsoft365DSC/issues/3050) * MISC * Added QA test that checks for existence of an example for each resource. + * Amended output for Convert-M365DscHashtableToString to show each value on a new line + Fixes[#2980](https://github.com/microsoft/Microsoft365DSC/issues/2980) * DRG * Various fixes: Remove invalid character from description in schema.mof diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 index 2fcdc8ae2f..6b0650077b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 @@ -1008,8 +1008,8 @@ function Test-TargetResource # remove thre ID from the values to check as it may not match $targetvalues.remove('ID') | Out-Null - Write-Verbose -Message "Current Values: $((Convert-M365DscHashtableToString -Hashtable $CurrentValues) -replace ';', "`r`n")" - Write-Verbose -Message "Target Values: $((Convert-M365DscHashtableToString -Hashtable $targetvalues) -replace ';', "`r`n")" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $targetvalues)" $TestResult = Test-M365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) `