Merge pull request #4349 from microsoft/Dev

Release 1.24.214.3
microsoft · Feb 20, 2024 · 5b558a4 · 5b558a4
2 parents 4fac2e3 + 07305a5
commit 5b558a4
Show file tree

Hide file tree

Showing 18 changed files with 254 additions and 203 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Change log for Microsoft365DSC
 
+# 1.24.214.3
+
+* AADAuthenticationMethodPolicy
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyAuthenticator
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyEmail
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyFido2
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicySms
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicySoftware
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyTemporary
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyVoice
+  * Fixed an error where the Export method would loop through the response header.
+* AADAuthenticationMethodPolicyX509
+  * Fixed an error where the Export method would loop through the response header.
+* IntuneAppConfigurationPolicy
+  * Fixed an error in the export on the Settings property.
+* IntuneDeviceEnrollmentStatusPageWindows10
+  * Fixed an error where the Export method would loop through the response header.
+* IntuneWindowsAutopilotDeploymentProfileAzureADJoined
+  * Fixed an error where the Export method would loop through the response header.
+* SCDLPComplianceRule
+  * Fixed the NotifyEmailCustomText and NotifyPolicyTipCustomText to escape fancy
+    quotes.
+* DEPENDENCIES
+  * Updated Microsoft.Graph to version 2.14.1.
+
 # 1.24.214.2
 
 * AADConditionalAccessPolicy

diff --git a/...C/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 b/...C/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1
@@ -555,7 +555,7 @@ function Export-TargetResource
     {
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicy `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.DisplayName}
         #endregion
 
         $i = 1
@@ -574,111 +574,112 @@ function Export-TargetResource
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {
                 $displayedKey = $config.displayName
-            }
-            Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
-            $params = @{
-                Id = $config.Id
-                DisplayName           =  $config.DisplayName
-                Ensure = 'Present'
-                Credential = $Credential
-                ApplicationId = $ApplicationId
-                TenantId = $TenantId
-                ApplicationSecret = $ApplicationSecret
-                CertificateThumbprint = $CertificateThumbprint
-                Managedidentity = $ManagedIdentity.IsPresent
-            }
 
-            $Results = Get-TargetResource @Params
-            $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-                -Results $Results
-            if ($null -ne $Results.RegistrationEnforcement)
-            {
-                $complexMapping = @(
-                    @{
-                        Name = 'RegistrationEnforcement'
-                        CimInstanceName = 'MicrosoftGraphRegistrationEnforcement'
-                        IsRequired = $False
-                    }
-                    @{
-                        Name = 'AuthenticationMethodsRegistrationCampaign'
-                        CimInstanceName = 'MicrosoftGraphAuthenticationMethodsRegistrationCampaign'
-                        IsRequired = $False
-                    }
-                    @{
-                        Name = 'ExcludeTargets'
-                        CimInstanceName = 'MicrosoftGraphExcludeTarget'
-                        IsRequired = $False
-                    }
-                    @{
-                        Name = 'IncludeTargets'
-                        CimInstanceName = 'MicrosoftGraphAuthenticationMethodsRegistrationCampaignIncludeTarget'
-                        IsRequired = $False
-                    }
-                )
-                $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString `
-                    -ComplexObject $Results.RegistrationEnforcement `
-                    -CIMInstanceName 'MicrosoftGraphregistrationEnforcement' `
-                    -ComplexTypeMapping $complexMapping
+                Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
+                $params = @{
+                    Id = $config.Id
+                    DisplayName           =  $config.DisplayName
+                    Ensure = 'Present'
+                    Credential = $Credential
+                    ApplicationId = $ApplicationId
+                    TenantId = $TenantId
+                    ApplicationSecret = $ApplicationSecret
+                    CertificateThumbprint = $CertificateThumbprint
+                    Managedidentity = $ManagedIdentity.IsPresent
+                }
 
-                if (-Not [String]::IsNullOrWhiteSpace($complexTypeStringResult))
+                $Results = Get-TargetResource @Params
+                $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
+                    -Results $Results
+                if ($null -ne $Results.RegistrationEnforcement)
                 {
-                    $Results.RegistrationEnforcement = $complexTypeStringResult
+                    $complexMapping = @(
+                        @{
+                            Name = 'RegistrationEnforcement'
+                            CimInstanceName = 'MicrosoftGraphRegistrationEnforcement'
+                            IsRequired = $False
+                        }
+                        @{
+                            Name = 'AuthenticationMethodsRegistrationCampaign'
+                            CimInstanceName = 'MicrosoftGraphAuthenticationMethodsRegistrationCampaign'
+                            IsRequired = $False
+                        }
+                        @{
+                            Name = 'ExcludeTargets'
+                            CimInstanceName = 'MicrosoftGraphExcludeTarget'
+                            IsRequired = $False
+                        }
+                        @{
+                            Name = 'IncludeTargets'
+                            CimInstanceName = 'MicrosoftGraphAuthenticationMethodsRegistrationCampaignIncludeTarget'
+                            IsRequired = $False
+                        }
+                    )
+                    $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString `
+                        -ComplexObject $Results.RegistrationEnforcement `
+                        -CIMInstanceName 'MicrosoftGraphregistrationEnforcement' `
+                        -ComplexTypeMapping $complexMapping
+
+                    if (-Not [String]::IsNullOrWhiteSpace($complexTypeStringResult))
+                    {
+                        $Results.RegistrationEnforcement = $complexTypeStringResult
+                    }
+                    else
+                    {
+                        $Results.Remove('RegistrationEnforcement') | Out-Null
+                    }
                 }
-                else
+                if ($null -ne $Results.SystemCredentialPreferences)
                 {
-                    $Results.Remove('RegistrationEnforcement') | Out-Null
-                }
-            }
-            if ($null -ne $Results.SystemCredentialPreferences)
-            {
-                $complexMapping = @(
-                    @{
-                        Name = 'SystemCredentialPreferences'
-                        CimInstanceName = 'MicrosoftGraphSystemCredentialPreferences'
-                        IsRequired = $False
+                    $complexMapping = @(
+                        @{
+                            Name = 'SystemCredentialPreferences'
+                            CimInstanceName = 'MicrosoftGraphSystemCredentialPreferences'
+                            IsRequired = $False
+                        }
+                        @{
+                            Name = 'ExcludeTargets'
+                            CimInstanceName = 'AADAuthenticationMethodPolicyExcludeTarget'
+                            IsRequired = $False
+                        }
+                        @{
+                            Name = 'IncludeTargets'
+                            CimInstanceName = 'AADAuthenticationMethodPolicyIncludeTarget'
+                            IsRequired = $False
+                        }
+                    )
+                    $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString `
+                        -ComplexObject $Results.SystemCredentialPreferences `
+                        -CIMInstanceName 'MicrosoftGraphsystemCredentialPreferences' `
+                        -ComplexTypeMapping $complexMapping
+
+                    if (-Not [String]::IsNullOrWhiteSpace($complexTypeStringResult))
+                    {
+                        $Results.SystemCredentialPreferences = $complexTypeStringResult
                     }
-                    @{
-                        Name = 'ExcludeTargets'
-                        CimInstanceName = 'AADAuthenticationMethodPolicyExcludeTarget'
-                        IsRequired = $False
+                    else
+                    {
+                        $Results.Remove('SystemCredentialPreferences') | Out-Null
                     }
-                    @{
-                        Name = 'IncludeTargets'
-                        CimInstanceName = 'AADAuthenticationMethodPolicyIncludeTarget'
-                        IsRequired = $False
-                    }
-                )
-                $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString `
-                    -ComplexObject $Results.SystemCredentialPreferences `
-                    -CIMInstanceName 'MicrosoftGraphsystemCredentialPreferences' `
-                    -ComplexTypeMapping $complexMapping
+                }
 
-                if (-Not [String]::IsNullOrWhiteSpace($complexTypeStringResult))
+                $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName `
+                    -ConnectionMode $ConnectionMode `
+                    -ModulePath $PSScriptRoot `
+                    -Results $Results `
+                    -Credential $Credential
+                if ($Results.RegistrationEnforcement)
                 {
-                    $Results.SystemCredentialPreferences = $complexTypeStringResult
+                    $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "RegistrationEnforcement" -isCIMArray:$False
                 }
-                else
+                if ($Results.SystemCredentialPreferences)
                 {
-                    $Results.Remove('SystemCredentialPreferences') | Out-Null
+                    $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "SystemCredentialPreferences" -isCIMArray:$False
                 }
+                $dscContent += $currentDSCBlock
+                Save-M365DSCPartialExport -Content $currentDSCBlock `
+                    -FileName $Global:PartialExportFileName
             }
-
-            $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName `
-                -ConnectionMode $ConnectionMode `
-                -ModulePath $PSScriptRoot `
-                -Results $Results `
-                -Credential $Credential
-            if ($Results.RegistrationEnforcement)
-            {
-                $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "RegistrationEnforcement" -isCIMArray:$False
-            }
-            if ($Results.SystemCredentialPreferences)
-            {
-                $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "SystemCredentialPreferences" -isCIMArray:$False
-            }
-            $dscContent += $currentDSCBlock
-            Save-M365DSCPartialExport -Content $currentDSCBlock `
-                -FileName $Global:PartialExportFileName
             $i++
             Write-Host $Global:M365DSCEmojiGreenCheckMark
         }

diff --git a/...henticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 b/...henticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
@@ -715,7 +715,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId MicrosoftAuthenticator `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1
@@ -495,7 +495,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId Email `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1
@@ -523,7 +523,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId Fido2 `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...esources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 b/...esources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1
@@ -471,7 +471,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId sms `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...SFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 b/...SFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1
@@ -471,7 +471,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId SoftwareOath  `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...T_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 b/...T_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1
@@ -540,7 +540,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId TemporaryAccessPass `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1
@@ -484,7 +484,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId Voice `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...ources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 b/...ources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1
@@ -547,7 +547,7 @@ function Export-TargetResource
         #region resource generator code
         [array]$getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration `
             -AuthenticationMethodConfigurationId X509Certificate `
-            -ErrorAction Stop
+            -ErrorAction Stop | Where-Object -FilterScript {$null -ne $_.Id}
         #endregion
 
         $i = 1

diff --git a/...DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1 b/...DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1
@@ -587,7 +587,7 @@ function Get-M365DSCIntuneAppConfigurationPolicyCustomSettingsAsString
     [OutputType([System.String])]
     param(
         [Parameter(Mandatory = $true)]
-        [System.Collections.ArrayList]
+        [System.Object[]]
         $Settings
     )
 

diff --git a/...neDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1 b/...neDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1
@@ -126,7 +126,8 @@ function Get-TargetResource
 
         $getValue = $null
         #region resource generator code
-        $getValue = Get-MgBetaDeviceManagementDeviceEnrollmentConfiguration -DeviceEnrollmentConfigurationId $Id -ErrorAction SilentlyContinue
+        $getValue = Get-MgBetaDeviceManagementDeviceEnrollmentConfiguration -DeviceEnrollmentConfigurationId $Id -ErrorAction SilentlyContinue `
+            | Where-Object -FilterScript {$null -ne $_.DisplayName}
 
         if ($null -eq $getValue)
         {
@@ -139,7 +140,7 @@ function Get-TargetResource
                     -ErrorAction SilentlyContinue | Where-Object `
                     -FilterScript { `
                         $_.AdditionalProperties.'@odata.type' -eq '#microsoft.graph.windows10EnrollmentCompletionPageConfiguration' `
-                }
+                } | Where-Object -FilterScript {$null -ne $_.DisplayName}
             }
         }
         #endregion
@@ -149,7 +150,7 @@ function Get-TargetResource
             return $nullResult
         }
 
-        if($getValue -is [Array])
+        if($getValue -is [Array] -and $getValue.Length -gt 1)
         {
             Throw "The DisplayName {$DisplayName} returned multiple policies, make sure DisplayName is unique."
         }

diff --git a/...oymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 b/...oymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1
@@ -107,7 +107,8 @@ function Get-TargetResource
 
         $getValue = $null
         #region resource generator code
-        $getValue = Get-MgBetaDeviceManagementWindowsAutopilotDeploymentProfile -WindowsAutopilotDeploymentProfileId $Id  -ErrorAction SilentlyContinue
+        $getValue = Get-MgBetaDeviceManagementWindowsAutopilotDeploymentProfile -WindowsAutopilotDeploymentProfileId $Id  -ErrorAction SilentlyContinue `
+            | Where-Object -FilterScript {$null -ne $_.DisplayName}
 
         if ($null -eq $getValue)
         {
@@ -117,7 +118,8 @@ function Get-TargetResource
             {
                 $getValue = Get-MgBetaDeviceManagementWindowsAutopilotDeploymentProfile `
                     -Filter "DisplayName eq '$DisplayName'" `
-                    -ErrorAction SilentlyContinue
+                    -ErrorAction SilentlyContinue `
+                    | Where-Object -FilterScript {$null -ne $_.DisplayName}
             }
         }
         #endregion

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1
@@ -406,8 +406,8 @@ function Get-TargetResource
                 GenerateIncidentReport                       = $PolicyRule.GenerateIncidentReport
                 IncidentReportContent                        = $ArrayIncidentReportContent
                 NotifyAllowOverride                          = $NotifyAllowOverrideValue
-                NotifyEmailCustomText                        = $PolicyRule.NotifyEmailCustomText
-                NotifyPolicyTipCustomText                    = $PolicyRule.NotifyPolicyTipCustomText
+                NotifyEmailCustomText                        = [regex]::Replace($PolicyRule.NotifyEmailCustomText, $fancyDoubleQuotes, "`"")
+                NotifyPolicyTipCustomText                    = [regex]::Replace($PolicyRule.NotifyPolicyTipCustomText, $fancyDoubleQuotes, "`"")
                 NotifyUser                                   = $PolicyRule.NotifyUser
                 ReportSeverityLevel                          = $PolicyRule.ReportSeverityLevel
                 RuleErrorAction                              = $PolicyRule.RuleErrorAction