From aec3b2e178c94de5803142a9d20377528e56955d Mon Sep 17 00:00:00 2001 From: Fabien Tschanz Date: Tue, 4 Feb 2025 13:57:37 +0100 Subject: [PATCH 01/26] Update authentication properties --- CHANGELOG.md | 5 +- .../MSFT_EXOSmtpDaneInbound.psm1 | 81 +++++++++++++++---- 2 files changed, 69 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ae55c46d2..571efd4a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ * AADConditionalAccessPolicy * Changed the InsiderRiskTypes property to a string array. +* EXOSmtpDaneInbound + * Updated authentication properties to align with MOF definition. + FIXES [#5709](https://github.com/microsoft/Microsoft365DSC/issues/5709) * MISC - * Changed the CIMInstance logic of various resources to us common logic. + * Changed the CIMInstance logic of various resources to use common logic. # 1.25.129.3 diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 index 8383f481c3..e82804d280 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 @@ -29,9 +29,21 @@ function Get-TargetResource [System.String] $CertificateThumbprint, + [Parameter()] + [System.String] + $CertificatePath, + [Parameter()] [System.Management.Automation.PSCredential] - $ApplicationSecret + $CertificatePassword, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) New-M365DSCConnection -Workload 'ExchangeOnline' ` @@ -65,9 +77,12 @@ function Get-TargetResource Ensure = 'Present' Credential = $Credential ApplicationId = $ApplicationId - TenantId = $TenantId CertificateThumbprint = $CertificateThumbprint - ApplicationSecret = $ApplicationSecret + CertificatePath = $CertificatePath + CertificatePassword = $CertificatePassword + Managedidentity = $ManagedIdentity.IsPresent + TenantId = $TenantId + AccessTokens = $AccessTokens } return [System.Collections.Hashtable] $results } @@ -113,9 +128,21 @@ function Set-TargetResource [System.String] $CertificateThumbprint, + [Parameter()] + [System.String] + $CertificatePath, + [Parameter()] [System.Management.Automation.PSCredential] - $ApplicationSecret + $CertificatePassword, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) New-M365DSCConnection -Workload 'ExchangeOnline' ` @@ -188,9 +215,21 @@ function Test-TargetResource [System.String] $CertificateThumbprint, + [Parameter()] + [System.String] + $CertificatePath, + [Parameter()] [System.Management.Automation.PSCredential] - $ApplicationSecret + $CertificatePassword, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) #Ensure the proper dependencies are installed in the current environment. @@ -243,16 +282,24 @@ function Export-TargetResource $TenantId, [Parameter()] - [System.Management.Automation.PSCredential] - $ApplicationSecret, + [System.String] + $CertificateThumbprint, [Parameter()] [System.String] - $CertificateThumbprint, + $CertificatePath, + + [Parameter()] + [System.Management.Automation.PSCredential] + $CertificatePassword, [Parameter()] [Switch] - $ManagedIdentity + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) $ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' ` @@ -298,14 +345,16 @@ function Export-TargetResource } Write-Host " |---[$i/$($getValue.Count)] $displayedKey" -NoNewline $params = @{ - DomainName = $config.DomainName - Ensure = 'Present' - Credential = $Credential - ApplicationId = $ApplicationId - TenantId = $TenantId + DomainName = $config.DomainName + Ensure = 'Present' + Credential = $Credential + ApplicationId = $ApplicationId CertificateThumbprint = $CertificateThumbprint - ApplicationSecret = $ApplicationSecret - + CertificatePath = $CertificatePath + CertificatePassword = $CertificatePassword + Managedidentity = $ManagedIdentity.IsPresent + TenantId = $TenantId + AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params From aa0a817c2f97d133375e2dcbde6d6ede6991d126 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Fri, 7 Feb 2025 07:24:37 -0500 Subject: [PATCH 02/26] Added checks for hardcoded Graph url --- .github/workflows/Validation Checks.yml | 34 +++++++++++++++++++ .../MSFT_AADGroupEligibilitySchedule.psm1 | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/Validation Checks.yml diff --git a/.github/workflows/Validation Checks.yml b/.github/workflows/Validation Checks.yml new file mode 100644 index 0000000000..23450a31f9 --- /dev/null +++ b/.github/workflows/Validation Checks.yml @@ -0,0 +1,34 @@ +name: Validation Checks +on: [push, pull_request] + +jobs: + # This workflow contains a single job called "build" + UnitTests: + # The type of runner that the job will run on + runs-on: windows-latest + + permissions: write-all + + # Only when run from the main repo + if: github.repository == 'microsoft/Microsoft365DSC' + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Ensure No Hardcoded Graph Endpoints + shell: pwsh + run: | + $resources = Get-ChildItem './Modules/Microsoft365DSC/DSCResources/*.psm1' -Recurse + + foreach ($resource in $resources) + { + $content = Get-Content $resource.FullName -Raw + $foundPosition = $content.IndexOf('https://graph.microsoft.com', 0) + if ($foundPosition -ge 0) + { + throw "Resource {$($Resource.Name)} contains hardcoded Graph references." + } + } diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 index 62a4ea729c..e2d1d78b5a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 @@ -113,7 +113,7 @@ function Get-TargetResource $Id = $getId.Id } - $uri = 'https://graph.microsoft.com/v1.0/identityGovernance/privilegedAccess/group/eligibilitySchedules/' + $Id + $uri = "$((Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl)v1.0/identityGovernance/privilegedAccess/group/eligibilitySchedules/" + $Id $getvalue = Invoke-GraphRequest -Uri $uri -Method Get -ErrorAction SilentlyContinue #endregion From 68b31d909412d7f5f0c49b918f3634e064634903 Mon Sep 17 00:00:00 2001 From: Mike Poulson Date: Fri, 7 Feb 2025 14:26:41 -0800 Subject: [PATCH 03/26] Fix 5741 - Add missing -All flag on get-mggroup to enumerate all groups. --- CHANGELOG.md | 4 ++++ .../MSFT_AADGroupEligibilitySchedule.psm1 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aaee5b929..f984ee0353 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change log for Microsoft365DSC +# UNRELEASED + +* AADGroupEligibilitySchedule + * FIXES [#5741] Missing -All variable which prevented enumeration of more than 100 Groups # 1.25.205.1 diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 index e2d1d78b5a..3dc12fdd47 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 @@ -784,7 +784,7 @@ function Export-TargetResource try { - $groups = Get-MgGroup -Filter "MailEnabled eq false and NOT(groupTypes/any(x:x eq 'DynamicMembership'))" -Property "displayname,Id" -CountVariable CountVar -ConsistencyLevel eventual -ErrorAction Stop + $groups = Get-MgGroup -Filter "MailEnabled eq false and NOT(groupTypes/any(x:x eq 'DynamicMembership'))" -Property "displayname,Id" -CountVariable CountVar -All -ConsistencyLevel eventual -ErrorAction Stop $j = 1 if ($groups.Length -eq 0) { From 30578679645a2a8b553a4ee31a22869e47145ef5 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Sat, 8 Feb 2025 10:20:12 -0500 Subject: [PATCH 04/26] EXORetentionPolicyTag - Initial Release --- CHANGELOG.md | 5 + .../MSFT_EXORetentionPolicyTag.psm1 | 450 + .../MSFT_EXORetentionPolicyTag.schema.mof | 19 + .../MSFT_EXORetentionPolicyTag/readme.md | 6 + .../MSFT_EXORetentionPolicyTag/settings.json | 34 + .../MSFT_PPTenantSettings.psm1 | 132 +- .../MSFT_PPTenantSettings.schema.mof | 1 + .../EXORetentionPolicyTag/1-Create.ps1 | 39 + .../EXORetentionPolicyTag/2-Update.ps1 | 39 + .../EXORetentionPolicyTag/3-Remove.ps1 | 39 + ...soft365DSC.EXORetentionPolicyTag.Tests.ps1 | 229 + Tests/Unit/Stubs/Microsoft365.psm1 | 9359 ++++++++--------- 12 files changed, 5526 insertions(+), 4826 deletions(-) create mode 100644 Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 create mode 100644 Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.schema.mof create mode 100644 Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/readme.md create mode 100644 Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/settings.json create mode 100644 Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/1-Create.ps1 create mode 100644 Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/2-Update.ps1 create mode 100644 Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/3-Remove.ps1 create mode 100644 Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORetentionPolicyTag.Tests.ps1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aaee5b929..4c12965902 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log for Microsoft365DSC +# UNRELEASED + +* EXORetentionPolicyTag + * Initial release. + # 1.25.205.1 * AADApplication diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 new file mode 100644 index 0000000000..2fcd79ac87 --- /dev/null +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 @@ -0,0 +1,450 @@ +function Get-TargetResource +{ + [CmdletBinding()] + [OutputType([System.Collections.Hashtable])] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + $Identity, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.String] + $AgeLimitForRetention, + + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Boolean] + $MustDisplayCommentEnabled, + + [Parameter()] + [System.String] + $RetentionAction, + + [Parameter()] + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.String] + $Type, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens + ) + + New-M365DSCConnection -Workload 'ExchangeOnline' ` + -InboundParameters $PSBoundParameters | Out-Null + + #Ensure the proper dependencies are installed in the current environment. + Confirm-M365DSCDependencies + + #region Telemetry + $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '') + $CommandName = $MyInvocation.MyCommand + $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName ` + -CommandName $CommandName ` + -Parameters $PSBoundParameters + Add-M365DSCTelemetryEvent -Data $data + #endregion + + $nullResult = $PSBoundParameters + $nullResult.Ensure = 'Absent' + try + { + if ($null -ne $Script:exportedInstances -and $Script:ExportMode) + { + $instance = $Script:exportedInstances | Where-Object -FilterScript {$_.Identity -eq $Identity} + } + else + { + $instance = Get-RetentionPolicyTag -Identity $Identity -ErrorAction SilentlyContinue + } + if ($null -eq $instance) + { + return $nullResult + } + + Write-Verbose -Message "Found existing instace of retention policy tag {$Identity}" + $results = @{ + Identity = $instance.Identity + Comment = $instance.Comment + AgeLimitForRetention = $instance.AgeLimitForRetention + MessageClass = $instance.MessageClass + MustDisplayCommentEnabled = $instance.MustDisplayCommentEnabled + RetentionAction = $instance.RetentionAction + RetentionEnabled = $instance.RetentionEnabled + Type = $instance.Type + Ensure = 'Present' + Credential = $Credential + ApplicationId = $ApplicationId + TenantId = $TenantId + CertificateThumbprint = $CertificateThumbprint + ManagedIdentity = $ManagedIdentity.IsPresent + AccessTokens = $AccessTokens + } + return [System.Collections.Hashtable] $results + } + catch + { + Write-Verbose -Message $_ + New-M365DSCLogEntry -Message 'Error retrieving data:' ` + -Exception $_ ` + -Source $($MyInvocation.MyCommand.Source) ` + -TenantId $TenantId ` + -Credential $Credential + + return $nullResult + } +} + +function Set-TargetResource +{ + [CmdletBinding()] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + $Identity, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.String] + $AgeLimitForRetention, + + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Boolean] + $MustDisplayCommentEnabled, + + [Parameter()] + [System.String] + $RetentionAction, + + [Parameter()] + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.String] + $Type, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens + ) + + #Ensure the proper dependencies are installed in the current environment. + Confirm-M365DSCDependencies + + #region Telemetry + $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '') + $CommandName = $MyInvocation.MyCommand + $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName ` + -CommandName $CommandName ` + -Parameters $PSBoundParameters + Add-M365DSCTelemetryEvent -Data $data + #endregion + + $currentInstance = Get-TargetResource @PSBoundParameters + $setParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters + + # CREATE + if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent') + { + Write-Verbose -Message "Creating new retention policy tag {$Identity}" + $setParameters.Add('Name', $Identity) + $setParameters.Remove("Identity") | Out-Null + New-RetentionPolicyTag @SetParameters + } + # UPDATE + elseif ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Present') + { + Write-Verbose -Message "Updating retention policy tag {$Identity}" + $setParameters.Remove('Type') | Out-Null + Set-RetentionPolicyTag @SetParameters + } + # REMOVE + elseif ($Ensure -eq 'Absent' -and $currentInstance.Ensure -eq 'Present') + { + Write-Verbose -Message "Removing retention policy tag {$Identity}" + Remove-RetentionPolicyTag -Identity $Identity + } +} + +function Test-TargetResource +{ + [CmdletBinding()] + [OutputType([System.Boolean])] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + $Identity, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.String] + $AgeLimitForRetention, + + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Boolean] + $MustDisplayCommentEnabled, + + [Parameter()] + [System.String] + $RetentionAction, + + [Parameter()] + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.String] + $Type, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens + ) + + #Ensure the proper dependencies are installed in the current environment. + Confirm-M365DSCDependencies + + #region Telemetry + $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '') + $CommandName = $MyInvocation.MyCommand + $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName ` + -CommandName $CommandName ` + -Parameters $PSBoundParameters + Add-M365DSCTelemetryEvent -Data $data + #endregion + + $CurrentValues = Get-TargetResource @PSBoundParameters + $ValuesToCheck = ([Hashtable]$PSBoundParameters).Clone() + + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)" + + $testResult = Test-M365DSCParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck $ValuesToCheck.Keys + + Write-Verbose -Message "Test-TargetResource returned $testResult" + + return $testResult +} + +function Export-TargetResource +{ + [CmdletBinding()] + [OutputType([System.String])] + param + ( + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.Management.Automation.PSCredential] + $ApplicationSecret, + + [Parameter()] + [System.String] + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens + ) + + $ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' ` + -InboundParameters $PSBoundParameters + + #Ensure the proper dependencies are installed in the current environment. + Confirm-M365DSCDependencies + + #region Telemetry + $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '') + $CommandName = $MyInvocation.MyCommand + $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName ` + -CommandName $CommandName ` + -Parameters $PSBoundParameters + Add-M365DSCTelemetryEvent -Data $data + #endregion + + try + { + $Script:ExportMode = $true + [array] $Script:exportedInstances = Get-RetentionPolicyTag -ErrorAction Stop + + $i = 1 + $dscContent = '' + if ($Script:exportedInstances.Length -eq 0) + { + Write-Host $Global:M365DSCEmojiGreenCheckMark + } + else + { + Write-Host "`r`n" -NoNewline + } + foreach ($config in $Script:exportedInstances) + { + if ($null -ne $Global:M365DSCExportResourceInstancesCount) + { + $Global:M365DSCExportResourceInstancesCount++ + } + + $displayedKey = $config.Identity + Write-Host " |---[$i/$($Script:exportedInstances.Count)] $displayedKey" -NoNewline + $params = @{ + Identity = $config.Identity + Credential = $Credential + ApplicationId = $ApplicationId + TenantId = $TenantId + CertificateThumbprint = $CertificateThumbprint + ManagedIdentity = $ManagedIdentity.IsPresent + AccessTokens = $AccessTokens + } + + $Results = Get-TargetResource @Params + $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` + -Results $Results + + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` + -ConnectionMode $ConnectionMode ` + -ModulePath $PSScriptRoot ` + -Results $Results ` + -Credential $Credential + $dscContent += $currentDSCBlock + Save-M365DSCPartialExport -Content $currentDSCBlock ` + -FileName $Global:PartialExportFileName + $i++ + Write-Host $Global:M365DSCEmojiGreenCheckMark + } + return $dscContent + } + catch + { + Write-Host $Global:M365DSCEmojiRedX + + New-M365DSCLogEntry -Message 'Error during Export:' ` + -Exception $_ ` + -Source $($MyInvocation.MyCommand.Source) ` + -TenantId $TenantId ` + -Credential $Credential + + return '' + } +} + +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.schema.mof new file mode 100644 index 0000000000..ed567d4c19 --- /dev/null +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.schema.mof @@ -0,0 +1,19 @@ +[ClassVersion("1.0.0.0"), FriendlyName("EXORetentionPolicyTag")] +class MSFT_EXORetentionPolicyTag : OMI_BaseResource +{ + [Key, Description("The Identity parameter specifies the name of the tag.")] String Identity; + [Write, Description("The Description parameter specifies a comment for the tag.")] String Comment; + [Write, Description("The AgeLimitForRetention parameter specifies the age at which retention is enforced on an item. The age limit corresponds to the number of days from the date the item was delivered, or the date an item was created if it wasn't delivered. If this parameter isn't present and the RetentionEnabled parameter is set to $true, an error is returned.")] String AgeLimitForRetention; + [Write, Description("The MessageClass parameter specifies the message type to which the tag applies. If not specified, the default value is set to *.")] String MessageClass; + [Write, Description("The MustDisplayCommentEnabled parameter specifies whether the comment can be hidden. The default value is $true.")] Boolean MustDisplayCommentEnabled; + [Write, Description("The RetentionAction parameter specifies the action for the retention policy.")] String RetentionAction; + [Write, Description("The RetentionEnabled parameter specifies whether the tag is enabled. When set to $false, the tag is disabled, and no retention action is taken on messages that have the tag applied.")] Boolean RetentionEnabled; + [Write, Description("The Type parameter specifies the type of retention tag being created.")] String Type; + [Write, Description("Present ensures the instance exists, absent ensures it is removed."), ValueMap{"Absent","Present"}, Values{"Absent","Present"}] string Ensure; + [Write, Description("Credentials of the workload's Admin"), EmbeddedInstance("MSFT_Credential")] string Credential; + [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId; + [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId; + [Write, Description("Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication.")] String CertificateThumbprint; + [Write, Description("Managed ID being used for authentication.")] Boolean ManagedIdentity; + [Write, Description("Access token used for authentication.")] String AccessTokens[]; +}; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/readme.md new file mode 100644 index 0000000000..ce44ed01c3 --- /dev/null +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/readme.md @@ -0,0 +1,6 @@ + +# EXORetentionPolicyTag + +## Description + +Manage Exchange Online retention policy tags. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/settings.json b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/settings.json new file mode 100644 index 0000000000..6fb28514e5 --- /dev/null +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/settings.json @@ -0,0 +1,34 @@ +{ + "resourceName": "EXORetentionPolicyTag", + "description": "Manage Exchange Online retention policy tags.", + "roles": { + "read": [ + "Global Reader" + ], + "update": [ + "Exchange Administrator" + ] + }, + "permissions": { + "graph": { + "delegated": { + "read": [], + "update": [] + }, + "application": { + "read": [], + "update": [] + } + }, + "exchange": { + "requiredroles": [ + "Organization Management", + "Recipient Management" + ], + "requiredrolegroups": [ + "Organization Management", + "Help Desk" + ] + } + } +} diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 index 2177e77ac1..3b257440ee 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 @@ -205,6 +205,10 @@ function Get-TargetResource [System.Boolean] $DisableSurveyScreenshots, + [Parameter()] + [System.Boolean] + $UseSupportBingSearchByAllUsers, + [Parameter()] [System.Management.Automation.PSCredential] $Credential, @@ -301,24 +305,24 @@ function Get-TargetResource DisableSkillsMatchInvitationReachout = $PPTenantSettings.powerPlatform.champions.disableSkillsMatchInvitationReachout #intelligence - DisableCopilotFeedback = $PPTenantSettings.powerPlatforms.intelligence.disableCopilotFeedback - EnableOpenAiBotPublishing = $PPTenantSettings.powerPlatforms.intelligence.enableOpenAiBotPublishing - DisableCopilotFeedbackMetadata = $PPTenantSettings.powerPlatforms.intelligence.disableCopilotFeedbackMetadata - DisableAiPrompts = $PPTenantSettings.powerPlatforms.intelligence.disableAiPrompts + DisableCopilotFeedback = $PPTenantSettings.powerPlatform.intelligence.disableCopilotFeedback + EnableOpenAiBotPublishing = $PPTenantSettings.powerPlatform.intelligence.enableOpenAiBotPublishing + DisableCopilotFeedbackMetadata = $PPTenantSettings.powerPlatform.intelligence.disableCopilotFeedbackMetadata + DisableAiPrompts = $PPTenantSettings.powerPlatform.intelligence.disableAiPrompts #modelExperimentation - EnableModelDataSharing = $PPTenantSettings.powerPlatforms.modelExperimentation.enableModelDataSharing - DisableDataLogging = $PPTenantSettings.powerPlatforms.modelExperimentation.disableDataLogging + EnableModelDataSharing = $PPTenantSettings.powerPlatform.modelExperimentation.enableModelDataSharing + DisableDataLogging = $PPTenantSettings.powerPlatform.modelExperimentation.disableDataLogging #catalogSettings - PowerCatalogAudienceSetting = $PPTenantSettings.powerPlatforms.catalogSettings.powerCatalogAudienceSetting + PowerCatalogAudienceSetting = $PPTenantSettings.powerPlatform.catalogSettings.powerCatalogAudienceSetting #userManagementSettings - EnableDeleteDisabledUserinAllEnvironments = $PPTenantSettings.powerPlatforms.userManagementSettings.enableDeleteDisabledUserinAllEnvironments + EnableDeleteDisabledUserinAllEnvironments = $PPTenantSettings.powerPlatform.userManagementSettings.enableDeleteDisabledUserinAllEnvironments #helpSupportSettings - DisableHelpSupportCopilot = $PPTenantSettings.powerPlatforms.helpSupportSettings.disableHelpSupportCopilot - UseSupportBingSearchByAllUsers = $PPTenantSettings.powerPlatforms.helpSupportSettings.useSupportBingSearchByAllUsers + DisableHelpSupportCopilot = $PPTenantSettings.powerPlatform.helpSupportSettings.disableHelpSupportCopilot + UseSupportBingSearchByAllUsers = $PPTenantSettings.powerPlatform.helpSupportSettings.useSupportBingSearchByAllUsers #Main WalkMeOptOut = $PPTenantSettings.walkMeOptOut @@ -557,6 +561,10 @@ function Set-TargetResource [System.Boolean] $DisableSurveyScreenshots, + [Parameter()] + [System.Boolean] + $UseSupportBingSearchByAllUsers, + [Parameter()] [System.Management.Automation.PSCredential] $Credential, @@ -597,7 +605,9 @@ function Set-TargetResource $SetParameters = $PSBoundParameters $RequestBody = Get-M365DSCPowerPlatformTenantSettings -Parameters $SetParameters - Set-TenantSettings -RequestBody $RequestBody | Out-Null + Write-Verbose -Message (ConvertTo-Json $RequestBody -Depth 10) + + Set-TenantSettings -RequestBody $RequestBody -Verbose | Out-Null } function Test-TargetResource @@ -807,6 +817,10 @@ function Test-TargetResource [System.Boolean] $DisableSurveyScreenshots, + [Parameter()] + [System.Boolean] + $UseSupportBingSearchByAllUsers, + [Parameter()] [System.Management.Automation.PSCredential] $Credential, @@ -972,23 +986,40 @@ function Get-M365DSCPowerPlatformTenantSettings ) $result = @{ + disableCapacityAllocationByEnvironmentAdmins = $Parameters.DisableCapacityAllocationByEnvironmentAdmins + disableSupportTicketsVisibleByAllUsers = $Parameters.DisableSupportTicketsVisibleByAllUsers walkMeOptOut = $Parameters.WalkMeOptOut - disableNPSCommentsReachout = $Parameters.DisableNPSCommentsReachout - disableNewsletterSendout = $Parameters.DisableNewsletterSendout + disableSurveyScreenshots = $Parameters.DisableSurveyScreenshots disableEnvironmentCreationByNonAdminUsers = $Parameters.DisableEnvironmentCreationByNonAdminUsers disablePortalsCreationByNonAdminUsers = $Parameters.DisablePortalsCreationByNonAdminUsers + disableNewsletterSendout = $Parameters.DisableNewsletterSendout + disableNPSCommentsReachout = $Parameters.DisableNPSCommentsReachout disableSurveyFeedback = $Parameters.DisableSurveyFeedback - disableSurveyScreenshots = $Parameters.DisableSurveyScreenshots disableTrialEnvironmentCreationByNonAdminUsers = $Parameters.DisableTrialEnvironmentCreationByNonAdminUsers - disableCapacityAllocationByEnvironmentAdmins = $Parameters.DisableCapacityAllocationByEnvironmentAdmins - disableSupportTicketsVisibleByAllUsers = $Parameters.DisableSupportTicketsVisibleByAllUsers powerPlatform = @{ - search = @{ - disableDocsSearch = $Parameters.DisableDocsSearch - disableCommunitySearch = $Parameters.DisableCommunitySearch - disableBingVideoSearch = $Parameters.DisableBingVideoSearch + powerAutomate = @{ + disableCopilotWithBing = $Parameters.DisableCopilotWithBing + } + catalogSettings = @{ + powerCatalogAudienceSetting = $Parameters.PowerCatalogAudienceSetting + } + governance = @{ + disableAdminDigest = $Parameters.DisableAdminDigest + disableDeveloperEnvironmentCreationByNonAdminUsers = $Parameters.DisableDeveloperEnvironmentCreationByNonAdminUsers + enableDefaultEnvironmentRouting = $Parameters.EnableDefaultEnvironmentRouting + policy = @{ + enableDesktopFlowDataPolicyManagement = [Boolean]::Parse($Parameters.EnableDesktopFlowDataPolicyManagement) + } + environmentRoutingAllMakers = $Parameters.EnvironmentRoutingAllMakers + } + environments = @{ + disablePreferredDataLocationForTeamsEnvironment = $Parameters.DisablePreferredDataLocationForTeamsEnvironment + } + helpSupportSettings = @{ + disableHelpSupportCopilot = $Parameters.DisableHelpSupportCopilot + useSupportBingSearchByAllUsers = $Parameters.UseSupportBingSearchByAllUsers } - teams = @{ + teamsIntegration = @{ shareWithColleaguesUserLimit = $Parameters.ShareWithColleaguesUserLimit } powerApps = @{ @@ -1003,25 +1034,27 @@ function Get-M365DSCPowerPlatformTenantSettings allowNewOrgChannelDefault = $Parameters.AllowNewOrgChannelDefault disableCopilot = $Parameters.DisableCopilot } - environments = @{ - disablePreferredDataLocationForTeamsEnvironment = $Parameters.DisablePreferredDataLocationForTeamsEnvironment + search = @{ + disableDocsSearch = $Parameters.DisableDocsSearch + disableCommunitySearch = $Parameters.DisableCommunitySearch + disableBingVideoSearch = $Parameters.DisableBingVideoSearch } - powerAutomate = @{ - disableCopilotWithBing = $Parameters.DisableCopilotWithBing + userManagementSettings = @{ + enableDeleteDisabledUserinAllEnvironments = $Parameters.EnableDeleteDisabledUserinAllEnvironments } - governance = @{ - disableAdminDigest = $Parameters.DisableAdminDigest - disableDeveloperEnvironmentCreationByNonAdminUsers = $Parameters.DisableDeveloperEnvironmentCreationByNonAdminUsers - enableDefaultEnvironmentRouting = $Parameters.EnableDefaultEnvironmentRouting - policy = @( - @{ - enableDesktopFlowDataPolicyManagement = $Parameters.EnableDesktopFlowDataPolicyManagement - } - ) - environmentRoutingAllMakers = $Parameters.EnvironmentRoutingAllMakers + powerPages = @{ + enableGenerativeAIFeaturesForSiteUsers = $Parameters.EnableGenerativeAIFeaturesForSiteUsers + enableExternalAuthenticationProvidersInPowerPages = $Parameters.EnableExternalAuthenticationProvidersInPowerPages } - teamsIntegration = @{ - shareWithColleaguesUserLimit = $Parameters.ShareWithColleaguesUserLimit + modelExperimentation = @{ + enableModelDataSharing = $Parameters.EnableModelDataSharing + disableDataLogging = $Parameters.DisableDataLogging + } + intelligence = @{ + disableCopilotFeedback = $Parameters.DisableCopilotFeedback + enableOpenAiBotPublishing = $Parameters.EnableOpenAiBotPublishing + disableCopilotFeedbackMetadata = $Parameters.DisableCopilotFeedbackMetadata + disableAiPrompts = $Parameters.DisableAiPrompts } licensing = @{ disableBillingPolicyCreationByNonAdminUsers = $Parameters.DisableBillingPolicyCreationByNonAdminUsers @@ -1030,34 +1063,11 @@ function Get-M365DSCPowerPlatformTenantSettings enableTenantLicensingReportForEnvironmentAdmins = $Parameters.EnableTenantLicensingReportForEnvironmentAdmins disableUseOfUnassignedAIBuilderCredits = $Parameters.DisableUseOfUnassignedAIBuilderCredits } - powerPages = @{ - enableGenerativeAIFeaturesForSiteUsers = $Parameters.EnableGenerativeAIFeaturesForSiteUsers - enableExternalAuthenticationProvidersInPowerPages = $Parameters.EnableExternalAuthenticationProvidersInPowerPages - } champions = @{ disableChampionsInvitationReachout = $Parameters.DisableChampionsInvitationReachout disableSkillsMatchInvitationReachout = $Parameters.DisableSkillsMatchInvitationReachout } - intelligence = @{ - disableCopilotFeedback = $Parameters.disableCopilotFeedback - enableOpenAiBotPublishing = $Parameters.enableOpenAiBotPublishing - disableCopilotFeedbackMetadata = $Parameters.disableCopilotFeedbackMetadata - disableAiPrompts = $Parameters.disableAiPrompts - } - modelExperimentation = @{ - enableModelDataSharing = $Parameters.enableModelDataSharing - disableDataLogging = $Parameters.disableDataLogging - } - catalogSettings = @{ - powerCatalogAudienceSetting = $Parameters.powerCatalogAudienceSetting - } - userManagementSettings = @{ - enableDeleteDisabledUserinAllEnvironments = $Parameters.enableDeleteDisabledUserinAllEnvironments - } - helpSupportSettings = @{ - disableHelpSupportCopilot = $Parameters.disableHelpSupportCopilot - useSupportBingSearchByAllUsers = $Parameters.useSupportBingSearchByAllUsers - } + gccCommercialSettings = @{} } } diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof index 52ddef519d..f61aef5147 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof @@ -39,6 +39,7 @@ class MSFT_PPTenantSettings : OMI_BaseResource [Write, Description("TBD")] Boolean DisableHelpSupportCopilot; [Write, Description("TBD")] Boolean DisableSurveyScreenshots; [Write, Description("When set to true this will disable the Walk Me guidance.")] boolean WalkMeOptOut; + [Write, Description("TBD")] boolean useSupportBingSearchByAllUsers; [Write, Description("When set to true this will disable the NPS Comments Reachout.")] boolean DisableNPSCommentsReachout; [Write, Description("When set to true this will disable the monthly newsletters.")] boolean DisableNewsletterSendout; [Write, Description("When set to true this will disable production environment creation by non-admin users.")] boolean DisableEnvironmentCreationByNonAdminUsers; diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/1-Create.ps1 new file mode 100644 index 0000000000..59dc8825b6 --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/1-Create.ps1 @@ -0,0 +1,39 @@ +<# +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. +#> + +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/2-Update.ps1 new file mode 100644 index 0000000000..750f3fa7dd --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/2-Update.ps1 @@ -0,0 +1,39 @@ +<# +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. +#> + +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my modified tag"; #Drift + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/3-Remove.ps1 new file mode 100644 index 0000000000..6c28bda3c4 --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/EXORetentionPolicyTag/3-Remove.ps1 @@ -0,0 +1,39 @@ +<# +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. +#> + +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Absent"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORetentionPolicyTag.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORetentionPolicyTag.Tests.ps1 new file mode 100644 index 0000000000..b58cf9a432 --- /dev/null +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORetentionPolicyTag.Tests.ps1 @@ -0,0 +1,229 @@ +[CmdletBinding()] +param( +) +$M365DSCTestFolder = Join-Path -Path $PSScriptRoot ` + -ChildPath '..\..\Unit' ` + -Resolve +$CmdletModule = (Join-Path -Path $M365DSCTestFolder ` + -ChildPath '\Stubs\Microsoft365.psm1' ` + -Resolve) +$GenericStubPath = (Join-Path -Path $M365DSCTestFolder ` + -ChildPath '\Stubs\Generic.psm1' ` + -Resolve) +Import-Module -Name (Join-Path -Path $M365DSCTestFolder ` + -ChildPath '\UnitTestHelper.psm1' ` + -Resolve) + +$CurrentScriptPath = $PSCommandPath.Split('\') +$CurrentScriptName = $CurrentScriptPath[$CurrentScriptPath.Length -1] +$ResourceName = $CurrentScriptName.Split('.')[1] +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` + -DscResource $ResourceName -GenericStubModule $GenericStubPath + +Describe -Name $Global:DscHelper.DescribeHeader -Fixture { + InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { + Invoke-Command -ScriptBlock $Global:DscHelper.InitializeScript -NoNewScope + BeforeAll { + + $secpasswd = ConvertTo-SecureString (New-Guid | Out-String) -AsPlainText -Force + $Credential = New-Object System.Management.Automation.PSCredential ('tenantadmin@mydomain.com', $secpasswd) + + Mock -CommandName Confirm-M365DSCDependencies -MockWith { + } + + Mock -CommandName New-M365DSCConnection -MockWith { + return "Credentials" + } + + Mock -CommandName New-RetentionPolicyTag -MockWith { + } + + Mock -CommandName Remove-RetentionPolicyTag -MockWith { + } + + Mock -CommandName Set-RetentionPolicyTag -MockWith { + } + + # Mock Write-Host to hide output during the tests + Mock -CommandName Write-Host -MockWith { + } + $Script:exportedInstance =$null + $Script:ExportMode = $false + } + # Test contexts + Context -Name "The instance should exist but it DOES NOT" -Fixture { + BeforeAll { + $testParams = @{ + Comment = "This is my test"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + Credential = $Credential; + } + + Mock -CommandName Get-RetentionPolicyTag -MockWith { + return $null + } + } + It 'Should return Values from the Get method' { + (Get-TargetResource @testParams).Ensure | Should -Be 'Absent' + } + It 'Should return false from the Test method' { + Test-TargetResource @testParams | Should -Be $false + } + + It 'Should create a new instance from the Set method' { + Set-TargetResource @testParams + Should -Invoke -CommandName New-RetentionPolicyTag -Exactly 1 + } + } + + Context -Name "The instance exists but it SHOULD NOT" -Fixture { + BeforeAll { + $testParams = @{ + Comment = "This is my test"; + Ensure = "Absent"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + Credential = $Credential; + } + + Mock -CommandName Get-RetentionPolicyTag -MockWith { + return @{ + Identity = "MyTag" + Name = "MyTag" + Comment = "This is my test"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + } + } + } + It 'Should return Values from the Get method' { + (Get-TargetResource @testParams).Ensure | Should -Be 'Present' + } + It 'Should return false from the Test method' { + Test-TargetResource @testParams | Should -Be $false + } + + It 'Should remove the instance from the Set method' { + Set-TargetResource @testParams + Should -Invoke -CommandName Remove-RetentionPolicyTag -Exactly 1 + } + } + + Context -Name "The instance exists and values are already in the desired state" -Fixture { + BeforeAll { + $testParams = @{ + Comment = "This is my test"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + Credential = $Credential; + } + + Mock -CommandName Get-RetentionPolicyTag -MockWith { + return @{ + Identity = "MyTag" + Name = "MyTag" + Comment = "This is my test"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + } + } + } + + It 'Should return true from the Test method' { + Test-TargetResource @testParams | Should -Be $true + } + } + + Context -Name "The instance exists and values are NOT in the desired state" -Fixture { + BeforeAll { + $testParams = @{ + Comment = "This is my test"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + Credential = $Credential; + } + + Mock -CommandName Get-RetentionPolicyTag -MockWith { + return @{ + Identity = "MyTag" + Name = "MyTag" + Comment = "This is my test"; + MessageClass = "*"; + MustDisplayCommentEnabled = $true; #Drift + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + } + } + } + + It 'Should return Values from the Get method' { + (Get-TargetResource @testParams).Ensure | Should -Be 'Present' + } + + It 'Should return false from the Test method' { + Test-TargetResource @testParams | Should -Be $false + } + + It 'Should call the Set method' { + Set-TargetResource @testParams + Should -Invoke -CommandName Set-RetentionPolicyTag -Exactly 1 + } + } + + Context -Name 'ReverseDSC Tests' -Fixture { + BeforeAll { + $Global:CurrentModeIsExport = $true + $Global:PartialExportFileName = "$(New-Guid).partial.ps1" + $testParams = @{ + Credential = $Credential; + } + + Mock -CommandName Get-RetentionPolicyTag -MockWith { + return @{ + Identity = "MyTag" + Name = "MyTag" + Comment = "This is my test"; + MessageClass = "*"; + MustDisplayCommentEnabled = $true; #Drift + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + Type = "Personal"; + } + } + } + It 'Should Reverse Engineer resource from the Export method' { + $result = Export-TargetResource @testParams + $result | Should -Not -BeNullOrEmpty + } + } + } +} + +Invoke-Command -ScriptBlock $Global:DscHelper.CleanupScript -NoNewScope diff --git a/Tests/Unit/Stubs/Microsoft365.psm1 b/Tests/Unit/Stubs/Microsoft365.psm1 index 4e9e9efb2c..e8009af02b 100644 --- a/Tests/Unit/Stubs/Microsoft365.psm1 +++ b/Tests/Unit/Stubs/Microsoft365.psm1 @@ -628,142 +628,142 @@ function Disable-AzSubscription } #endregion -# region ExchangeOnlineManagement - -function Get-MeetingInsightsSettings +#region ExchangeOnlineManagement +function Add-AvailabilityAddressSpace { [CmdletBinding()] param( - ) -} + [Parameter()] + [System.Management.Automation.PSCredential] + $Credentials, -function Set-MeetingInsightsSettings -{ - [CmdletBinding()] - param( - ) -} + [Parameter()] + [System.String] + $ForestName, -function Get-EmailTenantSettings -{ - [CmdletBinding()] - param( - ) -} + [Parameter()] + [System.Uri] + $TargetAutodiscoverEpr, -function Set-EmailTenantSettings -{ - [CmdletBinding()] - param( [Parameter()] - [System.Boolean] - $EnablePriorityAccountProtection - ) -} + [System.Management.Automation.SwitchParameter] + $Confirm, -function Get-DnssecStatusForVerifiedDomain -{ - [CmdletBinding()] - param( [Parameter()] - [System.Object] - $DomainName - ) -} + [System.String] + $TargetTenantId, + + [Parameter()] + [System.String] + $TargetServiceEpr, -function Enable-DnssecForVerifiedDomain -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $DomainName + $AccessMethod ) } - -function Disable-DnssecForVerifiedDomain +function Add-MailboxFolderPermission { [CmdletBinding()] param( + [Parameter()] + [System.Object[]] + $AccessRights, + [Parameter()] [System.Object] - $DomainName - ) -} + $SharingPermissionFlags, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, -function Get-MailboxIRMAccess -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] $User, [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Boolean] + $SendNotificationToUser ) } - -function Set-MailboxIRMAccess +function Add-MailboxPermission { [CmdletBinding()] param( + [Parameter()] + [System.Object[]] + $AccessRights, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $GroupMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Deny, + + [Parameter()] + [System.Object] + $AutoMapping, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] $User, [Parameter()] [System.Object] - $Identity, + $Owner, [Parameter()] [System.Object] - $AccessLevel + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, + + [Parameter()] + [System.DirectoryServices.ActiveDirectorySecurityInheritance] + $InheritanceType ) } - -function Remove-MailboxIRMAccess +function Add-RecipientPermission { [CmdletBinding()] param( [Parameter()] [System.Object] - $User, + $AccessRights, [Parameter()] [System.Object] - $Identity - ) -} - -function Get-ArcConfig -{ - [CmdletBinding()] - param() -} + $Trustee, -function Set-ArcConfig -{ - [CmdletBinding()] - param( [Parameter()] - [System.String[]] - $ArcTrustedSealers, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] $Identity ) } - -function Get-ManagementScope +function Add-RoleGroupMember { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $Exclusive, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] @@ -771,71 +771,53 @@ function Get-ManagementScope [Parameter()] [System.Management.Automation.SwitchParameter] - $Orphan + $BypassSecurityGroupManagerCheck, + + [Parameter()] + [System.Object] + $Member ) } - -function New-ManagementScope +function Disable-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Exclusive, + $Confirm, [Parameter()] [System.Object] - $RecipientRoot, - - [Parameter()] - [System.String] - $Name, - + $Identity + ) +} +function Disable-DnssecForVerifiedDomain +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.String] - $RecipientRestrictionFilter, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + $DomainName ) } - -function Set-ManagementScope +function Disable-EOPProtectionPolicyRule { [CmdletBinding()] param( - [Parameter()] - [System.Object] - $RecipientRoot, - - [Parameter()] - [System.String] - $Name, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.String] - $RecipientRestrictionFilter, - [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + $Identity ) } - -function Remove-ManagementScope +function Disable-JournalRule { [CmdletBinding()] param( @@ -845,1533 +827,173 @@ function Remove-ManagementScope [Parameter()] [System.Object] - $Identity, - + $Identity + ) +} +function Disable-SmtpDaneInbound +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force + $Confirm, + + [Parameter()] + [System.String] + $DomainName ) } - -function Get-FocusedInbox +function Enable-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + $Confirm, [Parameter()] [System.Object] $Identity ) } - -function Set-FocusedInbox +function Enable-DnssecForVerifiedDomain { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $UseCustomRouting, - - [Parameter()] - [System.Object] - $Identity, + $Confirm, [Parameter()] - [System.Object] - $FocusedInboxOn + [System.String] + $DomainName ) } - -function Get-MailboxCalendarConfiguration +function Enable-EOPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] - [System.Object] - $MailboxLocation, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] $Identity ) } - -function Set-MailboxCalendarConfiguration +function Enable-JournalRule { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $WeatherLocationBookmark, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $WorkspaceUserEnabled, - + $Identity + ) +} +function Enable-OrganizationCustomization +{ + [CmdletBinding()] + param( [Parameter()] - [System.Boolean] - $ConversationalSchedulingEnabled, - - [Parameter()] - [System.Boolean] - $HotelEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $SkipAgendaMailOnFreeDays, - - [Parameter()] - [System.Boolean] - $DiningEventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $CreateEventsFromEmailAsPrivate, - - [Parameter()] - [System.String] - $CalendarFeedsPreferredLanguage, - - [Parameter()] - [System.Boolean] - $PackageDeliveryEventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $WorkingHoursTimeZone, - - [Parameter()] - [System.Object] - $WeatherLocations, - - [Parameter()] - [System.Boolean] - $FlightEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $RentalCarEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $DeleteMeetingRequestOnRespond, - - [Parameter()] - [System.Int32] - $DefaultMeetingDuration, - - [Parameter()] - [System.Boolean] - $ReminderSoundEnabled, - - [Parameter()] - [System.TimeSpan] - $WorkingHoursEndTime, - - [Parameter()] - [System.Object] - $ShortenEventScopeDefault, - - [Parameter()] - [System.Boolean] - $InvoiceEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $UseBrightCalendarColorThemeInOwa, - - [Parameter()] - [System.TimeSpan] - $DefaultReminderTime, - - [Parameter()] - [System.Object] - $LocationDetailsInFreeBusy, - - [Parameter()] - [System.Object] - $WeatherEnabled, - - [Parameter()] - [System.String] - $CalendarFeedsPreferredRegion, - - [Parameter()] - [System.Boolean] - $ServiceAppointmentEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $ShowWeekNumbers, - - [Parameter()] - [System.Boolean] - $RemindersEnabled, - - [Parameter()] - [System.Object] - $WeekStartDay, - - [Parameter()] - [System.Object] - $FirstWeekOfYear, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $AgendaMailIntroductionEnabled, - - [Parameter()] - [System.TimeSpan] - $WorkingHoursStartTime, - - [Parameter()] - [System.String] - $CalendarFeedsRootPageId, - - [Parameter()] - [System.Object] - $DailyAgendaMailSchedule, - - [Parameter()] - [System.Int32] - $DefaultMinutesToReduceLongEventsBy, - - [Parameter()] - [System.Int32] - $DefaultMinutesToReduceShortEventsBy, - - [Parameter()] - [System.Boolean] - $AutoDeclineWhenBusy, - - [Parameter()] - [System.Object] - $OnlineMeetingsByDefaultEnabled, - - [Parameter()] - [System.Boolean] - $PreserveDeclinedMeetings, - - [Parameter()] - [System.Object] - $TimeIncrement, - - [Parameter()] - [System.Object] - $WorkDays, - - [Parameter()] - [System.Boolean] - $EntertainmentEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $EventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $WeatherUnit, - - [Parameter()] - [System.Object] - $DefaultOnlineMeetingProvider, - - [Parameter()] - [System.Object] - $MailboxLocation, - - [Parameter()] - [System.Boolean] - $AgendaMailEnabled, - - [Parameter()] - [System.Boolean] - $AgendaPaneEnabled - ) -} - - - -function Get-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} - -function New-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $RetentionPolicyTagLinks, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultArbitrationMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm - ) -} - - -function Remove-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} - - -function Set-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $RetentionPolicyTagLinks, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultArbitrationMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} - -function Get-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Int32] - $SkipCount, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $BypassScopeCheck, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ResultSize - ) -} -function New-ServicePrincipal -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DisplayName, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $ObjectId, - - [Parameter()] - [System.String] - $ServiceId, - - [Parameter()] - [System.String] - $AppId - ) -} -function New-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $DestinationFolder, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $SystemCategory, - - [Parameter()] - [System.Object] - $KeepLatest, - - [Parameter()] - [System.Object] - $SourceFolder, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Sender, - - [Parameter()] - [System.Object] - $KeepForDays, - - [Parameter()] - [System.Boolean] - $Enabled - ) -} -function Remove-ServicePrincipal -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Remove-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Set-ServicePrincipal -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DisplayName, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Set-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $Sender, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $SystemCategory, - - [Parameter()] - [System.Object] - $KeepLatest, - - [Parameter()] - [System.Object] - $SourceFolder, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DestinationFolder, - - [Parameter()] - [System.Object] - $KeepForDays, - - [Parameter()] - [System.Boolean] - $Enabled - ) -} - -function Get-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.String] - $Policy - ) -} - -function New-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $SenderIpRanges, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Domains, - - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.String] - $Policy - ) -} - -function Remove-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} - -function Set-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $AddDomains, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.Object] - $AddSenderIpRanges, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $RemoveDomains, - - [Parameter()] - [System.Object] - $RemoveSenderIpRanges - ) -} - -function Get-DefaultTenantBriefingConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [PSObject] - $ResultSize - ) -} -function Get-DefaultTenantMyAnalyticsFeatureConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [PSObject] - $ResultSize - ) -} -function Set-DefaultTenantBriefingConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $IsEnabledByDefault, - - [Parameter()] - [PSObject] - $ResultSize - ) -} -function Set-DefaultTenantMyAnalyticsFeatureConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Feature, - - [Parameter()] - [System.Boolean] - $IsEnabled, - - [Parameter()] - [PSObject] - $ResultSize, - - [Parameter()] - [System.Nullable`1[System.Double]] - $SamplingRate - ) -} -#endregion -#region ExchangeOnlineManagement -function Add-AvailabilityAddressSpace -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials, - - [Parameter()] - [System.String] - $ForestName, - - [Parameter()] - [System.Uri] - $TargetAutodiscoverEpr, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $TargetTenantId, - - [Parameter()] - [System.String] - $TargetServiceEpr, - - [Parameter()] - [System.Object] - $AccessMethod - ) -} -function Add-MailboxPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Owner, - - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $GroupMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Deny, - - [Parameter()] - [System.Object] - $AutoMapping, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, - - [Parameter()] - [System.DirectoryServices.ActiveDirectorySecurityInheritance] - $InheritanceType - ) -} -function Add-RecipientPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $AccessRights, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Trustee - ) -} -function Get-ExoSecOpsOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Policy - ) -} - -function New-ExoSecOpsOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $Policy, - - [Parameter()] - [System.String] - $Comment - ) -} -function Remove-ExoSecOpsOverrideRule -{ - [CmdletBinding()] - param( - - [Parameter()] - [System.Object] - $Identity - ) -} -function Set-ExoSecOpsOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Disable-JournalRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Enable-JournalRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Enable-OrganizationCustomization -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm - ) -} -function Get-AcceptedDomain -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-ActiveSyncDevice -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $SortBy, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $OrganizationalUnit, - - [Parameter()] - [System.String] - $Filter, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ResultSize - ) -} - -function Get-ActiveSyncMailboxPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} - -function Get-ActiveSyncDeviceAccessRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AddressBookPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AddressList -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $SearchText, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Container - ) -} -function Get-AdminAuditLogConfig -{ - [CmdletBinding()] - param( - - ) -} -function Get-AntiPhishPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Impersonation, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Advanced, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Spoof - ) -} -function Get-AntiPhishRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $State - ) -} -function Get-App -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OrganizationApp, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrivateCatalog - ) -} -function Get-ApplicationAccessPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} - -function Get-ATPProtectionPolicyRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Identity, - - [Parameter()] - [System.String] - $State - ) -} - -function Get-AtpPolicyForO365 -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AuditConfig -{ - [CmdletBinding()] - param( - - ) -} -function Get-AuditConfigurationPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AuthenticationPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AvailabilityAddressSpace -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AvailabilityConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-CalendarProcessing -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-CASMailbox -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $RecalculateHasActiveSyncDevicePartnership, - - [Parameter()] - [System.String] - $SortBy, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ProtocolSettings, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ReadIsOptimizedForAccessibility, - - [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, - - [Parameter()] - [System.Object] - $OrganizationalUnit, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ActiveSyncDebugLogging, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, - - [Parameter()] - [System.Object[]] - $RecipientTypeDetails, - - [Parameter()] - [System.Object] - $ResultSize, - - [Parameter()] - [System.String] - $Filter, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ActiveSyncSuppressReadReceipt, - - [Parameter()] - [System.String] - $Anr - ) -} -function Get-CASMailboxPlan -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $SortBy, - - [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, - - [Parameter()] - [System.Object] - $ResultSize, - - [Parameter()] - [System.String] - $Filter - ) -} -function Get-ClientAccessRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DomainController - ) -} -function Get-ComplianceTag -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludingLabelState, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-DataClassification -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ClassificationRuleCollectionIdentity - ) -} -function Get-DataEncryptionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DomainController - ) -} -function Get-DeviceConditionalAccessPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-DeviceConditionalAccessRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $CompareToWorkload, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DomainController - ) -} -function New-DeviceConditionalAccessRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $CameraEnabled, - - [Parameter()] - [System.Object] - $EnableRemovableStorage, - - [Parameter()] - [System.Object] - $AntiVirusSignatureStatus, - - [Parameter()] - [System.Object] - $FirewallStatus, - - [Parameter()] - [System.Object] - $AllowAppStore, - - [Parameter()] - [System.Object] - $AllowAssistantWhileLocked, - - [Parameter()] - [System.Object] - $AllowiCloudBackup, - - [Parameter()] - [System.Object] - $AppsRating, - - [Parameter()] - [System.Object] - $PasswordHistoryCount, - - [Parameter()] - [System.Object] - $PasswordQuality, - - [Parameter()] - [System.Object] - $PasswordMinComplexChars, - - [Parameter()] - [System.Object] - $PhoneMemoryEncrypted, - - [Parameter()] - [System.String] - $EmailAddress, - - [Parameter()] - [System.Object] - $BluetoothEnabled, - - [Parameter()] - [System.Object] - $AllowConvenienceLogon, - - [Parameter()] - [System.Object] - $MaxPasswordGracePeriod, - - [Parameter()] - [System.Object] - $AllowiCloudDocSync, - - [Parameter()] - [System.Object] - $ForceAppStorePassword, - - [Parameter()] - [System.Object] - $Policy, - - [Parameter()] - [System.Object] - $TVShowsRating, - - [Parameter()] - [System.Object] - $AllowJailbroken, - - [Parameter()] - [System.Object] - $RequireEmailProfile, - - [Parameter()] - [System.Object] - $AllowDiagnosticSubmission, - - [Parameter()] - [System.Object] - $AutoUpdateStatus, - - [Parameter()] - [System.String] - $AccountUserName, - - [Parameter()] - [System.Object] - $WLANEnabled, - - [Parameter()] - [System.Object] - $AllowVoiceDialing, - - [Parameter()] - [System.String] - $AccountName, - - [Parameter()] - [System.Object] - $PasswordExpirationDays, - - [Parameter()] - [System.Object] - $PasswordTimeout, - - [Parameter()] - [System.Object] - $AllowiCloudPhotoSync, - - [Parameter()] - [System.Object] - $AllowSimplePassword, - - [Parameter()] - [System.Object] - $AllowPassbookWhileLocked, - - [Parameter()] - [System.Object] - $PasswordMinimumLength, - - [Parameter()] - [System.Object] - $AllowVideoConferencing, - - [Parameter()] - [System.Object] - $PasswordRequired, - - [Parameter()] - [System.Object] - $MaxPasswordAttemptsBeforeWipe, - - [Parameter()] - [System.Object] - $MoviesRating, - + [System.Management.Automation.SwitchParameter] + $Confirm + ) +} +function Enable-SmtpDaneInbound +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, + [Parameter()] + [System.String] + $DomainName + ) +} +function Get-AcceptedDomain +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $DomainController, + $Identity, [Parameter()] [System.Object] - $AntiVirusStatus, - + $ResultSize + ) +} +function Get-ActiveSyncDevice +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $WorkFoldersSyncUrl, + $SortBy, [Parameter()] [System.Object] - $UserAccountControlStatus, + $Mailbox, [Parameter()] [System.Object] - $ForceEncryptedBackup, + $OrganizationalUnit, [Parameter()] [System.String] - $ExchangeActiveSyncHost, - - [Parameter()] - [System.Object] - $AllowScreenshot, + $Filter, [Parameter()] [System.Object] - $PasswordComplexity, + $Identity, [Parameter()] [System.Object] - $TargetGroups, - + $ResultSize + ) +} +function Get-ActiveSyncDeviceAccessRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowVoiceAssistant, - + $Identity + ) +} +function Get-ActiveSyncMailboxPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $SystemSecurityTLS, - + $Identity + ) +} +function Get-AddressBookPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $RegionRatings, + $Identity + ) +} +function Get-AdminAuditLogConfig +{ + [CmdletBinding()] + param( - [Parameter()] - [System.Object] - $SmartScreenEnabled ) } -function Remove-DeviceConditionalAccessRule +function Get-AdministrativeUnit { [CmdletBinding()] param( @@ -2384,220 +1006,327 @@ function Remove-DeviceConditionalAccessRule $Identity ) } -function Set-DeviceConditionalAccessRule +function Get-AntiPhishPolicy { [CmdletBinding()] param( [Parameter()] - [System.Object] - $CameraEnabled, + [System.Management.Automation.SwitchParameter] + $Impersonation, [Parameter()] - [System.Object] - $EnableRemovableStorage, + [System.Management.Automation.SwitchParameter] + $Advanced, [Parameter()] [System.Object] - $AntiVirusSignatureStatus, + $Identity, [Parameter()] - [System.Object] - $FirewallStatus, - + [System.Management.Automation.SwitchParameter] + $Spoof + ) +} +function Get-AntiPhishRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowAppStore, + $Identity, [Parameter()] [System.Object] - $AllowAssistantWhileLocked, - + $State + ) +} +function Get-App +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowiCloudBackup, + $Mailbox, [Parameter()] [System.Object] - $AppsRating, + $Identity, [Parameter()] - [System.Object] - $PasswordHistoryCount, + [System.Management.Automation.SwitchParameter] + $OrganizationApp, [Parameter()] - [System.Object] - $PasswordQuality, - + [System.Management.Automation.SwitchParameter] + $PrivateCatalog + ) +} +function Get-ApplicationAccessPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $PasswordMinComplexChars, + $Identity + ) +} +function Get-ArcConfig +{ + [CmdletBinding()] + param( + ) +} +function Get-ATPBuiltInProtectionRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $PhoneMemoryEncrypted, - - [Parameter()] - [System.String] - $EmailAddress, + $Identity, [Parameter()] [System.Object] - $BluetoothEnabled, - + $State + ) +} +function Get-AtpPolicyForO365 +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $Identity, - + $Identity + ) +} +function Get-ATPProtectionPolicyRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowConvenienceLogon, + $Identity, [Parameter()] [System.Object] - $MaxPasswordGracePeriod, + $State + ) +} +function Get-AuditConfig +{ + [CmdletBinding()] + param( + ) +} +function Get-AuditConfigurationPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowiCloudDocSync, - + $Identity + ) +} +function Get-AuthenticationPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object] - $ForceAppStorePassword, + [System.String] + $TenantId, [Parameter()] [System.Object] - $TVShowsRating, + $Identity, [Parameter()] - [System.Object] - $AllowJailbroken, - + [System.Management.Automation.SwitchParameter] + $AllowLegacyExchangeTokens + ) +} +function Get-AvailabilityAddressSpace +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $RequireEmailProfile, - + $Identity + ) +} +function Get-AvailabilityConfig +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AllowDiagnosticSubmission, - + $Identity + ) +} +function Get-CalendarProcessing +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $AutoUpdateStatus, - - [Parameter()] - [System.String] - $AccountUserName, + $Identity, [Parameter()] [System.Object] - $WLANEnabled, - + $ResultSize + ) +} +function Get-CASMailbox +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object] - $AllowVoiceDialing, + [System.Management.Automation.SwitchParameter] + $RecalculateHasActiveSyncDevicePartnership, [Parameter()] [System.String] - $AccountName, + $SortBy, [Parameter()] - [System.Object] - $PasswordExpirationDays, + [System.Management.Automation.SwitchParameter] + $ProtocolSettings, - [Parameter()] - [System.Object] - $PasswordTimeout, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ReadIsOptimizedForAccessibility, [Parameter()] - [System.Object] - $AllowiCloudPhotoSync, + [System.Management.Automation.PSCredential] + $Credential, [Parameter()] [System.Object] - $AllowSimplePassword, + $OrganizationalUnit, [Parameter()] - [System.Object] - $AllowPassbookWhileLocked, + [System.Management.Automation.SwitchParameter] + $ActiveSyncDebugLogging, [Parameter()] [System.Object] - $PasswordMinimumLength, + $Identity, [Parameter()] - [System.Object] - $AllowVideoConferencing, + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, [Parameter()] - [System.Object] - $PasswordRequired, + [System.Object[]] + $RecipientTypeDetails, [Parameter()] [System.Object] - $MaxPasswordAttemptsBeforeWipe, + $ResultSize, [Parameter()] - [System.Object] - $MoviesRating, + [System.String] + $Filter, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $ActiveSyncSuppressReadReceipt, [Parameter()] - [System.Object] - $DomainController, - + [System.String] + $Anr + ) +} +function Get-CASMailboxPlan +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object] - $AntiVirusStatus, + [System.String] + $SortBy, [Parameter()] - [System.String] - $WorkFoldersSyncUrl, + [System.Management.Automation.PSCredential] + $Credential, [Parameter()] [System.Object] - $UserAccountControlStatus, + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, [Parameter()] [System.Object] - $ForceEncryptedBackup, + $ResultSize, [Parameter()] [System.String] - $ExchangeActiveSyncHost, + $Filter + ) +} +function Get-ComplianceTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludingLabelState, [Parameter()] [System.Object] - $AllowScreenshot, - + $Identity + ) +} +function Get-DataClassification +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $PasswordComplexity, + $Identity, [Parameter()] [System.Object] - $TargetGroups, + $ClassificationRuleCollectionIdentity + ) +} +function Get-DataEncryptionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $AllowVoiceAssistant, + $Identity, [Parameter()] [System.Object] - $SystemSecurityTLS, - + $DomainController + ) +} +function Get-DeviceConditionalAccessPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $RegionRatings, - + $Identity + ) +} +function Get-DeviceConditionalAccessRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $SmartScreenEnabled + $Identity ) } - function Get-DeviceConfigurationPolicy { [CmdletBinding()] @@ -2607,13 +1336,22 @@ function Get-DeviceConfigurationPolicy $Identity ) } +function Get-DeviceConfigurationRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} function Get-DistributionGroup { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromDLMembersWithDisplayNames, + $IncludeGrantSendOnBehalfToWithDisplayNames, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -2623,21 +1361,33 @@ function Get-DistributionGroup [System.Management.Automation.PSCredential] $Credential, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeModeratedByWithDisplayNames, + [Parameter()] [System.Object] $OrganizationalUnit, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeBypassModerationFromSendersOrMembersWithDisplayNames, + [Parameter()] [System.Object] $Identity, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromDLMembersWithDisplayNames, + [Parameter()] [System.Object[]] $RecipientTypeDetails, [Parameter()] [System.Object] - $ManagedBy, + $ResultSize, [Parameter()] [System.String] @@ -2649,7 +1399,7 @@ function Get-DistributionGroup [Parameter()] [System.Object] - $ResultSize, + $ManagedBy, [Parameter()] [System.String] @@ -2690,6 +1440,31 @@ function Get-DkimSigningConfig $Identity ) } +function Get-DnssecStatusForVerifiedDomain +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipMtaStsValidation, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipMxValidation, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipDnsValidation, + + [Parameter()] + [System.String] + $DomainName + ) +} function Get-EmailAddressPolicy { [CmdletBinding()] @@ -2699,17 +1474,90 @@ function Get-EmailAddressPolicy $Identity ) } -function Get-GlobalAddressList +function Get-EmailTenantSettings +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-EOPProtectionPolicyRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $State + ) +} +function Get-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Policy, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Get-ExoSecOpsOverrideRule { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] $Identity, + [Parameter()] + [System.Object] + $Policy, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Get-ExternalInOutlook +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-FocusedInbox +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] - $DefaultOnly + $UseCustomRouting, + + [Parameter()] + [System.Object] + $Identity ) } function Get-Group @@ -2827,13 +1675,37 @@ function Get-IRMConfiguration ) } -function Get-JournalRule +function Get-JournalRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-M365DataAtRestEncryptionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Get-M365DataAtRestEncryptionPolicyAssignment { [CmdletBinding()] param( - [Parameter()] - [System.Object] - $Identity + ) } function Get-Mailbox @@ -2850,7 +1722,7 @@ function Get-Mailbox [Parameter()] [System.Management.Automation.SwitchParameter] - $InactiveMailboxOnly, + $IncludeForwardingAddressWithDisplayNames, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -2868,10 +1740,6 @@ function Get-Mailbox [System.Management.Automation.SwitchParameter] $SoftDeletedMailbox, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, - [Parameter()] [System.Management.Automation.SwitchParameter] $IncludeAcceptMessagesOnlyFromWithDisplayNames, @@ -2896,6 +1764,14 @@ function Get-Mailbox [System.Management.Automation.SwitchParameter] $Migration, + [Parameter()] + [System.Object] + $OrganizationalUnit, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeGrantSendOnBehalfToWithDisplayNames, + [Parameter()] [System.String] $Filter, @@ -2909,8 +1785,12 @@ function Get-Mailbox $IncludeInactiveMailbox, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $InactiveMailboxOnly, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -2955,6 +1835,19 @@ function Get-MailboxAutoReplyConfiguration $ResultSize ) } +function Get-MailboxCalendarConfiguration +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $MailboxLocation, + + [Parameter()] + [System.Object] + $Identity + ) +} function Get-MailboxCalendarFolder { [CmdletBinding()] @@ -3022,93 +1915,6 @@ function Get-MailboxFolderPermission $ResultSize ) } -function Set-MailboxFolderPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Object] - $SharingPermissionFlags, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser - ) -} -function Add-MailboxFolderPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Object] - $SharingPermissionFlags, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser - ) -} -function Remove-MailboxFolderPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ResetDelegateUserCollection, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} function Get-MailboxFolderStatistics { [CmdletBinding()] @@ -3162,6 +1968,19 @@ function Get-MailboxFolderStatistics $Identity ) } +function Get-MailboxIRMAccess +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity + ) +} function Get-MailboxPermission { [CmdletBinding()] @@ -3324,558 +2143,551 @@ function Get-MalwareFilterRule $State ) } - -function Get-ManagementRoleEntry +function Get-ManagementRole { [CmdletBinding()] param( [Parameter()] - [System.String] - $Identity, + [System.Object] + $RoleType, [Parameter()] - [System.String] - $ResultSize - ) -} + [System.String[]] + $CmdletParameters, -function Get-MgBetaRoleManagementEntitlementManagementRoleAssignment -{ - [CmdletBinding()] - param( [Parameter()] - [System.String] - $UnifiedRoleAssignmentId, + [System.String[]] + $ScriptParameters, [Parameter()] - [System.String] - $Filter, + [System.Object] + $Identity, - [Parameter()] - [Switch] - $All - ) -} -function Update-MgBetaEntitlementManagementSetting -{ - [CmdletBinding()] - param( [Parameter()] [System.String] - $Id, - - [Parameter()] - [PSObject] - $HttpPipelinePrepend, - - [Parameter()] - [PSObject] - $BodyParameter, - - [Parameter()] - [System.Uri] - $Proxy, + $Cmdlet, [Parameter()] - [System.Management.Automation.PSCredential] - $ProxyCredential, + [System.Management.Automation.SwitchParameter] + $Recurse, [Parameter()] [System.String] - $ResponseHeadersVariable, + $Script, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - + $GetChildren + ) +} +function Get-ManagementRoleAssignment +{ + [CmdletBinding()] + param( [Parameter()] - [PSObject] - $HttpPipelineAppend, + [System.Object] + $RoleAssigneeType, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ProxyUseDefaultCredentials, + [System.Object] + $CustomRecipientWriteScope, [Parameter()] - [System.Collections.IDictionary] - $Headers, + [System.Object] + $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Break, + [System.Object] + $RecipientGroupScope, [Parameter()] - [System.Collections.Hashtable] - $AdditionalProperties, + [System.Boolean] + $Enabled, [Parameter()] - [System.Int32] - $DaysUntilExternalUserDeletedAfterBlocked, + [System.Object] + $RecipientWriteScope, [Parameter()] - [System.String] - $ExternalUserLifecycleAction - ) -} + [System.Object] + $WritableRecipient, -function Get-MgBetaEntitlementManagementSetting -{ - [CmdletBinding()] - param( [Parameter()] - [PSObject] - $HttpPipelinePrepend, + [System.Object] + $ConfigWriteScope, [Parameter()] - [System.Uri] - $Proxy, + [System.Boolean] + $Delegating, [Parameter()] - [System.Management.Automation.PSCredential] - $ProxyCredential, + [System.Boolean] + $Exclusive, [Parameter()] - [System.String[]] - $ExpandProperty, + [System.Object[]] + $AssignmentMethod, [Parameter()] - [System.String] - $ResponseHeadersVariable, + [System.Management.Automation.SwitchParameter] + $GetEffectiveUsers, [Parameter()] - [PSObject] - $HttpPipelineAppend, + [System.Object] + $Role, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ProxyUseDefaultCredentials, + [System.Object] + $RecipientAdministrativeUnitScope, [Parameter()] - [System.Collections.IDictionary] - $Headers, + [System.Object] + $ExclusiveRecipientWriteScope, [Parameter()] - [System.String[]] - $Property, + [System.Object] + $RecipientOrganizationalUnitScope, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Break + [System.Object] + $RoleAssignee ) } - -function Get-MgBetaRoleManagementEntitlementManagementRoleDefinition +function Get-ManagementRoleEntry { [CmdletBinding()] param( [Parameter()] - [System.String] - $UnifiedRoleDefinitionId, + [System.Object[]] + $Type, [Parameter()] [System.String] - $Filter, + $PSSnapinName, [Parameter()] - [Switch] - $All - ) -} + [System.Object] + $Identity, -function Get-MgBetaPolicyAuthenticationFlowPolicy -{ - [CmdletBinding()] - param() -} + [Parameter()] + [System.String[]] + $Parameters, -function Update-MgBetaPolicyAuthenticationFlowPolicy -{ - [CmdletBinding()] - param( [Parameter()] - [System.Boolean] - $SelfServiceSignUp + [System.Object] + $ResultSize ) } - -function New-MgBetaRoleManagementEntitlementManagementRoleAssignment +function Get-ManagementScope { [CmdletBinding()] param( [Parameter()] - [System.String] - $AppScopeId, - - [Parameter()] - [System.String] - $DirectoryScopeId, + [System.Boolean] + $Exclusive, [Parameter()] - [System.String] - $PrincipalId, + [System.Object] + $Identity, [Parameter()] - [System.String] - $RoleDefinitionId + [System.Management.Automation.SwitchParameter] + $Orphan ) } - -function Remove-MgBetaRoleManagementEntitlementManagementRoleAssignment +function Get-MeetingInsightsSettings { [CmdletBinding()] param( - [Parameter()] - [System.String] - $UnifiedRoleAssignmentId + ) } - -function Get-MigrationEndpoint +function Get-MessageClassification { [CmdletBinding()] param( - [Parameter()] - [System.String] - $DiagnosticInfo, - - [Parameter()] - [System.Object] - $Type, - [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Object] - $Partition + [System.Management.Automation.SwitchParameter] + $IncludeLocales ) } - -function Set-MigrationEndpoint +function Get-MigrationBatch { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Identity, + [System.String] + $DiagnosticInfo, [Parameter()] - [System.Boolean] - $AcceptUntrustedCertificates, + [System.Management.Automation.SwitchParameter] + $IncludeReport, [Parameter()] [System.Object] - $MaxConcurrentMigrations, - - [Parameter()] - [System.Byte[]] - $ServiceAccountKeyFileData, + $Identity, [Parameter()] [System.Object] - $TestMailbox, + $Partition, [Parameter()] - [System.String] - $ExchangeServer, + [System.Object] + $ResultSize, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipVerification, + [System.Object] + $Status, [Parameter()] [System.Object] - $Authentication, - + $Endpoint + ) +} +function Get-MigrationEndpoint +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $AppSecretKeyVaultUrl, + $DiagnosticInfo, [Parameter()] [System.Object] - $Port, + $Type, [Parameter()] - [System.String] - $ApplicationId, + [System.Object] + $Identity, [Parameter()] [System.Object] - $RemoteServer, - + $Partition + ) +} +function Get-MigrationUser +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $Partition, + $EmailAddress, [Parameter()] [System.Object] - $MailboxPermission, + $MailboxGuid, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $SourceMailboxLegacyDN, + $IncludeAssociatedUsers, [Parameter()] - [System.String] - $NspiServer, + [System.Object] + $Identity, [Parameter()] [System.Object] - $RPCProxyServer, + $BatchId, [Parameter()] - [System.String] - $PublicFolderDatabaseServerLegacyDN, + [System.Object] + $Partition, [Parameter()] [System.Object] - $Security, + $ResultSize, [Parameter()] [System.Object] - $MaxConcurrentIncrementalSyncs, + $Status, [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials + [System.Object] + $StatusSummary ) } - -function New-MigrationEndpoint +function Get-MobileDevice { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $AcceptUntrustedCertificates, + $OWAforDevices, [Parameter()] [System.String] - $Name, + $SortBy, [Parameter()] [System.Management.Automation.SwitchParameter] - $ExchangeRemoteMove, - - [Parameter()] - [System.Object] - $MaxConcurrentMigrations, - - [Parameter()] - [System.Byte[]] - $ServiceAccountKeyFileData, + $UniversalOutlook, [Parameter()] [System.Management.Automation.SwitchParameter] - $PublicFolder, + $ActiveSync, [Parameter()] [System.Object] - $TestMailbox, - - [Parameter()] - [System.String] - $ExchangeServer, + $Mailbox, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipVerification, + [System.Object] + $OrganizationalUnit, [Parameter()] [System.Object] - $Authentication, + $Identity, [Parameter()] [System.Management.Automation.SwitchParameter] - $ExchangeOutlookAnywhere, + $RestApi, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Gmail, + [System.Object] + $ResultSize, [Parameter()] [System.String] - $AppSecretKeyVaultUrl, - + $Filter + ) +} +function Get-MobileDeviceMailboxPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Compliance, - + [System.Object] + $Identity + ) +} +function Get-OMEConfiguration +{ + [CmdletBinding()] + param( [Parameter()] - [System.Int32] - $Port, - + [System.Object] + $Identity + ) +} +function Get-OnPremisesOrganization +{ + [CmdletBinding()] + param( [Parameter()] - [System.Security.SecureString] - $OAuthCode, + [System.Object] + $Identity + ) +} +function Get-OrganizationConfig +{ + [CmdletBinding()] + param( + ) +} +function Get-OrganizationRelationship +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-OutboundConnector +{ + [CmdletBinding()] + param( [Parameter()] - [System.String] - $ApplicationId, + [System.Boolean] + $IncludeTestModeConnectors, [Parameter()] [System.Object] - $RemoteServer, + $Identity, [Parameter()] [System.Object] - $Partition, + $ResultSize, [Parameter()] - [System.Object] - $MailboxPermission, - + [System.Boolean] + $IsTransportRuleScoped + ) +} +function Get-OwaMailboxPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - + [System.Object] + $Identity + ) +} +function Get-PartnerApplication +{ + [CmdletBinding()] + param( [Parameter()] - [System.String] - $SourceMailboxLegacyDN, - + [System.Object] + $Identity + ) +} +function Get-PerimeterConfig +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $IMAP, - + [System.Object] + $Identity + ) +} +function Get-Place +{ + [CmdletBinding()] + param( [Parameter()] - [System.String] - $RemoteTenant, + [System.Object] + $Type, [Parameter()] [System.Management.Automation.SwitchParameter] - $PublicFolderToUnifiedGroup, - - [Parameter()] - [System.String] - $NspiServer, - - [Parameter()] - [System.String] - $RedirectUri, - - [Parameter()] - [System.Object] - $RPCProxyServer, + $Confirm, [Parameter()] [System.Object] - $EmailAddress, + $Identity, [Parameter()] [System.Object] - $Security, + $ResultSize + ) +} +function Get-PolicyConfig +{ + [CmdletBinding()] + param( + ) +} +function Get-PolicyTipConfig +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $MaxConcurrentIncrementalSyncs, + $Action, [Parameter()] - [System.String] - $PublicFolderDatabaseServerLegacyDN, + [System.Management.Automation.SwitchParameter] + $Original, [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials, + [System.Globalization.CultureInfo] + $Locale, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Autodiscover + [System.Object] + $Identity ) } - -function Remove-MigrationEndpoint +function Get-QuarantinePolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Object] $Identity, [Parameter()] [System.Object] - $Partition + $QuarantinePolicyType ) } - -function Set-ManagementRoleEntry +function Get-Recipient { [CmdletBinding()] param( [Parameter()] [System.String] + $SortBy, + + [Parameter()] + [System.Object] $Identity, [Parameter()] - [System.String[]] - $Parameters, + [System.String] + $RecipientPreviewFilter, [Parameter()] - [Switch] - $AddParameter, + [System.String] + $Anr, [Parameter()] - [Switch] - $RemoveParameter - ) -} + [System.String] + $BookmarkDisplayName, -function Get-ManagementRole -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $RoleType, + $Capabilities, [Parameter()] - [System.String[]] - $CmdletParameters, + [System.Object] + $ResultSize, + + [Parameter()] + [System.Object[]] + $RecipientTypeDetails, [Parameter()] [System.String[]] - $ScriptParameters, + $Properties, [Parameter()] [System.Object] - $Identity, + $PropertySet, + + [Parameter()] + [System.Object] + $AuthenticationType, [Parameter()] [System.String] - $Cmdlet, + $Filter, [Parameter()] [System.Management.Automation.SwitchParameter] - $Recurse, + $IncludeSoftDeletedRecipients, [Parameter()] - [System.String] - $Script, + [System.Object[]] + $RecipientType, [Parameter()] - [System.Management.Automation.SwitchParameter] - $GetChildren + [System.Object] + $OrganizationalUnit, + + [Parameter()] + [System.Boolean] + $IncludeBookmarkObject ) } -function Get-ManagementRoleAssignment +function Get-RecipientPermission { [CmdletBinding()] param( [Parameter()] - [System.Object] - $RoleAssigneeType, + [System.Management.Automation.SwitchParameter] + $ReadFromDomainController, [Parameter()] [System.Object] - $CustomRecipientWriteScope, + $AccessRights, [Parameter()] [System.Object] @@ -3883,120 +2695,159 @@ function Get-ManagementRoleAssignment [Parameter()] [System.Object] - $RecipientGroupScope, + $ResultSize, [Parameter()] - [System.Boolean] - $Enabled, - + [System.Object] + $Trustee + ) +} +function Get-RemoteDomain +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $RecipientWriteScope, + $Identity, [Parameter()] [System.Object] - $WritableRecipient, - + $ResultSize + ) +} +function Get-ReportSubmissionPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $ConfigWriteScope, - + $Identity + ) +} +function Get-ReportSubmissionRule +{ + [CmdletBinding()] + param( [Parameter()] - [System.Boolean] - $Delegating, + [System.Object] + $Identity, [Parameter()] - [System.Boolean] - $Exclusive, + [System.Object] + $State + ) +} +function Get-ResourceConfig +{ + [CmdletBinding()] + param( + ) +} +function Get-RetentionPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object[]] - $AssignmentMethod, - + [System.Object] + $Identity + ) +} +function Get-RetentionPolicyTag +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] - $GetEffectiveUsers, - - [Parameter()] - [System.Object] - $Role, + $OptionalInMailbox, [Parameter()] - [System.Object] - $RecipientAdministrativeUnitScope, + [System.Management.Automation.SwitchParameter] + $IncludeSystemTags, [Parameter()] [System.Object] - $ExclusiveRecipientWriteScope, + $Mailbox, [Parameter()] [System.Object] - $RecipientOrganizationalUnitScope, + $Identity, [Parameter()] - [System.Object] - $RoleAssignee + [System.Object[]] + $Types ) } -function Get-MessageClassification +function Get-RoleAssignmentPolicy { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeLocales + $Identity ) } -function Get-MobileDevice +function Get-RoleGroup { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $OWAforDevices, + [System.String] + $SortBy, [Parameter()] [System.String] - $SortBy, + $Filter, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UniversalOutlook, + [System.Object] + $ResultSize, [Parameter()] [System.Management.Automation.SwitchParameter] - $ActiveSync, + $ShowPartnerLinked, [Parameter()] [System.Object] - $Mailbox, - + $Identity + ) +} +function Get-RoleGroupMember +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $OrganizationalUnit, + $Identity, [Parameter()] [System.Object] - $Identity, - + $ResultSize + ) +} +function Get-SafeAttachmentPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $RestApi, - + [System.Object] + $Identity + ) +} +function Get-SafeAttachmentRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $ResultSize, + $Identity, [Parameter()] - [System.String] - $Filter + [System.Object] + $State ) } -function Get-MobileDeviceMailboxPolicy +function Get-SafeLinksPolicy { [CmdletBinding()] param( @@ -4005,25 +2856,33 @@ function Get-MobileDeviceMailboxPolicy $Identity ) } -function Get-OfflineAddressBook +function Get-SafeLinksRule { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $State ) } -function Get-OMEConfiguration +function Get-ServicePrincipal { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $Organization ) } -function Get-OnPremisesOrganization +function Get-SharingPolicy { [CmdletBinding()] param( @@ -4032,44 +2891,58 @@ function Get-OnPremisesOrganization $Identity ) } -function Get-OrganizationConfig +function Get-SupervisoryReviewPolicyV2 { [CmdletBinding()] param( - + [Parameter()] + [System.Object] + $Identity ) } -function Get-OrganizationRelationship +function Get-SupervisoryReviewRule { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $Policy ) } -function Get-OutboundConnector +function Get-SweepRule { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $IncludeTestModeConnectors, + [System.Int32] + $SkipCount, + + [Parameter()] + [System.String] + $Provider, [Parameter()] [System.Object] - $Identity, + $Mailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $BypassScopeCheck, [Parameter()] [System.Object] - $ResultSize, + $Identity, [Parameter()] - [System.Boolean] - $IsTransportRuleScoped + [System.Object] + $ResultSize ) } -function Get-OwaMailboxPolicy +function Get-TeamsProtectionPolicy { [CmdletBinding()] param( @@ -4078,759 +2951,778 @@ function Get-OwaMailboxPolicy $Identity ) } -function Get-PartnerApplication +function Get-TenantAllowBlockListItems { [CmdletBinding()] param( + [Parameter()] + [System.DateTime] + $ExpirationDate, + + [Parameter()] + [System.Object[]] + $ListSubType, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Block, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $OutputJson, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $NoExpiration, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Allow, + + [Parameter()] + [System.String] + $Entry, + [Parameter()] [System.Object] - $Identity + $ListType ) } -function Get-PerimeterConfig +function Get-TenantAllowBlockListSpoofItems { [CmdletBinding()] param( + [Parameter()] + [System.String] + $Action, + + [Parameter()] + [System.String] + $SpoofType, + [Parameter()] [System.Object] $Identity ) } -function Get-Place +function Get-TransportConfig +{ + [CmdletBinding()] + param( + + ) +} +function Get-TransportRule { [CmdletBinding()] param( + [Parameter()] + [System.String] + $DlpPolicy, + [Parameter()] [System.Object] - $Type, + $ResultSize, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $ExcludeConditionActionDetails, + + [Parameter()] + [System.String] + $Filter, [Parameter()] [System.Object] - $Identity, + $State, [Parameter()] [System.Object] - $ResultSize + $Identity ) } -function Get-PolicyTipConfig +function Get-UnifiedGroup { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Action, + [System.Management.Automation.SwitchParameter] + $IncludeGrantSendOnBehalfToWithDisplayNames, + + [Parameter()] + [System.String] + $SortBy, [Parameter()] [System.Management.Automation.SwitchParameter] - $Original, + $IncludeSoftDeletedGroups, [Parameter()] - [System.Globalization.CultureInfo] - $Locale, + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeModeratedByWithDisplayNames, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAllProperties, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeBypassModerationFromSendersOrMembersWithDisplayNames, [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeRejectMessagesFromSendersOrMembersWithDisplayNames, + + [Parameter()] + [System.Object] + $ResultSize, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.String] + $Anr ) } -function Get-QuarantinePolicy +function Get-User { [CmdletBinding()] param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $PublicFolder, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsVIP, + + [Parameter()] + [System.Object] + $OrganizationalUnit, + [Parameter()] [System.Object] $Identity, + [Parameter()] + [System.Object[]] + $RecipientTypeDetails, + [Parameter()] [System.Object] - $QuarantinePolicyType + $ResultSize, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.String] + $Anr ) } -function Get-Recipient +function New-ActiveSyncDeviceAccessRule { [CmdletBinding()] param( [Parameter()] [System.String] - $SortBy, + $QueryString, [Parameter()] [System.Object] - $Identity, + $Characteristic, [Parameter()] - [System.String] - $RecipientPreviewFilter, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.String] - $Anr, + [System.Object] + $AccessLevel + ) +} +function New-ActiveSyncMailboxPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Boolean] + $AllowUnsignedApplications, [Parameter()] - [System.String] - $BookmarkDisplayName, + [System.Boolean] + $AllowUnsignedInstallationPackages, [Parameter()] - [System.Object] - $Capabilities, + [System.Boolean] + $AllowExternalDeviceManagement, [Parameter()] - [System.Object] - $ResultSize, + [System.Boolean] + $AllowIrDA, [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [System.Boolean] + $AllowStorageCard, [Parameter()] - [System.String[]] - $Properties, + [System.Boolean] + $AllowNonProvisionableDevices, [Parameter()] - [System.Object] - $PropertySet, + [System.Boolean] + $AllowRemoteDesktop, [Parameter()] [System.Object] - $AuthenticationType, + $UnapprovedInROMApplicationList, [Parameter()] - [System.String] - $Filter, + [System.Boolean] + $DevicePasswordEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedRecipients, + [System.Boolean] + $RequireEncryptedSMIMEMessages, [Parameter()] - [System.Object[]] - $RecipientType, + [System.Int32] + $DevicePasswordHistory, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Boolean] + $RequireDeviceEncryption, [Parameter()] [System.Boolean] - $IncludeBookmarkObject - ) -} -function Get-RecipientPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ReadFromDomainController, + $AllowInternetSharing, [Parameter()] - [System.Object] - $AccessRights, + [System.Int32] + $MinDevicePasswordComplexCharacters, [Parameter()] [System.Object] - $Identity, + $RequireSignedSMIMEAlgorithm, [Parameter()] [System.Object] - $ResultSize, + $MaxEmailHTMLBodyTruncationSize, [Parameter()] [System.Object] - $Trustee - ) -} -function Get-RemoteDomain -{ - [CmdletBinding()] - param( + $DevicePasswordExpiration, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $UNCAccessEnabled, [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-ReportSubmissionPolicy -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowCamera, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-ReportSubmissionRule -{ - [CmdletBinding()] - param( + $MaxDevicePasswordFailedAttempts, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $AllowBrowser, [Parameter()] - [System.Object] - $State - ) -} -function Get-ResourceConfig -{ - [CmdletBinding()] - param( + [System.Boolean] + $RequireManualSyncWhenRoaming, - ) -} -function Get-RoleAssignmentPolicy -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $Identity - ) -} -function Get-RoleGroup -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $SortBy, + $AllowSMIMEEncryptionAlgorithmNegotiation, [Parameter()] - [System.String] - $Filter, + [System.Boolean] + $DeviceEncryptionEnabled, [Parameter()] [System.Object] - $ResultSize, + $MaxEmailBodyTruncationSize, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ShowPartnerLinked, + [System.Object] + $AllowBluetooth, [Parameter()] [System.Object] - $Identity - ) -} -function Get-RoleGroupMember -{ - [CmdletBinding()] - param( + $RequireEncryptionSMIMEAlgorithm, + [Parameter()] [System.Object] - $Identity, + $DevicePolicyRefreshInterval, [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-SafeAttachmentPolicy -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowMobileOTAUpdate, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-SafeAttachmentRule -{ - [CmdletBinding()] - param( + [System.String] + $Name, + [Parameter()] [System.Object] - $Identity, + $MaxAttachmentSize, [Parameter()] - [System.Object] - $State - ) -} -function Get-SafeLinksPolicy -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowConsumerEmail, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-SafeLinksRule -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowDesktopSync, + [Parameter()] [System.Object] - $Identity, + $MaxInactivityTimeDeviceLock, [Parameter()] - [System.Object] - $State - ) -} -function Get-ServicePrincipal -{ - [CmdletBinding()] - param( + [System.Boolean] + $AlphanumericDevicePasswordRequired, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $RequireStorageCardEncryption, [Parameter()] - [System.Object] - $Organization - ) -} -function Get-ServicePrincipal -{ - [CmdletBinding()] - param( + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $AttachmentsEnabled, [Parameter()] - [System.Object] - $Organization - ) -} -function Get-SharingPolicy -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowSMIMESoftCerts, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-SupervisoryReviewPolicyV2 -{ - [CmdletBinding()] - param( + $MaxEmailAgeFilter, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-SupervisoryReviewRule -{ - [CmdletBinding()] - param( + [System.Boolean] + $AllowSimpleDevicePassword, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $PasswordRecoveryEnabled, [Parameter()] [System.Object] - $Policy - ) -} -function Get-TransportConfig -{ - [CmdletBinding()] - param( + $MaxCalendarAgeFilter, - ) -} -function Get-TransportRule -{ - [CmdletBinding()] - param( [Parameter()] - [System.String] - $DlpPolicy, + [System.Boolean] + $AllowWiFi, [Parameter()] - [System.Object] - $ResultSize, + [System.Boolean] + $AllowApplePushNotifications, [Parameter()] [System.Boolean] - $ExcludeConditionActionDetails, + $AllowPOPIMAPEmail, [Parameter()] - [System.String] - $Filter, + [System.Boolean] + $IsDefault, [Parameter()] - [System.Object] - $State, + [System.Boolean] + $IsDefaultPolicy, [Parameter()] [System.Object] - $Identity - ) -} + $ApprovedApplicationList, -function Get-UnifiedAuditLogRetentionPolicy -{ - [CmdletBinding()] - param( [Parameter()] - [System.String] - $Operation, + [System.Boolean] + $AllowTextMessaging, [Parameter()] - [System.String] - $RecordType, + [System.Boolean] + $WSSAccessEnabled, [Parameter()] - [System.String] - $RetentionDuration, + [System.Boolean] + $RequireSignedSMIMEMessages, [Parameter()] - [System.String] - $UserId + [System.Boolean] + $AllowHTMLEmail, + + [Parameter()] + [System.Object] + $MinDevicePasswordLength, + + [Parameter()] + [System.Boolean] + $IrmEnabled ) } - -function Get-UnifiedGroup +function New-AntiPhishPolicy { [CmdletBinding()] param( [Parameter()] - [System.String] - $SortBy, + [System.Object] + $DmarcQuarantineAction, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedGroups, + $MakeDefault, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAllProperties, + [System.Int32] + $PhishThresholdLevel, [Parameter()] - [System.String] - $Filter, + [System.Boolean] + $EnableTargetedDomainsProtection, [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $HonorDmarcPolicy, [Parameter()] - [System.Object] - $ResultSize, + [System.Boolean] + $Enabled, [Parameter()] - [System.String] - $Anr - ) -} -function Get-User -{ - [CmdletBinding()] - param( + [System.Boolean] + $EnableViaTag, + [Parameter()] [System.String] - $SortBy, + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + [System.Object] + $TargetedDomainsToProtect, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsVIP, + [System.Boolean] + $EnableSpoofIntelligence, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Boolean] + $EnableSimilarUsersSafetyTips, [Parameter()] [System.Object] - $Identity, + $ExcludedDomains, [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [System.Object] + $MailboxIntelligenceProtectionAction, [Parameter()] [System.Object] - $ResultSize, + $TargetedDomainActionRecipients, [Parameter()] - [System.String] - $Filter, + [System.Boolean] + $EnableMailboxIntelligence, + + [Parameter()] + [System.Boolean] + $EnableFirstContactSafetyTips, [Parameter()] [System.String] - $Anr - ) -} -function New-ActiveSyncDeviceAccessRule -{ - [CmdletBinding()] - param( + $TargetedDomainQuarantineTag, + [Parameter()] [System.String] - $QueryString, + $SimilarUsersSafetyTipsCustomText, [Parameter()] [System.Object] - $Characteristic, + $ImpersonationProtectionState, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $MailboxIntelligenceProtectionActionRecipients, [Parameter()] [System.Object] - $AccessLevel - ) -} + $TargetedDomainProtectionAction, -function New-ActiveSyncMailboxPolicy -{ - [CmdletBinding()] - param( [Parameter()] - [System.Boolean] - $AllowUnsignedApplications, + [System.String] + $AdminDisplayName, [Parameter()] - [System.Boolean] - $AllowUnsignedInstallationPackages, + [System.Object] + $TargetedUsersToProtect, [Parameter()] - [System.Boolean] - $AllowExternalDeviceManagement, + [System.Object] + $TargetedUserProtectionAction, [Parameter()] - [System.Boolean] - $AllowIrDA, + [System.Object] + $RecommendedPolicyType, [Parameter()] - [System.Boolean] - $AllowStorageCard, + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $MailboxIntelligenceQuarantineTag, + + [Parameter()] + [System.String] + $UnusualCharactersSafetyTipsCustomText, [Parameter()] [System.Boolean] - $AllowNonProvisionableDevices, + $EnableSimilarDomainsSafetyTips, + + [Parameter()] + [System.String] + $SpoofQuarantineTag, [Parameter()] [System.Boolean] - $AllowRemoteDesktop, + $EnableUnauthenticatedSender, [Parameter()] [System.Object] - $UnapprovedInROMApplicationList, + $DmarcRejectAction, [Parameter()] - [System.Boolean] - $DevicePasswordEnabled, + [System.String] + $PolicyTag, [Parameter()] - [System.Boolean] - $RequireEncryptedSMIMEMessages, + [System.String] + $TargetedUserQuarantineTag, [Parameter()] - [System.Int32] - $DevicePasswordHistory, + [System.Boolean] + $EnableOrganizationDomainsProtection, [Parameter()] [System.Boolean] - $RequireDeviceEncryption, + $EnableMailboxIntelligenceProtection, [Parameter()] [System.Boolean] - $AllowInternetSharing, + $EnableUnusualCharactersSafetyTips, [Parameter()] - [System.Int32] - $MinDevicePasswordComplexCharacters, + [System.Boolean] + $EnableTargetedUserProtection, [Parameter()] [System.Object] - $RequireSignedSMIMEAlgorithm, + $AuthenticationFailAction, [Parameter()] [System.Object] - $MaxEmailHTMLBodyTruncationSize, + $TargetedUserActionRecipients, [Parameter()] [System.Object] - $DevicePasswordExpiration, + $ExcludedSenders + ) +} +function New-AntiPhishRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Int32] + $Priority, [Parameter()] - [System.Boolean] - $UNCAccessEnabled, + [System.String] + $Name, [Parameter()] - [System.Boolean] - $AllowCamera, + [System.Object[]] + $SentToMemberOf, [Parameter()] [System.Object] - $MaxDevicePasswordFailedAttempts, - - [Parameter()] - [System.Boolean] - $AllowBrowser, + $AntiPhishPolicy, [Parameter()] - [System.Boolean] - $RequireManualSyncWhenRoaming, + [System.Object[]] + $SentTo, [Parameter()] - [System.Object] - $AllowSMIMEEncryptionAlgorithmNegotiation, + [System.String] + $Comments, [Parameter()] - [System.Boolean] - $DeviceEncryptionEnabled, + [System.Object[]] + $RecipientDomainIs, [Parameter()] - [System.Object] - $MaxEmailBodyTruncationSize, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $AllowBluetooth, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] - [System.Object] - $RequireEncryptionSMIMEAlgorithm, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $DevicePolicyRefreshInterval, + [System.Object[]] + $ExceptIfSentToMemberOf, [Parameter()] [System.Boolean] - $AllowMobileOTAUpdate, - + $Enabled + ) +} +function New-App +{ + [CmdletBinding()] + param( [Parameter()] - [System.String] - $Name, + [System.Uri] + $Url, [Parameter()] - [System.Object] - $MaxAttachmentSize, + [System.String] + $Identity, [Parameter()] [System.Boolean] - $AllowConsumerEmail, + $Enabled, [Parameter()] - [System.Boolean] - $AllowDesktopSync, + [System.Object] + $AddInOverrides, [Parameter()] [System.Object] - $MaxInactivityTimeDeviceLock, + $Mailbox, [Parameter()] - [System.Boolean] - $AlphanumericDevicePasswordRequired, + [System.IO.Stream] + $FileStream, [Parameter()] - [System.Boolean] - $RequireStorageCardEncryption, + [System.String] + $MarketplaceServicesUrl, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $Etoken, [Parameter()] - [System.Boolean] - $AttachmentsEnabled, + [System.String] + $MarketplaceCorrelationID, [Parameter()] - [System.Boolean] - $AllowSMIMESoftCerts, + [System.String] + $Version, [Parameter()] [System.Object] - $MaxEmailAgeFilter, + $DefaultStateForUser, [Parameter()] - [System.Boolean] - $AllowSimpleDevicePassword, + [System.String] + $MarketplaceQueryMarket, [Parameter()] - [System.Boolean] - $PasswordRecoveryEnabled, + [System.String] + $MarketplaceUserProfileType, [Parameter()] [System.Object] - $MaxCalendarAgeFilter, + $AllowSetting, [Parameter()] - [System.Boolean] - $AllowWiFi, + [System.Management.Automation.SwitchParameter] + $DownloadOnly, [Parameter()] - [System.Boolean] - $AllowApplePushNotifications, + [System.Object] + $ProvidedTo, [Parameter()] - [System.Boolean] - $AllowPOPIMAPEmail, + [System.Object] + $UserList, [Parameter()] - [System.Boolean] - $IsDefault, + [System.String] + $AppState, [Parameter()] - [System.Boolean] - $IsDefaultPolicy, + [System.Management.Automation.SwitchParameter] + $OrganizationApp, [Parameter()] - [System.Object] - $ApprovedApplicationList, + [System.String] + $AppType, [Parameter()] - [System.Boolean] - $AllowTextMessaging, + [System.String] + $MarketplaceAssetID, [Parameter()] - [System.Boolean] - $WSSAccessEnabled, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Boolean] - $RequireSignedSMIMEMessages, + [System.Byte[]] + $FileData, [Parameter()] - [System.Boolean] - $AllowHTMLEmail, + [System.Management.Automation.SwitchParameter] + $AllowReadWriteMailbox, [Parameter()] - [System.Object] - $MinDevicePasswordLength, + [System.Management.Automation.SwitchParameter] + $PrivateCatalog, [Parameter()] - [System.Boolean] - $IrmEnabled + [System.Management.Automation.SwitchParameter] + $UpdateAppState ) } - -function New-AddressBookPolicy +function New-ApplicationAccessPolicy { [CmdletBinding()] param( [Parameter()] - [System.Object] - $RoomList, + [System.String] + $Description, [Parameter()] [System.Object] - $OfflineAddressBook, - - [Parameter()] - [System.String] - $Name, + $PolicyScopeGroupId, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -4838,289 +3730,313 @@ function New-AddressBookPolicy [Parameter()] [System.Object] - $GlobalAddressList, + $AccessRight, [Parameter()] - [System.Object[]] - $AddressLists + [System.String[]] + $AppId ) } -function New-AddressList +function New-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Int32] + $Priority, [Parameter()] [System.String] - $RecipientFilter, + $Name, [Parameter()] - [System.Object] - $ConditionalCustomAttribute8, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.String] - $DisplayName, + [System.Object[]] + $SentTo, [Parameter()] - [System.Object] - $ConditionalCustomAttribute10, + [System.String] + $Comments, [Parameter()] - [System.String] - $Name, + [System.Object[]] + $RecipientDomainIs, [Parameter()] [System.Object] - $ConditionalCustomAttribute9, + $SafeAttachmentPolicy, [Parameter()] [System.Object] - $ConditionalCustomAttribute2, + $SafeLinksPolicy, [Parameter()] - [System.Object] - $IncludedRecipients, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] - [System.Object] - $ConditionalCompany, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $ConditionalCustomAttribute6, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $ConditionalCustomAttribute3, + [System.Object[]] + $ExceptIfSentToMemberOf, [Parameter()] - [System.Object] - $ConditionalCustomAttribute12, + [System.Boolean] + $Enabled + ) +} +function New-AuthenticationPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, [Parameter()] - [System.Object] - $Container, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPop, [Parameter()] - [System.Object] - $ConditionalCustomAttribute13, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthSmtp, [Parameter()] - [System.Object] - $ConditionalCustomAttribute15, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthMapi, [Parameter()] - [System.Object] - $ConditionalDepartment, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthImap, [Parameter()] - [System.Object] - $ConditionalStateOrProvince, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthAutodiscover, [Parameter()] - [System.Object] - $ConditionalCustomAttribute7, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPowershell, [Parameter()] - [System.Object] - $ConditionalCustomAttribute14, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthRpc, [Parameter()] - [System.Object] - $ConditionalCustomAttribute4, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOfflineAddressBook, [Parameter()] - [System.Object] - $ConditionalCustomAttribute11, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthReportingWebServices, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOutlookService, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthActiveSync, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthWebServices + ) +} +function New-AvailabilityConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $ConditionalCustomAttribute1, + $OrgWideAccount, [Parameter()] [System.Object] - $ConditionalCustomAttribute5 + $AllowedTenantIds ) } -function New-AntiPhishPolicy +function New-DataEncryptionPolicy { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $EnableFirstContactSafetyTips, + [System.String] + $Description, [Parameter()] - [System.Management.Automation.SwitchParameter] - $MakeDefault, + [System.String] + $Name, [Parameter()] [System.Object] - $DmarcRejectAction, - - [Parameter()] - [System.Int32] - $PhishThresholdLevel, + $DomainController, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Boolean] - $EnableTargetedDomainsProtection, + [System.Object] + $AzureKeyIDs, [Parameter()] [System.Boolean] - $HonorDmarcPolicy, + $Enabled + ) +} +function New-DistributionGroup +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $ModeratedBy, [Parameter()] [System.Boolean] - $Enabled, + $RequireSenderAuthenticationEnabled, [Parameter()] [System.Boolean] - $EnableViaTag, + $ModerationEnabled, [Parameter()] [System.String] - $Name, + $DisplayName, [Parameter()] [System.Object] - $TargetedDomainsToProtect, - - [Parameter()] - [System.Boolean] - $EnableSpoofIntelligence, - - [Parameter()] - [System.Boolean] - $EnableSimilarUsersSafetyTips, + $MemberDepartRestriction, [Parameter()] - [System.Object] - $ExcludedDomains, + [System.String] + $Name, [Parameter()] - [System.Object] - $MailboxIntelligenceProtectionAction, + [System.Management.Automation.SwitchParameter] + $IgnoreNamingPolicy, [Parameter()] - [System.Object] - $TargetedDomainActionRecipients, + [System.Management.Automation.SwitchParameter] + $RoomList, [Parameter()] - [System.Object] - $DmarcQuarantineAction, + [System.Management.Automation.SwitchParameter] + $HiddenGroupMembershipEnabled, [Parameter()] [System.Boolean] - $EnableMailboxIntelligence, + $BypassNestedModerationEnabled, [Parameter()] - [System.String] - $TargetedDomainQuarantineTag, + [System.Management.Automation.SwitchParameter] + $CopyOwnerToMember, [Parameter()] - [System.String] - $SimilarUsersSafetyTipsCustomText, + [System.Boolean] + $BccBlocked, [Parameter()] [System.Object] - $ImpersonationProtectionState, + $Members, [Parameter()] [System.Object] - $TargetedDomainProtectionAction, + $Description, [Parameter()] - [System.String] - $AdminDisplayName, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $TargetedUsersToProtect, + [System.String] + $Notes, [Parameter()] [System.Object] - $TargetedUserProtectionAction, + $MemberJoinRestriction, [Parameter()] [System.Object] - $RecommendedPolicyType, + $Type, [Parameter()] [System.Object] - $MailboxIntelligenceProtectionActionRecipients, - - [Parameter()] - [System.String] - $MailboxIntelligenceQuarantineTag, + $ManagedBy, [Parameter()] [System.String] - $UnusualCharactersSafetyTipsCustomText, - - [Parameter()] - [System.Boolean] - $EnableSimilarDomainsSafetyTips, + $Alias, [Parameter()] - [System.String] - $SpoofQuarantineTag, + [System.Object] + $PrimarySmtpAddress, [Parameter()] - [System.Boolean] - $EnableUnauthenticatedSender, + [System.Object] + $SendModerationNotifications, [Parameter()] - [System.String] - $PolicyTag, - + [System.Object] + $OrganizationalUnit + ) +} +function New-DkimSigningConfig +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $TargetedUserQuarantineTag, - - [Parameter()] - [System.Boolean] - $EnableOrganizationDomainsProtection, + $AdminDisplayName, [Parameter()] - [System.Boolean] - $EnableMailboxIntelligenceProtection, + [System.Object] + $BodyCanonicalization, [Parameter()] - [System.Boolean] - $EnableUnusualCharactersSafetyTips, + [System.Object] + $HeaderCanonicalization, [Parameter()] - [System.Boolean] - $EnableTargetedUserProtection, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $AuthenticationFailAction, + [System.UInt16] + $KeySize, [Parameter()] [System.Object] - $TargetedUserActionRecipients, + $DomainName, [Parameter()] - [System.Object] - $ExcludedSenders + [System.Boolean] + $Enabled ) } -function New-AntiPhishRule +function New-EmailAddressPolicy { [CmdletBinding()] param( [Parameter()] - [System.Int32] + [System.Object] $Priority, [Parameter()] @@ -5129,681 +4045,678 @@ function New-AntiPhishRule [Parameter()] [System.Object] - $AntiPhishPolicy, - - [Parameter()] - [System.Object[]] - $SentToMemberOf, + $EnabledEmailAddressTemplates, [Parameter()] - [System.Object[]] - $SentTo, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Comments, - - [Parameter()] - [System.Object[]] - $RecipientDomainIs, - - [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + $EnabledPrimarySMTPAddressTemplate, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.String] + $ManagedByFilter, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, - - [Parameter()] - [System.Boolean] - $Enabled + $IncludeUnifiedGroupRecipients ) } -function New-App +function New-ExoPhishSimOverrideRule { [CmdletBinding()] param( - [Parameter()] - [System.Uri] - $Url, - [Parameter()] [System.String] - $Identity, + $Name, [Parameter()] - [System.Boolean] - $Enabled, + [System.Object] + $SenderIpRanges, [Parameter()] [System.Object] - $AddInOverrides, + $DomainController, [Parameter()] - [System.Object] - $Mailbox, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.IO.Stream] - $FileStream, + [System.Object] + $Domains, [Parameter()] [System.String] - $MarketplaceServicesUrl, + $Comment, + [Parameter()] + [System.Object] + $Policy + ) +} +function New-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $Etoken, + $Name, [Parameter()] - [System.String] - $MarketplaceCorrelationID, + [System.Object] + $Policy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Version, + $Comment, [Parameter()] [System.Object] - $DefaultStateForUser, + $DomainController + ) +} +function New-HostedConnectionFilterPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $ConfigurationXmlRaw, [Parameter()] [System.String] - $MarketplaceQueryMarket, + $Name, [Parameter()] [System.String] - $MarketplaceUserProfileType, + $AdminDisplayName, [Parameter()] - [System.Object] - $AllowSetting, + [System.Boolean] + $EnableSafeList, [Parameter()] [System.Management.Automation.SwitchParameter] - $DownloadOnly, + $Confirm, [Parameter()] [System.Object] - $ProvidedTo, + $IPBlockList, [Parameter()] [System.Object] - $UserList, - + $IPAllowList + ) +} +function New-HostedContentFilterPolicy +{ + [CmdletBinding()] + param( [Parameter()] - [System.String] - $AppState, + [System.Boolean] + $InlineSafetyTipsEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $OrganizationApp, + [System.Object] + $RegionBlockList, [Parameter()] [System.String] - $AppType, + $HighConfidencePhishQuarantineTag, [Parameter()] - [System.String] - $MarketplaceAssetID, + [System.Int32] + $EndUserSpamNotificationFrequency, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Int32] + $QuarantineRetentionPeriod, [Parameter()] - [System.Byte[]] - $FileData, + [System.Int32] + $EndUserSpamNotificationLimit, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowReadWriteMailbox, + [System.Int32] + $BulkThreshold, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrivateCatalog, + [System.Object] + $TestModeBccToRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UpdateAppState - ) -} -function New-ApplicationAccessPolicy -{ - [CmdletBinding()] - param( + [System.String] + $PhishQuarantineTag, + [Parameter()] [System.String] - $Description, + $AddXHeaderValue, [Parameter()] [System.Object] - $PolicyScopeGroupId, + $MarkAsSpamEmbedTagsInHtml, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $MarkAsSpamFramesInHtml, [Parameter()] [System.Object] - $AccessRight, + $IncreaseScoreWithImageLinks, [Parameter()] - [System.String[]] - $AppId - ) -} + [System.Boolean] + $EnableLanguageBlockList, -function New-ATPProtectionPolicyRule -{ - [CmdletBinding()] - param( [Parameter()] - [System.String] - $Name, + [System.Object] + $PhishSpamAction, [Parameter()] [System.String] - $SafeAttachmentPolicy, + $EndUserSpamNotificationCustomFromName, [Parameter()] - [System.String] - $SafeLinksPolicy, + [System.Object] + $MarkAsSpamSensitiveWordList, [Parameter()] [System.String] - $Comments, - - [Parameter()] - [System.Boolean] - $Enabled, + $SpamQuarantineTag, [Parameter()] - [System.String[]] - $ExceptIfRecipientDomainIs, + [System.Object] + $MarkAsSpamNdrBackscatter, [Parameter()] - [System.String[]] - $ExceptIfSentTo, + [System.Object] + $BlockedSenders, [Parameter()] - [System.String[]] - $ExceptIfSentToMemberOf, + [System.Object] + $LanguageBlockList, [Parameter()] - [System.UInt32] - $Priority, + [System.Object] + $HighConfidenceSpamAction, [Parameter()] - [System.String[]] - $RecipientDomainIs, + [System.Object] + $AllowedSenderDomains, [Parameter()] - [System.String[]] - $SentTo, + [System.Object] + $IncreaseScoreWithBizOrInfoUrls, [Parameter()] - [System.String[]] - $SentToMemberOf - ) -} + [System.Object] + $MarkAsSpamWebBugsInHtml, -function New-AuthenticationPolicy -{ - [CmdletBinding()] - param( [Parameter()] [System.String] - $Name, + $AdminDisplayName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPop, + [System.Object] + $IntraOrgFilterState, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthSmtp, + [System.Object] + $MarkAsSpamFromAddressAuthFail, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthMapi, + [System.String] + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthImap, + [System.Object] + $MarkAsSpamEmptyMessages, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthAutodiscover, + [System.String] + $BulkQuarantineTag, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPowershell, + [System.Object] + $MarkAsSpamFormTagsInHtml, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthRpc, + [System.Object] + $MarkAsSpamObjectTagsInHtml, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOfflineAddressBook, + [System.Object] + $BulkSpamAction, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthReportingWebServices, + [System.Object] + $EndUserSpamNotificationLanguage, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOutlookService, + [System.Object] + $IncreaseScoreWithRedirectToOtherPort, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthActiveSync, + [System.Object] + $HighConfidencePhishAction, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthWebServices - ) -} -function New-AvailabilityConfig -{ - [CmdletBinding()] - param( + [System.Object] + $RedirectToRecipients, + [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $SpamZapEnabled, [Parameter()] [System.Object] - $OrgWideAccount, + $TestModeAction, [Parameter()] - [System.Object] - $AllowedTenantIds - ) -} -function New-ClientAccessRule -{ - [CmdletBinding()] - param( + [System.Boolean] + $EnableRegionBlockList, + + [Parameter()] + [System.String] + $EndUserSpamNotificationCustomSubject, + [Parameter()] [System.Object] - $Action, + $MarkAsSpamSpfRecordHardFail, [Parameter()] [System.Object] - $AnyOfClientIPAddressesOrRanges, + $EndUserSpamNotificationCustomFromAddress, [Parameter()] [System.Boolean] - $Enabled, + $DownloadLink, [Parameter()] [System.Object] - $ExceptAnyOfClientIPAddressesOrRanges, - - [Parameter()] - [System.String] - $Name, + $SpamAction, [Parameter()] [System.String] - $UserRecipientFilter, + $ModifySubjectValue, [Parameter()] [System.Object] - $ExceptAnyOfProtocols, + $IncreaseScoreWithNumericIps, [Parameter()] - [System.Int32] - $Priority, + [System.Object] + $AllowedSenders, [Parameter()] [System.Object] - $ExceptUsernameMatchesAnyOfPatterns, + $MarkAsSpamJavaScriptInHtml, [Parameter()] [System.Object] - $UsernameMatchesAnyOfPatterns, + $MarkAsSpamBulkMail, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $BlockedSenderDomains, [Parameter()] [System.Object] - $AnyOfAuthenticationTypes, + $RecommendedPolicyType, [Parameter()] - [System.Object] - $AnyOfProtocols, + [System.Boolean] + $PhishZapEnabled, [Parameter()] - [System.Object] - $ExceptAnyOfAuthenticationTypes, + [System.Boolean] + $EnableEndUserSpamNotifications, [Parameter()] - [System.Object] - $Scope + [System.String] + $HighConfidenceSpamQuarantineTag ) } -function New-DataEncryptionPolicy +function New-HostedContentFilterRule { [CmdletBinding()] param( + [Parameter()] + [System.Int32] + $Priority, + [Parameter()] [System.String] - $Description, + $Name, + + [Parameter()] + [System.Object[]] + $SentToMemberOf, + + [Parameter()] + [System.Object] + $HostedContentFilterPolicy, + + [Parameter()] + [System.Object[]] + $SentTo, + + [Parameter()] + [System.String] + $Comments, + + [Parameter()] + [System.Object[]] + $RecipientDomainIs, [Parameter()] - [System.String] - $Name, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $DomainController, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $AzureKeyIDs, + [System.Object[]] + $ExceptIfSentToMemberOf, [Parameter()] [System.Boolean] $Enabled ) } -function New-DistributionGroup +function New-HostedOutboundSpamFilterPolicy { [CmdletBinding()] param( [Parameter()] [System.Object] - $ModeratedBy, - - [Parameter()] - [System.Boolean] - $RequireSenderAuthenticationEnabled, + $RecommendedPolicyType, [Parameter()] - [System.Boolean] - $ModerationEnabled, + [System.String] + $Name, [Parameter()] [System.String] - $DisplayName, + $AdminDisplayName, [Parameter()] [System.Object] - $MemberDepartRestriction, + $BccSuspiciousOutboundAdditionalRecipients, [Parameter()] - [System.String] - $Name, + [System.Object] + $NotifyOutboundSpamRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreNamingPolicy, + [System.UInt32] + $RecipientLimitPerDay, [Parameter()] - [System.Management.Automation.SwitchParameter] - $RoomList, + [System.Object] + $ActionWhenThresholdReached, [Parameter()] - [System.Management.Automation.SwitchParameter] - $HiddenGroupMembershipEnabled, + [System.Object] + $AutoForwardingMode, [Parameter()] [System.Boolean] - $BypassNestedModerationEnabled, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $CopyOwnerToMember, + $NotifyOutboundSpam, [Parameter()] [System.Boolean] - $BccBlocked, + $BccSuspiciousOutboundMail, [Parameter()] - [System.Object] - $Members, + [System.UInt32] + $RecipientLimitInternalPerHour, [Parameter()] - [System.Object] - $Description, - + [System.UInt32] + $RecipientLimitExternalPerHour + ) +} +function New-HostedOutboundSpamFilterRule +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Int32] + $Priority, [Parameter()] [System.String] - $Notes, + $Name, [Parameter()] - [System.Object] - $MemberJoinRestriction, + [System.Object[]] + $ExceptIfFromMemberOf, [Parameter()] - [System.Object] - $Type, + [System.Object[]] + $ExceptIfFrom, [Parameter()] - [System.Object] - $ManagedBy, + [System.Object[]] + $ExceptIfSenderDomainIs, [Parameter()] [System.String] - $Alias, + $Comments, [Parameter()] - [System.Object] - $PrimarySmtpAddress, + [System.Object[]] + $FromMemberOf, [Parameter()] - [System.Object] - $SendModerationNotifications, + [System.Object[]] + $SenderDomainIs, [Parameter()] [System.Object] - $OrganizationalUnit + $HostedOutboundSpamFilterPolicy, + + [Parameter()] + [System.Object[]] + $From, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $Enabled ) } -function New-DkimSigningConfig +function New-InboundConnector { [CmdletBinding()] param( [Parameter()] - [System.String] - $AdminDisplayName, + [System.Boolean] + $RestrictDomainsToIPAddresses, [Parameter()] - [System.Object] - $BodyCanonicalization, + [System.Boolean] + $CloudServicesMailEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $Enabled, [Parameter()] [System.Object] - $HeaderCanonicalization, - - [Parameter()] - [System.UInt16] - $KeySize, + $ClientHostNames, [Parameter()] [System.Object] - $DomainName, + $EFSkipMailGateway, [Parameter()] [System.Boolean] - $Enabled - ) -} -function New-EmailAddressPolicy -{ - [CmdletBinding()] - param( + $EFTestMode, + [Parameter()] [System.Object] - $Priority, + $TrustedOrganizations, [Parameter()] - [System.String] - $Name, + [System.Object] + $TlsSenderCertificateName, [Parameter()] [System.Object] - $EnabledEmailAddressTemplates, + $ScanAndDropRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $AssociatedAcceptedDomains, [Parameter()] [System.String] - $EnabledPrimarySMTPAddressTemplate, + $Name, [Parameter()] [System.String] - $ManagedByFilter, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeUnifiedGroupRecipients - ) -} -function New-GlobalAddressList -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $Comment, [Parameter()] - [System.String] - $RecipientFilter, + [System.Boolean] + $RequireTls, [Parameter()] [System.Object] - $ConditionalCustomAttribute8, + $SenderDomains, [Parameter()] [System.Object] - $ConditionalCustomAttribute10, + $SenderIPAddresses, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $EFSkipLastIP, [Parameter()] [System.Object] - $ConditionalCustomAttribute9, + $EFUsers, [Parameter()] - [System.Object] - $ConditionalCustomAttribute2, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $IncludedRecipients, + $ConnectorType, [Parameter()] - [System.Object] - $ConditionalCompany, + [System.Boolean] + $RestrictDomainsToCertificate, [Parameter()] [System.Object] - $ConditionalCustomAttribute6, + $EFSkipIPs, [Parameter()] - [System.Object] - $ConditionalCustomAttribute3, + [System.Boolean] + $TreatMessagesAsInternal, [Parameter()] [System.Object] - $ConditionalCustomAttribute12, + $ConnectorSource + ) +} +function New-IntraOrganizationConnector +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, [Parameter()] [System.Object] - $ConditionalCustomAttribute13, + $TargetAddressDomains, [Parameter()] - [System.Object] - $ConditionalCustomAttribute15, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $ConditionalDepartment, + [System.Uri] + $TargetSharingEpr, [Parameter()] - [System.Object] - $ConditionalStateOrProvince, + [System.Uri] + $DiscoveryEndpoint, [Parameter()] - [System.Object] - $ConditionalCustomAttribute7, + [System.Boolean] + $Enabled + ) +} +function New-JournalRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, [Parameter()] [System.Object] - $ConditionalCustomAttribute14, + $Scope, [Parameter()] - [System.Object] - $ConditionalCustomAttribute4, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $ConditionalCustomAttribute11, + $JournalEmailAddress, [Parameter()] [System.Object] - $ConditionalCustomAttribute1, + $Recipient, [Parameter()] - [System.Object] - $ConditionalCustomAttribute5 + [System.Boolean] + $Enabled ) } -function New-HostedConnectionFilterPolicy +function New-M365DataAtRestEncryptionPolicy { [CmdletBinding()] param( [Parameter()] [System.String] - $ConfigurationXmlRaw, + $Description, [Parameter()] [System.String] $Name, [Parameter()] - [System.String] - $AdminDisplayName, - - [Parameter()] - [System.Boolean] - $EnableSafeList, + [System.Object] + $DomainController, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -5811,353 +4724,333 @@ function New-HostedConnectionFilterPolicy [Parameter()] [System.Object] - $IPBlockList, + $AzureKeyIDs, [Parameter()] - [System.Object] - $IPAllowList + [System.Boolean] + $Enabled ) } -function New-HostedContentFilterPolicy +function New-Mailbox { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $MailboxRegion, + + [Parameter()] + [System.Object] + $ModeratedBy, [Parameter()] [System.Boolean] - $InlineSafetyTipsEnabled, + $ModerationEnabled, [Parameter()] - [System.Object] - $BulkSpamAction, + [System.String] + $Office, [Parameter()] [System.String] - $HighConfidencePhishQuarantineTag, + $DisplayName, [Parameter()] - [System.Int32] - $EndUserSpamNotificationFrequency, + [System.Security.SecureString] + $Password, [Parameter()] - [System.Int32] - $EndUserSpamNotificationLimit, + [System.String] + $Name, [Parameter()] - [System.Int32] - $BulkThreshold, + [System.Object] + $RemovedMailbox, [Parameter()] - [System.Object] - $TestModeBccToRecipients, + [System.Management.Automation.SwitchParameter] + $PublicFolder, [Parameter()] - [System.String] - $PhishQuarantineTag, + [System.Management.Automation.SwitchParameter] + $Force, [Parameter()] [System.String] - $AddXHeaderValue, + $LastName, [Parameter()] - [System.Object] - $MarkAsSpamEmbedTagsInHtml, + [System.Management.Automation.SwitchParameter] + $TargetAllMDBs, [Parameter()] [System.Object] - $MarkAsSpamFramesInHtml, + $RoleAssignmentPolicy, [Parameter()] [System.Object] - $IncreaseScoreWithImageLinks, + $ResourceCapacity, [Parameter()] - [System.Boolean] - $EnableLanguageBlockList, + [System.Management.Automation.SwitchParameter] + $Archive, [Parameter()] - [System.Object] - $PhishSpamAction, + [System.Management.Automation.SwitchParameter] + $Equipment, [Parameter()] [System.String] - $EndUserSpamNotificationCustomFromName, + $ImmutableId, [Parameter()] - [System.Object] - $MarkAsSpamSensitiveWordList, + [System.Security.SecureString] + $RoomMailboxPassword, [Parameter()] - [System.String] - $SpamQuarantineTag, + [System.Management.Automation.SwitchParameter] + $Shared, [Parameter()] - [System.Object] - $MarkAsSpamNdrBackscatter, + [System.Boolean] + $IsExcludedFromServingHierarchy, [Parameter()] [System.Object] - $BlockedSenders, + $MailboxPlan, [Parameter()] [System.Object] - $LanguageBlockList, + $MicrosoftOnlineServicesID, [Parameter()] - [System.Object] - $HighConfidenceSpamAction, + [System.Management.Automation.SwitchParameter] + $Migration, [Parameter()] - [System.Object] - $AllowedSenderDomains, + [System.Management.Automation.SwitchParameter] + $Room, [Parameter()] - [System.Object] - $IncreaseScoreWithBizOrInfoUrls, + [System.String] + $Initials, [Parameter()] [System.Object] - $MarkAsSpamWebBugsInHtml, + $InactiveMailbox, [Parameter()] [System.String] - $AdminDisplayName, + $FederatedIdentity, [Parameter()] [System.Object] - $IntraOrgFilterState, + $ActiveSyncMailboxPolicy, [Parameter()] [System.Object] - $RegionBlockList, + $OrganizationalUnit, [Parameter()] - [System.Object] - $MarkAsSpamFromAddressAuthFail, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.String] - $Name, + [System.Management.Automation.SwitchParameter] + $HoldForMigration, [Parameter()] - [System.Object] - $MarkAsSpamEmptyMessages, + [System.Management.Automation.SwitchParameter] + $Discovery, [Parameter()] - [System.String] - $BulkQuarantineTag, + [System.Boolean] + $ResetPasswordOnNextLogon, [Parameter()] - [System.Object] - $MarkAsSpamFormTagsInHtml, + [System.Boolean] + $EnableRoomMailboxAccount, [Parameter()] - [System.Object] - $MarkAsSpamObjectTagsInHtml, + [System.String] + $FirstName, [Parameter()] - [System.Object] - $EndUserSpamNotificationLanguage, + [System.String] + $Phone, [Parameter()] [System.Object] - $IncreaseScoreWithRedirectToOtherPort, - - [Parameter()] - [System.Int32] - $QuarantineRetentionPeriod, + $PrimarySmtpAddress, [Parameter()] [System.Object] - $HighConfidencePhishAction, + $SendModerationNotifications, [Parameter()] - [System.Object] - $RedirectToRecipients, + [System.String] + $Alias, [Parameter()] [System.Boolean] - $SpamZapEnabled, - + $RemotePowerShellEnabled + ) +} +function New-MailContact +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $TestModeAction, + $ModeratedBy, [Parameter()] [System.Boolean] - $EnableRegionBlockList, + $ModerationEnabled, + + [Parameter()] + [System.Object] + $MacAttachmentFormat, [Parameter()] [System.String] - $EndUserSpamNotificationCustomSubject, + $DisplayName, [Parameter()] - [System.Object] - $MarkAsSpamSpfRecordHardFail, + [System.String] + $Name, [Parameter()] - [System.Object] - $EndUserSpamNotificationCustomFromAddress, + [System.String] + $LastName, [Parameter()] [System.Boolean] - $DownloadLink, + $UsePreferMessageFormat, [Parameter()] [System.Object] - $SpamAction, + $MessageBodyFormat, [Parameter()] [System.String] - $ModifySubjectValue, + $Initials, [Parameter()] - [System.Object] - $IncreaseScoreWithNumericIps, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $AllowedSenders, + $ExternalEmailAddress, [Parameter()] - [System.Object] - $MarkAsSpamJavaScriptInHtml, + [System.String] + $Alias, [Parameter()] [System.Object] - $MarkAsSpamBulkMail, + $MessageFormat, [Parameter()] - [System.Object] - $BlockedSenderDomains, + [System.String] + $FirstName, [Parameter()] [System.Object] - $RecommendedPolicyType, - - [Parameter()] - [System.Boolean] - $PhishZapEnabled, - - [Parameter()] - [System.Boolean] - $EnableEndUserSpamNotifications, + $SendModerationNotifications, [Parameter()] - [System.String] - $HighConfidenceSpamQuarantineTag + [System.Object] + $OrganizationalUnit ) } -function New-HostedContentFilterRule +function New-MalwareFilterPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Int32] - $Priority, - [Parameter()] [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $SentToMemberOf, + $CustomFromName, [Parameter()] - [System.Object] - $HostedContentFilterPolicy, + [System.String] + $AdminDisplayName, [Parameter()] - [System.Object[]] - $SentTo, + [System.String] + $Name, [Parameter()] [System.String] - $Comments, + $CustomExternalBody, [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.String] + $QuarantineTag, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Boolean] + $CustomNotifications, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Boolean] + $EnableExternalSenderAdminNotifications, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $InternalSenderAdminAddress, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.String[]] + $FileTypes, [Parameter()] [System.Boolean] - $Enabled - ) -} -function New-HostedOutboundSpamFilterPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $RecommendedPolicyType, + $EnableInternalSenderAdminNotifications, [Parameter()] - [System.String] - $Name, + [System.Object] + $CustomFromAddress, [Parameter()] [System.String] - $AdminDisplayName, - - [Parameter()] - [System.Object] - $BccSuspiciousOutboundAdditionalRecipients, + $CustomExternalSubject, [Parameter()] - [System.Object] - $NotifyOutboundSpamRecipients, + [System.Boolean] + $ZapEnabled, [Parameter()] - [System.UInt32] - $RecipientLimitPerDay, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $ActionWhenThresholdReached, + $ExternalSenderAdminAddress, [Parameter()] [System.Object] - $AutoForwardingMode, + $RecommendedPolicyType, [Parameter()] - [System.Boolean] - $NotifyOutboundSpam, + [System.Object] + $FileTypeAction, [Parameter()] - [System.Boolean] - $BccSuspiciousOutboundMail, + [System.String] + $CustomInternalSubject, [Parameter()] - [System.UInt32] - $RecipientLimitInternalPerHour, + [System.String] + $CustomInternalBody, [Parameter()] - [System.UInt32] - $RecipientLimitExternalPerHour + [System.Boolean] + $EnableFileFilter ) } -function New-HostedOutboundSpamFilterRule +function New-MalwareFilterRule { [CmdletBinding()] param( @@ -6171,15 +5064,11 @@ function New-HostedOutboundSpamFilterRule [Parameter()] [System.Object[]] - $ExceptIfFromMemberOf, - - [Parameter()] - [System.Object[]] - $ExceptIfFrom, + $SentToMemberOf, [Parameter()] [System.Object[]] - $ExceptIfSenderDomainIs, + $SentTo, [Parameter()] [System.String] @@ -6187,92 +5076,101 @@ function New-HostedOutboundSpamFilterRule [Parameter()] [System.Object[]] - $FromMemberOf, + $RecipientDomainIs, [Parameter()] [System.Object[]] - $SenderDomainIs, + $ExceptIfRecipientDomainIs, [Parameter()] [System.Object] - $HostedOutboundSpamFilterPolicy, + $MalwareFilterPolicy, [Parameter()] [System.Object[]] - $From, + $ExceptIfSentTo, [Parameter()] - [System.Boolean] - $Enabled, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm + [System.Object[]] + $ExceptIfSentToMemberOf, + + [Parameter()] + [System.Boolean] + $Enabled ) } -function New-InboundConnector +function New-ManagementRole { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $RestrictDomainsToIPAddresses, - - [Parameter()] - [System.Boolean] - $CloudServicesMailEnabled, + [System.String] + $Description, [Parameter()] - [System.Boolean] - $Enabled, + [System.String[]] + $EnabledCmdlets, [Parameter()] - [System.Object] - $EFSkipMailGateway, + [System.String] + $Name, [Parameter()] - [System.Boolean] - $EFTestMode, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $TrustedOrganizations, + $Parent, [Parameter()] - [System.Object] - $TlsSenderCertificateName, - + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function New-ManagementRoleAssignment +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $ScanAndDropRecipients, + $CustomRecipientWriteScope, [Parameter()] [System.Object] - $AssociatedAcceptedDomains, + $RecipientGroupScope, [Parameter()] [System.String] - $Comment, + $Name, [Parameter()] - [System.Boolean] - $RequireTls, + [System.Management.Automation.SwitchParameter] + $Force, [Parameter()] [System.Object] - $SenderDomains, + $RecipientAdministrativeUnitScope, [Parameter()] [System.Object] - $SenderIPAddresses, + $SecurityGroup, [Parameter()] - [System.Boolean] - $EFSkipLastIP, + [System.Object] + $ExclusiveRecipientWriteScope, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Delegating, [Parameter()] [System.Object] - $EFUsers, + $User, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -6280,376 +5178,286 @@ function New-InboundConnector [Parameter()] [System.Object] - $ConnectorType, + $App, [Parameter()] - [System.Boolean] - $RestrictDomainsToCertificate, + [System.Object] + $Role, [Parameter()] [System.Object] - $EFSkipIPs, + $CustomResourceScope, [Parameter()] - [System.Boolean] - $TreatMessagesAsInternal, + [System.Object] + $Policy, [Parameter()] [System.Object] - $ConnectorSource, + $RecipientOrganizationalUnitScope, [Parameter()] - [System.String] - $Name + [System.Object] + $RecipientRelativeWriteScope ) } -function New-IntraOrganizationConnector +function New-ManagementScope { [CmdletBinding()] param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $TargetAddressDomains, - [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Uri] - $TargetSharingEpr, + $Exclusive, [Parameter()] - [System.Uri] - $DiscoveryEndpoint, + [System.Object] + $RecipientRoot, - [Parameter()] - [System.Boolean] - $Enabled - ) -} -function New-JournalRule -{ - [CmdletBinding()] - param( [Parameter()] [System.String] $Name, - [Parameter()] - [System.Object] - $Scope, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $JournalEmailAddress, - - [Parameter()] - [System.Object] - $Recipient, + [System.String] + $RecipientRestrictionFilter, [Parameter()] - [System.Boolean] - $Enabled + [System.Management.Automation.SwitchParameter] + $Force ) } -function New-Mailbox +function New-MessageClassification { [CmdletBinding()] param( [Parameter()] [System.String] - $MailboxRegion, - - [Parameter()] - [System.Object] - $ModeratedBy, - - [Parameter()] - [System.Boolean] - $ModerationEnabled, - - [Parameter()] - [System.Boolean] - $EnableRoomMailboxAccount, - - [Parameter()] - [System.String] - $Office, + $SenderDescription, [Parameter()] [System.String] $DisplayName, [Parameter()] - [System.Security.SecureString] - $Password, + [System.String] + $RecipientDescription, [Parameter()] [System.String] $Name, [Parameter()] - [System.Object] - $RemovedMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + [System.Globalization.CultureInfo] + $Locale, [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, - - [Parameter()] - [System.String] - $LastName, + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $TargetAllMDBs, + [System.Boolean] + $PermissionMenuVisible, [Parameter()] - [System.Object] - $RoleAssignmentPolicy, + [System.Guid] + $ClassificationID, [Parameter()] [System.Object] - $ResourceCapacity, + $DisplayPrecedence, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Archive, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Equipment, - - [Parameter()] - [System.String] - $ImmutableId, - + [System.Boolean] + $RetainClassificationEnabled + ) +} +function New-MigrationBatch +{ + [CmdletBinding()] + param( [Parameter()] - [System.Security.SecureString] - $RoomMailboxPassword, + [System.Object] + $Partition, [Parameter()] [System.Management.Automation.SwitchParameter] - $Shared, - - [Parameter()] - [System.Boolean] - $IsExcludedFromServingHierarchy, + $SkipRules, [Parameter()] [System.Object] - $MailboxPlan, + $TargetDatabases, [Parameter()] - [System.Object] - $MicrosoftOnlineServicesID, + [System.Byte[]] + $CSVData, [Parameter()] [System.Management.Automation.SwitchParameter] - $Migration, + $SkipDelegates, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Room, + [System.Object] + $Users, [Parameter()] - [System.String] - $Initials, + [System.Management.Automation.SwitchParameter] + $IncludeOtherContacts, [Parameter()] - [System.Object] - $InactiveMailbox, + [System.Management.Automation.SwitchParameter] + $SkipMail, [Parameter()] - [System.String] - $FederatedIdentity, + [System.Globalization.CultureInfo] + $ContentFilterLanguage, [Parameter()] [System.Object] - $ActiveSyncMailboxPolicy, + $TimeZone, [Parameter()] [System.Object] - $OrganizationalUnit, + $NotificationEmails, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $ManagedGmailTeams, [Parameter()] [System.Management.Automation.SwitchParameter] - $HoldForMigration, + $SkipCalendar, [Parameter()] [System.Management.Automation.SwitchParameter] - $Discovery, + $AutoStart, [Parameter()] [System.Boolean] - $ResetPasswordOnNextLogon, + $AllowUnknownColumnsInCSV, [Parameter()] - [System.String] - $FirstName, + [System.Object] + $MoveOptions, [Parameter()] - [System.String] - $Phone, + [System.Management.Automation.SwitchParameter] + $AdoptPreexisting, [Parameter()] [System.Object] - $PrimarySmtpAddress, + $TargetEndpoint, [Parameter()] [System.Object] - $SendModerationNotifications, + $StartAfter, [Parameter()] - [System.String] - $Alias, + [System.Management.Automation.SwitchParameter] + $RemoveOnCopy, [Parameter()] - [System.Boolean] - $RemotePowerShellEnabled - ) -} -function New-MailContact -{ - [CmdletBinding()] - param( + [System.Byte[]] + $XMLData, + [Parameter()] [System.Object] - $ModeratedBy, + $UserIds, [Parameter()] - [System.Boolean] - $ModerationEnabled, + [System.Management.Automation.SwitchParameter] + $PublicFolderToUnifiedGroup, [Parameter()] [System.Object] - $MacAttachmentFormat, - - [Parameter()] - [System.String] - $DisplayName, + $ReportInterval, [Parameter()] - [System.String] - $Name, + [System.Management.Automation.SwitchParameter] + $AutoProvisioning, [Parameter()] - [System.String] - $LastName, + [System.Management.Automation.SwitchParameter] + $DisableOnCopy, [Parameter()] - [System.Boolean] - $UsePreferMessageFormat, + [System.Management.Automation.SwitchParameter] + $ArchiveOnly, [Parameter()] [System.Object] - $MessageBodyFormat, + $SkipMerging, [Parameter()] - [System.String] - $Initials, + [System.Management.Automation.SwitchParameter] + $MigrateTasks, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $DataFusion, [Parameter()] [System.Object] - $ExternalEmailAddress, - - [Parameter()] - [System.String] - $Alias, + $CompleteAfter, [Parameter()] [System.Object] - $MessageFormat, + $ExcludeFolders, [Parameter()] - [System.String] - $FirstName, + [System.Management.Automation.SwitchParameter] + $GoogleResource, [Parameter()] - [System.Object] - $SendModerationNotifications, + [System.Management.Automation.SwitchParameter] + $Analyze, [Parameter()] - [System.Object] - $OrganizationalUnit - ) -} -function New-MalwareFilterPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $CustomFromName, + [System.Guid] + $SourcePFPrimaryMailboxGuid, [Parameter()] - [System.String] - $AdminDisplayName, + [System.Object] + $TargetDeliveryDomain, [Parameter()] [System.String] - $Name, + $ArchiveDomain, [Parameter()] - [System.String] - $CustomExternalBody, + [System.Management.Automation.SwitchParameter] + $PrimaryOnly, [Parameter()] - [System.String] - $QuarantineTag, + [System.Management.Automation.SwitchParameter] + $SkipProvisioning, [Parameter()] - [System.Boolean] - $CustomNotifications, + [System.Management.Automation.SwitchParameter] + $SimplifiedSwitchOver, [Parameter()] - [System.Boolean] - $EnableExternalSenderAdminNotifications, + [System.Management.Automation.SwitchParameter] + $Restore, [Parameter()] [System.Object] - $InternalSenderAdminAddress, - - [Parameter()] - [System.String[]] - $FileTypes, + $IncludeFolders, [Parameter()] - [System.Boolean] - $EnableInternalSenderAdminNotifications, + [System.String] + $ContentFilter, [Parameter()] [System.Object] - $CustomFromAddress, + $SkipMoving, [Parameter()] [System.String] - $CustomExternalSubject, - - [Parameter()] - [System.Boolean] - $ZapEnabled, + $WorkflowTemplate, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -6657,223 +5465,196 @@ function New-MalwareFilterPolicy [Parameter()] [System.Object] - $ExternalSenderAdminAddress, + $SourceEndpoint, [Parameter()] - [System.Object] - $RecommendedPolicyType, + [System.Management.Automation.SwitchParameter] + $AvoidMergeOverlap, [Parameter()] - [System.Object] - $FileTypeAction, + [System.Management.Automation.SwitchParameter] + $SkipReports, [Parameter()] - [System.String] - $CustomInternalSubject, + [System.Management.Automation.SwitchParameter] + $SkipContacts, [Parameter()] - [System.String] - $CustomInternalBody, + [System.Object] + $BadItemLimit, [Parameter()] - [System.Boolean] - $EnableFileFilter - ) -} -function New-MalwareFilterRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Int32] - $Priority, + [System.Object] + $TargetArchiveDatabases, [Parameter()] - [System.String] - $Name, + [System.Object] + $WorkflowControlFlags, [Parameter()] - [System.Object[]] - $SentToMemberOf, + [System.Management.Automation.SwitchParameter] + $AutoComplete, [Parameter()] - [System.Object[]] - $SentTo, + [System.Object] + $LargeItemLimit, [Parameter()] [System.String] - $Comments, - - [Parameter()] - [System.Object[]] - $RecipientDomainIs, + $Name, [Parameter()] [System.Object] - $MalwareFilterPolicy, - - [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, - - [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + $ForwardingDisposition, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + $ExcludeDumpsters, [Parameter()] - [System.Boolean] - $Enabled + [System.Management.Automation.SwitchParameter] + $RenamePrimaryCalendar ) } -function New-ManagementRole +function New-MigrationEndpoint { [CmdletBinding()] param( [Parameter()] - [System.String] - $Description, - - [Parameter()] - [System.String[]] - $EnabledCmdlets, + [System.Management.Automation.SwitchParameter] + $AcceptUntrustedCertificates, [Parameter()] [System.String] $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Parent, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function New-ManagementRoleAssignment -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $CustomRecipientWriteScope, + [System.Management.Automation.SwitchParameter] + $ExchangeRemoteMove, [Parameter()] [System.Object] - $RecipientGroupScope, + $MaxConcurrentMigrations, [Parameter()] - [System.String] - $Name, + [System.Byte[]] + $ServiceAccountKeyFileData, [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $PublicFolder, [Parameter()] [System.Object] - $RecipientAdministrativeUnitScope, + $TestMailbox, [Parameter()] - [System.Object] - $SecurityGroup, + [System.String] + $ExchangeServer, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipVerification, [Parameter()] [System.Object] - $ExclusiveRecipientWriteScope, + $Authentication, [Parameter()] [System.Management.Automation.SwitchParameter] - $Delegating, + $ExchangeOutlookAnywhere, [Parameter()] - [System.Object] - $User, + [System.Management.Automation.SwitchParameter] + $Gmail, + + [Parameter()] + [System.String] + $AppSecretKeyVaultUrl, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Compliance, [Parameter()] - [System.Object] - $App, + [System.Int32] + $Port, [Parameter()] - [System.Object] - $Role, + [System.Security.SecureString] + $OAuthCode, [Parameter()] - [System.Object] - $CustomResourceScope, + [System.String] + $ApplicationId, [Parameter()] [System.Object] - $Policy, + $RemoteServer, [Parameter()] [System.Object] - $RecipientOrganizationalUnitScope, + $Partition, [Parameter()] [System.Object] - $RecipientRelativeWriteScope - ) -} -function New-MessageClassification -{ - [CmdletBinding()] - param( + $MailboxPermission, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.String] - $SenderDescription, + $SourceMailboxLegacyDN, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IMAP, [Parameter()] [System.String] - $DisplayName, + $RemoteTenant, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $PublicFolderToUnifiedGroup, [Parameter()] [System.String] - $RecipientDescription, + $NspiServer, [Parameter()] [System.String] - $Name, + $RedirectUri, [Parameter()] - [System.Globalization.CultureInfo] - $Locale, + [System.Object] + $RPCProxyServer, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $EmailAddress, [Parameter()] - [System.Boolean] - $RetainClassificationEnabled, + [System.Object] + $Security, [Parameter()] - [System.Boolean] - $PermissionMenuVisible, + [System.Object] + $MaxConcurrentIncrementalSyncs, [Parameter()] - [System.Guid] - $ClassificationID, + [System.String] + $PublicFolderDatabaseServerLegacyDN, [Parameter()] - [System.Object] - $DisplayPrecedence + [System.Management.Automation.PSCredential] + $Credentials, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Autodiscover ) } function New-MobileDeviceMailboxPolicy @@ -6892,10 +5673,6 @@ function New-MobileDeviceMailboxPolicy [System.Boolean] $AllowUnsignedInstallationPackages, - [Parameter()] - [System.Object] - $MaxPasswordFailedAttempts, - [Parameter()] [System.Boolean] $AllowExternalDeviceManagement, @@ -6996,6 +5773,10 @@ function New-MobileDeviceMailboxPolicy [System.Object] $AllowBluetooth, + [Parameter()] + [System.Boolean] + $WSSAccessEnabled, + [Parameter()] [System.Object] $RequireEncryptionSMIMEAlgorithm, @@ -7032,6 +5813,10 @@ function New-MobileDeviceMailboxPolicy [System.Boolean] $AllowDesktopSync, + [Parameter()] + [System.Boolean] + $PasswordRecoveryEnabled, + [Parameter()] [System.Boolean] $RequireStorageCardEncryption, @@ -7040,10 +5825,6 @@ function New-MobileDeviceMailboxPolicy [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.Boolean] - $AttachmentsEnabled, - [Parameter()] [System.Boolean] $AllowSMIMESoftCerts, @@ -7054,7 +5835,7 @@ function New-MobileDeviceMailboxPolicy [Parameter()] [System.Boolean] - $PasswordRecoveryEnabled, + $AttachmentsEnabled, [Parameter()] [System.Object] @@ -7089,8 +5870,8 @@ function New-MobileDeviceMailboxPolicy $AllowTextMessaging, [Parameter()] - [System.Boolean] - $WSSAccessEnabled, + [System.Object] + $MaxPasswordFailedAttempts, [Parameter()] [System.Boolean] @@ -7105,31 +5886,6 @@ function New-MobileDeviceMailboxPolicy $AllowHTMLEmail ) } -function New-OfflineAddressBook -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $IsDefault, - - [Parameter()] - [System.Object] - $DiffRetentionPeriod, - - [Parameter()] - [System.Object[]] - $AddressLists - ) -} function New-OMEConfiguration { [CmdletBinding()] @@ -7440,12 +6196,12 @@ function New-PartnerApplication $AcceptSecurityIdentifierInformation, [Parameter()] - [System.Boolean] - $Enabled, + [System.Object] + $AccountType, [Parameter()] - [System.Object] - $AccountType + [System.Boolean] + $Enabled ) } function New-PolicyTipConfig @@ -7469,6 +6225,10 @@ function New-QuarantinePolicy { [CmdletBinding()] param( + [Parameter()] + [System.Boolean] + $IncludeMessagesFromBlockedSenderAddress, + [Parameter()] [System.Object] $MultiLanguageCustomDisclaimer, @@ -7812,73 +6572,167 @@ function New-ReportSubmissionPolicy $NotJunkReviewResultMessage, [Parameter()] - [System.Boolean] - $NotificationsForSubmissionAirInvestigationsEnabled, + [System.Boolean] + $NotificationsForSubmissionAirInvestigationsEnabled, + + [Parameter()] + [System.Boolean] + $PreSubmitMessageEnabled, + + [Parameter()] + [System.Boolean] + $PostSubmitMessageEnabled, + + [Parameter()] + [System.String] + $PreSubmitMessageTitle, + + [Parameter()] + [System.String[]] + $MultiLanguagePreSubmitMessageTitleForPhishing, + + [Parameter()] + [System.String[]] + $MultiLanguagePreSubmitMessageButtonTextForPhishing, + + [Parameter()] + [System.String] + $UserSubmissionOptionsMessage, + + [Parameter()] + [System.String] + $PostSubmitMessageForPhishing, + + [Parameter()] + [System.String[]] + $MultiLanguagePostSubmitMessageButtonLinkForJunk, + + [Parameter()] + [System.Boolean] + $ReportPhishToCustomizedAddress + ) +} +function New-ReportSubmissionRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $SentTo, + + [Parameter()] + [System.String] + $Comments, + + [Parameter()] + [System.Object] + $ReportSubmissionPolicy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function New-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $RetentionPolicyTagLinks, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultArbitrationMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm + ) +} +function New-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $AgeLimitForRetention, [Parameter()] - [System.Boolean] - $PreSubmitMessageEnabled, + [System.String] + $MessageClass, [Parameter()] [System.Boolean] - $PostSubmitMessageEnabled, + $MustDisplayCommentEnabled, [Parameter()] [System.String] - $PreSubmitMessageTitle, + $Name, [Parameter()] - [System.String[]] - $MultiLanguagePreSubmitMessageTitleForPhishing, + [System.Management.Automation.SwitchParameter] + $IsDefaultAutoGroupPolicyTag, [Parameter()] - [System.String[]] - $MultiLanguagePreSubmitMessageButtonTextForPhishing, + [System.Object] + $LocalizedRetentionPolicyTagName, [Parameter()] - [System.String] - $UserSubmissionOptionsMessage, + [System.Object] + $LocalizedComment, [Parameter()] - [System.String] - $PostSubmitMessageForPhishing, + [System.Management.Automation.SwitchParameter] + $IsDefaultModeratedRecipientsPolicyTag, [Parameter()] - [System.String[]] - $MultiLanguagePostSubmitMessageButtonLinkForJunk, + [System.Object] + $RetentionAction, - [Parameter()] - [System.Boolean] - $ReportPhishToCustomizedAddress - ) -} -function New-ReportSubmissionRule -{ - [CmdletBinding()] - param( [Parameter()] [System.String] - $Name, + $Comment, [Parameter()] - [System.Object[]] - $SentTo, + [System.Guid] + $RetentionId, [Parameter()] - [System.String] - $Comments, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $ReportSubmissionPolicy, + [System.Boolean] + $RetentionEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $Type, [Parameter()] [System.Boolean] - $Enabled + $SystemTag ) } function New-RoleAssignmentPolicy @@ -7934,6 +6788,10 @@ function New-RoleGroup [System.Management.Automation.SwitchParameter] $Confirm, + [Parameter()] + [System.Object[]] + $Roles, + [Parameter()] [System.String] $WellKnownObject, @@ -7942,10 +6800,6 @@ function New-RoleGroup [System.Object] $ManagedBy, - [Parameter()] - [System.Object[]] - $Roles, - [Parameter()] [System.Management.Automation.SwitchParameter] $Force @@ -7988,12 +6842,12 @@ function New-SafeAttachmentPolicy $RedirectAddress, [Parameter()] - [System.String] - $QuarantineTag, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm + [System.String] + $QuarantineTag ) } function New-SafeAttachmentRule @@ -8038,170 +6892,355 @@ function New-SafeAttachmentRule [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + $Confirm, + + [Parameter()] + [System.Object[]] + $ExceptIfSentToMemberOf, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function New-SafeLinksPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Boolean] + $EnableOrganizationBranding, + + [Parameter()] + [System.String] + $AdminDisplayName, + + [Parameter()] + [System.Boolean] + $UseTranslatedNotificationText, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $MakeBuiltInProtection, + + [Parameter()] + [System.Object] + $DoNotRewriteUrls, + + [Parameter()] + [System.Boolean] + $EnableSafeLinksForTeams, + + [Parameter()] + [System.Boolean] + $DisableUrlRewrite, + + [Parameter()] + [System.Boolean] + $EnableSafeLinksForOffice, + + [Parameter()] + [System.Boolean] + $TrackClicks, + + [Parameter()] + [System.Boolean] + $AllowClickThrough, + + [Parameter()] + [System.Object] + $RecommendedPolicyType, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $CustomNotificationText, + + [Parameter()] + [System.Boolean] + $DeliverMessageAfterScan, + + [Parameter()] + [System.Boolean] + $EnableSafeLinksForEmail, + + [Parameter()] + [System.Boolean] + $ScanUrls, + + [Parameter()] + [System.Boolean] + $EnableForInternalSenders + ) +} +function New-SafeLinksRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Int32] + $Priority, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $SentToMemberOf, + + [Parameter()] + [System.Object[]] + $SentTo, + + [Parameter()] + [System.String] + $Comments, + + [Parameter()] + [System.Object[]] + $RecipientDomainIs, + + [Parameter()] + [System.Object[]] + $ExceptIfRecipientDomainIs, + + [Parameter()] + [System.Object] + $SafeLinksPolicy, + + [Parameter()] + [System.Object[]] + $ExceptIfSentTo, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object[]] + $ExceptIfSentToMemberOf, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function New-ServicePrincipal +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $ObjectId, + + [Parameter()] + [System.String] + $ServiceId, + + [Parameter()] + [System.String] + $AppId + ) +} +function New-SharingPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Domains, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Default, [Parameter()] [System.Boolean] $Enabled ) } -function New-SafeLinksPolicy +function New-SweepRule { [CmdletBinding()] param( - [Parameter()] - [System.Boolean] - $EnableOrganizationBranding, - [Parameter()] [System.String] - $AdminDisplayName, + $Name, [Parameter()] - [System.Boolean] - $UseTranslatedNotificationText, + [System.Object] + $DestinationFolder, [Parameter()] [System.String] - $Name, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $MakeBuiltInProtection, + $Provider, [Parameter()] [System.Object] - $DoNotRewriteUrls, + $SystemCategory, [Parameter()] - [System.Boolean] - $EnableSafeLinksForTeams, + [System.Object] + $KeepLatest, [Parameter()] - [System.Boolean] - $DisableUrlRewrite, + [System.Object] + $SourceFolder, [Parameter()] - [System.Boolean] - $EnableSafeLinksForOffice, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Boolean] - $TrackClicks, + [System.Object] + $Mailbox, [Parameter()] - [System.Boolean] - $AllowClickThrough, + [System.Object] + $Sender, [Parameter()] [System.Object] - $RecommendedPolicyType, + $KeepForDays, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $Enabled + ) +} +function New-TeamsProtectionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $HighConfidencePhishQuarantineTag, [Parameter()] [System.String] - $CustomNotificationText, + $Name, [Parameter()] [System.Boolean] - $DeliverMessageAfterScan, + $ZapEnabled, [Parameter()] - [System.Boolean] - $EnableSafeLinksForEmail, + [System.String] + $MalwareQuarantineTag, [Parameter()] - [System.Boolean] - $ScanUrls, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Boolean] - $EnableForInternalSenders + [System.Object] + $Organization ) } -function New-SafeLinksRule +function New-TenantAllowBlockListItems { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $Priority, + [System.DateTime] + $ExpirationDate, [Parameter()] - [System.String] - $Name, + [System.Object] + $ListSubType, [Parameter()] - [System.Object[]] - $SentToMemberOf, + [System.Management.Automation.SwitchParameter] + $Block, [Parameter()] - [System.Object[]] - $SentTo, + [System.Management.Automation.SwitchParameter] + $LogExtraDetails, [Parameter()] [System.String] - $Comments, + $Notes, [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.Int32] + $RemoveAfter, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Management.Automation.SwitchParameter] + $OutputJson, [Parameter()] - [System.Object] - $SafeLinksPolicy, + [System.Management.Automation.SwitchParameter] + $NoExpiration, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.String] + $SubmissionID, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Allow, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.String[]] + $Entries, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $ListType ) } -function New-SharingPolicy +function New-TenantAllowBlockListSpoofItems { [CmdletBinding()] param( [Parameter()] [System.String] - $Name, + $Action, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $SendingInfrastructure, [Parameter()] - [System.Object] - $Domains, + [System.String] + $SpoofType, [Parameter()] [System.Management.Automation.SwitchParameter] - $Default, + $Confirm, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $Identity, + + [Parameter()] + [System.String] + $SpoofedUser ) } function New-TransportRule @@ -8388,6 +7427,10 @@ function New-TransportRule [System.Object] $RuleSubType, + [Parameter()] + [System.Object[]] + $AnyOfRecipientAddressMatchesPatterns, + [Parameter()] [System.Object] $SentToScope, @@ -8756,10 +7799,6 @@ function New-TransportRule [System.Object[]] $ExceptIfRecipientADAttributeMatchesPatterns, - [Parameter()] - [System.Boolean] - $StopRuleProcessing, - [Parameter()] [System.Object[]] $RecipientADAttributeContainsWords, @@ -8897,49 +7936,14 @@ function New-TransportRule $ExceptIfAttachmentPropertyContainsWords, [Parameter()] - [System.Object[]] - $AnyOfRecipientAddressMatchesPatterns, + [System.Boolean] + $StopRuleProcessing, [Parameter()] [System.Object] $ExceptIfHeaderContainsMessageHeader ) } - -function New-UnifiedAuditLogRetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.UInt32] - $Priority, - - [Parameter()] - [System.String] - $RetentionDuration, - - [Parameter()] - [System.String] - $Description, - - [Parameter()] - [System.String[]] - $Operations, - - [Parameter()] - [System.String[]] - $RecordTypes, - - [Parameter()] - [System.String[]] - $UserIds - ) -} - function Remove-ActiveSyncDevice { [CmdletBinding()] @@ -8953,25 +7957,6 @@ function Remove-ActiveSyncDevice $Identity ) } - -function Remove-ActiveSyncMailboxPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} - function Remove-ActiveSyncDeviceAccessRule { [CmdletBinding()] @@ -8985,20 +7970,7 @@ function Remove-ActiveSyncDeviceAccessRule $Identity ) } -function Remove-AddressBookPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Remove-AddressList +function Remove-ActiveSyncMailboxPolicy { [CmdletBinding()] param( @@ -9012,24 +7984,24 @@ function Remove-AddressList [Parameter()] [System.Management.Automation.SwitchParameter] - $Recursive + $Force ) } function Remove-AntiPhishPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } function Remove-AntiPhishRule @@ -9087,17 +8059,19 @@ function Remove-ApplicationAccessPolicy $Identity ) } - function Remove-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] - [System.String] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] $Identity ) } - function Remove-AuditConfigurationPolicy { [CmdletBinding()] @@ -9112,28 +8086,23 @@ function Remove-AuthenticationPolicy [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $TenantId, - [Parameter()] - [System.Object] - $Identity - ) -} -function Remove-AvailabilityAddressSpace -{ - [CmdletBinding()] - param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowLegacyExchangeTokens ) } -function Remove-AvailabilityConfig +function Remove-AvailabilityAddressSpace { [CmdletBinding()] param( @@ -9146,7 +8115,7 @@ function Remove-AvailabilityConfig $Identity ) } -function Remove-ClientAccessRule +function Remove-AvailabilityConfig { [CmdletBinding()] param( @@ -9202,7 +8171,7 @@ function Remove-EmailAddressPolicy $Identity ) } -function Remove-GlobalAddressList +function Remove-ExoPhishSimOverrideRule { [CmdletBinding()] param( @@ -9212,7 +8181,28 @@ function Remove-GlobalAddressList [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Remove-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController ) } function Remove-HostedConnectionFilterPolicy @@ -9323,10 +8313,6 @@ function Remove-Mailbox { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $PublicFolder, @@ -9349,7 +8335,53 @@ function Remove-Mailbox [Parameter()] [System.Management.Automation.SwitchParameter] - $Migration + $Migration, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Remove-MailboxFolderPermission +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ResetDelegateUserCollection, + + [Parameter()] + [System.Boolean] + $SendNotificationToUser, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Remove-MailboxIRMAccess +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity ) } function Remove-MailboxPermission @@ -9450,8 +8482,25 @@ function Remove-ManagementRole param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Recurse, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Remove-ManagementRoleAssignment +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9462,17 +8511,30 @@ function Remove-ManagementRole [Parameter()] [System.Management.Automation.SwitchParameter] - $Recurse + $Force ) } -function Remove-ManagementRoleAssignment +function Remove-ManagementScope { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $Confirm, + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Remove-MessageClassification +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9482,7 +8544,7 @@ function Remove-ManagementRoleAssignment $Identity ) } -function Remove-MessageClassification +function Remove-MigrationBatch { [CmdletBinding()] param( @@ -9492,7 +8554,28 @@ function Remove-MessageClassification [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $Partition + ) +} +function Remove-MigrationEndpoint +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Partition ) } function Remove-MobileDevice @@ -9514,8 +8597,21 @@ function Remove-MobileDeviceMailboxPolicy param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $Confirm, + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Remove-OMEConfiguration +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9525,14 +8621,23 @@ function Remove-MobileDeviceMailboxPolicy $Identity ) } -function Remove-OfflineAddressBook +function Remove-OnPremisesOrganization { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $Confirm, + [Parameter()] + [System.Object] + $Identity + ) +} +function Remove-OrganizationRelationship +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9542,7 +8647,7 @@ function Remove-OfflineAddressBook $Identity ) } -function Remove-OMEConfiguration +function Remove-OutboundConnector { [CmdletBinding()] param( @@ -9555,7 +8660,7 @@ function Remove-OMEConfiguration $Identity ) } -function Remove-OnPremisesOrganization +function Remove-OwaMailboxPolicy { [CmdletBinding()] param( @@ -9565,10 +8670,14 @@ function Remove-OnPremisesOrganization [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } -function Remove-OrganizationRelationship +function Remove-PartnerApplication { [CmdletBinding()] param( @@ -9581,7 +8690,7 @@ function Remove-OrganizationRelationship $Identity ) } -function Remove-OutboundConnector +function Remove-PolicyTipConfig { [CmdletBinding()] param( @@ -9594,14 +8703,86 @@ function Remove-OutboundConnector $Identity ) } -function Remove-OwaMailboxPolicy +function Remove-QuarantinePolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Remove-RecipientPermission { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, + $SkipDomainValidationForMailContact, + + [Parameter()] + [System.Object] + $AccessRights, + + [Parameter()] + [System.Object] + $MultiTrustees, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Deny, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipDomainValidationForMailUser, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipDomainValidationForSharedMailbox, + + [Parameter()] + [System.Object] + $Trustee + ) +} +function Remove-RemoteDomain +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] + [System.Object] + $Identity + ) +} +function Remove-ReportSubmissionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Remove-ReportSubmissionRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9611,7 +8792,7 @@ function Remove-OwaMailboxPolicy $Identity ) } -function Remove-PartnerApplication +function Remove-RetentionPolicy { [CmdletBinding()] param( @@ -9621,10 +8802,14 @@ function Remove-PartnerApplication [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } -function Remove-PolicyTipConfig +function Remove-RetentionPolicyTag { [CmdletBinding()] param( @@ -9637,39 +8822,23 @@ function Remove-PolicyTipConfig $Identity ) } -function Remove-QuarantinePolicy +function Remove-RoleAssignmentPolicy { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $DomainController + $Identity ) } -function Remove-RecipientPermission +function Remove-RoleGroup { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipDomainValidationForMailContact, - - [Parameter()] - [System.Object] - $AccessRights, - - [Parameter()] - [System.Object] - $Trustee, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Deny, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9680,14 +8849,14 @@ function Remove-RecipientPermission [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipDomainValidationForMailUser, + $BypassSecurityGroupManagerCheck, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipDomainValidationForSharedMailbox + $Force ) } -function Remove-RemoteDomain +function Remove-RoleGroupMember { [CmdletBinding()] param( @@ -9697,19 +8866,18 @@ function Remove-RemoteDomain [Parameter()] [System.Object] - $Identity - ) -} -function Remove-ReportSubmissionPolicy -{ - [CmdletBinding()] - param( + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $BypassSecurityGroupManagerCheck, + [Parameter()] [System.Object] - $Identity + $Member ) } -function Remove-ReportSubmissionRule +function Remove-SafeAttachmentPolicy { [CmdletBinding()] param( @@ -9719,10 +8887,14 @@ function Remove-ReportSubmissionRule [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } -function Remove-RoleAssignmentPolicy +function Remove-SafeAttachmentRule { [CmdletBinding()] param( @@ -9735,14 +8907,10 @@ function Remove-RoleAssignmentPolicy $Identity ) } -function Remove-RoleGroup +function Remove-SafeLinksPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9753,17 +8921,13 @@ function Remove-RoleGroup [Parameter()] [System.Management.Automation.SwitchParameter] - $BypassSecurityGroupManagerCheck + $Force ) } -function Remove-SafeAttachmentPolicy +function Remove-SafeLinksRule { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9773,7 +8937,7 @@ function Remove-SafeAttachmentPolicy $Identity ) } -function Remove-SafeAttachmentRule +function Remove-ServicePrincipal { [CmdletBinding()] param( @@ -9786,14 +8950,10 @@ function Remove-SafeAttachmentRule $Identity ) } -function Remove-SafeLinksPolicy +function Remove-SharingPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -9803,7 +8963,7 @@ function Remove-SafeLinksPolicy $Identity ) } -function Remove-SafeLinksRule +function Remove-SweepRule { [CmdletBinding()] param( @@ -9811,25 +8971,41 @@ function Remove-SafeLinksRule [System.Management.Automation.SwitchParameter] $Confirm, + [Parameter()] + [System.Object] + $Mailbox, + [Parameter()] [System.Object] $Identity ) } -function Remove-SharingPolicy +function Remove-TenantAllowBlockListItems { [CmdletBinding()] param( + [Parameter()] + [System.Object] + $ListSubType, + [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $OutputJson, + + [Parameter()] + [System.String[]] + $Ids, + + [Parameter()] + [System.String[]] + $Entries, [Parameter()] [System.Object] - $Identity + $ListType ) } -function Remove-TransportRule +function Remove-TenantAllowBlockListSpoofItems { [CmdletBinding()] param( @@ -9839,27 +9015,33 @@ function Remove-TransportRule [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.String[]] + $Ids ) } - -function Remove-UnifiedAuditLogRetentionPolicy +function Remove-TransportRule { [CmdletBinding()] param( [Parameter()] - [System.String] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] $Identity ) } - function Set-AcceptedDomain { [CmdletBinding()] param( [Parameter()] [System.Boolean] - $CanHaveCloudCache, + $SendingToDomainDisabled, [Parameter()] [System.Boolean] @@ -9870,8 +9052,8 @@ function Set-AcceptedDomain $OutboundOnly, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $CanHaveCloudCache, [Parameter()] [System.Boolean] @@ -9881,6 +9063,10 @@ function Set-AcceptedDomain [System.Object] $Identity, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Boolean] $MatchSubDomains, @@ -9907,7 +9093,6 @@ function Set-ActiveSyncDeviceAccessRule $AccessLevel ) } - function Set-ActiveSyncMailboxPolicy { [CmdletBinding()] @@ -10101,192 +9286,57 @@ function Set-ActiveSyncMailboxPolicy $IsDefault, [Parameter()] - [System.Boolean] - $IsDefaultPolicy, - - [Parameter()] - [System.Object] - $ApprovedApplicationList, - - [Parameter()] - [System.Boolean] - $AllowTextMessaging, - - [Parameter()] - [System.Boolean] - $WSSAccessEnabled, - - [Parameter()] - [System.Boolean] - $RequireSignedSMIMEMessages, - - [Parameter()] - [System.Boolean] - $AllowHTMLEmail, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $MinDevicePasswordLength, - - [Parameter()] - [System.Boolean] - $IrmEnabled - ) -} - -function Set-AddressBookPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $RoomList, - - [Parameter()] - [System.Object] - $OfflineAddressBook, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $GlobalAddressList, - - [Parameter()] - [System.Object[]] - $AddressLists - ) -} -function Set-AddressList -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute8, - - [Parameter()] - [System.String] - $DisplayName, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute10, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute9, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute2, - - [Parameter()] - [System.Object] - $IncludedRecipients, - - [Parameter()] - [System.Object] - $ConditionalCompany, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute6, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute3, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute12, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute13, - - [Parameter()] - [System.String] - $RecipientFilter, - - [Parameter()] - [System.Object] - $ConditionalCustomAttribute15, + [System.Boolean] + $IsDefaultPolicy, [Parameter()] [System.Object] - $ConditionalDepartment, + $ApprovedApplicationList, [Parameter()] - [System.Object] - $ConditionalStateOrProvince, + [System.Boolean] + $AllowTextMessaging, [Parameter()] - [System.Object] - $ConditionalCustomAttribute7, + [System.Boolean] + $WSSAccessEnabled, [Parameter()] - [System.Object] - $ConditionalCustomAttribute14, + [System.Boolean] + $RequireSignedSMIMEMessages, [Parameter()] - [System.Object] - $ConditionalCustomAttribute4, + [System.Boolean] + $AllowHTMLEmail, [Parameter()] [System.Object] - $ConditionalCustomAttribute11, + $Identity, [Parameter()] [System.Object] - $ConditionalCustomAttribute1, + $MinDevicePasswordLength, [Parameter()] - [System.Object] - $ConditionalCustomAttribute5 + [System.Boolean] + $IrmEnabled ) } function Set-AdminAuditLogConfig { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Boolean] - $UnifiedAuditLogIngestionEnabled + $UnifiedAuditLogIngestionEnabled, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } function Set-AntiPhishPolicy @@ -10301,18 +9351,10 @@ function Set-AntiPhishPolicy [System.Management.Automation.SwitchParameter] $MakeDefault, - [Parameter()] - [System.Object] - $DmarcRejectAction, - [Parameter()] [System.Int32] $PhishThresholdLevel, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Boolean] $EnableTargetedDomainsProtection, @@ -10377,6 +9419,10 @@ function Set-AntiPhishPolicy [System.Object] $ImpersonationProtectionState, + [Parameter()] + [System.Object] + $MailboxIntelligenceProtectionActionRecipients, + [Parameter()] [System.Object] $TargetedDomainProtectionAction, @@ -10394,8 +9440,8 @@ function Set-AntiPhishPolicy $TargetedUserProtectionAction, [Parameter()] - [System.Object] - $MailboxIntelligenceProtectionActionRecipients, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] @@ -10413,6 +9459,10 @@ function Set-AntiPhishPolicy [System.Boolean] $EnableUnauthenticatedSender, + [Parameter()] + [System.Object] + $DmarcRejectAction, + [Parameter()] [System.String] $TargetedUserQuarantineTag, @@ -10503,14 +9553,14 @@ function Set-App { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Object] $UserList, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $PrivateCatalog, + [Parameter()] [System.Object] $DefaultStateForUser, @@ -10524,16 +9574,16 @@ function Set-App $OrganizationApp, [Parameter()] - [System.Boolean] - $Enabled, + [System.Object] + $ProvidedTo, [Parameter()] [System.Management.Automation.SwitchParameter] - $PrivateCatalog, + $Confirm, [Parameter()] - [System.Object] - $ProvidedTo + [System.Boolean] + $Enabled ) } function Set-ApplicationAccessPolicy @@ -10553,137 +9603,124 @@ function Set-ApplicationAccessPolicy $Identity ) } -function Set-AtpPolicyForO365 +function Set-ArcConfig { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $EnableATPForSPOTeamsODB, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $EnableSafeDocs, + [System.String[]] + $ArcTrustedSealers, [Parameter()] - [System.Boolean] - $AllowSafeDocsOpen, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm + [System.Object] + $Identity ) } - -function Set-ATPProtectionPolicyRule +function Set-ATPBuiltInProtectionRule { [CmdletBinding()] param( [Parameter()] [System.String] - $Identity, + $Comments, [Parameter()] - [System.String] - $Comments, + [System.Object] + $Identity, [Parameter()] - [System.String] + [System.Object[]] $ExceptIfRecipientDomainIs, [Parameter()] - [System.String] + [System.Object[]] $ExceptIfSentTo, [Parameter()] - [System.String] - $ExceptIfSentToMemberOf, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.String] - $String, + [System.Object[]] + $ExceptIfSentToMemberOf + ) +} +function Set-AtpPolicyForO365 +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Boolean] + $EnableATPForSPOTeamsODB, [Parameter()] - [System.UInt32] - $Priority, + [System.Object] + $Identity, [Parameter()] - [System.String[]] - $RecipientDomainIs, + [System.Boolean] + $EnableSafeDocs, [Parameter()] - [System.String[]] - $SentTo, + [System.Boolean] + $AllowSafeDocsOpen, [Parameter()] - [System.String[]] - $SentToMemberOf + [System.Management.Automation.SwitchParameter] + $Confirm ) } - -function Set-AuthenticationPolicy +function Set-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPop, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthSmtp, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthMapi, + [System.Int32] + $Priority, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthImap, + [System.String] + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthAutodiscover, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPowershell, + [System.Object[]] + $SentTo, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthRpc, + [System.String] + $Comments, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOfflineAddressBook, + [System.Object[]] + $RecipientDomainIs, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthReportingWebServices, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOutlookService, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthActiveSync, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthWebServices + [System.Object[]] + $ExceptIfSentToMemberOf ) } function Set-AvailabilityConfig @@ -10847,6 +9884,10 @@ function Set-CalendarProcessing [System.Boolean] $OrganizerInfo, + [Parameter()] + [System.Int32] + $MinimumDurationInMinutes, + [Parameter()] [System.Boolean] $AddAdditionalResponse, @@ -10855,10 +9896,6 @@ function Set-CalendarProcessing [System.Boolean] $RemoveForwardedMeetingNotifications, - [Parameter()] - [System.Int32] - $MinimumDurationInMinutes, - [Parameter()] [System.Int32] $BookingWindowInDays, @@ -11017,110 +10054,57 @@ function Set-CASMailbox $PopSuppressReadReceipt, [Parameter()] - [System.Object] - $EwsAllowList, - - [Parameter()] - [System.Object] - $PopMessagesRetrievalMimeFormat - ) -} -function set-CASMailboxPlan -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Boolean] - $ImapEnabled, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $OwaMailboxPolicy, - - [Parameter()] - [System.Boolean] - $PopEnabled, - - [Parameter()] - [System.Boolean] - $ActiveSyncEnabled - ) -} -function Set-ClientAccessRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $UsernameMatchesAnyOfPatterns, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Action, - - [Parameter()] - [System.Object] - $AnyOfClientIPAddressesOrRanges, - - [Parameter()] - [System.Boolean] - $Enabled, - - [Parameter()] - [System.Object] - $ExceptAnyOfClientIPAddressesOrRanges, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.String] - $UserRecipientFilter, + [System.Object] + $EwsAllowList, [Parameter()] [System.Object] - $ExceptAnyOfProtocols, - + $PopMessagesRetrievalMimeFormat + ) +} +function set-CASMailboxPlan +{ + [CmdletBinding()] + param( [Parameter()] - [System.Int32] - $Priority, + [System.Boolean] + $ImapEnabled, [Parameter()] [System.Object] - $ExceptUsernameMatchesAnyOfPatterns, + $OwaMailboxPolicy, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $AnyOfAuthenticationTypes, + [System.Boolean] + $OWAEnabled, [Parameter()] [System.Object] - $AnyOfProtocols, + $EwsEnabled, [Parameter()] [System.Object] - $ExceptAnyOfAuthenticationTypes, + $Identity, [Parameter()] - [System.Object] - $Scope + [System.Boolean] + $ECPEnabled, + + [Parameter()] + [System.Boolean] + $PopEnabled, + + [Parameter()] + [System.Boolean] + $ActiveSyncEnabled, + + [Parameter()] + [System.Boolean] + $MAPIEnabled ) } function Set-DataClassification @@ -11143,17 +10127,17 @@ function Set-DataClassification [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, - [Parameter()] [System.Object] $Fingerprints, [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault ) } function Set-DataEncryptionPolicy @@ -11192,17 +10176,17 @@ function Set-DataEncryptionPolicy [System.String] $PermanentDataPurgeReason, - [Parameter()] - [System.Boolean] - $Enabled, - [Parameter()] [System.String] $PermanentDataPurgeContact, [Parameter()] [System.Management.Automation.SwitchParameter] - $Refresh + $Refresh, + + [Parameter()] + [System.Boolean] + $Enabled ) } function Set-DistributionGroup @@ -11225,6 +10209,14 @@ function Set-DistributionGroup [System.Object] $AcceptMessagesOnlyFromSendersOrMembers, + [Parameter()] + [System.String] + $CustomAttribute14, + + [Parameter()] + [System.String] + $CustomAttribute12, + [Parameter()] [System.String] $CustomAttribute10, @@ -11257,10 +10249,6 @@ function Set-DistributionGroup [System.Management.Automation.SwitchParameter] $IgnoreNamingPolicy, - [Parameter()] - [System.Boolean] - $ReportToManagerEnabled, - [Parameter()] [System.String] $MailTip, @@ -11271,7 +10259,7 @@ function Set-DistributionGroup [Parameter()] [System.Object] - $GrantSendOnBehalfTo, + $PrimarySmtpAddress, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -11293,10 +10281,6 @@ function Set-DistributionGroup [System.Object] $MemberDepartRestriction, - [Parameter()] - [System.Object] - $ExtensionCustomAttribute4, - [Parameter()] [System.String] $CustomAttribute15, @@ -11345,13 +10329,17 @@ function Set-DistributionGroup [System.Object] $Description, + [Parameter()] + [System.Object] + $GrantSendOnBehalfTo, + [Parameter()] [System.Object] $ExtensionCustomAttribute1, [Parameter()] - [System.String] - $CustomAttribute14, + [System.Boolean] + $ReportToManagerEnabled, [Parameter()] [System.Boolean] @@ -11373,6 +10361,10 @@ function Set-DistributionGroup [System.Management.Automation.SwitchParameter] $BypassSecurityGroupManagerCheck, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UpdateMemberCount, + [Parameter()] [System.Object] $ExtensionCustomAttribute2, @@ -11385,10 +10377,6 @@ function Set-DistributionGroup [System.String] $CustomAttribute2, - [Parameter()] - [System.Object] - $PrimarySmtpAddress, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -11430,8 +10418,8 @@ function Set-DistributionGroup $ExtensionCustomAttribute3, [Parameter()] - [System.String] - $CustomAttribute12, + [System.Object] + $ExtensionCustomAttribute4, [Parameter()] [System.String] @@ -11458,10 +10446,6 @@ function Set-DkimSigningConfig [System.Object] $BodyCanonicalization, - [Parameter()] - [System.Object] - $HeaderCanonicalization, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -11476,7 +10460,11 @@ function Set-DkimSigningConfig [Parameter()] [System.Boolean] - $Enabled + $Enabled, + + [Parameter()] + [System.Object] + $HeaderCanonicalization ) } function Set-EmailAddressPolicy @@ -11512,10 +10500,18 @@ function Set-EmailAddressPolicy $Identity ) } -function Set-GlobalAddressList +function Set-EmailTenantSettings { [CmdletBinding()] param( + [Parameter()] + [System.Boolean] + $EnablePriorityAccountProtection, + + [Parameter()] + [System.Object] + $DomainController, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -11525,88 +10521,149 @@ function Set-GlobalAddressList $Identity, [Parameter()] - [System.Object] - $ConditionalCustomAttribute8, - + [System.Management.Automation.SwitchParameter] + $IgnoreDehydratedFlag + ) +} +function Set-EOPProtectionPolicyRule +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object] - $ConditionalCustomAttribute10, + [System.Int32] + $Priority, [Parameter()] [System.String] $Name, [Parameter()] - [System.Object] - $ConditionalCustomAttribute9, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.Object] - $ConditionalCustomAttribute2, + [System.Object[]] + $SentTo, [Parameter()] - [System.Object] - $IncludedRecipients, + [System.String] + $Comments, [Parameter()] - [System.Object] - $ConditionalCompany, + [System.Object[]] + $RecipientDomainIs, [Parameter()] [System.Object] - $ConditionalCustomAttribute6, + $Identity, [Parameter()] - [System.Object] - $ConditionalCustomAttribute3, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $ConditionalCustomAttribute12, + [System.Object[]] + $ExceptIfSentTo, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] + [System.Object[]] + $ExceptIfSentToMemberOf + ) +} +function Set-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $ConditionalCustomAttribute13, + $AddDomains, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $RecipientFilter, + $Comment, + + [Parameter()] + [System.Object] + $AddSenderIpRanges, [Parameter()] [System.Object] - $ConditionalCustomAttribute15, + $Identity, [Parameter()] [System.Object] - $ConditionalDepartment, + $RemoveDomains, [Parameter()] [System.Object] - $ConditionalStateOrProvince, + $RemoveSenderIpRanges, [Parameter()] [System.Object] - $ConditionalCustomAttribute7, + $DomainController + ) +} +function Set-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $DomainController, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $Comment, [Parameter()] [System.Object] - $ConditionalCustomAttribute14, + $Identity + ) +} +function Set-ExternalInOutlook +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $AllowList, [Parameter()] [System.Object] - $ConditionalCustomAttribute4, + $Identity, [Parameter()] [System.Object] - $ConditionalCustomAttribute1, + $Enabled + ) +} +function Set-FocusedInbox +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, [Parameter()] [System.Object] - $ConditionalCustomAttribute5, + $Identity, [Parameter()] [System.Object] - $ConditionalCustomAttribute11 + $FocusedInboxOn ) } function Set-HostedConnectionFilterPolicy @@ -11650,17 +10707,13 @@ function Set-HostedContentFilterPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Boolean] $InlineSafetyTipsEnabled, [Parameter()] [System.Object] - $BulkSpamAction, + $RegionBlockList, [Parameter()] [System.String] @@ -11670,6 +10723,10 @@ function Set-HostedContentFilterPolicy [System.Int32] $EndUserSpamNotificationFrequency, + [Parameter()] + [System.Int32] + $QuarantineRetentionPeriod, + [Parameter()] [System.Int32] $EndUserSpamNotificationLimit, @@ -11762,10 +10819,6 @@ function Set-HostedContentFilterPolicy [System.Object] $IntraOrgFilterState, - [Parameter()] - [System.Object] - $RegionBlockList, - [Parameter()] [System.Object] $MarkAsSpamFromAddressAuthFail, @@ -11786,6 +10839,10 @@ function Set-HostedContentFilterPolicy [System.Object] $MarkAsSpamObjectTagsInHtml, + [Parameter()] + [System.Object] + $BulkSpamAction, + [Parameter()] [System.Object] $EndUserSpamNotificationLanguage, @@ -11795,8 +10852,8 @@ function Set-HostedContentFilterPolicy $IncreaseScoreWithRedirectToOtherPort, [Parameter()] - [System.Int32] - $QuarantineRetentionPeriod, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] @@ -12253,9 +11310,46 @@ function Set-JournalRule [System.String] $Name, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $JournalEmailAddress, + + [Parameter()] + [System.Object] + $Recipient, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Scope + ) +} +function Set-M365DataAtRestEncryptionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Description, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + + [Parameter()] + [System.String] + $Name, + [Parameter()] [System.Object] - $Scope, + $DomainController, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -12263,15 +11357,24 @@ function Set-JournalRule [Parameter()] [System.Object] - $JournalEmailAddress, + $Identity, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Refresh, + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function Set-M365DataAtRestEncryptionPolicyAssignment +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $Recipient + $DataEncryptionPolicy ) } function Set-Mailbox @@ -12506,6 +11609,10 @@ function Set-Mailbox [System.Boolean] $CalendarRepairDisabled, + [Parameter()] + [System.Object] + $AddressBookPolicy, + [Parameter()] [System.Management.Automation.SwitchParameter] $RemoveMailboxProvisioningConstraint, @@ -12568,15 +11675,15 @@ function Set-Mailbox [Parameter()] [System.Object] - $ExtensionCustomAttribute4, + $ExternalOofOptions, [Parameter()] [System.Object] - $LitigationHoldDate, + $ExtensionCustomAttribute4, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $LitigationHoldDate, [Parameter()] [System.Boolean] @@ -12631,8 +11738,8 @@ function Set-Mailbox $RemoveDelayHoldApplied, [Parameter()] - [System.Object] - $ExternalOofOptions, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] @@ -12678,10 +11785,6 @@ function Set-Mailbox [System.Object] $RecipientLimits, - [Parameter()] - [System.Object] - $AddressBookPolicy, - [Parameter()] [System.Boolean] $MessageCopyForSentAsEnabled, @@ -12779,6 +11882,10 @@ function Set-MailboxAuditBypassAssociation { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Boolean] $AuditBypassEnabled, @@ -12800,10 +11907,6 @@ function Set-MailboxAutoReplyConfiguration [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.String] - $InternalMessage, - [Parameter()] [System.String] $DeclineMeetingMessage, @@ -12852,11 +11955,216 @@ function Set-MailboxAutoReplyConfiguration [System.DateTime] $EndTime, + [Parameter()] + [System.String] + $InternalMessage, + [Parameter()] [System.String] $ExternalMessage ) } +function Set-MailboxCalendarConfiguration +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Int32] + $WeatherLocationBookmark, + + [Parameter()] + [System.Object] + $WorkspaceUserEnabled, + + [Parameter()] + [System.Boolean] + $ConversationalSchedulingEnabled, + + [Parameter()] + [System.Boolean] + $HotelEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $SkipAgendaMailOnFreeDays, + + [Parameter()] + [System.Boolean] + $DiningEventsFromEmailEnabled, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Boolean] + $CreateEventsFromEmailAsPrivate, + + [Parameter()] + [System.String] + $CalendarFeedsPreferredLanguage, + + [Parameter()] + [System.Boolean] + $PackageDeliveryEventsFromEmailEnabled, + + [Parameter()] + [System.Object] + $WorkingHoursTimeZone, + + [Parameter()] + [System.Object] + $WeatherLocations, + + [Parameter()] + [System.Boolean] + $FlightEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $RentalCarEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $DeleteMeetingRequestOnRespond, + + [Parameter()] + [System.Int32] + $DefaultMeetingDuration, + + [Parameter()] + [System.Boolean] + $ReminderSoundEnabled, + + [Parameter()] + [System.TimeSpan] + $WorkingHoursEndTime, + + [Parameter()] + [System.Object] + $ShortenEventScopeDefault, + + [Parameter()] + [System.Boolean] + $InvoiceEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $UseBrightCalendarColorThemeInOwa, + + [Parameter()] + [System.TimeSpan] + $DefaultReminderTime, + + [Parameter()] + [System.Object] + $LocationDetailsInFreeBusy, + + [Parameter()] + [System.Object] + $WeatherEnabled, + + [Parameter()] + [System.String] + $CalendarFeedsPreferredRegion, + + [Parameter()] + [System.Boolean] + $ServiceAppointmentEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $ShowWeekNumbers, + + [Parameter()] + [System.Boolean] + $RemindersEnabled, + + [Parameter()] + [System.Object] + $WeekStartDay, + + [Parameter()] + [System.Object] + $FirstWeekOfYear, + + [Parameter()] + [System.Int32] + $DefaultMinutesToReduceShortEventsBy, + + [Parameter()] + [System.Boolean] + $AgendaMailIntroductionEnabled, + + [Parameter()] + [System.TimeSpan] + $WorkingHoursStartTime, + + [Parameter()] + [System.String] + $CalendarFeedsRootPageId, + + [Parameter()] + [System.Object] + $DailyAgendaMailSchedule, + + [Parameter()] + [System.Int32] + $DefaultMinutesToReduceLongEventsBy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $AutoDeclineWhenBusy, + + [Parameter()] + [System.Object] + $OnlineMeetingsByDefaultEnabled, + + [Parameter()] + [System.Boolean] + $PreserveDeclinedMeetings, + + [Parameter()] + [System.Object] + $TimeIncrement, + + [Parameter()] + [System.Object] + $WorkDays, + + [Parameter()] + [System.Boolean] + $EntertainmentEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $EventsFromEmailEnabled, + + [Parameter()] + [System.Object] + $WeatherUnit, + + [Parameter()] + [System.Object] + $DefaultOnlineMeetingProvider, + + [Parameter()] + [System.Object] + $MailboxLocation, + + [Parameter()] + [System.Boolean] + $AgendaMailEnabled, + + [Parameter()] + [System.Boolean] + $AgendaPaneEnabled + ) +} function Set-MailboxCalendarFolder { [CmdletBinding()] @@ -12906,6 +12214,52 @@ function Set-MailboxCalendarFolder $Confirm ) } +function Set-MailboxFolderPermission +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object[]] + $AccessRights, + + [Parameter()] + [System.Object] + $SharingPermissionFlags, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Boolean] + $SendNotificationToUser + ) +} +function Set-MailboxIRMAccess +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $AccessLevel + ) +} function Set-MailboxPlan { [CmdletBinding()] @@ -12924,11 +12278,11 @@ function Set-MailboxPlan [Parameter()] [System.Object] - $MaxSendSize, + $ProhibitSendReceiveQuota, [Parameter()] [System.Object] - $ProhibitSendReceiveQuota, + $MaxSendSize, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -13052,18 +12406,10 @@ function Set-MailContact [System.String] $DisplayName, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.String] $CustomAttribute3, - [Parameter()] - [System.Object] - $RejectMessagesFrom, - [Parameter()] [System.Object] $RejectMessagesFromSendersOrMembers, @@ -13144,6 +12490,10 @@ function Set-MailContact [System.String] $CustomAttribute15, + [Parameter()] + [System.Object] + $RejectMessagesFrom, + [Parameter()] [System.Object] $UserSMimeCertificate, @@ -13156,6 +12506,10 @@ function Set-MailContact [System.Object] $MessageFormat, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] $ExtensionCustomAttribute5, @@ -13348,113 +12702,305 @@ function Set-MalwareFilterRule [Parameter()] [System.Object] - $MalwareFilterPolicy, + $MalwareFilterPolicy, + + [Parameter()] + [System.Object[]] + $ExceptIfSentTo, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object[]] + $ExceptIfSentToMemberOf + ) +} +function Set-ManagementRoleEntry +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String[]] + $Parameters, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $RemoveParameter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AddParameter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Set-ManagementScope +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $RecipientRoot, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $RecipientRestrictionFilter, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Set-MeetingInsightsSettings +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Enabled + ) +} +function Set-MessageClassification +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SenderDescription, + + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.String] + $RecipientDescription, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $PermissionMenuVisible, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Guid] + $ClassificationID, + + [Parameter()] + [System.Object] + $DisplayPrecedence, + + [Parameter()] + [System.Boolean] + $RetainClassificationEnabled + ) +} +function Set-MigrationBatch +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Byte[]] + $CSVData, + + [Parameter()] + [System.Object] + $ReportInterval, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $MoveOptions, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Update, + + [Parameter()] + [System.Object] + $NotificationEmails, + + [Parameter()] + [System.Boolean] + $SkipReports, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ApproveSkippedItems, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SyncNow, + + [Parameter()] + [System.Object] + $SkipMerging, + + [Parameter()] + [System.Object] + $SkipMoving, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AddUsers, + + [Parameter()] + [System.Object] + $CompleteAfter, + + [Parameter()] + [System.Object] + $Partition, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $BadItemLimit, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Boolean] + $AllowUnknownColumnsInCSV, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $StartAfter, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf + [System.Object] + $LargeItemLimit ) } -function Set-ManagementRoleAssignment +function Set-MigrationEndpoint { [CmdletBinding()] param( [Parameter()] [System.Object] - $RecipientGroupScope, + $Identity, [Parameter()] - [System.Object] - $CustomRecipientWriteScope, + [System.Boolean] + $AcceptUntrustedCertificates, [Parameter()] [System.Object] - $RecipientAdministrativeUnitScope, + $MaxConcurrentMigrations, [Parameter()] - [System.Object] - $ExclusiveRecipientWriteScope, + [System.Byte[]] + $ServiceAccountKeyFileData, [Parameter()] [System.Object] - $CustomResourceScope, + $TestMailbox, [Parameter()] - [System.Object] - $Identity, + [System.String] + $ExchangeServer, [Parameter()] - [System.Object] - $RecipientOrganizationalUnitScope, + [System.Management.Automation.SwitchParameter] + $SkipVerification, [Parameter()] - [System.Boolean] - $Enabled, + [System.Object] + $Authentication, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $AppSecretKeyVaultUrl, [Parameter()] [System.Object] - $RecipientRelativeWriteScope, + $Port, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Set-MessageClassification -{ - [CmdletBinding()] - param( [Parameter()] [System.String] - $SenderDescription, + $ApplicationId, [Parameter()] - [System.String] - $DisplayName, + [System.Object] + $RemoteServer, [Parameter()] - [System.String] - $RecipientDescription, + [System.Object] + $Partition, [Parameter()] - [System.String] - $Name, + [System.Object] + $MailboxPermission, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Boolean] - $RetainClassificationEnabled, + [System.String] + $SourceMailboxLegacyDN, [Parameter()] - [System.Boolean] - $PermissionMenuVisible, + [System.String] + $NspiServer, [Parameter()] [System.Object] - $Identity, + $RPCProxyServer, [Parameter()] - [System.Guid] - $ClassificationID, + [System.String] + $PublicFolderDatabaseServerLegacyDN, + + [Parameter()] + [System.Object] + $Security, [Parameter()] [System.Object] - $DisplayPrecedence + $MaxConcurrentIncrementalSyncs, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credentials ) } function Set-MobileDeviceMailboxPolicy @@ -13473,10 +13019,6 @@ function Set-MobileDeviceMailboxPolicy [System.Boolean] $AllowUnsignedInstallationPackages, - [Parameter()] - [System.Object] - $MaxPasswordFailedAttempts, - [Parameter()] [System.Boolean] $AllowExternalDeviceManagement, @@ -13577,6 +13119,10 @@ function Set-MobileDeviceMailboxPolicy [System.Object] $AllowBluetooth, + [Parameter()] + [System.Boolean] + $WSSAccessEnabled, + [Parameter()] [System.Object] $RequireEncryptionSMIMEAlgorithm, @@ -13670,8 +13216,8 @@ function Set-MobileDeviceMailboxPolicy $AllowTextMessaging, [Parameter()] - [System.Boolean] - $WSSAccessEnabled, + [System.Object] + $MaxPasswordFailedAttempts, [Parameter()] [System.Boolean] @@ -13690,67 +13236,6 @@ function Set-MobileDeviceMailboxPolicy $Identity ) } -function Set-OfflineAddressBook -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $Versions, - - [Parameter()] - [System.Object] - $Schedule, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ApplyMandatoryProperties, - - [Parameter()] - [System.Boolean] - $ZipOabFilesBeforeUploading, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $UpgradeFromE14, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Int32] - $FullOabDownloadPreventionThreshold, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DiffRetentionPeriod, - - [Parameter()] - [System.Object[]] - $AddressLists, - - [Parameter()] - [System.Object] - $ConfiguredAttributes, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseDefaultAttributes, - - [Parameter()] - [System.Boolean] - $IsDefault - ) -} function Set-OMEConfiguration { [CmdletBinding()] @@ -13849,46 +13334,86 @@ function Set-Organization { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Boolean] - $UnifiedAuditLogIngestionEnabled + $UnifiedAuditLogIngestionEnabled, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } function Set-OrganizationConfig { [CmdletBinding()] param( + [Parameter()] + [System.Object] + $EwsAllowMacOutlook, + + [Parameter()] + [System.Int32] + $RequiredCharsetCoverage, + [Parameter()] [System.Boolean] - $FindTimeLockPollForAttendeesEnabled, + $PublicComputersDetectionEnabled, + + [Parameter()] + [System.Boolean] + $OAuth2ClientProfileEnabled, [Parameter()] [System.Boolean] - $ConnectorsEnabledForYammer, + $ActionableMessagesExtenalAccessTokenEnabled, [Parameter()] [System.Boolean] - $PublicFolderShowClientControl, + $EnableOutlookEvents, [Parameter()] [System.Boolean] - $MailTipsGroupMetricsEnabled, + $OutlookGifPickerDisabled, + + [Parameter()] + [System.String] + $VisibleMeetingUpdateProperties, [Parameter()] [System.Object] - $PublicFoldersEnabled, + $EwsEnabled, + + [Parameter()] + [System.Object] + $DefaultPublicFolderIssueWarningQuota, [Parameter()] [System.Boolean] - $ReadTrackingEnabled, + $RefreshSessionEnabled, + + [Parameter()] + [System.Boolean] + $IsGroupFoldersAndRulesEnabled, + + [Parameter()] + [System.Boolean] + $WebSuggestedRepliesDisabled, + + [Parameter()] + [System.Boolean] + $MessageRecallAlertRecipientsEnabled, + + [Parameter()] + [System.Boolean] + $BookingsExposureOfStaffDetailsRestricted, + + [Parameter()] + [System.Object] + $MessageRecallEnabled, [Parameter()] [System.Boolean] @@ -13896,183 +13421,195 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $BookingsNamingPolicyPrefixEnabled, + $AutoEnableArchiveMailbox, [Parameter()] [System.Boolean] - $MailTipsExternalRecipientsTipsEnabled, + $WorkspaceTenantEnabled, [Parameter()] [System.Object] - $FocusedInboxOn, + $DistributionGroupDefaultOU, + + [Parameter()] + [System.Boolean] + $BookingsSocialSharingRestricted, + + [Parameter()] + [System.Int32] + $DefaultMinutesToReduceLongEventsBy, [Parameter()] [System.Object] - $EwsApplicationAccessPolicy, + $PublicFoldersEnabled, [Parameter()] [System.Boolean] - $OAuth2ClientProfileEnabled, + $MaskClientIpInReceivedHeadersEnabled, + + [Parameter()] + [System.Object] + $EwsAllowList, [Parameter()] [System.Boolean] - $MobileAppEducationEnabled, + $BookingsAuthEnabled, [Parameter()] [System.Boolean] - $EnableOutlookEvents, + $AcceptedDomainApprovedSendersEnabled, [Parameter()] [System.Boolean] - $BookingsExposureOfStaffDetailsRestricted, + $AutomaticForcedReadReceiptEnabled, + + [Parameter()] + [System.Object] + $OnlineMeetingsByDefaultEnabled, + + [Parameter()] + [System.String] + $BookingsNamingPolicyPrefix, + + [Parameter()] + [System.Boolean] + $FindTimeLockPollForAttendeesEnabled, + + [Parameter()] + [System.Object] + $RecallReadMessagesEnabled, [Parameter()] [System.Boolean] - $ElcProcessingDisabled, + $BookingsNamingPolicyPrefixEnabled, [Parameter()] [System.Boolean] - $UnblockUnsafeSenderPromptEnabled, + $ConnectorsEnabledForSharepoint, [Parameter()] - [System.Boolean] - $AutoEnableArchiveMailbox, + [System.Object] + $EwsBlockList, [Parameter()] [System.Boolean] - $HybridRSVPEnabled, + $ActivityBasedAuthenticationTimeoutEnabled, [Parameter()] [System.Boolean] - $RefreshSessionEnabled, + $OutlookMobileSingleAccountEnabled, [Parameter()] - [System.Boolean] - $SmtpActionableMessagesEnabled, + [System.Object] + $ActivityBasedAuthenticationTimeoutInterval, [Parameter()] [System.Boolean] - $ConnectorsEnabledForTeams, + $LinkPreviewEnabled, [Parameter()] - [System.Boolean] - $ComplianceMLBgdCrawlEnabled, + [System.Object] + $DefaultPublicFolderDeletedItemRetention, [Parameter()] [System.Boolean] $MailTipsAllTipsEnabled, - [Parameter()] - [System.Boolean] - $PostponeRoamingSignaturesUntilLater, - [Parameter()] [System.Object] - $RemotePublicFolderMailboxes, + $DistributionGroupNameBlockedWordsList, [Parameter()] [System.Boolean] - $BlockMoveMessagesForGroupFolders, + $ConnectorsEnabledForTeams, [Parameter()] - [System.Int32] - $DefaultMinutesToReduceShortEventsBy, + [System.Boolean] + $EndUserDLUpgradeFlowsDisabled, [Parameter()] [System.Object] - $EwsAllowEntourage, + $MessageRecallMaxRecallableAge, [Parameter()] - [System.Boolean] - $OutlookGifPickerDisabled, + [System.Object] + $FocusedInboxOn, [Parameter()] [System.Object] - $OnlineMeetingsByDefaultEnabled, + $DefaultPublicFolderAgeLimit, [Parameter()] [System.Boolean] - $ConnectorsEnabledForOutlook, - - [Parameter()] - [System.Object] - $DefaultPublicFolderProhibitPostQuota, + $EnableForwardingAddressSyncForMailboxes, [Parameter()] [System.Object] - $ExchangeNotificationRecipients, + $DefaultGroupAccessType, [Parameter()] [System.Boolean] - $MessageRemindersEnabled, + $BlockMoveMessagesForGroupFolders, [Parameter()] [System.Boolean] - $DirectReportsGroupAutoCreationEnabled, + $FindTimeAutoScheduleDisabled, [Parameter()] [System.Boolean] - $AuditDisabled, + $BookingsSearchEngineIndexDisabled, [Parameter()] - [System.Boolean] - $BookingsAuthEnabled, + [System.Uri] + $SiteMailboxCreationURL, [Parameter()] [System.Boolean] - $OutlookMobileGCCRestrictionsEnabled, + $ConnectorsEnabledForOutlook, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.UInt32] + $MailTipsLargeAudienceThreshold, [Parameter()] [System.Boolean] - $BookingsCreationOfCustomQuestionsRestricted, + $DirectReportsGroupAutoCreationEnabled, [Parameter()] [System.Boolean] - $BookingsSmsMicrosoftEnabled, + $TenantAdminNotificationForDelayedDelicensingEnabled, [Parameter()] - [System.Object] - $DefaultAuthenticationPolicy, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Boolean] - $WebPushNotificationsDisabled, + $MessageRemindersEnabled, [Parameter()] [System.Boolean] - $ActivityBasedAuthenticationTimeoutEnabled, + $PublicFolderShowClientControl, [Parameter()] [System.Boolean] - $BookingsAddressEntryRestricted, + $AppsForOfficeEnabled, [Parameter()] - [System.String] - $BookingsNamingPolicyPrefix, + [System.Boolean] + $UnblockUnsafeSenderPromptEnabled, [Parameter()] - [System.Object] - $DefaultPublicFolderDeletedItemRetention, + [System.Boolean] + $ConnectorsActionableMessagesEnabled, [Parameter()] [System.Int32] - $PreferredInternetCodePageForShiftJis, - - [Parameter()] - [System.Object] - $ShortenEventScopeDefault, - - [Parameter()] - [System.Object] - $HierarchicalAddressBookRoot, + $DefaultMinutesToReduceShortEventsBy, [Parameter()] [System.Boolean] - $IsAgendaMailEnabled, + $CalendarVersionStoreEnabled, [Parameter()] [System.Boolean] @@ -14080,27 +13617,23 @@ function Set-OrganizationConfig [Parameter()] [System.Object] - $EwsEnabled, - - [Parameter()] - [System.Boolean] - $FindTimeAttendeeAuthenticationEnabled, + $RemotePublicFolderMailboxes, [Parameter()] [System.Boolean] - $AutomaticForcedReadReceiptEnabled, + $EndUserMailNotificationForDelayedDelicensingEnabled, [Parameter()] [System.Boolean] - $LeanPopoutEnabled, + $BookingsBlockedWordsEnabled, [Parameter()] [System.Object] - $DistributionGroupNameBlockedWordsList, + $DistributionGroupNamingPolicy, [Parameter()] - [System.Int32] - $RequiredCharsetCoverage, + [System.Object] + $HierarchicalAddressBookRoot, [Parameter()] [System.Boolean] @@ -14108,235 +13641,227 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $ConnectorsEnabledForSharepoint, + $HybridRSVPEnabled, [Parameter()] [System.Boolean] - $BookingsBlockedWordsEnabled, + $ConnectorsEnabled, [Parameter()] [System.Boolean] - $ActivityBasedAuthenticationTimeoutWithSingleSignOnEnabled, + $PerTenantSwitchToESTSEnabled, [Parameter()] - [System.Boolean] - $WorkspaceTenantEnabled, + [System.Int32] + $PreferredInternetCodePageForShiftJis, [Parameter()] [System.Boolean] - $BookingsNamingPolicyEnabled, - - [Parameter()] - [System.Object] - $DefaultPublicFolderAgeLimit, + $BookingsPhoneNumberEntryRestricted, [Parameter()] - [System.String] - $VisibleMeetingUpdateProperties, + [System.Boolean] + $MobileAppEducationEnabled, [Parameter()] [System.Boolean] - $OutlookPayEnabled, + $BookingsNamingPolicyEnabled, [Parameter()] - [System.UInt32] - $MailTipsLargeAudienceThreshold, + [System.Boolean] + $BookingsAddressEntryRestricted, [Parameter()] - [System.Object] - $DefaultGroupAccessType, + [System.Boolean] + $RejectDirectSend, [Parameter()] [System.Boolean] - $CalendarVersionStoreEnabled, + $BookingsSmsMicrosoftEnabled, [Parameter()] [System.Boolean] - $BookingsPaymentsEnabled, + $LeanPopoutEnabled, [Parameter()] [System.Object] - $MessageRecallEnabled, + $ExchangeNotificationRecipients, [Parameter()] - [System.Boolean] - $MessageHighlightsEnabled, + [System.Object] + $EwsAllowEntourage, [Parameter()] [System.Boolean] - $WebSuggestedRepliesDisabled, + $IsAgendaMailEnabled, [Parameter()] [System.Boolean] - $DisablePlusAddressInRecipients, - - [Parameter()] - [System.Object] - $DistributionGroupNamingPolicy, + $CustomerLockboxEnabled, [Parameter()] [System.Boolean] - $PublicComputersDetectionEnabled, + $OutlookPayEnabled, [Parameter()] [System.Boolean] - $BookingsSocialSharingRestricted, + $MailTipsMailboxSourcedTipsEnabled, [Parameter()] - [System.String] - $BookingsNamingPolicySuffix, + [System.Boolean] + $OutlookTextPredictionDisabled, [Parameter()] [System.Boolean] - $BookingsNamingPolicySuffixEnabled, + $BookingsMembershipApprovalRequired, [Parameter()] [System.Boolean] - $BookingsMembershipApprovalRequired, + $BookingsEnabled, [Parameter()] [System.Boolean] - $IsGroupMemberAllowedToEditContent, + $SendFromAliasEnabled, [Parameter()] [System.Object] - $DefaultPublicFolderMovedItemRetention, + $IPListBlocked, [Parameter()] [System.Object] - $DistributionGroupDefaultOU, + $DefaultPublicFolderMaxItemSize, [Parameter()] [System.Boolean] - $OutlookTextPredictionDisabled, + $ActivityBasedAuthenticationTimeoutWithSingleSignOnEnabled, [Parameter()] [System.Boolean] - $SharedDomainEmailAddressFlowEnabled, + $IsGroupMemberAllowedToEditContent, [Parameter()] - [System.Boolean] - $ConnectorsActionableMessagesEnabled, + [System.Object] + $DefaultPublicFolderProhibitPostQuota, [Parameter()] [System.Boolean] - $MailTipsMailboxSourcedTipsEnabled, + $DisablePlusAddressInRecipients, [Parameter()] [System.Boolean] - $BookingsEnabled, + $OutlookMobileGCCRestrictionsEnabled, [Parameter()] - [System.Boolean] - $EndUserDLUpgradeFlowsDisabled, + [System.Management.Automation.SwitchParameter] + $AutoExpandingArchive, [Parameter()] - [System.Object] - $RecallReadMessagesEnabled, + [System.Boolean] + $MessageRecallAlertRecipientsReadMessagesOnlyEnabled, [Parameter()] [System.Boolean] - $BookingsPhoneNumberEntryRestricted, + $SharedDomainEmailAddressFlowEnabled, [Parameter()] - [System.Boolean] - $AppsForOfficeEnabled, + [System.Object] + $ShortenEventScopeDefault, [Parameter()] [System.Boolean] - $EnableForwardingAddressSyncForMailboxes, + $DelayedDelicensingEnabled, [Parameter()] - [System.Object] - $EwsAllowOutlook, + [System.Boolean] + $MailTipsGroupMetricsEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AutoExpandingArchive, + [System.Boolean] + $ReadTrackingEnabled, [Parameter()] [System.Boolean] - $LinkPreviewEnabled, + $SmtpActionableMessagesEnabled, [Parameter()] [System.Boolean] - $BookingsSearchEngineIndexDisabled, + $BookingsNamingPolicySuffixEnabled, [Parameter()] - [System.Object] - $EwsAllowMacOutlook, + [System.Boolean] + $AutodiscoverPartialDirSync, [Parameter()] - [System.Object] - $EwsAllowList, + [System.Boolean] + $BookingsCreationOfCustomQuestionsRestricted, [Parameter()] - [System.Object] - $DefaultPublicFolderMaxItemSize, + [System.Boolean] + $AuditDisabled, [Parameter()] [System.Boolean] - $MatchSenderOrganizerProperties, + $FindTimeAttendeeAuthenticationEnabled, [Parameter()] - [System.Int32] - $DefaultMinutesToReduceLongEventsBy, + [System.String] + $BookingsNamingPolicySuffix, [Parameter()] [System.Object] - $IPListBlocked, + $EwsAllowOutlook, [Parameter()] [System.Boolean] - $BookingsNotesEntryRestricted, + $ComplianceMLBgdCrawlEnabled, [Parameter()] [System.Boolean] - $SendFromAliasEnabled, + $BookingsPaymentsEnabled, [Parameter()] [System.Boolean] - $AutodiscoverPartialDirSync, + $OutlookMobileHelpShiftEnabled, [Parameter()] - [System.Object] - $ActivityBasedAuthenticationTimeoutInterval, + [System.Boolean] + $PostponeRoamingSignaturesUntilLater, [Parameter()] [System.Boolean] - $OutlookMobileSingleAccountEnabled, + $MailTipsExternalRecipientsTipsEnabled, [Parameter()] [System.Boolean] - $IsGroupFoldersAndRulesEnabled, + $BookingsNotesEntryRestricted, [Parameter()] [System.Boolean] - $MaskClientIpInReceivedHeadersEnabled, + $MatchSenderOrganizerProperties, [Parameter()] - [System.Boolean] - $PerTenantSwitchToESTSEnabled, + [System.Object] + $EwsApplicationAccessPolicy, [Parameter()] [System.Boolean] - $ConnectorsEnabled, + $MessageHighlightsEnabled, [Parameter()] - [System.Object] - $EwsBlockList, + [System.Boolean] + $ElcProcessingDisabled, [Parameter()] [System.Boolean] - $CustomerLockboxEnabled, + $WebPushNotificationsDisabled, [Parameter()] - [System.Boolean] - $OutlookMobileHelpShiftEnabled, + [System.Object] + $DefaultPublicFolderMovedItemRetention, [Parameter()] - [System.Uri] - $SiteMailboxCreationURL, + [System.Object] + $DefaultAuthenticationPolicy, [Parameter()] [System.Int32] @@ -14344,11 +13869,7 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $FindTimeAutoScheduleDisabled, - - [Parameter()] - [System.Object] - $DefaultPublicFolderIssueWarningQuota + $ConnectorsEnabledForYammer ) } function Set-OrganizationRelationship @@ -14485,8 +14006,8 @@ function Set-OutboundConnector $AllAcceptedDomains, [Parameter()] - [System.Object] - $TlsDomain, + [System.Boolean] + $TestMode, [Parameter()] [System.String] @@ -14533,8 +14054,8 @@ function Set-OutboundConnector $SenderRewritingEnabled, [Parameter()] - [System.Boolean] - $TestMode, + [System.Object] + $TlsDomain, [Parameter()] [System.Object] @@ -14545,10 +14066,6 @@ function Set-OwaMailboxPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Int32] $DefaultClientLanguage, @@ -14577,6 +14094,10 @@ function Set-OwaMailboxPolicy [System.Object] $BlockedFileTypes, + [Parameter()] + [System.Boolean] + $FeedbackEnabled, + [Parameter()] [System.Boolean] $NpsSurveysEnabled, @@ -14603,7 +14124,11 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $AdditionalStorageProvidersAvailable, + $WeatherEnabled, + + [Parameter()] + [System.Boolean] + $OWALightEnabled, [Parameter()] [System.Boolean] @@ -14617,10 +14142,6 @@ function Set-OwaMailboxPolicy [System.Boolean] $SMimeSuppressNameChecksEnabled, - [Parameter()] - [System.Object] - $ActionForUnknownFileAndMIMETypes, - [Parameter()] [System.String] $ExternalSPMySiteHostURL, @@ -14629,13 +14150,17 @@ function Set-OwaMailboxPolicy [System.Boolean] $OfflineEnabledWeb, + [Parameter()] + [System.Object] + $HideClassicOutlookToggleOut, + [Parameter()] [System.Object] $ForceSaveMimeTypes, [Parameter()] [System.Boolean] - $CalendarEnabled, + $JournalEnabled, [Parameter()] [System.Boolean] @@ -14657,6 +14182,10 @@ function Set-OwaMailboxPolicy [System.Object] $ForceSaveFileTypes, + [Parameter()] + [System.Object] + $OutlookNewslettersAccessLevel, + [Parameter()] [System.Object] $ChangeSettingsAccountEnabled, @@ -14710,8 +14239,8 @@ function Set-OwaMailboxPolicy $DirectFileAccessOnPrivateComputersEnabled, [Parameter()] - [System.Boolean] - $JournalEnabled, + [System.Object] + $OutlookNewslettersReactions, [Parameter()] [System.Boolean] @@ -14750,16 +14279,20 @@ function Set-OwaMailboxPolicy $SatisfactionEnabled, [Parameter()] - [System.Boolean] - $OWALightEnabled, + [System.Object] + $AllowedMimeTypes, [Parameter()] [System.Object] $InstantMessagingType, + [Parameter()] + [System.Object] + $OutlookDataFile, + [Parameter()] [System.Boolean] - $ActiveSyncIntegrationEnabled, + $AccountTransferEnabled, [Parameter()] [System.Object] @@ -14779,15 +14312,19 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $ForceWacViewingFirstOnPrivateComputers, + $AllowCopyContactsToDeviceAddressBook, + + [Parameter()] + [System.Boolean] + $MonthlyUpdatesEnabled, [Parameter()] [System.Object] - $AllowedMimeTypes, + $OutlookNewslettersShowMore, [Parameter()] - [System.Boolean] - $AllowCopyContactsToDeviceAddressBook, + [System.Management.Automation.SwitchParameter] + $IsDefault, [Parameter()] [System.Object] @@ -14795,19 +14332,23 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $PlacesEnabled, + $LocalEventsEnabled, [Parameter()] [System.Boolean] - $ReportJunkEmailEnabled, + $CalendarEnabled, [Parameter()] [System.Boolean] - $UseISO885915, + $ForceWacViewingFirstOnPrivateComputers, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Boolean] - $RecoverDeletedItemsEnabled, + $UMIntegrationEnabled, [Parameter()] [System.Boolean] @@ -14822,8 +14363,8 @@ function Set-OwaMailboxPolicy $WebPartsFrameOptionsType, [Parameter()] - [System.String] - $SetPhotoURL, + [System.Object] + $ActionForUnknownFileAndMIMETypes, [Parameter()] [System.Boolean] @@ -14875,11 +14416,11 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $UMIntegrationEnabled, + $PlacesEnabled, [Parameter()] [System.Boolean] - $FeedbackEnabled, + $UseISO885915, [Parameter()] [System.Boolean] @@ -14887,11 +14428,7 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $WeatherEnabled, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, + $RecoverDeletedItemsEnabled, [Parameter()] [System.Boolean] @@ -14906,8 +14443,8 @@ function Set-OwaMailboxPolicy $AllowedFileTypes, [Parameter()] - [System.Boolean] - $ExternalImageProxyEnabled, + [System.String] + $SetPhotoURL, [Parameter()] [System.Boolean] @@ -14921,6 +14458,14 @@ function Set-OwaMailboxPolicy [System.Boolean] $FreCardsEnabled, + [Parameter()] + [System.Boolean] + $ExternalImageProxyEnabled, + + [Parameter()] + [System.Boolean] + $ActiveSyncIntegrationEnabled, + [Parameter()] [System.String] $Name, @@ -14935,7 +14480,7 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $LocalEventsEnabled, + $AdditionalStorageProvidersAvailable, [Parameter()] [System.Boolean] @@ -14961,6 +14506,10 @@ function Set-OwaMailboxPolicy [System.Object] $Identity, + [Parameter()] + [System.Boolean] + $ReportJunkEmailEnabled, + [Parameter()] [System.Boolean] $PhoneticSupportEnabled, @@ -15011,12 +14560,12 @@ function Set-PartnerApplication $ActAsPermissions, [Parameter()] - [System.Boolean] - $Enabled, + [System.Object] + $AccountType, [Parameter()] - [System.Object] - $AccountType + [System.Boolean] + $Enabled ) } function Set-PerimeterConfig @@ -15076,10 +14625,6 @@ function Set-Place [System.String] $DisplayDeviceName, - [Parameter()] - [System.Object[]] - $Desks, - [Parameter()] [System.String] $Building, @@ -15096,10 +14641,6 @@ function Set-Place [System.Object] $Floor, - [Parameter()] - [System.Object] - $ParentType, - [Parameter()] [System.String] $VideoDeviceName, @@ -15154,6 +14695,10 @@ function Set-QuarantinePolicy { [CmdletBinding()] param( + [Parameter()] + [System.Boolean] + $IncludeMessagesFromBlockedSenderAddress, + [Parameter()] [System.Object] $MultiLanguageCustomDisclaimer, @@ -15303,10 +14848,6 @@ function Set-RemoteDomain [System.Object] $PreferredInternetCodePageForShiftJis, - [Parameter()] - [System.Boolean] - $SmtpDaneMandatoryModeEnabled, - [Parameter()] [System.String] $NonMimeCharacterSet, @@ -15333,11 +14874,11 @@ function Set-RemoteDomain [Parameter()] [System.Boolean] - $NDREnabled, + $NDRDiagnosticInfoEnabled, [Parameter()] [System.Boolean] - $NDRDiagnosticInfoEnabled, + $NDREnabled, [Parameter()] [System.Boolean] @@ -15605,74 +15146,184 @@ function Set-ReportSubmissionPolicy $PreSubmitMessageTitle, [Parameter()] - [System.String[]] - $MultiLanguagePreSubmitMessageTitleForPhishing, + [System.String[]] + $MultiLanguagePreSubmitMessageTitleForPhishing, + + [Parameter()] + [System.String[]] + $MultiLanguagePreSubmitMessageButtonTextForPhishing, + + [Parameter()] + [System.String] + $UserSubmissionOptionsMessage, + + [Parameter()] + [System.String] + $PostSubmitMessageForPhishing, + + [Parameter()] + [System.String[]] + $MultiLanguagePostSubmitMessageButtonLinkForJunk, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Boolean] + $ReportPhishToCustomizedAddress + ) +} +function Set-ReportSubmissionRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $SentTo, + + [Parameter()] + [System.String] + $Comments, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ReportSubmissionPolicy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm + ) +} +function Set-ResourceConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $ResourcePropertySchema + ) +} +function Set-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $RetentionPolicyTagLinks, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultArbitrationMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function Set-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Object] + $Identity, [Parameter()] - [System.String[]] - $MultiLanguagePreSubmitMessageButtonTextForPhishing, + [System.Boolean] + $MustDisplayCommentEnabled, [Parameter()] - [System.String] - $UserSubmissionOptionsMessage, + [System.Object[]] + $OptionalInMailbox, [Parameter()] - [System.String] - $PostSubmitMessageForPhishing, + [System.Object] + $Mailbox, [Parameter()] - [System.String[]] - $MultiLanguagePostSubmitMessageButtonLinkForJunk, + [System.Management.Automation.SwitchParameter] + $Force, [Parameter()] [System.Object] - $Identity, + $LocalizedRetentionPolicyTagName, [Parameter()] - [System.Boolean] - $ReportPhishToCustomizedAddress - ) -} -function Set-ReportSubmissionRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, + [System.Object] + $LegacyManagedFolder, [Parameter()] - [System.Object[]] - $SentTo, + [System.Object] + $AgeLimitForRetention, [Parameter()] - [System.String] - $Comments, + [System.Object] + $RetentionAction, [Parameter()] [System.Object] - $Identity, + $LocalizedComment, [Parameter()] - [System.Object] - $ReportSubmissionPolicy, + [System.String] + $Comment, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm - ) -} -function Set-ResourceConfig -{ - [CmdletBinding()] - param( + [System.Guid] + $RetentionId, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $ResourcePropertySchema + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.Boolean] + $SystemTag, + + [Parameter()] + [System.String] + $Name ) } function Set-RoleAssignmentPolicy @@ -15692,12 +15343,12 @@ function Set-RoleAssignmentPolicy $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, + [System.Object] + $Identity, [Parameter()] - [System.Object] - $Identity + [System.Management.Automation.SwitchParameter] + $IsDefault ) } function Set-RoleGroup @@ -15708,10 +15359,6 @@ function Set-RoleGroup [System.String] $Description, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - [Parameter()] [System.String] $DisplayName, @@ -15738,7 +15385,11 @@ function Set-RoleGroup [Parameter()] [System.Object] - $ManagedBy + $ManagedBy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } function Set-SafeAttachmentPolicy @@ -15876,110 +15527,279 @@ function Set-SafeLinksPolicy $AllowClickThrough, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $CustomNotificationText, + + [Parameter()] + [System.Boolean] + $DeliverMessageAfterScan, + + [Parameter()] + [System.Boolean] + $EnableSafeLinksForEmail, + + [Parameter()] + [System.Boolean] + $ScanUrls, + + [Parameter()] + [System.Boolean] + $EnableForInternalSenders + ) +} +function Set-SafeLinksRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Int32] + $Priority, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $SentToMemberOf, + + [Parameter()] + [System.Object[]] + $SentTo, + + [Parameter()] + [System.String] + $Comments, + + [Parameter()] + [System.Object[]] + $RecipientDomainIs, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object[]] + $ExceptIfRecipientDomainIs, + + [Parameter()] + [System.Object] + $SafeLinksPolicy, + + [Parameter()] + [System.Object[]] + $ExceptIfSentTo, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object[]] + $ExceptIfSentToMemberOf + ) +} +function Set-ServicePrincipal +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-SharingPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Domains, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Default, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function Set-SweepRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $Sender, + + [Parameter()] + [System.String] + $Provider, + + [Parameter()] + [System.Object] + $SystemCategory, + + [Parameter()] + [System.Object] + $KeepLatest, + + [Parameter()] + [System.Object] + $SourceFolder, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DestinationFolder, + + [Parameter()] + [System.Object] + $KeepForDays, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function Set-TeamsProtectionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $HighConfidencePhishQuarantineTag, [Parameter()] [System.String] - $CustomNotificationText, + $AdminDisplayName, [Parameter()] [System.Boolean] - $DeliverMessageAfterScan, + $ZapEnabled, [Parameter()] - [System.Boolean] - $EnableSafeLinksForEmail, + [System.String] + $MalwareQuarantineTag, [Parameter()] - [System.Boolean] - $ScanUrls, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Boolean] - $EnableForInternalSenders + [System.Object] + $Identity ) } -function Set-SafeLinksRule +function Set-TenantAllowBlockListItems { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $Priority, - - [Parameter()] - [System.String] - $Name, + [System.DateTime] + $ExpirationDate, [Parameter()] - [System.Object[]] - $SentToMemberOf, + [System.Object] + $ListSubType, [Parameter()] - [System.Object[]] - $SentTo, + [System.Management.Automation.SwitchParameter] + $Block, [Parameter()] [System.String] - $Comments, + $Notes, [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.Int32] + $RemoveAfter, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $OutputJson, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Management.Automation.SwitchParameter] + $NoExpiration, [Parameter()] - [System.Object] - $SafeLinksPolicy, + [System.String[]] + $Ids, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Management.Automation.SwitchParameter] + $Allow, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String[]] + $Entries, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf + [System.Object] + $ListType ) } -function Set-SharingPolicy +function Set-TenantAllowBlockListSpoofItems { [CmdletBinding()] param( [Parameter()] [System.String] - $Name, + $Action, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.Object] - $Domains, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Default, - [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Boolean] - $Enabled + [System.String[]] + $Ids ) } function Set-TransportConfig @@ -15998,18 +15818,10 @@ function Set-TransportConfig [System.Boolean] $ExternalDelayDsnEnabled, - [Parameter()] - [System.Object] - $DSNConversionMode, - [Parameter()] [System.Boolean] $SmtpClientAuthenticationDisabled, - [Parameter()] - [System.Globalization.CultureInfo] - $InternalDsnDefaultLanguage, - [Parameter()] [System.Object] $MessageExpiration, @@ -16022,10 +15834,6 @@ function Set-TransportConfig [System.Boolean] $ReplyAllStormProtectionEnabled, - [Parameter()] - [System.Boolean] - $InternalDsnLanguageDetectionEnabled, - [Parameter()] [System.Boolean] $AddressBookPolicyRoutingEnabled, @@ -16043,16 +15851,16 @@ function Set-TransportConfig $Rfc2231EncodingEnabled, [Parameter()] - [System.Object] - $HeaderPromotionModeSetting, + [System.Boolean] + $InternalDsnLanguageDetectionEnabled, [Parameter()] [System.Boolean] $VoicemailJournalingEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $HeaderPromotionModeSetting, [Parameter()] [System.Object] @@ -16062,14 +15870,26 @@ function Set-TransportConfig [System.Boolean] $ConvertDisclaimerWrapperToEml, + [Parameter()] + [System.Object] + $ExternalDsnReportingAuthority, + [Parameter()] [System.Object] $InternalDsnReportingAuthority, + [Parameter()] + [System.Boolean] + $PreventDuplicateJournalingEnabled, + [Parameter()] [System.Int32] $JournalMessageExpirationDays, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] $MaxRecipientEnvelopeLimit, @@ -16080,12 +15900,16 @@ function Set-TransportConfig [Parameter()] [System.Object] - $ExternalDsnReportingAuthority, + $DSNConversionMode, [Parameter()] [System.Globalization.CultureInfo] $ExternalDsnDefaultLanguage, + [Parameter()] + [System.Globalization.CultureInfo] + $InternalDsnDefaultLanguage, + [Parameter()] [System.Object] $AllowLegacyTLSClients, @@ -17029,53 +16853,22 @@ function Set-UnifiedGroup $HiddenFromAddressListsEnabled ) } - -function Set-UnifiedAuditLogRetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Identity, - - [Parameter()] - [System.UInt32] - $Priority, - - [Parameter()] - [System.String] - $RetentionDuration, - - [Parameter()] - [System.String] - $Description, - - [Parameter()] - [System.String[]] - $Operations, - - [Parameter()] - [System.String[]] - $RecordTypes, - - [Parameter()] - [System.String[]] - $UserIds - ) -} - function Set-User { [CmdletBinding()] param( [Parameter()] - [System.String] - $MailboxRegion, + [System.Object] + $WindowsEmailAddress, [Parameter()] [System.Boolean] $IsShadowMailbox, + [Parameter()] + [System.String] + $LastName, + [Parameter()] [System.String] $Phone, @@ -17108,10 +16901,6 @@ function Set-User [System.String] $Pager, - [Parameter()] - [System.String] - $Name, - [Parameter()] [System.String] $PhoneticDisplayName, @@ -17132,6 +16921,10 @@ function Set-User [System.Object] $ManagedOnboardingType, + [Parameter()] + [System.Object] + $StsRefreshTokensValidFrom, + [Parameter()] [System.Management.Automation.SwitchParameter] $RemoveMailboxProvisioningConstraint, @@ -17168,6 +16961,14 @@ function Set-User [System.String] $AssistantName, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $PublicFolder, + + [Parameter()] + [System.String] + $FirstName, + [Parameter()] [System.String] $Company, @@ -17178,11 +16979,11 @@ function Set-User [Parameter()] [System.String] - $Initials, + $SimpleDisplayName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $Initials, [Parameter()] [System.String] @@ -17192,10 +16993,6 @@ function Set-User [System.String] $Notes, - [Parameter()] - [System.String] - $LastName, - [Parameter()] [System.Management.Automation.SwitchParameter] $PermanentlyClearPreviousMailboxInfo, @@ -17205,8 +17002,8 @@ function Set-User $Manager, [Parameter()] - [System.Object] - $StsRefreshTokensValidFrom, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] @@ -17214,7 +17011,7 @@ function Set-User [Parameter()] [System.String] - $SimpleDisplayName, + $StreetAddress, [Parameter()] [System.Object] @@ -17228,30 +17025,26 @@ function Set-User [System.String] $Department, - [Parameter()] - [System.String] - $FirstName, - [Parameter()] [System.Object] - $PostOfficeBox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + $OtherHomePhone, [Parameter()] - [System.Object] - $WindowsEmailAddress, + [System.String] + $MailboxRegion, [Parameter()] - [System.String] - $StreetAddress, + [System.Boolean] + $EXOModuleEnabled, [Parameter()] [System.Boolean] $RemotePowerShellEnabled, + [Parameter()] + [System.String] + $Name, + [Parameter()] [System.String] $PostalCode, @@ -17262,7 +17055,7 @@ function Set-User [Parameter()] [System.Object] - $OtherHomePhone, + $PostOfficeBox, [Parameter()] [System.Object] @@ -17273,6 +17066,40 @@ function Set-User $CanHaveCloudCache ) } +function Start-MigrationBatch +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Partition + ) +} +function Stop-MigrationBatch +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Partition + ) +} function Update-RoleGroupMember { [CmdletBinding()] @@ -17296,6 +17123,8 @@ function Update-RoleGroupMember } #endregion + + #region Microsoft.Graph.Applications function Get-MgApplication { From fc03facc8bc4ddd7183932096d660d41496bd9e2 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Sat, 8 Feb 2025 10:47:16 -0500 Subject: [PATCH 05/26] Fixing Stubs --- Tests/Unit/Stubs/Microsoft365.psm1 | 8914 +++++++++++++++------------- 1 file changed, 4631 insertions(+), 4283 deletions(-) diff --git a/Tests/Unit/Stubs/Microsoft365.psm1 b/Tests/Unit/Stubs/Microsoft365.psm1 index e8009af02b..fb456ea356 100644 --- a/Tests/Unit/Stubs/Microsoft365.psm1 +++ b/Tests/Unit/Stubs/Microsoft365.psm1 @@ -628,616 +628,2091 @@ function Disable-AzSubscription } #endregion -#region ExchangeOnlineManagement -function Add-AvailabilityAddressSpace +# region ExchangeOnlineManagement + +function Get-MeetingInsightsSettings { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials, - - [Parameter()] - [System.String] - $ForestName, - - [Parameter()] - [System.Uri] - $TargetAutodiscoverEpr, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $TargetTenantId, - - [Parameter()] - [System.String] - $TargetServiceEpr, - - [Parameter()] - [System.Object] - $AccessMethod ) } -function Add-MailboxFolderPermission + +function Set-MeetingInsightsSettings { [CmdletBinding()] param( - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Object] - $SharingPermissionFlags, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser ) } -function Add-MailboxPermission + +function Get-EmailTenantSettings { [CmdletBinding()] param( - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $GroupMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Deny, - - [Parameter()] - [System.Object] - $AutoMapping, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Owner, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, - - [Parameter()] - [System.DirectoryServices.ActiveDirectorySecurityInheritance] - $InheritanceType ) } -function Add-RecipientPermission + +function Set-EmailTenantSettings { [CmdletBinding()] param( [Parameter()] - [System.Object] - $AccessRights, - - [Parameter()] - [System.Object] - $Trustee, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity + [System.Boolean] + $EnablePriorityAccountProtection ) } -function Add-RoleGroupMember + +function Get-DnssecStatusForVerifiedDomain { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $BypassSecurityGroupManagerCheck, - [Parameter()] [System.Object] - $Member + $DomainName ) } -function Disable-ATPProtectionPolicyRule + +function Enable-DnssecForVerifiedDomain { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Object] - $Identity + $DomainName ) } + function Disable-DnssecForVerifiedDomain { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] + [System.Object] $DomainName ) } -function Disable-EOPProtectionPolicyRule + +function Get-MailboxIRMAccess { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $User, [Parameter()] [System.Object] $Identity ) } -function Disable-JournalRule + +function Set-MailboxIRMAccess { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $User, [Parameter()] [System.Object] - $Identity - ) -} -function Disable-SmtpDaneInbound -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $Identity, [Parameter()] - [System.String] - $DomainName + [System.Object] + $AccessLevel ) } -function Enable-ATPProtectionPolicyRule + +function Remove-MailboxIRMAccess { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $User, [Parameter()] [System.Object] $Identity ) } -function Enable-DnssecForVerifiedDomain + +function Get-ArcConfig { [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $DomainName - ) + param() } -function Enable-EOPProtectionPolicyRule + +function Set-ArcConfig { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String[]] + $ArcTrustedSealers, [Parameter()] [System.Object] $Identity ) } -function Enable-JournalRule + +function Get-ManagementScope { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $Exclusive, [Parameter()] [System.Object] - $Identity - ) -} -function Enable-OrganizationCustomization -{ - [CmdletBinding()] - param( + $Identity, + [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm + $Orphan ) } -function Enable-SmtpDaneInbound + +function New-ManagementScope { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Exclusive, + + [Parameter()] + [System.Object] + $RecipientRoot, [Parameter()] [System.String] - $DomainName - ) -} -function Get-AcceptedDomain -{ - [CmdletBinding()] - param( + $Name, + [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $ResultSize + [System.String] + $RecipientRestrictionFilter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } -function Get-ActiveSyncDevice + +function Set-ManagementScope { [CmdletBinding()] param( [Parameter()] - [System.String] - $SortBy, + [System.Object] + $RecipientRoot, [Parameter()] - [System.Object] - $Mailbox, + [System.String] + $Name, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Filter, + $RecipientRestrictionFilter, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Object] - $ResultSize + [System.Management.Automation.SwitchParameter] + $Force ) } -function Get-ActiveSyncDeviceAccessRule + +function Remove-ManagementScope { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Identity - ) -} -function Get-ActiveSyncMailboxPolicy -{ - [CmdletBinding()] - param( + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-AddressBookPolicy -{ - [CmdletBinding()] - param( + $Identity, + [Parameter()] - [System.Object] - $Identity + [System.Management.Automation.SwitchParameter] + $Force ) } -function Get-AdminAuditLogConfig -{ - [CmdletBinding()] - param( - ) -} -function Get-AdministrativeUnit +function Get-FocusedInbox { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $UseCustomRouting, [Parameter()] [System.Object] $Identity ) } -function Get-AntiPhishPolicy + +function Set-FocusedInbox { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Impersonation, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Advanced, + $UseCustomRouting, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Spoof + [System.Object] + $FocusedInboxOn ) } -function Get-AntiPhishRule + +function Get-MailboxCalendarConfiguration { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity, + $MailboxLocation, [Parameter()] [System.Object] - $State + $Identity ) } -function Get-App + +function Set-MailboxCalendarConfiguration { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Mailbox, + [System.Int32] + $WeatherLocationBookmark, [Parameter()] [System.Object] - $Identity, + $WorkspaceUserEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $OrganizationApp, + [System.Boolean] + $ConversationalSchedulingEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrivateCatalog - ) -} -function Get-ApplicationAccessPolicy -{ - [CmdletBinding()] - param( + [System.Boolean] + $HotelEventsFromEmailEnabled, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-ArcConfig -{ - [CmdletBinding()] - param( + [System.Boolean] + $SkipAgendaMailOnFreeDays, + + [Parameter()] + [System.Boolean] + $DiningEventsFromEmailEnabled, - ) -} -function Get-ATPBuiltInProtectionRule -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Object] - $State - ) -} -function Get-AtpPolicyForO365 -{ - [CmdletBinding()] - param( + [System.Boolean] + $CreateEventsFromEmailAsPrivate, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-ATPProtectionPolicyRule -{ - [CmdletBinding()] - param( + [System.String] + $CalendarFeedsPreferredLanguage, + [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $PackageDeliveryEventsFromEmailEnabled, [Parameter()] [System.Object] - $State - ) -} -function Get-AuditConfig -{ - [CmdletBinding()] - param( + $WorkingHoursTimeZone, - ) -} -function Get-AuditConfigurationPolicy -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $Identity - ) -} -function Get-AuthenticationPolicy -{ - [CmdletBinding()] - param( + $WeatherLocations, + [Parameter()] - [System.String] - $TenantId, + [System.Boolean] + $FlightEventsFromEmailEnabled, [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $RentalCarEventsFromEmailEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowLegacyExchangeTokens - ) -} -function Get-AvailabilityAddressSpace -{ - [CmdletBinding()] - param( + [System.Boolean] + $DeleteMeetingRequestOnRespond, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-AvailabilityConfig -{ - [CmdletBinding()] - param( + [System.Int32] + $DefaultMeetingDuration, + [Parameter()] - [System.Object] - $Identity - ) -} -function Get-CalendarProcessing -{ - [CmdletBinding()] - param( + [System.Boolean] + $ReminderSoundEnabled, + [Parameter()] - [System.Object] - $Identity, + [System.TimeSpan] + $WorkingHoursEndTime, [Parameter()] [System.Object] - $ResultSize - ) -} -function Get-CASMailbox -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $RecalculateHasActiveSyncDevicePartnership, + $ShortenEventScopeDefault, [Parameter()] - [System.String] - $SortBy, + [System.Boolean] + $InvoiceEventsFromEmailEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ProtocolSettings, + [System.Boolean] + $UseBrightCalendarColorThemeInOwa, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ReadIsOptimizedForAccessibility, + [System.TimeSpan] + $DefaultReminderTime, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.Object] + $LocationDetailsInFreeBusy, [Parameter()] [System.Object] - $OrganizationalUnit, + $WeatherEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ActiveSyncDebugLogging, + [System.String] + $CalendarFeedsPreferredRegion, [Parameter()] - [System.Object] - $Identity, + [System.Boolean] + $ServiceAppointmentEventsFromEmailEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, + [System.Boolean] + $ShowWeekNumbers, [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [System.Boolean] + $RemindersEnabled, [Parameter()] [System.Object] - $ResultSize, + $WeekStartDay, [Parameter()] - [System.String] - $Filter, + [System.Object] + $FirstWeekOfYear, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $AgendaMailIntroductionEnabled, + + [Parameter()] + [System.TimeSpan] + $WorkingHoursStartTime, + + [Parameter()] + [System.String] + $CalendarFeedsRootPageId, + + [Parameter()] + [System.Object] + $DailyAgendaMailSchedule, + + [Parameter()] + [System.Int32] + $DefaultMinutesToReduceLongEventsBy, + + [Parameter()] + [System.Int32] + $DefaultMinutesToReduceShortEventsBy, + + [Parameter()] + [System.Boolean] + $AutoDeclineWhenBusy, + + [Parameter()] + [System.Object] + $OnlineMeetingsByDefaultEnabled, + + [Parameter()] + [System.Boolean] + $PreserveDeclinedMeetings, + + [Parameter()] + [System.Object] + $TimeIncrement, + + [Parameter()] + [System.Object] + $WorkDays, + + [Parameter()] + [System.Boolean] + $EntertainmentEventsFromEmailEnabled, + + [Parameter()] + [System.Boolean] + $EventsFromEmailEnabled, + + [Parameter()] + [System.Object] + $WeatherUnit, + + [Parameter()] + [System.Object] + $DefaultOnlineMeetingProvider, + + [Parameter()] + [System.Object] + $MailboxLocation, + + [Parameter()] + [System.Boolean] + $AgendaMailEnabled, + + [Parameter()] + [System.Boolean] + $AgendaPaneEnabled + ) +} + + + +function Get-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} + +function New-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $RetentionPolicyTagLinks, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultArbitrationMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm + ) +} + + +function Remove-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} + + +function Set-RetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object[]] + $RetentionPolicyTagLinks, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultArbitrationMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} + +function Get-SweepRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Int32] + $SkipCount, + + [Parameter()] + [System.String] + $Provider, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $BypassScopeCheck, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ResultSize + ) +} +function New-ServicePrincipal +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $ObjectId, + + [Parameter()] + [System.String] + $ServiceId, + + [Parameter()] + [System.String] + $AppId + ) +} +function New-SweepRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $DestinationFolder, + + [Parameter()] + [System.String] + $Provider, + + [Parameter()] + [System.Object] + $SystemCategory, + + [Parameter()] + [System.Object] + $KeepLatest, + + [Parameter()] + [System.Object] + $SourceFolder, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Sender, + + [Parameter()] + [System.Object] + $KeepForDays, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function Remove-ServicePrincipal +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Remove-SweepRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-ServicePrincipal +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-SweepRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $Sender, + + [Parameter()] + [System.String] + $Provider, + + [Parameter()] + [System.Object] + $SystemCategory, + + [Parameter()] + [System.Object] + $KeepLatest, + + [Parameter()] + [System.Object] + $SourceFolder, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DestinationFolder, + + [Parameter()] + [System.Object] + $KeepForDays, + + [Parameter()] + [System.Boolean] + $Enabled + ) +} + +function Get-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.String] + $Policy + ) +} + +function New-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $SenderIpRanges, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Domains, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.String] + $Policy + ) +} + +function Remove-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} + +function Set-ExoPhishSimOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $AddDomains, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.Object] + $AddSenderIpRanges, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $RemoveDomains, + + [Parameter()] + [System.Object] + $RemoveSenderIpRanges + ) +} + +function Get-DefaultTenantBriefingConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [PSObject] + $ResultSize + ) +} +function Get-DefaultTenantMyAnalyticsFeatureConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [PSObject] + $ResultSize + ) +} +function Set-DefaultTenantBriefingConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $IsEnabledByDefault, + + [Parameter()] + [PSObject] + $ResultSize + ) +} +function Set-DefaultTenantMyAnalyticsFeatureConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Feature, + + [Parameter()] + [System.Boolean] + $IsEnabled, + + [Parameter()] + [PSObject] + $ResultSize, + + [Parameter()] + [System.Nullable`1[System.Double]] + $SamplingRate + ) +} +#endregion +#region ExchangeOnlineManagement +function Add-AvailabilityAddressSpace +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.PSCredential] + $Credentials, + + [Parameter()] + [System.String] + $ForestName, + + [Parameter()] + [System.Uri] + $TargetAutodiscoverEpr, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $TargetTenantId, + + [Parameter()] + [System.String] + $TargetServiceEpr, + + [Parameter()] + [System.Object] + $AccessMethod + ) +} +function Add-MailboxPermission +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Owner, + + [Parameter()] + [System.Object[]] + $AccessRights, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $GroupMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Deny, + + [Parameter()] + [System.Object] + $AutoMapping, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $User, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, + + [Parameter()] + [System.DirectoryServices.ActiveDirectorySecurityInheritance] + $InheritanceType + ) +} +function Add-RecipientPermission +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $AccessRights, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Trustee + ) +} +function Get-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Policy + ) +} + +function New-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $Policy, + + [Parameter()] + [System.String] + $Comment + ) +} +function Remove-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-ExoSecOpsOverrideRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Disable-JournalRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Enable-JournalRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Enable-OrganizationCustomization +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm + ) +} +function Get-AcceptedDomain +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ResultSize + ) +} +function Get-ActiveSyncDevice +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $OrganizationalUnit, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ResultSize + ) +} + +function Get-ActiveSyncMailboxPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} + +function Get-ActiveSyncDeviceAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AddressBookPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AddressList +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SearchText, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $Container + ) +} +function Get-AdminAuditLogConfig +{ + [CmdletBinding()] + param( + + ) +} +function Get-AntiPhishPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Impersonation, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Advanced, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Spoof + ) +} +function Get-AntiPhishRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $State + ) +} +function Get-App +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $OrganizationApp, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $PrivateCatalog + ) +} +function Get-ApplicationAccessPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} + +function Get-ATPProtectionPolicyRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Identity, + + [Parameter()] + [System.String] + $State + ) +} + +function Get-AtpPolicyForO365 +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AuditConfig +{ + [CmdletBinding()] + param( + + ) +} +function Get-AuditConfigurationPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AuthenticationPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AvailabilityAddressSpace +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-AvailabilityConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-CalendarProcessing +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ResultSize + ) +} +function Get-CASMailbox +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $RecalculateHasActiveSyncDevicePartnership, + + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ProtocolSettings, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ReadIsOptimizedForAccessibility, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.Object] + $OrganizationalUnit, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ActiveSyncDebugLogging, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, + + [Parameter()] + [System.Object[]] + $RecipientTypeDetails, + + [Parameter()] + [System.Object] + $ResultSize, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ActiveSyncSuppressReadReceipt, + + [Parameter()] + [System.String] + $Anr + ) +} +function Get-CASMailboxPlan +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, + + [Parameter()] + [System.Object] + $ResultSize, + + [Parameter()] + [System.String] + $Filter + ) +} +function Get-ClientAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Get-ComplianceTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludingLabelState, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-DataClassification +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ClassificationRuleCollectionIdentity + ) +} +function Get-DataEncryptionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function Get-DeviceConditionalAccessPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-DeviceConditionalAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $CompareToWorkload, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DomainController + ) +} +function New-DeviceConditionalAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $CameraEnabled, + + [Parameter()] + [System.Object] + $EnableRemovableStorage, + + [Parameter()] + [System.Object] + $AntiVirusSignatureStatus, + + [Parameter()] + [System.Object] + $FirewallStatus, + + [Parameter()] + [System.Object] + $AllowAppStore, + + [Parameter()] + [System.Object] + $AllowAssistantWhileLocked, + + [Parameter()] + [System.Object] + $AllowiCloudBackup, + + [Parameter()] + [System.Object] + $AppsRating, + + [Parameter()] + [System.Object] + $PasswordHistoryCount, + + [Parameter()] + [System.Object] + $PasswordQuality, + + [Parameter()] + [System.Object] + $PasswordMinComplexChars, + + [Parameter()] + [System.Object] + $PhoneMemoryEncrypted, + + [Parameter()] + [System.String] + $EmailAddress, + + [Parameter()] + [System.Object] + $BluetoothEnabled, + + [Parameter()] + [System.Object] + $AllowConvenienceLogon, + + [Parameter()] + [System.Object] + $MaxPasswordGracePeriod, + + [Parameter()] + [System.Object] + $AllowiCloudDocSync, + + [Parameter()] + [System.Object] + $ForceAppStorePassword, + + [Parameter()] + [System.Object] + $Policy, + + [Parameter()] + [System.Object] + $TVShowsRating, + + [Parameter()] + [System.Object] + $AllowJailbroken, + + [Parameter()] + [System.Object] + $RequireEmailProfile, + + [Parameter()] + [System.Object] + $AllowDiagnosticSubmission, + + [Parameter()] + [System.Object] + $AutoUpdateStatus, + + [Parameter()] + [System.String] + $AccountUserName, + + [Parameter()] + [System.Object] + $WLANEnabled, + + [Parameter()] + [System.Object] + $AllowVoiceDialing, + + [Parameter()] + [System.String] + $AccountName, + + [Parameter()] + [System.Object] + $PasswordExpirationDays, + + [Parameter()] + [System.Object] + $PasswordTimeout, + + [Parameter()] + [System.Object] + $AllowiCloudPhotoSync, + + [Parameter()] + [System.Object] + $AllowSimplePassword, + + [Parameter()] + [System.Object] + $AllowPassbookWhileLocked, + + [Parameter()] + [System.Object] + $PasswordMinimumLength, + + [Parameter()] + [System.Object] + $AllowVideoConferencing, + + [Parameter()] + [System.Object] + $PasswordRequired, + + [Parameter()] + [System.Object] + $MaxPasswordAttemptsBeforeWipe, + + [Parameter()] + [System.Object] + $MoviesRating, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $DomainController, + + [Parameter()] + [System.Object] + $AntiVirusStatus, + + [Parameter()] + [System.String] + $WorkFoldersSyncUrl, + + [Parameter()] + [System.Object] + $UserAccountControlStatus, + + [Parameter()] + [System.Object] + $ForceEncryptedBackup, + + [Parameter()] + [System.String] + $ExchangeActiveSyncHost, + + [Parameter()] + [System.Object] + $AllowScreenshot, + + [Parameter()] + [System.Object] + $PasswordComplexity, + + [Parameter()] + [System.Object] + $TargetGroups, + + [Parameter()] + [System.Object] + $AllowVoiceAssistant, + + [Parameter()] + [System.Object] + $SystemSecurityTLS, + + [Parameter()] + [System.Object] + $RegionRatings, + + [Parameter()] + [System.Object] + $SmartScreenEnabled + ) +} +function Remove-DeviceConditionalAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-DeviceConditionalAccessRule +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $CameraEnabled, + + [Parameter()] + [System.Object] + $EnableRemovableStorage, + + [Parameter()] + [System.Object] + $AntiVirusSignatureStatus, + + [Parameter()] + [System.Object] + $FirewallStatus, + + [Parameter()] + [System.Object] + $AllowAppStore, + + [Parameter()] + [System.Object] + $AllowAssistantWhileLocked, + + [Parameter()] + [System.Object] + $AllowiCloudBackup, + + [Parameter()] + [System.Object] + $AppsRating, + + [Parameter()] + [System.Object] + $PasswordHistoryCount, + + [Parameter()] + [System.Object] + $PasswordQuality, + + [Parameter()] + [System.Object] + $PasswordMinComplexChars, + + [Parameter()] + [System.Object] + $PhoneMemoryEncrypted, + + [Parameter()] + [System.String] + $EmailAddress, + + [Parameter()] + [System.Object] + $BluetoothEnabled, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $AllowConvenienceLogon, + + [Parameter()] + [System.Object] + $MaxPasswordGracePeriod, + + [Parameter()] + [System.Object] + $AllowiCloudDocSync, + + [Parameter()] + [System.Object] + $ForceAppStorePassword, + + [Parameter()] + [System.Object] + $TVShowsRating, + + [Parameter()] + [System.Object] + $AllowJailbroken, + + [Parameter()] + [System.Object] + $RequireEmailProfile, + + [Parameter()] + [System.Object] + $AllowDiagnosticSubmission, + + [Parameter()] + [System.Object] + $AutoUpdateStatus, + + [Parameter()] + [System.String] + $AccountUserName, + + [Parameter()] + [System.Object] + $WLANEnabled, + + [Parameter()] + [System.Object] + $AllowVoiceDialing, + + [Parameter()] + [System.String] + $AccountName, + + [Parameter()] + [System.Object] + $PasswordExpirationDays, + + [Parameter()] + [System.Object] + $PasswordTimeout, + + [Parameter()] + [System.Object] + $AllowiCloudPhotoSync, + + [Parameter()] + [System.Object] + $AllowSimplePassword, + + [Parameter()] + [System.Object] + $AllowPassbookWhileLocked, + + [Parameter()] + [System.Object] + $PasswordMinimumLength, + + [Parameter()] + [System.Object] + $AllowVideoConferencing, + + [Parameter()] + [System.Object] + $PasswordRequired, + + [Parameter()] + [System.Object] + $MaxPasswordAttemptsBeforeWipe, + + [Parameter()] + [System.Object] + $MoviesRating, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $DomainController, + + [Parameter()] + [System.Object] + $AntiVirusStatus, + + [Parameter()] + [System.String] + $WorkFoldersSyncUrl, + + [Parameter()] + [System.Object] + $UserAccountControlStatus, + + [Parameter()] + [System.Object] + $ForceEncryptedBackup, + + [Parameter()] + [System.String] + $ExchangeActiveSyncHost, + + [Parameter()] + [System.Object] + $AllowScreenshot, + + [Parameter()] + [System.Object] + $PasswordComplexity, + + [Parameter()] + [System.Object] + $TargetGroups, + + [Parameter()] + [System.Object] + $AllowVoiceAssistant, + + [Parameter()] + [System.Object] + $SystemSecurityTLS, + + [Parameter()] + [System.Object] + $RegionRatings, + + [Parameter()] + [System.Object] + $SmartScreenEnabled + ) +} + +function Get-DeviceConfigurationPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-DistributionGroup +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromDLMembersWithDisplayNames, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromWithDisplayNames, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.Object] + $OrganizationalUnit, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object[]] + $RecipientTypeDetails, + + [Parameter()] + [System.Object] + $ManagedBy, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + + [Parameter()] + [System.Object] + $ResultSize, + + [Parameter()] + [System.String] + $Anr, + + [Parameter()] + [System.String] + $SortBy + ) +} +function Get-DistributionGroupMember +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeSoftDeletedObjects, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.Object] + $ResultSize + ) +} +function Get-DkimSigningConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-EmailAddressPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} +function Get-GlobalAddressList +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, [Parameter()] [System.Management.Automation.SwitchParameter] - $ActiveSyncSuppressReadReceipt, - - [Parameter()] - [System.String] - $Anr + $DefaultOnly ) } -function Get-CASMailboxPlan +function Get-Group { [CmdletBinding()] param( @@ -1246,16 +2721,16 @@ function Get-CASMailboxPlan $SortBy, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.Object] + $OrganizationalUnit, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, + [System.Object[]] + $RecipientTypeDetails, [Parameter()] [System.Object] @@ -1263,23 +2738,32 @@ function Get-CASMailboxPlan [Parameter()] [System.String] - $Filter + $Filter, + + [Parameter()] + [System.String] + $Anr ) } -function Get-ComplianceTag +function Get-HostedConnectionFilterPolicy { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludingLabelState, - + [System.Object] + $Identity + ) +} +function Get-HostedContentFilterPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] $Identity ) } -function Get-DataClassification +function Get-HostedContentFilterRule { [CmdletBinding()] param( @@ -1289,36 +2773,45 @@ function Get-DataClassification [Parameter()] [System.Object] - $ClassificationRuleCollectionIdentity + $State ) } -function Get-DataEncryptionPolicy +function Get-HostedOutboundSpamFilterPolicy { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - + [System.Object] + $Identity + ) +} +function Get-HostedOutboundSpamFilterRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] $Identity, [Parameter()] [System.Object] - $DomainController + $State ) } -function Get-DeviceConditionalAccessPolicy +function Get-InboundConnector { [CmdletBinding()] param( [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $ResultSize ) } -function Get-DeviceConditionalAccessRule +function Get-IntraOrganizationConnector { [CmdletBinding()] param( @@ -1327,16 +2820,14 @@ function Get-DeviceConditionalAccessRule $Identity ) } -function Get-DeviceConfigurationPolicy +function Get-IRMConfiguration { [CmdletBinding()] param( - [Parameter()] - [System.Object] - $Identity + ) } -function Get-DeviceConfigurationRule +function Get-JournalRule { [CmdletBinding()] param( @@ -1345,49 +2836,65 @@ function Get-DeviceConfigurationRule $Identity ) } -function Get-DistributionGroup +function Get-Mailbox { [CmdletBinding()] param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Object] + $Identity, + [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeGrantSendOnBehalfToWithDisplayNames, + $InactiveMailboxOnly, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromWithDisplayNames, + $PublicFolder, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.String] + $Anr, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeModeratedByWithDisplayNames, + $Archive, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Management.Automation.SwitchParameter] + $SoftDeletedMailbox, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeBypassModerationFromSendersOrMembersWithDisplayNames, + $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $IncludeAcceptMessagesOnlyFromWithDisplayNames, [Parameter()] [System.Management.Automation.SwitchParameter] $IncludeAcceptMessagesOnlyFromDLMembersWithDisplayNames, + [Parameter()] + [System.Object] + $ResultSize, + + [Parameter()] + [System.Object] + $MailboxPlan, + [Parameter()] [System.Object[]] $RecipientTypeDetails, [Parameter()] - [System.Object] - $ResultSize, + [System.Management.Automation.SwitchParameter] + $Migration, [Parameter()] [System.String] @@ -1395,271 +2902,407 @@ function Get-DistributionGroup [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + $GroupMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeInactiveMailbox, [Parameter()] [System.Object] - $ManagedBy, + $OrganizationalUnit, [Parameter()] - [System.String] - $Anr, + [System.Management.Automation.SwitchParameter] + $IncludeEmailAddressDisplayNames + ) +} +function Get-MailboxAuditBypassAssociation +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity, [Parameter()] - [System.String] - $SortBy + [System.Object] + $ResultSize ) } -function Get-DistributionGroupMember +function Get-MailboxAutoReplyConfiguration { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedObjects, + $ReadFromDomainController, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, [Parameter()] [System.Management.Automation.PSCredential] $Credential, + [Parameter()] + [System.Object] + $Identity, + [Parameter()] [System.Object] $ResultSize ) } -function Get-DkimSigningConfig +function Get-MailboxCalendarFolder { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, + [Parameter()] [System.Object] $Identity ) } -function Get-DnssecStatusForVerifiedDomain +function Get-MailboxFolder { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipMtaStsValidation, + $MailFolderOnly, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $GetChildren, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipMxValidation, + [System.Object] + $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipDnsValidation, + [System.Object] + $ResultSize, [Parameter()] - [System.String] - $DomainName + [System.Management.Automation.SwitchParameter] + $Recurse ) } -function Get-EmailAddressPolicy +function Get-MailboxFolderPermission { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Identity - ) -} -function Get-EmailTenantSettings -{ - [CmdletBinding()] - param( + [System.Int32] + $SkipCount, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $GroupMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-EOPProtectionPolicyRule -{ - [CmdletBinding()] - param( + $User, + [Parameter()] [System.Object] $Identity, [Parameter()] [System.Object] - $State + $ResultSize ) } -function Get-ExoPhishSimOverrideRule +function Set-MailboxFolderPermission { [CmdletBinding()] param( + [Parameter()] + [System.Object[]] + $AccessRights, + + [Parameter()] + [System.Object] + $SharingPermissionFlags, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity, + $User, [Parameter()] [System.Object] - $Policy, + $Identity, [Parameter()] - [System.Object] - $DomainController + [System.Boolean] + $SendNotificationToUser ) } -function Get-ExoSecOpsOverrideRule +function Add-MailboxFolderPermission { [CmdletBinding()] param( + [Parameter()] + [System.Object[]] + $AccessRights, + + [Parameter()] + [System.Object] + $SharingPermissionFlags, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity, + $User, [Parameter()] [System.Object] - $Policy, + $Identity, [Parameter()] - [System.Object] - $DomainController + [System.Boolean] + $SendNotificationToUser ) } -function Get-ExternalInOutlook +function Remove-MailboxFolderPermission { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-FocusedInbox -{ - [CmdletBinding()] - param( + $User, + + [Parameter()] + [System.Object] + $Identity, + [Parameter()] [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + $ResetDelegateUserCollection, [Parameter()] - [System.Object] - $Identity + [System.Boolean] + $SendNotificationToUser, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force ) } -function Get-Group +function Get-MailboxFolderStatistics { [CmdletBinding()] param( + [Parameter()] + [System.Object] + $Database, + [Parameter()] [System.String] - $SortBy, + $DiagnosticInfo, [Parameter()] [System.Object] - $OrganizationalUnit, + $StoreMailboxIdentity, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $IncludeOldestAndNewestItems, [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Archive, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeSoftDeletedRecipients, + + [Parameter()] + [System.Int32] + $SkipCount, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeAnalysis, [Parameter()] [System.Object] $ResultSize, [Parameter()] - [System.String] - $Filter, + [System.Object] + $FolderScope, - [Parameter()] - [System.String] - $Anr - ) -} -function Get-HostedConnectionFilterPolicy -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] $Identity ) } -function Get-HostedContentFilterPolicy +function Get-MailboxPermission { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ReadFromDomainController, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeUnresolvedPermissions, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $GroupMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeSoftDeletedUserPermissions, + [Parameter()] [System.Object] - $Identity - ) -} -function Get-HostedContentFilterRule -{ - [CmdletBinding()] - param( + $User, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Owner, + [Parameter()] [System.Object] $Identity, + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SoftDeletedMailbox, + [Parameter()] [System.Object] - $State + $ResultSize ) } -function Get-HostedOutboundSpamFilterPolicy +function Get-MailboxPlan { [CmdletBinding()] param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Management.Automation.PSCredential] + $Credential, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IgnoreDefaultScope, + [Parameter()] [System.Object] - $Identity + $ResultSize, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllMailboxPlanReleases ) } -function Get-HostedOutboundSpamFilterRule +function Get-MailboxRegionalConfiguration { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $VerifyDefaultFolderNameLanguage, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseCustomRouting, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Archive, + [Parameter()] [System.Object] $Identity, [Parameter()] [System.Object] - $State + $MailboxLocation ) } -function Get-InboundConnector +function Get-MailContact { [CmdletBinding()] param( + [Parameter()] + [System.String] + $SortBy, + + [Parameter()] + [System.Object] + $OrganizationalUnit, + [Parameter()] [System.Object] $Identity, + [Parameter()] + [System.Object[]] + $RecipientTypeDetails, + [Parameter()] [System.Object] - $ResultSize + $ResultSize, + + [Parameter()] + [System.String] + $Filter, + + [Parameter()] + [System.String] + $Anr ) } -function Get-IntraOrganizationConnector +function Get-MalwareFilterPolicy { [CmdletBinding()] param( @@ -1668,210 +3311,236 @@ function Get-IntraOrganizationConnector $Identity ) } -function Get-IRMConfiguration +function Get-MalwareFilterRule { [CmdletBinding()] param( + [Parameter()] + [System.Object] + $Identity, - ) -} -function Get-JournalRule -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $Identity + $State ) } -function Get-M365DataAtRestEncryptionPolicy + +function Get-ManagementRoleEntry { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] + [System.String] $Identity, [Parameter()] - [System.Object] - $DomainController + [System.String] + $ResultSize ) } -function Get-M365DataAtRestEncryptionPolicyAssignment + +function Get-MgBetaRoleManagementEntitlementManagementRoleAssignment { [CmdletBinding()] param( + [Parameter()] + [System.String] + $UnifiedRoleAssignmentId, + + [Parameter()] + [System.String] + $Filter, + [Parameter()] + [Switch] + $All ) } -function Get-Mailbox +function Update-MgBetaEntitlementManagementSetting { [CmdletBinding()] param( [Parameter()] [System.String] - $SortBy, + $Id, [Parameter()] - [System.Object] - $Identity, + [PSObject] + $HttpPipelinePrepend, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeForwardingAddressWithDisplayNames, + [PSObject] + $BodyParameter, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + [System.Uri] + $Proxy, + + [Parameter()] + [System.Management.Automation.PSCredential] + $ProxyCredential, [Parameter()] [System.String] - $Anr, + $ResponseHeadersVariable, [Parameter()] [System.Management.Automation.SwitchParameter] - $Archive, + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SoftDeletedMailbox, + [PSObject] + $HttpPipelineAppend, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromWithDisplayNames, + $ProxyUseDefaultCredentials, + + [Parameter()] + [System.Collections.IDictionary] + $Headers, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromDLMembersWithDisplayNames, + $Break, [Parameter()] - [System.Object] - $ResultSize, + [System.Collections.Hashtable] + $AdditionalProperties, [Parameter()] - [System.Object] - $MailboxPlan, + [System.Int32] + $DaysUntilExternalUserDeletedAfterBlocked, + + [Parameter()] + [System.String] + $ExternalUserLifecycleAction + ) +} +function Get-MgBetaEntitlementManagementSetting +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [PSObject] + $HttpPipelinePrepend, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Migration, + [System.Uri] + $Proxy, [Parameter()] - [System.Object] - $OrganizationalUnit, + [System.Management.Automation.PSCredential] + $ProxyCredential, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeGrantSendOnBehalfToWithDisplayNames, + [System.String[]] + $ExpandProperty, [Parameter()] [System.String] - $Filter, + $ResponseHeadersVariable, [Parameter()] - [System.Management.Automation.SwitchParameter] - $GroupMailbox, + [PSObject] + $HttpPipelineAppend, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeInactiveMailbox, + $ProxyUseDefaultCredentials, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + [System.Collections.IDictionary] + $Headers, [Parameter()] - [System.Management.Automation.SwitchParameter] - $InactiveMailboxOnly, + [System.String[]] + $Property, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeEmailAddressDisplayNames + $Break ) } -function Get-MailboxAuditBypassAssociation + +function Get-MgBetaRoleManagementEntitlementManagementRoleDefinition { [CmdletBinding()] param( [Parameter()] - [System.Object] - $Identity, + [System.String] + $UnifiedRoleDefinitionId, [Parameter()] - [System.Object] - $ResultSize + [System.String] + $Filter, + + [Parameter()] + [Switch] + $All ) } -function Get-MailboxAutoReplyConfiguration + +function Get-MgBetaPolicyAuthenticationFlowPolicy +{ + [CmdletBinding()] + param() +} + +function Update-MgBetaPolicyAuthenticationFlowPolicy { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $ReadFromDomainController, + [System.Boolean] + $SelfServiceSignUp + ) +} +function New-MgBetaRoleManagementEntitlementManagementRoleAssignment +{ + [CmdletBinding()] + param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + [System.String] + $AppScopeId, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.String] + $DirectoryScopeId, [Parameter()] - [System.Object] - $Identity, + [System.String] + $PrincipalId, [Parameter()] - [System.Object] - $ResultSize + [System.String] + $RoleDefinitionId ) } -function Get-MailboxCalendarConfiguration -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $MailboxLocation, - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-MailboxCalendarFolder +function Remove-MgBetaRoleManagementEntitlementManagementRoleAssignment { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, - - [Parameter()] - [System.Object] - $Identity + [System.String] + $UnifiedRoleAssignmentId ) } -function Get-MailboxFolder + +function Get-MigrationEndpoint { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $MailFolderOnly, + [System.String] + $DiagnosticInfo, [Parameter()] - [System.Management.Automation.SwitchParameter] - $GetChildren, + [System.Object] + $Type, [Parameter()] [System.Object] @@ -1879,270 +3548,286 @@ function Get-MailboxFolder [Parameter()] [System.Object] - $ResultSize, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Recurse + $Partition ) } -function Get-MailboxFolderPermission + +function Set-MigrationEndpoint { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $SkipCount, + [System.Object] + $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $GroupMailbox, + [System.Boolean] + $AcceptUntrustedCertificates, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + [System.Object] + $MaxConcurrentMigrations, [Parameter()] - [System.Object] - $User, + [System.Byte[]] + $ServiceAccountKeyFileData, [Parameter()] [System.Object] - $Identity, + $TestMailbox, [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-MailboxFolderStatistics -{ - [CmdletBinding()] - param( + [System.String] + $ExchangeServer, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $SkipVerification, + [Parameter()] [System.Object] - $Database, + $Authentication, [Parameter()] [System.String] - $DiagnosticInfo, + $AppSecretKeyVaultUrl, [Parameter()] [System.Object] - $StoreMailboxIdentity, + $Port, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeOldestAndNewestItems, + [System.String] + $ApplicationId, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + [System.Object] + $RemoteServer, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Archive, + [System.Object] + $Partition, + + [Parameter()] + [System.Object] + $MailboxPermission, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedRecipients, + $Confirm, [Parameter()] - [System.Int32] - $SkipCount, + [System.String] + $SourceMailboxLegacyDN, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAnalysis, + [System.String] + $NspiServer, [Parameter()] [System.Object] - $ResultSize, + $RPCProxyServer, [Parameter()] - [System.Object] - $FolderScope, + [System.String] + $PublicFolderDatabaseServerLegacyDN, [Parameter()] [System.Object] - $Identity - ) -} -function Get-MailboxIRMAccess -{ - [CmdletBinding()] - param( + $Security, + [Parameter()] [System.Object] - $User, + $MaxConcurrentIncrementalSyncs, [Parameter()] - [System.Object] - $Identity + [System.Management.Automation.PSCredential] + $Credentials ) } -function Get-MailboxPermission + +function New-MigrationEndpoint { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $ReadFromDomainController, + $AcceptUntrustedCertificates, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeUnresolvedPermissions, + [System.String] + $Name, [Parameter()] [System.Management.Automation.SwitchParameter] - $GroupMailbox, + $ExchangeRemoteMove, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + [System.Object] + $MaxConcurrentMigrations, + + [Parameter()] + [System.Byte[]] + $ServiceAccountKeyFileData, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedUserPermissions, + $PublicFolder, [Parameter()] [System.Object] - $User, + $TestMailbox, + + [Parameter()] + [System.String] + $ExchangeServer, [Parameter()] [System.Management.Automation.SwitchParameter] - $Owner, + $SkipVerification, [Parameter()] [System.Object] - $Identity, + $Authentication, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.Management.Automation.SwitchParameter] + $ExchangeOutlookAnywhere, [Parameter()] [System.Management.Automation.SwitchParameter] - $SoftDeletedMailbox, + $Gmail, - [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-MailboxPlan -{ - [CmdletBinding()] - param( [Parameter()] [System.String] - $SortBy, + $AppSecretKeyVaultUrl, [Parameter()] - [System.Management.Automation.PSCredential] - $Credential, + [System.Management.Automation.SwitchParameter] + $Compliance, + + [Parameter()] + [System.Int32] + $Port, + + [Parameter()] + [System.Security.SecureString] + $OAuthCode, [Parameter()] [System.String] - $Filter, + $ApplicationId, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDefaultScope, + [System.Object] + $RemoteServer, [Parameter()] [System.Object] - $ResultSize, + $Partition, [Parameter()] [System.Object] - $Identity, + $MailboxPermission, [Parameter()] [System.Management.Automation.SwitchParameter] - $AllMailboxPlanReleases - ) -} -function Get-MailboxRegionalConfiguration -{ - [CmdletBinding()] - param( + $Confirm, + [Parameter()] - [System.Management.Automation.SwitchParameter] - $VerifyDefaultFolderNameLanguage, + [System.String] + $SourceMailboxLegacyDN, [Parameter()] [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + $IMAP, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Archive, + [System.String] + $RemoteTenant, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $PublicFolderToUnifiedGroup, [Parameter()] - [System.Object] - $MailboxLocation - ) -} -function Get-MailContact -{ - [CmdletBinding()] - param( + [System.String] + $NspiServer, + [Parameter()] [System.String] - $SortBy, + $RedirectUri, [Parameter()] [System.Object] - $OrganizationalUnit, + $RPCProxyServer, [Parameter()] [System.Object] - $Identity, + $EmailAddress, [Parameter()] - [System.Object[]] - $RecipientTypeDetails, + [System.Object] + $Security, [Parameter()] [System.Object] - $ResultSize, + $MaxConcurrentIncrementalSyncs, [Parameter()] [System.String] - $Filter, + $PublicFolderDatabaseServerLegacyDN, [Parameter()] - [System.String] - $Anr + [System.Management.Automation.PSCredential] + $Credentials, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Autodiscover ) } -function Get-MalwareFilterPolicy + +function Remove-MigrationEndpoint { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Object] + $Partition ) } -function Get-MalwareFilterRule + +function Set-ManagementRoleEntry { [CmdletBinding()] param( [Parameter()] - [System.Object] + [System.String] $Identity, [Parameter()] - [System.Object] - $State + [System.String[]] + $Parameters, + + [Parameter()] + [Switch] + $AddParameter, + + [Parameter()] + [Switch] + $RemoveParameter ) } + function Get-ManagementRole { [CmdletBinding()] @@ -2253,161 +3938,17 @@ function Get-ManagementRoleAssignment $RoleAssignee ) } -function Get-ManagementRoleEntry -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object[]] - $Type, - - [Parameter()] - [System.String] - $PSSnapinName, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.String[]] - $Parameters, - - [Parameter()] - [System.Object] - $ResultSize - ) -} -function Get-ManagementScope -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Boolean] - $Exclusive, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Orphan - ) -} -function Get-MeetingInsightsSettings -{ - [CmdletBinding()] - param( - - ) -} function Get-MessageClassification { - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeLocales - ) -} -function Get-MigrationBatch -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DiagnosticInfo, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeReport, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Partition, - - [Parameter()] - [System.Object] - $ResultSize, - - [Parameter()] - [System.Object] - $Status, - - [Parameter()] - [System.Object] - $Endpoint - ) -} -function Get-MigrationEndpoint -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DiagnosticInfo, - - [Parameter()] - [System.Object] - $Type, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Partition - ) -} -function Get-MigrationUser -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $EmailAddress, - - [Parameter()] - [System.Object] - $MailboxGuid, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAssociatedUsers, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $BatchId, - - [Parameter()] - [System.Object] - $Partition, - - [Parameter()] - [System.Object] - $ResultSize, - + [CmdletBinding()] + param( [Parameter()] [System.Object] - $Status, + $Identity, [Parameter()] - [System.Object] - $StatusSummary + [System.Management.Automation.SwitchParameter] + $IncludeLocales ) } function Get-MobileDevice @@ -2464,6 +4005,15 @@ function Get-MobileDeviceMailboxPolicy $Identity ) } +function Get-OfflineAddressBook +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $Identity + ) +} function Get-OMEConfiguration { [CmdletBinding()] @@ -2567,13 +4117,6 @@ function Get-Place $ResultSize ) } -function Get-PolicyConfig -{ - [CmdletBinding()] - param( - - ) -} function Get-PolicyTipConfig { [CmdletBinding()] @@ -2744,40 +4287,6 @@ function Get-ResourceConfig ) } -function Get-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-RetentionPolicyTag -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OptionalInMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeSystemTags, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object[]] - $Types - ) -} function Get-RoleAssignmentPolicy { [CmdletBinding()] @@ -2882,25 +4391,7 @@ function Get-ServicePrincipal $Organization ) } -function Get-SharingPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-SupervisoryReviewPolicyV2 -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $Identity - ) -} -function Get-SupervisoryReviewRule +function Get-ServicePrincipal { [CmdletBinding()] param( @@ -2910,39 +4401,19 @@ function Get-SupervisoryReviewRule [Parameter()] [System.Object] - $Policy + $Organization ) } -function Get-SweepRule +function Get-SharingPolicy { [CmdletBinding()] param( - [Parameter()] - [System.Int32] - $SkipCount, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $BypassScopeCheck, - - [Parameter()] - [System.Object] - $Identity, - [Parameter()] [System.Object] - $ResultSize + $Identity ) } -function Get-TeamsProtectionPolicy +function Get-SupervisoryReviewPolicyV2 { [CmdletBinding()] param( @@ -2951,58 +4422,17 @@ function Get-TeamsProtectionPolicy $Identity ) } -function Get-TenantAllowBlockListItems +function Get-SupervisoryReviewRule { [CmdletBinding()] param( - [Parameter()] - [System.DateTime] - $ExpirationDate, - - [Parameter()] - [System.Object[]] - $ListSubType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Block, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OutputJson, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $NoExpiration, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Allow, - - [Parameter()] - [System.String] - $Entry, - [Parameter()] [System.Object] - $ListType - ) -} -function Get-TenantAllowBlockListSpoofItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Action, - - [Parameter()] - [System.String] - $SpoofType, + $Identity, [Parameter()] [System.Object] - $Identity + $Policy ) } function Get-TransportConfig @@ -3041,54 +4471,57 @@ function Get-TransportRule $Identity ) } -function Get-UnifiedGroup + +function Get-UnifiedAuditLogRetentionPolicy { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeGrantSendOnBehalfToWithDisplayNames, + [System.String] + $Operation, [Parameter()] [System.String] - $SortBy, + $RecordType, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeSoftDeletedGroups, + [System.String] + $RetentionDuration, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeAcceptMessagesOnlyFromSendersOrMembersWithDisplayNames, + [System.String] + $UserId + ) +} + +function Get-UnifiedGroup +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SortBy, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeModeratedByWithDisplayNames, + $IncludeSoftDeletedGroups, [Parameter()] [System.Management.Automation.SwitchParameter] $IncludeAllProperties, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeBypassModerationFromSendersOrMembersWithDisplayNames, + [System.String] + $Filter, [Parameter()] [System.Object] $Identity, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeRejectMessagesFromSendersOrMembersWithDisplayNames, - [Parameter()] [System.Object] $ResultSize, - [Parameter()] - [System.String] - $Filter, - [Parameter()] [System.String] $Anr @@ -3156,6 +4589,7 @@ function New-ActiveSyncDeviceAccessRule $AccessLevel ) } + function New-ActiveSyncMailboxPolicy { [CmdletBinding()] @@ -3253,476 +4687,150 @@ function New-ActiveSyncMailboxPolicy $AllowSMIMEEncryptionAlgorithmNegotiation, [Parameter()] - [System.Boolean] - $DeviceEncryptionEnabled, - - [Parameter()] - [System.Object] - $MaxEmailBodyTruncationSize, - - [Parameter()] - [System.Object] - $AllowBluetooth, - - [Parameter()] - [System.Object] - $RequireEncryptionSMIMEAlgorithm, - - [Parameter()] - [System.Object] - $DevicePolicyRefreshInterval, - - [Parameter()] - [System.Boolean] - $AllowMobileOTAUpdate, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $MaxAttachmentSize, - - [Parameter()] - [System.Boolean] - $AllowConsumerEmail, - - [Parameter()] - [System.Boolean] - $AllowDesktopSync, - - [Parameter()] - [System.Object] - $MaxInactivityTimeDeviceLock, - - [Parameter()] - [System.Boolean] - $AlphanumericDevicePasswordRequired, - - [Parameter()] - [System.Boolean] - $RequireStorageCardEncryption, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $AttachmentsEnabled, - - [Parameter()] - [System.Boolean] - $AllowSMIMESoftCerts, - - [Parameter()] - [System.Object] - $MaxEmailAgeFilter, - - [Parameter()] - [System.Boolean] - $AllowSimpleDevicePassword, - - [Parameter()] - [System.Boolean] - $PasswordRecoveryEnabled, - - [Parameter()] - [System.Object] - $MaxCalendarAgeFilter, - - [Parameter()] - [System.Boolean] - $AllowWiFi, - - [Parameter()] - [System.Boolean] - $AllowApplePushNotifications, - - [Parameter()] - [System.Boolean] - $AllowPOPIMAPEmail, - - [Parameter()] - [System.Boolean] - $IsDefault, - - [Parameter()] - [System.Boolean] - $IsDefaultPolicy, - - [Parameter()] - [System.Object] - $ApprovedApplicationList, - - [Parameter()] - [System.Boolean] - $AllowTextMessaging, - - [Parameter()] - [System.Boolean] - $WSSAccessEnabled, - - [Parameter()] - [System.Boolean] - $RequireSignedSMIMEMessages, - - [Parameter()] - [System.Boolean] - $AllowHTMLEmail, - - [Parameter()] - [System.Object] - $MinDevicePasswordLength, - - [Parameter()] - [System.Boolean] - $IrmEnabled - ) -} -function New-AntiPhishPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $DmarcQuarantineAction, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $MakeDefault, - - [Parameter()] - [System.Int32] - $PhishThresholdLevel, - - [Parameter()] - [System.Boolean] - $EnableTargetedDomainsProtection, - - [Parameter()] - [System.Boolean] - $HonorDmarcPolicy, - - [Parameter()] - [System.Boolean] - $Enabled, - - [Parameter()] - [System.Boolean] - $EnableViaTag, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $TargetedDomainsToProtect, - - [Parameter()] - [System.Boolean] - $EnableSpoofIntelligence, - - [Parameter()] - [System.Boolean] - $EnableSimilarUsersSafetyTips, - - [Parameter()] - [System.Object] - $ExcludedDomains, - - [Parameter()] - [System.Object] - $MailboxIntelligenceProtectionAction, - - [Parameter()] - [System.Object] - $TargetedDomainActionRecipients, - - [Parameter()] - [System.Boolean] - $EnableMailboxIntelligence, - - [Parameter()] - [System.Boolean] - $EnableFirstContactSafetyTips, - - [Parameter()] - [System.String] - $TargetedDomainQuarantineTag, - - [Parameter()] - [System.String] - $SimilarUsersSafetyTipsCustomText, - - [Parameter()] - [System.Object] - $ImpersonationProtectionState, - - [Parameter()] - [System.Object] - $MailboxIntelligenceProtectionActionRecipients, - - [Parameter()] - [System.Object] - $TargetedDomainProtectionAction, - - [Parameter()] - [System.String] - $AdminDisplayName, - - [Parameter()] - [System.Object] - $TargetedUsersToProtect, - - [Parameter()] - [System.Object] - $TargetedUserProtectionAction, - - [Parameter()] - [System.Object] - $RecommendedPolicyType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $MailboxIntelligenceQuarantineTag, - - [Parameter()] - [System.String] - $UnusualCharactersSafetyTipsCustomText, - - [Parameter()] - [System.Boolean] - $EnableSimilarDomainsSafetyTips, - - [Parameter()] - [System.String] - $SpoofQuarantineTag, - - [Parameter()] - [System.Boolean] - $EnableUnauthenticatedSender, - - [Parameter()] - [System.Object] - $DmarcRejectAction, - - [Parameter()] - [System.String] - $PolicyTag, - - [Parameter()] - [System.String] - $TargetedUserQuarantineTag, - - [Parameter()] - [System.Boolean] - $EnableOrganizationDomainsProtection, - - [Parameter()] - [System.Boolean] - $EnableMailboxIntelligenceProtection, - - [Parameter()] - [System.Boolean] - $EnableUnusualCharactersSafetyTips, - - [Parameter()] - [System.Boolean] - $EnableTargetedUserProtection, - - [Parameter()] - [System.Object] - $AuthenticationFailAction, - - [Parameter()] - [System.Object] - $TargetedUserActionRecipients, - - [Parameter()] - [System.Object] - $ExcludedSenders - ) -} -function New-AntiPhishRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Int32] - $Priority, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $SentToMemberOf, - - [Parameter()] - [System.Object] - $AntiPhishPolicy, - - [Parameter()] - [System.Object[]] - $SentTo, - - [Parameter()] - [System.String] - $Comments, - - [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.Boolean] + $DeviceEncryptionEnabled, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Object] + $MaxEmailBodyTruncationSize, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Object] + $AllowBluetooth, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $RequireEncryptionSMIMEAlgorithm, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.Object] + $DevicePolicyRefreshInterval, [Parameter()] [System.Boolean] - $Enabled - ) -} -function New-App -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Uri] - $Url, + $AllowMobileOTAUpdate, [Parameter()] [System.String] - $Identity, + $Name, + + [Parameter()] + [System.Object] + $MaxAttachmentSize, [Parameter()] [System.Boolean] - $Enabled, + $AllowConsumerEmail, [Parameter()] - [System.Object] - $AddInOverrides, + [System.Boolean] + $AllowDesktopSync, [Parameter()] [System.Object] - $Mailbox, + $MaxInactivityTimeDeviceLock, [Parameter()] - [System.IO.Stream] - $FileStream, + [System.Boolean] + $AlphanumericDevicePasswordRequired, [Parameter()] - [System.String] - $MarketplaceServicesUrl, + [System.Boolean] + $RequireStorageCardEncryption, [Parameter()] - [System.String] - $Etoken, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.String] - $MarketplaceCorrelationID, + [System.Boolean] + $AttachmentsEnabled, [Parameter()] - [System.String] - $Version, + [System.Boolean] + $AllowSMIMESoftCerts, [Parameter()] [System.Object] - $DefaultStateForUser, + $MaxEmailAgeFilter, [Parameter()] - [System.String] - $MarketplaceQueryMarket, + [System.Boolean] + $AllowSimpleDevicePassword, [Parameter()] - [System.String] - $MarketplaceUserProfileType, + [System.Boolean] + $PasswordRecoveryEnabled, [Parameter()] [System.Object] - $AllowSetting, + $MaxCalendarAgeFilter, [Parameter()] - [System.Management.Automation.SwitchParameter] - $DownloadOnly, + [System.Boolean] + $AllowWiFi, [Parameter()] - [System.Object] - $ProvidedTo, + [System.Boolean] + $AllowApplePushNotifications, [Parameter()] - [System.Object] - $UserList, + [System.Boolean] + $AllowPOPIMAPEmail, [Parameter()] - [System.String] - $AppState, + [System.Boolean] + $IsDefault, [Parameter()] - [System.Management.Automation.SwitchParameter] - $OrganizationApp, + [System.Boolean] + $IsDefaultPolicy, [Parameter()] - [System.String] - $AppType, + [System.Object] + $ApprovedApplicationList, [Parameter()] - [System.String] - $MarketplaceAssetID, + [System.Boolean] + $AllowTextMessaging, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $WSSAccessEnabled, [Parameter()] - [System.Byte[]] - $FileData, + [System.Boolean] + $RequireSignedSMIMEMessages, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowReadWriteMailbox, + [System.Boolean] + $AllowHTMLEmail, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrivateCatalog, + [System.Object] + $MinDevicePasswordLength, [Parameter()] - [System.Management.Automation.SwitchParameter] - $UpdateAppState + [System.Boolean] + $IrmEnabled ) } -function New-ApplicationAccessPolicy + +function New-AddressBookPolicy { [CmdletBinding()] param( [Parameter()] - [System.String] - $Description, + [System.Object] + $RoomList, [Parameter()] [System.Object] - $PolicyScopeGroupId, + $OfflineAddressBook, + + [Parameter()] + [System.String] + $Name, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -3730,313 +4838,289 @@ function New-ApplicationAccessPolicy [Parameter()] [System.Object] - $AccessRight, + $GlobalAddressList, [Parameter()] - [System.String[]] - $AppId + [System.Object[]] + $AddressLists ) } -function New-ATPProtectionPolicyRule +function New-AddressList { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $Priority, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $SentToMemberOf, + $RecipientFilter, [Parameter()] - [System.Object[]] - $SentTo, + [System.Object] + $ConditionalCustomAttribute8, [Parameter()] [System.String] - $Comments, - - [Parameter()] - [System.Object[]] - $RecipientDomainIs, - - [Parameter()] - [System.Object] - $SafeAttachmentPolicy, + $DisplayName, [Parameter()] [System.Object] - $SafeLinksPolicy, - - [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + $ConditionalCustomAttribute10, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.String] + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute9, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.Object] + $ConditionalCustomAttribute2, [Parameter()] - [System.Boolean] - $Enabled - ) -} -function New-AuthenticationPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, + [System.Object] + $IncludedRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPop, + [System.Object] + $ConditionalCompany, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthSmtp, + [System.Object] + $ConditionalCustomAttribute6, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthMapi, + [System.Object] + $ConditionalCustomAttribute3, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthImap, + [System.Object] + $ConditionalCustomAttribute12, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthAutodiscover, + [System.Object] + $Container, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthPowershell, + [System.Object] + $ConditionalCustomAttribute13, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthRpc, + [System.Object] + $ConditionalCustomAttribute15, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOfflineAddressBook, + [System.Object] + $ConditionalDepartment, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthReportingWebServices, + [System.Object] + $ConditionalStateOrProvince, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthOutlookService, + [System.Object] + $ConditionalCustomAttribute7, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute14, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthActiveSync, + [System.Object] + $ConditionalCustomAttribute4, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowBasicAuthWebServices - ) -} -function New-AvailabilityConfig -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute11, [Parameter()] [System.Object] - $OrgWideAccount, + $ConditionalCustomAttribute1, [Parameter()] [System.Object] - $AllowedTenantIds + $ConditionalCustomAttribute5 ) } -function New-DataEncryptionPolicy +function New-AntiPhishPolicy { [CmdletBinding()] param( [Parameter()] - [System.String] - $Description, + [System.Boolean] + $EnableFirstContactSafetyTips, [Parameter()] - [System.String] - $Name, + [System.Management.Automation.SwitchParameter] + $MakeDefault, [Parameter()] [System.Object] - $DomainController, + $DmarcRejectAction, + + [Parameter()] + [System.Int32] + $PhishThresholdLevel, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $AzureKeyIDs, + [System.Boolean] + $EnableTargetedDomainsProtection, [Parameter()] [System.Boolean] - $Enabled - ) -} -function New-DistributionGroup -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $ModeratedBy, + $HonorDmarcPolicy, [Parameter()] [System.Boolean] - $RequireSenderAuthenticationEnabled, + $Enabled, [Parameter()] [System.Boolean] - $ModerationEnabled, + $EnableViaTag, [Parameter()] [System.String] - $DisplayName, + $Name, [Parameter()] [System.Object] - $MemberDepartRestriction, + $TargetedDomainsToProtect, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $EnableSpoofIntelligence, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreNamingPolicy, + [System.Boolean] + $EnableSimilarUsersSafetyTips, [Parameter()] - [System.Management.Automation.SwitchParameter] - $RoomList, + [System.Object] + $ExcludedDomains, [Parameter()] - [System.Management.Automation.SwitchParameter] - $HiddenGroupMembershipEnabled, + [System.Object] + $MailboxIntelligenceProtectionAction, [Parameter()] - [System.Boolean] - $BypassNestedModerationEnabled, + [System.Object] + $TargetedDomainActionRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $CopyOwnerToMember, + [System.Object] + $DmarcQuarantineAction, [Parameter()] [System.Boolean] - $BccBlocked, + $EnableMailboxIntelligence, [Parameter()] - [System.Object] - $Members, + [System.String] + $TargetedDomainQuarantineTag, + + [Parameter()] + [System.String] + $SimilarUsersSafetyTipsCustomText, [Parameter()] [System.Object] - $Description, + $ImpersonationProtectionState, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $TargetedDomainProtectionAction, [Parameter()] [System.String] - $Notes, + $AdminDisplayName, [Parameter()] [System.Object] - $MemberJoinRestriction, + $TargetedUsersToProtect, [Parameter()] [System.Object] - $Type, + $TargetedUserProtectionAction, [Parameter()] [System.Object] - $ManagedBy, + $RecommendedPolicyType, + + [Parameter()] + [System.Object] + $MailboxIntelligenceProtectionActionRecipients, [Parameter()] [System.String] - $Alias, + $MailboxIntelligenceQuarantineTag, [Parameter()] - [System.Object] - $PrimarySmtpAddress, + [System.String] + $UnusualCharactersSafetyTipsCustomText, [Parameter()] - [System.Object] - $SendModerationNotifications, + [System.Boolean] + $EnableSimilarDomainsSafetyTips, [Parameter()] - [System.Object] - $OrganizationalUnit - ) -} -function New-DkimSigningConfig -{ - [CmdletBinding()] - param( + [System.String] + $SpoofQuarantineTag, + + [Parameter()] + [System.Boolean] + $EnableUnauthenticatedSender, + [Parameter()] [System.String] - $AdminDisplayName, + $PolicyTag, [Parameter()] - [System.Object] - $BodyCanonicalization, + [System.String] + $TargetedUserQuarantineTag, [Parameter()] - [System.Object] - $HeaderCanonicalization, + [System.Boolean] + $EnableOrganizationDomainsProtection, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $EnableMailboxIntelligenceProtection, [Parameter()] - [System.UInt16] - $KeySize, + [System.Boolean] + $EnableUnusualCharactersSafetyTips, + + [Parameter()] + [System.Boolean] + $EnableTargetedUserProtection, [Parameter()] [System.Object] - $DomainName, + $AuthenticationFailAction, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $TargetedUserActionRecipients, + + [Parameter()] + [System.Object] + $ExcludedSenders ) } -function New-EmailAddressPolicy +function New-AntiPhishRule { [CmdletBinding()] param( [Parameter()] - [System.Object] + [System.Int32] $Priority, [Parameter()] @@ -4045,678 +5129,681 @@ function New-EmailAddressPolicy [Parameter()] [System.Object] - $EnabledEmailAddressTemplates, + $AntiPhishPolicy, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.String] - $EnabledPrimarySMTPAddressTemplate, + [System.Object[]] + $SentTo, [Parameter()] [System.String] - $ManagedByFilter, + $Comments, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IncludeUnifiedGroupRecipients - ) -} -function New-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, + [System.Object[]] + $RecipientDomainIs, [Parameter()] - [System.Object] - $SenderIpRanges, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $DomainController, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $Domains, - - [Parameter()] - [System.String] - $Comment, + [System.Object[]] + $ExceptIfSentToMemberOf, [Parameter()] - [System.Object] - $Policy + [System.Boolean] + $Enabled ) } -function New-ExoSecOpsOverrideRule +function New-App { [CmdletBinding()] param( + [Parameter()] + [System.Uri] + $Url, + [Parameter()] [System.String] - $Name, + $Identity, + + [Parameter()] + [System.Boolean] + $Enabled, [Parameter()] [System.Object] - $Policy, + $AddInOverrides, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $Mailbox, + + [Parameter()] + [System.IO.Stream] + $FileStream, [Parameter()] [System.String] - $Comment, + $MarketplaceServicesUrl, [Parameter()] - [System.Object] - $DomainController - ) -} -function New-HostedConnectionFilterPolicy -{ - [CmdletBinding()] - param( + [System.String] + $Etoken, + [Parameter()] [System.String] - $ConfigurationXmlRaw, + $MarketplaceCorrelationID, [Parameter()] [System.String] - $Name, + $Version, + + [Parameter()] + [System.Object] + $DefaultStateForUser, [Parameter()] [System.String] - $AdminDisplayName, + $MarketplaceQueryMarket, [Parameter()] - [System.Boolean] - $EnableSafeList, + [System.String] + $MarketplaceUserProfileType, + + [Parameter()] + [System.Object] + $AllowSetting, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $DownloadOnly, [Parameter()] [System.Object] - $IPBlockList, + $ProvidedTo, [Parameter()] [System.Object] - $IPAllowList - ) -} -function New-HostedContentFilterPolicy -{ - [CmdletBinding()] - param( + $UserList, + [Parameter()] - [System.Boolean] - $InlineSafetyTipsEnabled, + [System.String] + $AppState, [Parameter()] - [System.Object] - $RegionBlockList, + [System.Management.Automation.SwitchParameter] + $OrganizationApp, [Parameter()] [System.String] - $HighConfidencePhishQuarantineTag, + $AppType, [Parameter()] - [System.Int32] - $EndUserSpamNotificationFrequency, + [System.String] + $MarketplaceAssetID, [Parameter()] - [System.Int32] - $QuarantineRetentionPeriod, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Int32] - $EndUserSpamNotificationLimit, + [System.Byte[]] + $FileData, [Parameter()] - [System.Int32] - $BulkThreshold, + [System.Management.Automation.SwitchParameter] + $AllowReadWriteMailbox, [Parameter()] - [System.Object] - $TestModeBccToRecipients, + [System.Management.Automation.SwitchParameter] + $PrivateCatalog, [Parameter()] - [System.String] - $PhishQuarantineTag, - + [System.Management.Automation.SwitchParameter] + $UpdateAppState + ) +} +function New-ApplicationAccessPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $AddXHeaderValue, + $Description, [Parameter()] [System.Object] - $MarkAsSpamEmbedTagsInHtml, + $PolicyScopeGroupId, [Parameter()] - [System.Object] - $MarkAsSpamFramesInHtml, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $IncreaseScoreWithImageLinks, + $AccessRight, [Parameter()] - [System.Boolean] - $EnableLanguageBlockList, + [System.String[]] + $AppId + ) +} +function New-ATPProtectionPolicyRule +{ + [CmdletBinding()] + param( [Parameter()] - [System.Object] - $PhishSpamAction, + [System.String] + $Name, [Parameter()] [System.String] - $EndUserSpamNotificationCustomFromName, + $SafeAttachmentPolicy, [Parameter()] - [System.Object] - $MarkAsSpamSensitiveWordList, + [System.String] + $SafeLinksPolicy, [Parameter()] [System.String] - $SpamQuarantineTag, + $Comments, [Parameter()] - [System.Object] - $MarkAsSpamNdrBackscatter, + [System.Boolean] + $Enabled, [Parameter()] - [System.Object] - $BlockedSenders, + [System.String[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $LanguageBlockList, + [System.String[]] + $ExceptIfSentTo, [Parameter()] - [System.Object] - $HighConfidenceSpamAction, + [System.String[]] + $ExceptIfSentToMemberOf, [Parameter()] - [System.Object] - $AllowedSenderDomains, + [System.UInt32] + $Priority, [Parameter()] - [System.Object] - $IncreaseScoreWithBizOrInfoUrls, + [System.String[]] + $RecipientDomainIs, [Parameter()] - [System.Object] - $MarkAsSpamWebBugsInHtml, + [System.String[]] + $SentTo, + + [Parameter()] + [System.String[]] + $SentToMemberOf + ) +} +function New-AuthenticationPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $AdminDisplayName, + $Name, [Parameter()] - [System.Object] - $IntraOrgFilterState, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPop, [Parameter()] - [System.Object] - $MarkAsSpamFromAddressAuthFail, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthSmtp, [Parameter()] - [System.String] - $Name, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthMapi, [Parameter()] - [System.Object] - $MarkAsSpamEmptyMessages, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthImap, [Parameter()] - [System.String] - $BulkQuarantineTag, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthAutodiscover, [Parameter()] - [System.Object] - $MarkAsSpamFormTagsInHtml, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPowershell, [Parameter()] - [System.Object] - $MarkAsSpamObjectTagsInHtml, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthRpc, [Parameter()] - [System.Object] - $BulkSpamAction, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOfflineAddressBook, [Parameter()] - [System.Object] - $EndUserSpamNotificationLanguage, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthReportingWebServices, [Parameter()] - [System.Object] - $IncreaseScoreWithRedirectToOtherPort, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOutlookService, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object] - $HighConfidencePhishAction, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthActiveSync, [Parameter()] - [System.Object] - $RedirectToRecipients, - + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthWebServices + ) +} +function New-AvailabilityConfig +{ + [CmdletBinding()] + param( [Parameter()] - [System.Boolean] - $SpamZapEnabled, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $TestModeAction, - - [Parameter()] - [System.Boolean] - $EnableRegionBlockList, + $OrgWideAccount, [Parameter()] - [System.String] - $EndUserSpamNotificationCustomSubject, - + [System.Object] + $AllowedTenantIds + ) +} +function New-ClientAccessRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $MarkAsSpamSpfRecordHardFail, + $Action, [Parameter()] [System.Object] - $EndUserSpamNotificationCustomFromAddress, + $AnyOfClientIPAddressesOrRanges, [Parameter()] [System.Boolean] - $DownloadLink, + $Enabled, [Parameter()] [System.Object] - $SpamAction, + $ExceptAnyOfClientIPAddressesOrRanges, [Parameter()] [System.String] - $ModifySubjectValue, + $Name, [Parameter()] - [System.Object] - $IncreaseScoreWithNumericIps, + [System.String] + $UserRecipientFilter, [Parameter()] [System.Object] - $AllowedSenders, + $ExceptAnyOfProtocols, [Parameter()] - [System.Object] - $MarkAsSpamJavaScriptInHtml, + [System.Int32] + $Priority, [Parameter()] [System.Object] - $MarkAsSpamBulkMail, + $ExceptUsernameMatchesAnyOfPatterns, [Parameter()] [System.Object] - $BlockedSenderDomains, + $UsernameMatchesAnyOfPatterns, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $RecommendedPolicyType, + $AnyOfAuthenticationTypes, [Parameter()] - [System.Boolean] - $PhishZapEnabled, + [System.Object] + $AnyOfProtocols, [Parameter()] - [System.Boolean] - $EnableEndUserSpamNotifications, + [System.Object] + $ExceptAnyOfAuthenticationTypes, [Parameter()] - [System.String] - $HighConfidenceSpamQuarantineTag + [System.Object] + $Scope ) } -function New-HostedContentFilterRule +function New-DataEncryptionPolicy { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $Priority, + [System.String] + $Description, [Parameter()] [System.String] $Name, - [Parameter()] - [System.Object[]] - $SentToMemberOf, - [Parameter()] [System.Object] - $HostedContentFilterPolicy, - - [Parameter()] - [System.Object[]] - $SentTo, - - [Parameter()] - [System.String] - $Comments, - - [Parameter()] - [System.Object[]] - $RecipientDomainIs, - - [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, - - [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + $DomainController, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.Object] + $AzureKeyIDs, [Parameter()] [System.Boolean] $Enabled ) } -function New-HostedOutboundSpamFilterPolicy +function New-DistributionGroup { [CmdletBinding()] param( [Parameter()] [System.Object] - $RecommendedPolicyType, + $ModeratedBy, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $RequireSenderAuthenticationEnabled, [Parameter()] - [System.String] - $AdminDisplayName, + [System.Boolean] + $ModerationEnabled, [Parameter()] - [System.Object] - $BccSuspiciousOutboundAdditionalRecipients, + [System.String] + $DisplayName, [Parameter()] [System.Object] - $NotifyOutboundSpamRecipients, + $MemberDepartRestriction, [Parameter()] - [System.UInt32] - $RecipientLimitPerDay, + [System.String] + $Name, [Parameter()] - [System.Object] - $ActionWhenThresholdReached, + [System.Management.Automation.SwitchParameter] + $IgnoreNamingPolicy, [Parameter()] - [System.Object] - $AutoForwardingMode, + [System.Management.Automation.SwitchParameter] + $RoomList, [Parameter()] - [System.Boolean] - $NotifyOutboundSpam, + [System.Management.Automation.SwitchParameter] + $HiddenGroupMembershipEnabled, [Parameter()] [System.Boolean] - $BccSuspiciousOutboundMail, - - [Parameter()] - [System.UInt32] - $RecipientLimitInternalPerHour, + $BypassNestedModerationEnabled, [Parameter()] - [System.UInt32] - $RecipientLimitExternalPerHour - ) -} -function New-HostedOutboundSpamFilterRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Int32] - $Priority, + [System.Management.Automation.SwitchParameter] + $CopyOwnerToMember, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $BccBlocked, [Parameter()] - [System.Object[]] - $ExceptIfFromMemberOf, + [System.Object] + $Members, [Parameter()] - [System.Object[]] - $ExceptIfFrom, + [System.Object] + $Description, [Parameter()] - [System.Object[]] - $ExceptIfSenderDomainIs, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Comments, + $Notes, [Parameter()] - [System.Object[]] - $FromMemberOf, + [System.Object] + $MemberJoinRestriction, [Parameter()] - [System.Object[]] - $SenderDomainIs, + [System.Object] + $Type, [Parameter()] [System.Object] - $HostedOutboundSpamFilterPolicy, + $ManagedBy, [Parameter()] - [System.Object[]] - $From, + [System.String] + $Alias, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $PrimarySmtpAddress, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $SendModerationNotifications, + + [Parameter()] + [System.Object] + $OrganizationalUnit ) } -function New-InboundConnector +function New-DkimSigningConfig { [CmdletBinding()] param( [Parameter()] - [System.Boolean] - $RestrictDomainsToIPAddresses, + [System.String] + $AdminDisplayName, [Parameter()] - [System.Boolean] - $CloudServicesMailEnabled, + [System.Object] + $BodyCanonicalization, [Parameter()] - [System.Boolean] - $Enabled, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] - $ClientHostNames, + $HeaderCanonicalization, + + [Parameter()] + [System.UInt16] + $KeySize, [Parameter()] [System.Object] - $EFSkipMailGateway, + $DomainName, [Parameter()] [System.Boolean] - $EFTestMode, - + $Enabled + ) +} +function New-EmailAddressPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $TrustedOrganizations, + $Priority, [Parameter()] - [System.Object] - $TlsSenderCertificateName, + [System.String] + $Name, [Parameter()] [System.Object] - $ScanAndDropRecipients, + $EnabledEmailAddressTemplates, [Parameter()] - [System.Object] - $AssociatedAcceptedDomains, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] - $Name, + $EnabledPrimarySMTPAddressTemplate, [Parameter()] [System.String] - $Comment, + $ManagedByFilter, [Parameter()] - [System.Boolean] - $RequireTls, + [System.Management.Automation.SwitchParameter] + $IncludeUnifiedGroupRecipients + ) +} +function New-GlobalAddressList +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.String] + $RecipientFilter, [Parameter()] [System.Object] - $SenderDomains, + $ConditionalCustomAttribute8, [Parameter()] [System.Object] - $SenderIPAddresses, + $ConditionalCustomAttribute10, [Parameter()] - [System.Boolean] - $EFSkipLastIP, + [System.String] + $Name, [Parameter()] [System.Object] - $EFUsers, + $ConditionalCustomAttribute9, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute2, [Parameter()] [System.Object] - $ConnectorType, + $IncludedRecipients, [Parameter()] - [System.Boolean] - $RestrictDomainsToCertificate, + [System.Object] + $ConditionalCompany, [Parameter()] [System.Object] - $EFSkipIPs, + $ConditionalCustomAttribute6, [Parameter()] - [System.Boolean] - $TreatMessagesAsInternal, + [System.Object] + $ConditionalCustomAttribute3, [Parameter()] [System.Object] - $ConnectorSource - ) -} -function New-IntraOrganizationConnector -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, + $ConditionalCustomAttribute12, [Parameter()] [System.Object] - $TargetAddressDomains, + $ConditionalCustomAttribute13, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute15, [Parameter()] - [System.Uri] - $TargetSharingEpr, + [System.Object] + $ConditionalDepartment, [Parameter()] - [System.Uri] - $DiscoveryEndpoint, + [System.Object] + $ConditionalStateOrProvince, [Parameter()] - [System.Boolean] - $Enabled - ) -} -function New-JournalRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, + [System.Object] + $ConditionalCustomAttribute7, [Parameter()] [System.Object] - $Scope, + $ConditionalCustomAttribute14, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute4, [Parameter()] [System.Object] - $JournalEmailAddress, + $ConditionalCustomAttribute11, [Parameter()] [System.Object] - $Recipient, + $ConditionalCustomAttribute1, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $ConditionalCustomAttribute5 ) } -function New-M365DataAtRestEncryptionPolicy +function New-HostedConnectionFilterPolicy { [CmdletBinding()] param( [Parameter()] [System.String] - $Description, + $ConfigurationXmlRaw, [Parameter()] [System.String] $Name, [Parameter()] - [System.Object] - $DomainController, + [System.String] + $AdminDisplayName, + + [Parameter()] + [System.Boolean] + $EnableSafeList, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -4724,333 +5811,353 @@ function New-M365DataAtRestEncryptionPolicy [Parameter()] [System.Object] - $AzureKeyIDs, + $IPBlockList, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $IPAllowList ) } -function New-Mailbox +function New-HostedContentFilterPolicy { [CmdletBinding()] param( [Parameter()] - [System.String] - $MailboxRegion, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Object] - $ModeratedBy, + [System.Boolean] + $InlineSafetyTipsEnabled, [Parameter()] - [System.Boolean] - $ModerationEnabled, + [System.Object] + $BulkSpamAction, [Parameter()] [System.String] - $Office, + $HighConfidencePhishQuarantineTag, [Parameter()] - [System.String] - $DisplayName, + [System.Int32] + $EndUserSpamNotificationFrequency, [Parameter()] - [System.Security.SecureString] - $Password, + [System.Int32] + $EndUserSpamNotificationLimit, [Parameter()] - [System.String] - $Name, + [System.Int32] + $BulkThreshold, [Parameter()] [System.Object] - $RemovedMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + $TestModeBccToRecipients, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, + [System.String] + $PhishQuarantineTag, [Parameter()] [System.String] - $LastName, + $AddXHeaderValue, [Parameter()] - [System.Management.Automation.SwitchParameter] - $TargetAllMDBs, + [System.Object] + $MarkAsSpamEmbedTagsInHtml, [Parameter()] [System.Object] - $RoleAssignmentPolicy, + $MarkAsSpamFramesInHtml, [Parameter()] [System.Object] - $ResourceCapacity, + $IncreaseScoreWithImageLinks, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Archive, + [System.Boolean] + $EnableLanguageBlockList, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Equipment, + [System.Object] + $PhishSpamAction, [Parameter()] [System.String] - $ImmutableId, + $EndUserSpamNotificationCustomFromName, [Parameter()] - [System.Security.SecureString] - $RoomMailboxPassword, + [System.Object] + $MarkAsSpamSensitiveWordList, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Shared, + [System.String] + $SpamQuarantineTag, [Parameter()] - [System.Boolean] - $IsExcludedFromServingHierarchy, + [System.Object] + $MarkAsSpamNdrBackscatter, [Parameter()] [System.Object] - $MailboxPlan, + $BlockedSenders, [Parameter()] [System.Object] - $MicrosoftOnlineServicesID, + $LanguageBlockList, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Migration, + [System.Object] + $HighConfidenceSpamAction, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Room, + [System.Object] + $AllowedSenderDomains, [Parameter()] - [System.String] - $Initials, + [System.Object] + $IncreaseScoreWithBizOrInfoUrls, [Parameter()] [System.Object] - $InactiveMailbox, + $MarkAsSpamWebBugsInHtml, [Parameter()] [System.String] - $FederatedIdentity, + $AdminDisplayName, [Parameter()] [System.Object] - $ActiveSyncMailboxPolicy, + $IntraOrgFilterState, [Parameter()] [System.Object] - $OrganizationalUnit, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $RegionBlockList, [Parameter()] - [System.Management.Automation.SwitchParameter] - $HoldForMigration, + [System.Object] + $MarkAsSpamFromAddressAuthFail, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Discovery, + [System.String] + $Name, [Parameter()] - [System.Boolean] - $ResetPasswordOnNextLogon, + [System.Object] + $MarkAsSpamEmptyMessages, [Parameter()] - [System.Boolean] - $EnableRoomMailboxAccount, + [System.String] + $BulkQuarantineTag, [Parameter()] - [System.String] - $FirstName, + [System.Object] + $MarkAsSpamFormTagsInHtml, [Parameter()] - [System.String] - $Phone, + [System.Object] + $MarkAsSpamObjectTagsInHtml, [Parameter()] [System.Object] - $PrimarySmtpAddress, + $EndUserSpamNotificationLanguage, [Parameter()] [System.Object] - $SendModerationNotifications, + $IncreaseScoreWithRedirectToOtherPort, [Parameter()] - [System.String] - $Alias, + [System.Int32] + $QuarantineRetentionPeriod, [Parameter()] - [System.Boolean] - $RemotePowerShellEnabled - ) -} -function New-MailContact -{ - [CmdletBinding()] - param( + [System.Object] + $HighConfidencePhishAction, + [Parameter()] [System.Object] - $ModeratedBy, + $RedirectToRecipients, [Parameter()] [System.Boolean] - $ModerationEnabled, + $SpamZapEnabled, [Parameter()] [System.Object] - $MacAttachmentFormat, + $TestModeAction, [Parameter()] - [System.String] - $DisplayName, + [System.Boolean] + $EnableRegionBlockList, [Parameter()] [System.String] - $Name, + $EndUserSpamNotificationCustomSubject, [Parameter()] - [System.String] - $LastName, + [System.Object] + $MarkAsSpamSpfRecordHardFail, + + [Parameter()] + [System.Object] + $EndUserSpamNotificationCustomFromAddress, [Parameter()] [System.Boolean] - $UsePreferMessageFormat, + $DownloadLink, [Parameter()] [System.Object] - $MessageBodyFormat, + $SpamAction, [Parameter()] [System.String] - $Initials, + $ModifySubjectValue, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $IncreaseScoreWithNumericIps, [Parameter()] [System.Object] - $ExternalEmailAddress, + $AllowedSenders, [Parameter()] - [System.String] - $Alias, + [System.Object] + $MarkAsSpamJavaScriptInHtml, [Parameter()] [System.Object] - $MessageFormat, + $MarkAsSpamBulkMail, [Parameter()] - [System.String] - $FirstName, + [System.Object] + $BlockedSenderDomains, [Parameter()] [System.Object] - $SendModerationNotifications, + $RecommendedPolicyType, [Parameter()] - [System.Object] - $OrganizationalUnit + [System.Boolean] + $PhishZapEnabled, + + [Parameter()] + [System.Boolean] + $EnableEndUserSpamNotifications, + + [Parameter()] + [System.String] + $HighConfidenceSpamQuarantineTag ) } -function New-MalwareFilterPolicy +function New-HostedContentFilterRule { [CmdletBinding()] param( [Parameter()] - [System.String] - $CustomFromName, + [System.Int32] + $Priority, [Parameter()] [System.String] - $AdminDisplayName, + $Name, [Parameter()] - [System.String] - $Name, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.String] - $CustomExternalBody, + [System.Object] + $HostedContentFilterPolicy, + + [Parameter()] + [System.Object[]] + $SentTo, [Parameter()] [System.String] - $QuarantineTag, + $Comments, [Parameter()] - [System.Boolean] - $CustomNotifications, + [System.Object[]] + $RecipientDomainIs, [Parameter()] - [System.Boolean] - $EnableExternalSenderAdminNotifications, + [System.Object[]] + $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object] - $InternalSenderAdminAddress, + [System.Object[]] + $ExceptIfSentTo, [Parameter()] - [System.String[]] - $FileTypes, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Boolean] - $EnableInternalSenderAdminNotifications, + [System.Object[]] + $ExceptIfSentToMemberOf, + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function New-HostedOutboundSpamFilterPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $CustomFromAddress, + $RecommendedPolicyType, [Parameter()] [System.String] - $CustomExternalSubject, + $Name, [Parameter()] - [System.Boolean] - $ZapEnabled, + [System.String] + $AdminDisplayName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $BccSuspiciousOutboundAdditionalRecipients, [Parameter()] [System.Object] - $ExternalSenderAdminAddress, + $NotifyOutboundSpamRecipients, [Parameter()] - [System.Object] - $RecommendedPolicyType, + [System.UInt32] + $RecipientLimitPerDay, [Parameter()] [System.Object] - $FileTypeAction, + $ActionWhenThresholdReached, [Parameter()] - [System.String] - $CustomInternalSubject, + [System.Object] + $AutoForwardingMode, [Parameter()] - [System.String] - $CustomInternalBody, + [System.Boolean] + $NotifyOutboundSpam, [Parameter()] [System.Boolean] - $EnableFileFilter + $BccSuspiciousOutboundMail, + + [Parameter()] + [System.UInt32] + $RecipientLimitInternalPerHour, + + [Parameter()] + [System.UInt32] + $RecipientLimitExternalPerHour ) } -function New-MalwareFilterRule +function New-HostedOutboundSpamFilterRule { [CmdletBinding()] param( @@ -5064,11 +6171,15 @@ function New-MalwareFilterRule [Parameter()] [System.Object[]] - $SentToMemberOf, + $ExceptIfFromMemberOf, [Parameter()] [System.Object[]] - $SentTo, + $ExceptIfFrom, + + [Parameter()] + [System.Object[]] + $ExceptIfSenderDomainIs, [Parameter()] [System.String] @@ -5076,101 +6187,92 @@ function New-MalwareFilterRule [Parameter()] [System.Object[]] - $RecipientDomainIs, + $FromMemberOf, [Parameter()] [System.Object[]] - $ExceptIfRecipientDomainIs, + $SenderDomainIs, [Parameter()] [System.Object] - $MalwareFilterPolicy, + $HostedOutboundSpamFilterPolicy, [Parameter()] [System.Object[]] - $ExceptIfSentTo, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $From, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf, + [System.Boolean] + $Enabled, [Parameter()] - [System.Boolean] - $Enabled + [System.Management.Automation.SwitchParameter] + $Confirm ) } -function New-ManagementRole +function New-InboundConnector { [CmdletBinding()] param( [Parameter()] - [System.String] - $Description, + [System.Boolean] + $RestrictDomainsToIPAddresses, [Parameter()] - [System.String[]] - $EnabledCmdlets, + [System.Boolean] + $CloudServicesMailEnabled, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $Enabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $EFSkipMailGateway, [Parameter()] - [System.Object] - $Parent, + [System.Boolean] + $EFTestMode, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function New-ManagementRoleAssignment -{ - [CmdletBinding()] - param( + [System.Object] + $TrustedOrganizations, + [Parameter()] [System.Object] - $CustomRecipientWriteScope, + $TlsSenderCertificateName, [Parameter()] [System.Object] - $RecipientGroupScope, + $ScanAndDropRecipients, [Parameter()] - [System.String] - $Name, + [System.Object] + $AssociatedAcceptedDomains, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, + [System.String] + $Comment, [Parameter()] - [System.Object] - $RecipientAdministrativeUnitScope, + [System.Boolean] + $RequireTls, [Parameter()] [System.Object] - $SecurityGroup, + $SenderDomains, [Parameter()] [System.Object] - $ExclusiveRecipientWriteScope, + $SenderIPAddresses, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Delegating, + [System.Boolean] + $EFSkipLastIP, [Parameter()] [System.Object] - $User, + $EFUsers, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -5178,483 +6280,600 @@ function New-ManagementRoleAssignment [Parameter()] [System.Object] - $App, + $ConnectorType, [Parameter()] - [System.Object] - $Role, + [System.Boolean] + $RestrictDomainsToCertificate, [Parameter()] [System.Object] - $CustomResourceScope, + $EFSkipIPs, [Parameter()] - [System.Object] - $Policy, + [System.Boolean] + $TreatMessagesAsInternal, [Parameter()] [System.Object] - $RecipientOrganizationalUnitScope, + $ConnectorSource, [Parameter()] - [System.Object] - $RecipientRelativeWriteScope + [System.String] + $Name ) } -function New-ManagementScope +function New-IntraOrganizationConnector { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Exclusive, + [System.String] + $Name, [Parameter()] [System.Object] - $RecipientRoot, + $TargetAddressDomains, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Uri] + $TargetSharingEpr, + + [Parameter()] + [System.Uri] + $DiscoveryEndpoint, + [Parameter()] + [System.Boolean] + $Enabled + ) +} +function New-JournalRule +{ + [CmdletBinding()] + param( [Parameter()] [System.String] $Name, + [Parameter()] + [System.Object] + $Scope, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.String] - $RecipientRestrictionFilter, + [System.Object] + $JournalEmailAddress, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Object] + $Recipient, + + [Parameter()] + [System.Boolean] + $Enabled ) } -function New-MessageClassification +function New-Mailbox { [CmdletBinding()] param( [Parameter()] [System.String] - $SenderDescription, + $MailboxRegion, + + [Parameter()] + [System.Object] + $ModeratedBy, + + [Parameter()] + [System.Boolean] + $ModerationEnabled, + + [Parameter()] + [System.Boolean] + $EnableRoomMailboxAccount, [Parameter()] [System.String] - $DisplayName, + $Office, [Parameter()] [System.String] - $RecipientDescription, + $DisplayName, + + [Parameter()] + [System.Security.SecureString] + $Password, [Parameter()] [System.String] $Name, [Parameter()] - [System.Globalization.CultureInfo] - $Locale, + [System.Object] + $RemovedMailbox, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $PublicFolder, [Parameter()] - [System.Boolean] - $PermissionMenuVisible, + [System.Management.Automation.SwitchParameter] + $Force, [Parameter()] - [System.Guid] - $ClassificationID, + [System.String] + $LastName, [Parameter()] - [System.Object] - $DisplayPrecedence, + [System.Management.Automation.SwitchParameter] + $TargetAllMDBs, [Parameter()] - [System.Boolean] - $RetainClassificationEnabled - ) -} -function New-MigrationBatch -{ - [CmdletBinding()] - param( + [System.Object] + $RoleAssignmentPolicy, + [Parameter()] [System.Object] - $Partition, + $ResourceCapacity, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipRules, + $Archive, [Parameter()] - [System.Object] - $TargetDatabases, + [System.Management.Automation.SwitchParameter] + $Equipment, [Parameter()] - [System.Byte[]] - $CSVData, + [System.String] + $ImmutableId, + + [Parameter()] + [System.Security.SecureString] + $RoomMailboxPassword, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipDelegates, + $Shared, + + [Parameter()] + [System.Boolean] + $IsExcludedFromServingHierarchy, [Parameter()] [System.Object] - $Users, + $MailboxPlan, + + [Parameter()] + [System.Object] + $MicrosoftOnlineServicesID, [Parameter()] [System.Management.Automation.SwitchParameter] - $IncludeOtherContacts, + $Migration, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipMail, + $Room, [Parameter()] - [System.Globalization.CultureInfo] - $ContentFilterLanguage, + [System.String] + $Initials, [Parameter()] [System.Object] - $TimeZone, + $InactiveMailbox, + + [Parameter()] + [System.String] + $FederatedIdentity, [Parameter()] [System.Object] - $NotificationEmails, + $ActiveSyncMailboxPolicy, + + [Parameter()] + [System.Object] + $OrganizationalUnit, [Parameter()] [System.Management.Automation.SwitchParameter] - $ManagedGmailTeams, + $Confirm, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipCalendar, + $HoldForMigration, [Parameter()] [System.Management.Automation.SwitchParameter] - $AutoStart, + $Discovery, [Parameter()] [System.Boolean] - $AllowUnknownColumnsInCSV, + $ResetPasswordOnNextLogon, [Parameter()] - [System.Object] - $MoveOptions, + [System.String] + $FirstName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AdoptPreexisting, + [System.String] + $Phone, [Parameter()] [System.Object] - $TargetEndpoint, + $PrimarySmtpAddress, [Parameter()] [System.Object] - $StartAfter, + $SendModerationNotifications, [Parameter()] - [System.Management.Automation.SwitchParameter] - $RemoveOnCopy, + [System.String] + $Alias, [Parameter()] - [System.Byte[]] - $XMLData, - + [System.Boolean] + $RemotePowerShellEnabled + ) +} +function New-MailContact +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $UserIds, + $ModeratedBy, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolderToUnifiedGroup, + [System.Boolean] + $ModerationEnabled, [Parameter()] [System.Object] - $ReportInterval, + $MacAttachmentFormat, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AutoProvisioning, + [System.String] + $DisplayName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $DisableOnCopy, + [System.String] + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ArchiveOnly, + [System.String] + $LastName, + + [Parameter()] + [System.Boolean] + $UsePreferMessageFormat, [Parameter()] [System.Object] - $SkipMerging, + $MessageBodyFormat, [Parameter()] - [System.Management.Automation.SwitchParameter] - $MigrateTasks, + [System.String] + $Initials, [Parameter()] [System.Management.Automation.SwitchParameter] - $DataFusion, + $Confirm, [Parameter()] [System.Object] - $CompleteAfter, + $ExternalEmailAddress, [Parameter()] - [System.Object] - $ExcludeFolders, + [System.String] + $Alias, [Parameter()] - [System.Management.Automation.SwitchParameter] - $GoogleResource, + [System.Object] + $MessageFormat, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Analyze, + [System.String] + $FirstName, [Parameter()] - [System.Guid] - $SourcePFPrimaryMailboxGuid, + [System.Object] + $SendModerationNotifications, [Parameter()] [System.Object] - $TargetDeliveryDomain, - + $OrganizationalUnit + ) +} +function New-MalwareFilterPolicy +{ + [CmdletBinding()] + param( [Parameter()] [System.String] - $ArchiveDomain, + $CustomFromName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrimaryOnly, + [System.String] + $AdminDisplayName, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipProvisioning, + [System.String] + $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SimplifiedSwitchOver, + [System.String] + $CustomExternalBody, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Restore, + [System.String] + $QuarantineTag, [Parameter()] - [System.Object] - $IncludeFolders, + [System.Boolean] + $CustomNotifications, [Parameter()] - [System.String] - $ContentFilter, + [System.Boolean] + $EnableExternalSenderAdminNotifications, [Parameter()] [System.Object] - $SkipMoving, + $InternalSenderAdminAddress, [Parameter()] - [System.String] - $WorkflowTemplate, + [System.String[]] + $FileTypes, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Boolean] + $EnableInternalSenderAdminNotifications, [Parameter()] [System.Object] - $SourceEndpoint, + $CustomFromAddress, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AvoidMergeOverlap, + [System.String] + $CustomExternalSubject, [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipReports, + [System.Boolean] + $ZapEnabled, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipContacts, - - [Parameter()] - [System.Object] - $BadItemLimit, + $Confirm, [Parameter()] [System.Object] - $TargetArchiveDatabases, + $ExternalSenderAdminAddress, [Parameter()] [System.Object] - $WorkflowControlFlags, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AutoComplete, + $RecommendedPolicyType, [Parameter()] [System.Object] - $LargeItemLimit, + $FileTypeAction, [Parameter()] [System.String] - $Name, - - [Parameter()] - [System.Object] - $ForwardingDisposition, + $CustomInternalSubject, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ExcludeDumpsters, + [System.String] + $CustomInternalBody, [Parameter()] - [System.Management.Automation.SwitchParameter] - $RenamePrimaryCalendar + [System.Boolean] + $EnableFileFilter ) } -function New-MigrationEndpoint +function New-MalwareFilterRule { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $AcceptUntrustedCertificates, + [System.Int32] + $Priority, [Parameter()] [System.String] $Name, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ExchangeRemoteMove, + [System.Object[]] + $SentToMemberOf, [Parameter()] - [System.Object] - $MaxConcurrentMigrations, + [System.Object[]] + $SentTo, [Parameter()] - [System.Byte[]] - $ServiceAccountKeyFileData, + [System.String] + $Comments, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, + [System.Object[]] + $RecipientDomainIs, [Parameter()] [System.Object] - $TestMailbox, + $MalwareFilterPolicy, [Parameter()] - [System.String] - $ExchangeServer, + [System.Object[]] + $ExceptIfRecipientDomainIs, + + [Parameter()] + [System.Object[]] + $ExceptIfSentTo, [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipVerification, + $Confirm, [Parameter()] - [System.Object] - $Authentication, + [System.Object[]] + $ExceptIfSentToMemberOf, [Parameter()] - [System.Management.Automation.SwitchParameter] - $ExchangeOutlookAnywhere, + [System.Boolean] + $Enabled + ) +} +function New-ManagementRole +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Description, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Gmail, + [System.String[]] + $EnabledCmdlets, [Parameter()] [System.String] - $AppSecretKeyVaultUrl, + $Name, [Parameter()] [System.Management.Automation.SwitchParameter] - $Compliance, + $Confirm, [Parameter()] - [System.Int32] - $Port, + [System.Object] + $Parent, [Parameter()] - [System.Security.SecureString] - $OAuthCode, + [System.Management.Automation.SwitchParameter] + $Force + ) +} +function New-ManagementRoleAssignment +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $CustomRecipientWriteScope, + + [Parameter()] + [System.Object] + $RecipientGroupScope, [Parameter()] [System.String] - $ApplicationId, + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, [Parameter()] [System.Object] - $RemoteServer, + $RecipientAdministrativeUnitScope, [Parameter()] [System.Object] - $Partition, + $SecurityGroup, [Parameter()] [System.Object] - $MailboxPermission, + $ExclusiveRecipientWriteScope, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Delegating, [Parameter()] - [System.String] - $SourceMailboxLegacyDN, + [System.Object] + $User, [Parameter()] [System.Management.Automation.SwitchParameter] - $IMAP, + $Confirm, [Parameter()] - [System.String] - $RemoteTenant, + [System.Object] + $App, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolderToUnifiedGroup, + [System.Object] + $Role, [Parameter()] - [System.String] - $NspiServer, + [System.Object] + $CustomResourceScope, [Parameter()] - [System.String] - $RedirectUri, + [System.Object] + $Policy, [Parameter()] [System.Object] - $RPCProxyServer, + $RecipientOrganizationalUnitScope, [Parameter()] [System.Object] - $EmailAddress, + $RecipientRelativeWriteScope + ) +} +function New-MessageClassification +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $SenderDescription, [Parameter()] - [System.Object] - $Security, + [System.String] + $DisplayName, [Parameter()] - [System.Object] - $MaxConcurrentIncrementalSyncs, + [System.String] + $RecipientDescription, [Parameter()] [System.String] - $PublicFolderDatabaseServerLegacyDN, + $Name, [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials, + [System.Globalization.CultureInfo] + $Locale, [Parameter()] [System.Management.Automation.SwitchParameter] - $Autodiscover + $Confirm, + + [Parameter()] + [System.Boolean] + $RetainClassificationEnabled, + + [Parameter()] + [System.Boolean] + $PermissionMenuVisible, + + [Parameter()] + [System.Guid] + $ClassificationID, + + [Parameter()] + [System.Object] + $DisplayPrecedence ) } function New-MobileDeviceMailboxPolicy @@ -5673,6 +6892,10 @@ function New-MobileDeviceMailboxPolicy [System.Boolean] $AllowUnsignedInstallationPackages, + [Parameter()] + [System.Object] + $MaxPasswordFailedAttempts, + [Parameter()] [System.Boolean] $AllowExternalDeviceManagement, @@ -5773,10 +6996,6 @@ function New-MobileDeviceMailboxPolicy [System.Object] $AllowBluetooth, - [Parameter()] - [System.Boolean] - $WSSAccessEnabled, - [Parameter()] [System.Object] $RequireEncryptionSMIMEAlgorithm, @@ -5813,10 +7032,6 @@ function New-MobileDeviceMailboxPolicy [System.Boolean] $AllowDesktopSync, - [Parameter()] - [System.Boolean] - $PasswordRecoveryEnabled, - [Parameter()] [System.Boolean] $RequireStorageCardEncryption, @@ -5825,6 +7040,10 @@ function New-MobileDeviceMailboxPolicy [System.Management.Automation.SwitchParameter] $Confirm, + [Parameter()] + [System.Boolean] + $AttachmentsEnabled, + [Parameter()] [System.Boolean] $AllowSMIMESoftCerts, @@ -5835,7 +7054,7 @@ function New-MobileDeviceMailboxPolicy [Parameter()] [System.Boolean] - $AttachmentsEnabled, + $PasswordRecoveryEnabled, [Parameter()] [System.Object] @@ -5870,8 +7089,8 @@ function New-MobileDeviceMailboxPolicy $AllowTextMessaging, [Parameter()] - [System.Object] - $MaxPasswordFailedAttempts, + [System.Boolean] + $WSSAccessEnabled, [Parameter()] [System.Boolean] @@ -5886,6 +7105,31 @@ function New-MobileDeviceMailboxPolicy $AllowHTMLEmail ) } +function New-OfflineAddressBook +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $IsDefault, + + [Parameter()] + [System.Object] + $DiffRetentionPeriod, + + [Parameter()] + [System.Object[]] + $AddressLists + ) +} function New-OMEConfiguration { [CmdletBinding()] @@ -6196,12 +7440,12 @@ function New-PartnerApplication $AcceptSecurityIdentifierInformation, [Parameter()] - [System.Object] - $AccountType, + [System.Boolean] + $Enabled, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $AccountType ) } function New-PolicyTipConfig @@ -6225,10 +7469,6 @@ function New-QuarantinePolicy { [CmdletBinding()] param( - [Parameter()] - [System.Boolean] - $IncludeMessagesFromBlockedSenderAddress, - [Parameter()] [System.Object] $MultiLanguageCustomDisclaimer, @@ -6641,100 +7881,6 @@ function New-ReportSubmissionRule $Enabled ) } -function New-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $RetentionPolicyTagLinks, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultArbitrationMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm - ) -} -function New-RetentionPolicyTag -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $AgeLimitForRetention, - - [Parameter()] - [System.String] - $MessageClass, - - [Parameter()] - [System.Boolean] - $MustDisplayCommentEnabled, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultAutoGroupPolicyTag, - - [Parameter()] - [System.Object] - $LocalizedRetentionPolicyTagName, - - [Parameter()] - [System.Object] - $LocalizedComment, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultModeratedRecipientsPolicyTag, - - [Parameter()] - [System.Object] - $RetentionAction, - - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $RetentionEnabled, - - [Parameter()] - [System.Object] - $Type, - - [Parameter()] - [System.Boolean] - $SystemTag - ) -} function New-RoleAssignmentPolicy { [CmdletBinding()] @@ -6788,10 +7934,6 @@ function New-RoleGroup [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.Object[]] - $Roles, - [Parameter()] [System.String] $WellKnownObject, @@ -6800,6 +7942,10 @@ function New-RoleGroup [System.Object] $ManagedBy, + [Parameter()] + [System.Object[]] + $Roles, + [Parameter()] [System.Management.Automation.SwitchParameter] $Force @@ -6842,12 +7988,12 @@ function New-SafeAttachmentPolicy $RedirectAddress, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $QuarantineTag, [Parameter()] - [System.String] - $QuarantineTag + [System.Management.Automation.SwitchParameter] + $Confirm ) } function New-SafeAttachmentRule @@ -7033,31 +8179,6 @@ function New-SafeLinksRule $Enabled ) } -function New-ServicePrincipal -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DisplayName, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $ObjectId, - - [Parameter()] - [System.String] - $ServiceId, - - [Parameter()] - [System.String] - $AppId - ) -} function New-SharingPolicy { [CmdletBinding()] @@ -7083,166 +8204,6 @@ function New-SharingPolicy $Enabled ) } -function New-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $DestinationFolder, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $SystemCategory, - - [Parameter()] - [System.Object] - $KeepLatest, - - [Parameter()] - [System.Object] - $SourceFolder, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Sender, - - [Parameter()] - [System.Object] - $KeepForDays, - - [Parameter()] - [System.Boolean] - $Enabled - ) -} -function New-TeamsProtectionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $HighConfidencePhishQuarantineTag, - - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Boolean] - $ZapEnabled, - - [Parameter()] - [System.String] - $MalwareQuarantineTag, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Organization - ) -} -function New-TenantAllowBlockListItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.DateTime] - $ExpirationDate, - - [Parameter()] - [System.Object] - $ListSubType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Block, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $LogExtraDetails, - - [Parameter()] - [System.String] - $Notes, - - [Parameter()] - [System.Int32] - $RemoveAfter, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OutputJson, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $NoExpiration, - - [Parameter()] - [System.String] - $SubmissionID, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Allow, - - [Parameter()] - [System.String[]] - $Entries, - - [Parameter()] - [System.Object] - $ListType - ) -} -function New-TenantAllowBlockListSpoofItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Action, - - [Parameter()] - [System.String] - $SendingInfrastructure, - - [Parameter()] - [System.String] - $SpoofType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.String] - $SpoofedUser - ) -} function New-TransportRule { [CmdletBinding()] @@ -7427,10 +8388,6 @@ function New-TransportRule [System.Object] $RuleSubType, - [Parameter()] - [System.Object[]] - $AnyOfRecipientAddressMatchesPatterns, - [Parameter()] [System.Object] $SentToScope, @@ -7799,6 +8756,10 @@ function New-TransportRule [System.Object[]] $ExceptIfRecipientADAttributeMatchesPatterns, + [Parameter()] + [System.Boolean] + $StopRuleProcessing, + [Parameter()] [System.Object[]] $RecipientADAttributeContainsWords, @@ -7936,14 +8897,49 @@ function New-TransportRule $ExceptIfAttachmentPropertyContainsWords, [Parameter()] - [System.Boolean] - $StopRuleProcessing, + [System.Object[]] + $AnyOfRecipientAddressMatchesPatterns, [Parameter()] [System.Object] $ExceptIfHeaderContainsMessageHeader ) } + +function New-UnifiedAuditLogRetentionPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.UInt32] + $Priority, + + [Parameter()] + [System.String] + $RetentionDuration, + + [Parameter()] + [System.String] + $Description, + + [Parameter()] + [System.String[]] + $Operations, + + [Parameter()] + [System.String[]] + $RecordTypes, + + [Parameter()] + [System.String[]] + $UserIds + ) +} + function Remove-ActiveSyncDevice { [CmdletBinding()] @@ -7957,6 +8953,25 @@ function Remove-ActiveSyncDevice $Identity ) } + +function Remove-ActiveSyncMailboxPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force + ) +} + function Remove-ActiveSyncDeviceAccessRule { [CmdletBinding()] @@ -7970,7 +8985,20 @@ function Remove-ActiveSyncDeviceAccessRule $Identity ) } -function Remove-ActiveSyncMailboxPolicy +function Remove-AddressBookPolicy +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Remove-AddressList { [CmdletBinding()] param( @@ -7984,7 +9012,7 @@ function Remove-ActiveSyncMailboxPolicy [Parameter()] [System.Management.Automation.SwitchParameter] - $Force + $Recursive ) } function Remove-AntiPhishPolicy @@ -7993,15 +9021,15 @@ function Remove-AntiPhishPolicy param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Force, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Object] + $Identity ) } function Remove-AntiPhishRule @@ -8059,19 +9087,17 @@ function Remove-ApplicationAccessPolicy $Identity ) } + function Remove-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] + [System.String] $Identity ) } + function Remove-AuditConfigurationPolicy { [CmdletBinding()] @@ -8085,21 +9111,13 @@ function Remove-AuthenticationPolicy { [CmdletBinding()] param( - [Parameter()] - [System.String] - $TenantId, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AllowLegacyExchangeTokens + $Identity ) } function Remove-AvailabilityAddressSpace @@ -8128,7 +9146,7 @@ function Remove-AvailabilityConfig $Identity ) } -function Remove-DataClassification +function Remove-ClientAccessRule { [CmdletBinding()] param( @@ -8141,7 +9159,7 @@ function Remove-DataClassification $Identity ) } -function Remove-DistributionGroup +function Remove-DataClassification { [CmdletBinding()] param( @@ -8151,14 +9169,10 @@ function Remove-DistributionGroup [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $BypassSecurityGroupManagerCheck + $Identity ) } -function Remove-EmailAddressPolicy +function Remove-DistributionGroup { [CmdletBinding()] param( @@ -8168,10 +9182,14 @@ function Remove-EmailAddressPolicy [Parameter()] [System.Object] - $Identity + $Identity, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $BypassSecurityGroupManagerCheck ) } -function Remove-ExoPhishSimOverrideRule +function Remove-EmailAddressPolicy { [CmdletBinding()] param( @@ -8181,14 +9199,10 @@ function Remove-ExoPhishSimOverrideRule [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DomainController + $Identity ) } -function Remove-ExoSecOpsOverrideRule +function Remove-GlobalAddressList { [CmdletBinding()] param( @@ -8198,11 +9212,7 @@ function Remove-ExoSecOpsOverrideRule [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DomainController + $Identity ) } function Remove-HostedConnectionFilterPolicy @@ -8313,6 +9323,10 @@ function Remove-Mailbox { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + [Parameter()] [System.Management.Automation.SwitchParameter] $PublicFolder, @@ -8335,53 +9349,7 @@ function Remove-Mailbox [Parameter()] [System.Management.Automation.SwitchParameter] - $Migration, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-MailboxFolderPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ResetDelegateUserCollection, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-MailboxIRMAccess -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity + $Migration ) } function Remove-MailboxPermission @@ -8480,6 +9448,10 @@ function Remove-ManagementRole { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -8490,11 +9462,7 @@ function Remove-ManagementRole [Parameter()] [System.Management.Automation.SwitchParameter] - $Recurse, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + $Recurse ) } function Remove-ManagementRoleAssignment @@ -8503,32 +9471,15 @@ function Remove-ManagementRoleAssignment param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, + $Force, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-ManagementScope -{ - [CmdletBinding()] - param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + $Identity ) } function Remove-MessageClassification @@ -8544,7 +9495,7 @@ function Remove-MessageClassification $Identity ) } -function Remove-MigrationBatch +function Remove-MobileDevice { [CmdletBinding()] param( @@ -8554,34 +9505,17 @@ function Remove-MigrationBatch [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Partition + $Identity ) } -function Remove-MigrationEndpoint +function Remove-MobileDeviceMailboxPolicy { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, + $Force, - [Parameter()] - [System.Object] - $Partition - ) -} -function Remove-MobileDevice -{ - [CmdletBinding()] - param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -8591,21 +9525,21 @@ function Remove-MobileDevice $Identity ) } -function Remove-MobileDeviceMailboxPolicy +function Remove-OfflineAddressBook { [CmdletBinding()] param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Force, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Object] + $Identity ) } function Remove-OMEConfiguration @@ -8666,15 +9600,15 @@ function Remove-OwaMailboxPolicy param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Force, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Object] + $Identity ) } function Remove-PartnerApplication @@ -8730,7 +9664,7 @@ function Remove-RecipientPermission [Parameter()] [System.Object] - $MultiTrustees, + $Trustee, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -8750,11 +9684,7 @@ function Remove-RecipientPermission [Parameter()] [System.Management.Automation.SwitchParameter] - $SkipDomainValidationForSharedMailbox, - - [Parameter()] - [System.Object] - $Trustee + $SkipDomainValidationForSharedMailbox ) } function Remove-RemoteDomain @@ -8792,36 +9722,6 @@ function Remove-ReportSubmissionRule $Identity ) } -function Remove-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-RetentionPolicyTag -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} function Remove-RoleAssignmentPolicy { [CmdletBinding()] @@ -8841,25 +9741,8 @@ function Remove-RoleGroup param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $BypassSecurityGroupManagerCheck, + $Force, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-RoleGroupMember -{ - [CmdletBinding()] - param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -8870,11 +9753,7 @@ function Remove-RoleGroupMember [Parameter()] [System.Management.Automation.SwitchParameter] - $BypassSecurityGroupManagerCheck, - - [Parameter()] - [System.Object] - $Member + $BypassSecurityGroupManagerCheck ) } function Remove-SafeAttachmentPolicy @@ -8883,15 +9762,15 @@ function Remove-SafeAttachmentPolicy param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Force, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Object] + $Identity ) } function Remove-SafeAttachmentRule @@ -8913,21 +9792,8 @@ function Remove-SafeLinksPolicy param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, + $Force, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Remove-SafeLinksRule -{ - [CmdletBinding()] - param( [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -8937,7 +9803,7 @@ function Remove-SafeLinksRule $Identity ) } -function Remove-ServicePrincipal +function Remove-SafeLinksRule { [CmdletBinding()] param( @@ -8963,7 +9829,7 @@ function Remove-SharingPolicy $Identity ) } -function Remove-SweepRule +function Remove-TransportRule { [CmdletBinding()] param( @@ -8971,77 +9837,29 @@ function Remove-SweepRule [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.Object] - $Mailbox, - [Parameter()] [System.Object] $Identity ) } -function Remove-TenantAllowBlockListItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $ListSubType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OutputJson, - [Parameter()] - [System.String[]] - $Ids, - - [Parameter()] - [System.String[]] - $Entries, - - [Parameter()] - [System.Object] - $ListType - ) -} -function Remove-TenantAllowBlockListSpoofItems +function Remove-UnifiedAuditLogRetentionPolicy { [CmdletBinding()] param( [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.String[]] - $Ids - ) -} -function Remove-TransportRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] + [System.String] $Identity ) } + function Set-AcceptedDomain { [CmdletBinding()] param( [Parameter()] [System.Boolean] - $SendingToDomainDisabled, + $CanHaveCloudCache, [Parameter()] [System.Boolean] @@ -9052,8 +9870,8 @@ function Set-AcceptedDomain $OutboundOnly, [Parameter()] - [System.Boolean] - $CanHaveCloudCache, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Boolean] @@ -9063,10 +9881,6 @@ function Set-AcceptedDomain [System.Object] $Identity, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Boolean] $MatchSubDomains, @@ -9093,6 +9907,7 @@ function Set-ActiveSyncDeviceAccessRule $AccessLevel ) } + function Set-ActiveSyncMailboxPolicy { [CmdletBinding()] @@ -9322,21 +10137,156 @@ function Set-ActiveSyncMailboxPolicy $IrmEnabled ) } -function Set-AdminAuditLogConfig + +function Set-AddressBookPolicy { [CmdletBinding()] param( + [Parameter()] + [System.Object] + $RoomList, + + [Parameter()] + [System.Object] + $OfflineAddressBook, + + [Parameter()] + [System.String] + $Name, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Boolean] - $UnifiedAuditLogIngestionEnabled, + [System.Object] + $Identity, + [Parameter()] + [System.Object] + $GlobalAddressList, + + [Parameter()] + [System.Object[]] + $AddressLists + ) +} +function Set-AddressList +{ + [CmdletBinding()] + param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Force + $Confirm, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute8, + + [Parameter()] + [System.String] + $DisplayName, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute10, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute9, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute2, + + [Parameter()] + [System.Object] + $IncludedRecipients, + + [Parameter()] + [System.Object] + $ConditionalCompany, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute6, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute3, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute12, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute13, + + [Parameter()] + [System.String] + $RecipientFilter, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute15, + + [Parameter()] + [System.Object] + $ConditionalDepartment, + + [Parameter()] + [System.Object] + $ConditionalStateOrProvince, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute7, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute14, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute4, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute11, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute1, + + [Parameter()] + [System.Object] + $ConditionalCustomAttribute5 + ) +} +function Set-AdminAuditLogConfig +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $UnifiedAuditLogIngestionEnabled ) } function Set-AntiPhishPolicy @@ -9351,10 +10301,18 @@ function Set-AntiPhishPolicy [System.Management.Automation.SwitchParameter] $MakeDefault, + [Parameter()] + [System.Object] + $DmarcRejectAction, + [Parameter()] [System.Int32] $PhishThresholdLevel, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Boolean] $EnableTargetedDomainsProtection, @@ -9419,10 +10377,6 @@ function Set-AntiPhishPolicy [System.Object] $ImpersonationProtectionState, - [Parameter()] - [System.Object] - $MailboxIntelligenceProtectionActionRecipients, - [Parameter()] [System.Object] $TargetedDomainProtectionAction, @@ -9440,8 +10394,8 @@ function Set-AntiPhishPolicy $TargetedUserProtectionAction, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $MailboxIntelligenceProtectionActionRecipients, [Parameter()] [System.String] @@ -9459,10 +10413,6 @@ function Set-AntiPhishPolicy [System.Boolean] $EnableUnauthenticatedSender, - [Parameter()] - [System.Object] - $DmarcRejectAction, - [Parameter()] [System.String] $TargetedUserQuarantineTag, @@ -9554,12 +10504,12 @@ function Set-App [CmdletBinding()] param( [Parameter()] - [System.Object] - $UserList, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $PrivateCatalog, + [System.Object] + $UserList, [Parameter()] [System.Object] @@ -9574,16 +10524,16 @@ function Set-App $OrganizationApp, [Parameter()] - [System.Object] - $ProvidedTo, + [System.Boolean] + $Enabled, [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $PrivateCatalog, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $ProvidedTo ) } function Set-ApplicationAccessPolicy @@ -9603,124 +10553,137 @@ function Set-ApplicationAccessPolicy $Identity ) } -function Set-ArcConfig +function Set-AtpPolicyForO365 { [CmdletBinding()] param( [Parameter()] - [System.String[]] - $ArcTrustedSealers, + [System.Boolean] + $EnableATPForSPOTeamsODB, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $Identity, [Parameter()] - [System.Object] - $Identity + [System.Boolean] + $EnableSafeDocs, + + [Parameter()] + [System.Boolean] + $AllowSafeDocsOpen, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm ) } -function Set-ATPBuiltInProtectionRule + +function Set-ATPProtectionPolicyRule { [CmdletBinding()] param( [Parameter()] [System.String] - $Comments, + $Identity, [Parameter()] - [System.Object] - $Identity, + [System.String] + $Comments, [Parameter()] - [System.Object[]] + [System.String] $ExceptIfRecipientDomainIs, [Parameter()] - [System.Object[]] + [System.String] $ExceptIfSentTo, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.String] + $ExceptIfSentToMemberOf, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf - ) -} -function Set-AtpPolicyForO365 -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Boolean] - $EnableATPForSPOTeamsODB, + [System.String] + $String, [Parameter()] - [System.Object] - $Identity, + [System.UInt32] + $Priority, [Parameter()] - [System.Boolean] - $EnableSafeDocs, + [System.String[]] + $RecipientDomainIs, [Parameter()] - [System.Boolean] - $AllowSafeDocsOpen, + [System.String[]] + $SentTo, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm + [System.String[]] + $SentToMemberOf ) } -function Set-ATPProtectionPolicyRule + +function Set-AuthenticationPolicy { [CmdletBinding()] param( [Parameter()] - [System.Int32] - $Priority, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPop, [Parameter()] - [System.String] - $Name, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthSmtp, [Parameter()] - [System.Object[]] - $SentToMemberOf, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthMapi, [Parameter()] - [System.Object[]] - $SentTo, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthImap, [Parameter()] - [System.String] - $Comments, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthAutodiscover, [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthPowershell, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthRpc, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOfflineAddressBook, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthReportingWebServices, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthOutlookService, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthActiveSync, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $AllowBasicAuthWebServices ) } function Set-AvailabilityConfig @@ -9884,10 +10847,6 @@ function Set-CalendarProcessing [System.Boolean] $OrganizerInfo, - [Parameter()] - [System.Int32] - $MinimumDurationInMinutes, - [Parameter()] [System.Boolean] $AddAdditionalResponse, @@ -9896,6 +10855,10 @@ function Set-CalendarProcessing [System.Boolean] $RemoveForwardedMeetingNotifications, + [Parameter()] + [System.Int32] + $MinimumDurationInMinutes, + [Parameter()] [System.Int32] $BookingWindowInDays, @@ -10070,41 +11033,94 @@ function set-CASMailboxPlan [System.Boolean] $ImapEnabled, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Object] - $OwaMailboxPolicy, + $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $OwaMailboxPolicy, [Parameter()] [System.Boolean] - $OWAEnabled, + $PopEnabled, + [Parameter()] + [System.Boolean] + $ActiveSyncEnabled + ) +} +function Set-ClientAccessRule +{ + [CmdletBinding()] + param( [Parameter()] [System.Object] - $EwsEnabled, + $UsernameMatchesAnyOfPatterns, [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Boolean] - $ECPEnabled, + [System.Object] + $Action, [Parameter()] - [System.Boolean] - $PopEnabled, + [System.Object] + $AnyOfClientIPAddressesOrRanges, [Parameter()] [System.Boolean] - $ActiveSyncEnabled, + $Enabled, [Parameter()] - [System.Boolean] - $MAPIEnabled + [System.Object] + $ExceptAnyOfClientIPAddressesOrRanges, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.String] + $UserRecipientFilter, + + [Parameter()] + [System.Object] + $ExceptAnyOfProtocols, + + [Parameter()] + [System.Int32] + $Priority, + + [Parameter()] + [System.Object] + $ExceptUsernameMatchesAnyOfPatterns, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $AnyOfAuthenticationTypes, + + [Parameter()] + [System.Object] + $AnyOfProtocols, + + [Parameter()] + [System.Object] + $ExceptAnyOfAuthenticationTypes, + + [Parameter()] + [System.Object] + $Scope ) } function Set-DataClassification @@ -10128,16 +11144,16 @@ function Set-DataClassification $Confirm, [Parameter()] - [System.Object] - $Fingerprints, + [System.Management.Automation.SwitchParameter] + $IsDefault, [Parameter()] [System.Object] - $Identity, + $Fingerprints, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault + [System.Object] + $Identity ) } function Set-DataEncryptionPolicy @@ -10176,17 +11192,17 @@ function Set-DataEncryptionPolicy [System.String] $PermanentDataPurgeReason, + [Parameter()] + [System.Boolean] + $Enabled, + [Parameter()] [System.String] $PermanentDataPurgeContact, [Parameter()] [System.Management.Automation.SwitchParameter] - $Refresh, - - [Parameter()] - [System.Boolean] - $Enabled + $Refresh ) } function Set-DistributionGroup @@ -10209,14 +11225,6 @@ function Set-DistributionGroup [System.Object] $AcceptMessagesOnlyFromSendersOrMembers, - [Parameter()] - [System.String] - $CustomAttribute14, - - [Parameter()] - [System.String] - $CustomAttribute12, - [Parameter()] [System.String] $CustomAttribute10, @@ -10249,6 +11257,10 @@ function Set-DistributionGroup [System.Management.Automation.SwitchParameter] $IgnoreNamingPolicy, + [Parameter()] + [System.Boolean] + $ReportToManagerEnabled, + [Parameter()] [System.String] $MailTip, @@ -10259,7 +11271,7 @@ function Set-DistributionGroup [Parameter()] [System.Object] - $PrimarySmtpAddress, + $GrantSendOnBehalfTo, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -10281,6 +11293,10 @@ function Set-DistributionGroup [System.Object] $MemberDepartRestriction, + [Parameter()] + [System.Object] + $ExtensionCustomAttribute4, + [Parameter()] [System.String] $CustomAttribute15, @@ -10329,17 +11345,13 @@ function Set-DistributionGroup [System.Object] $Description, - [Parameter()] - [System.Object] - $GrantSendOnBehalfTo, - [Parameter()] [System.Object] $ExtensionCustomAttribute1, [Parameter()] - [System.Boolean] - $ReportToManagerEnabled, + [System.String] + $CustomAttribute14, [Parameter()] [System.Boolean] @@ -10361,10 +11373,6 @@ function Set-DistributionGroup [System.Management.Automation.SwitchParameter] $BypassSecurityGroupManagerCheck, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $UpdateMemberCount, - [Parameter()] [System.Object] $ExtensionCustomAttribute2, @@ -10377,6 +11385,10 @@ function Set-DistributionGroup [System.String] $CustomAttribute2, + [Parameter()] + [System.Object] + $PrimarySmtpAddress, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -10418,8 +11430,8 @@ function Set-DistributionGroup $ExtensionCustomAttribute3, [Parameter()] - [System.Object] - $ExtensionCustomAttribute4, + [System.String] + $CustomAttribute12, [Parameter()] [System.String] @@ -10446,6 +11458,10 @@ function Set-DkimSigningConfig [System.Object] $BodyCanonicalization, + [Parameter()] + [System.Object] + $HeaderCanonicalization, + [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -10460,11 +11476,7 @@ function Set-DkimSigningConfig [Parameter()] [System.Boolean] - $Enabled, - - [Parameter()] - [System.Object] - $HeaderCanonicalization + $Enabled ) } function Set-EmailAddressPolicy @@ -10500,18 +11512,10 @@ function Set-EmailAddressPolicy $Identity ) } -function Set-EmailTenantSettings +function Set-GlobalAddressList { [CmdletBinding()] param( - [Parameter()] - [System.Boolean] - $EnablePriorityAccountProtection, - - [Parameter()] - [System.Object] - $DomainController, - [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, @@ -10521,149 +11525,88 @@ function Set-EmailTenantSettings $Identity, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IgnoreDehydratedFlag - ) -} -function Set-EOPProtectionPolicyRule -{ - [CmdletBinding()] - param( + [System.Object] + $ConditionalCustomAttribute8, + [Parameter()] - [System.Int32] - $Priority, + [System.Object] + $ConditionalCustomAttribute10, [Parameter()] [System.String] $Name, [Parameter()] - [System.Object[]] - $SentToMemberOf, - - [Parameter()] - [System.Object[]] - $SentTo, - - [Parameter()] - [System.String] - $Comments, + [System.Object] + $ConditionalCustomAttribute9, [Parameter()] - [System.Object[]] - $RecipientDomainIs, + [System.Object] + $ConditionalCustomAttribute2, [Parameter()] [System.Object] - $Identity, + $IncludedRecipients, [Parameter()] - [System.Object[]] - $ExceptIfRecipientDomainIs, + [System.Object] + $ConditionalCompany, [Parameter()] - [System.Object[]] - $ExceptIfSentTo, + [System.Object] + $ConditionalCustomAttribute6, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute3, - [Parameter()] - [System.Object[]] - $ExceptIfSentToMemberOf - ) -} -function Set-ExoPhishSimOverrideRule -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $AddDomains, + $ConditionalCustomAttribute12, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ConditionalCustomAttribute13, [Parameter()] [System.String] - $Comment, + $RecipientFilter, [Parameter()] [System.Object] - $AddSenderIpRanges, + $ConditionalCustomAttribute15, [Parameter()] [System.Object] - $Identity, + $ConditionalDepartment, [Parameter()] [System.Object] - $RemoveDomains, + $ConditionalStateOrProvince, [Parameter()] [System.Object] - $RemoveSenderIpRanges, + $ConditionalCustomAttribute7, [Parameter()] [System.Object] - $DomainController - ) -} -function Set-ExoSecOpsOverrideRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $DomainController, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $ConditionalCustomAttribute14, - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Set-ExternalInOutlook -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $AllowList, + $ConditionalCustomAttribute4, [Parameter()] [System.Object] - $Identity, + $ConditionalCustomAttribute1, [Parameter()] [System.Object] - $Enabled - ) -} -function Set-FocusedInbox -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $UseCustomRouting, + $ConditionalCustomAttribute5, [Parameter()] [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $FocusedInboxOn + $ConditionalCustomAttribute11 ) } function Set-HostedConnectionFilterPolicy @@ -10707,13 +11650,17 @@ function Set-HostedContentFilterPolicy { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Boolean] $InlineSafetyTipsEnabled, [Parameter()] [System.Object] - $RegionBlockList, + $BulkSpamAction, [Parameter()] [System.String] @@ -10723,10 +11670,6 @@ function Set-HostedContentFilterPolicy [System.Int32] $EndUserSpamNotificationFrequency, - [Parameter()] - [System.Int32] - $QuarantineRetentionPeriod, - [Parameter()] [System.Int32] $EndUserSpamNotificationLimit, @@ -10819,6 +11762,10 @@ function Set-HostedContentFilterPolicy [System.Object] $IntraOrgFilterState, + [Parameter()] + [System.Object] + $RegionBlockList, + [Parameter()] [System.Object] $MarkAsSpamFromAddressAuthFail, @@ -10839,10 +11786,6 @@ function Set-HostedContentFilterPolicy [System.Object] $MarkAsSpamObjectTagsInHtml, - [Parameter()] - [System.Object] - $BulkSpamAction, - [Parameter()] [System.Object] $EndUserSpamNotificationLanguage, @@ -10852,8 +11795,8 @@ function Set-HostedContentFilterPolicy $IncreaseScoreWithRedirectToOtherPort, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Int32] + $QuarantineRetentionPeriod, [Parameter()] [System.Object] @@ -11310,71 +12253,25 @@ function Set-JournalRule [System.String] $Name, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $JournalEmailAddress, - - [Parameter()] - [System.Object] - $Recipient, - - [Parameter()] - [System.Object] - $Identity, - [Parameter()] [System.Object] - $Scope - ) -} -function Set-M365DataAtRestEncryptionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Description, + $Scope, [Parameter()] [System.Management.Automation.SwitchParameter] - $Force, - - [Parameter()] - [System.String] - $Name, + $Confirm, [Parameter()] [System.Object] - $DomainController, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $JournalEmailAddress, [Parameter()] [System.Object] $Identity, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Refresh, - - [Parameter()] - [System.Boolean] - $Enabled - ) -} -function Set-M365DataAtRestEncryptionPolicyAssignment -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] - $DataEncryptionPolicy + $Recipient ) } function Set-Mailbox @@ -11609,10 +12506,6 @@ function Set-Mailbox [System.Boolean] $CalendarRepairDisabled, - [Parameter()] - [System.Object] - $AddressBookPolicy, - [Parameter()] [System.Management.Automation.SwitchParameter] $RemoveMailboxProvisioningConstraint, @@ -11673,10 +12566,6 @@ function Set-Mailbox [System.Object] $DataEncryptionPolicy, - [Parameter()] - [System.Object] - $ExternalOofOptions, - [Parameter()] [System.Object] $ExtensionCustomAttribute4, @@ -11685,6 +12574,10 @@ function Set-Mailbox [System.Object] $LitigationHoldDate, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Boolean] $EnableRoomMailboxAccount, @@ -11738,8 +12631,8 @@ function Set-Mailbox $RemoveDelayHoldApplied, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $ExternalOofOptions, [Parameter()] [System.Object] @@ -11785,6 +12678,10 @@ function Set-Mailbox [System.Object] $RecipientLimits, + [Parameter()] + [System.Object] + $AddressBookPolicy, + [Parameter()] [System.Boolean] $MessageCopyForSentAsEnabled, @@ -11882,10 +12779,6 @@ function Set-MailboxAuditBypassAssociation { [CmdletBinding()] param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Boolean] $AuditBypassEnabled, @@ -11907,6 +12800,10 @@ function Set-MailboxAutoReplyConfiguration [System.Management.Automation.SwitchParameter] $Confirm, + [Parameter()] + [System.String] + $InternalMessage, + [Parameter()] [System.String] $DeclineMeetingMessage, @@ -11955,216 +12852,11 @@ function Set-MailboxAutoReplyConfiguration [System.DateTime] $EndTime, - [Parameter()] - [System.String] - $InternalMessage, - [Parameter()] [System.String] $ExternalMessage ) } -function Set-MailboxCalendarConfiguration -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Int32] - $WeatherLocationBookmark, - - [Parameter()] - [System.Object] - $WorkspaceUserEnabled, - - [Parameter()] - [System.Boolean] - $ConversationalSchedulingEnabled, - - [Parameter()] - [System.Boolean] - $HotelEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $SkipAgendaMailOnFreeDays, - - [Parameter()] - [System.Boolean] - $DiningEventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $CreateEventsFromEmailAsPrivate, - - [Parameter()] - [System.String] - $CalendarFeedsPreferredLanguage, - - [Parameter()] - [System.Boolean] - $PackageDeliveryEventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $WorkingHoursTimeZone, - - [Parameter()] - [System.Object] - $WeatherLocations, - - [Parameter()] - [System.Boolean] - $FlightEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $RentalCarEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $DeleteMeetingRequestOnRespond, - - [Parameter()] - [System.Int32] - $DefaultMeetingDuration, - - [Parameter()] - [System.Boolean] - $ReminderSoundEnabled, - - [Parameter()] - [System.TimeSpan] - $WorkingHoursEndTime, - - [Parameter()] - [System.Object] - $ShortenEventScopeDefault, - - [Parameter()] - [System.Boolean] - $InvoiceEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $UseBrightCalendarColorThemeInOwa, - - [Parameter()] - [System.TimeSpan] - $DefaultReminderTime, - - [Parameter()] - [System.Object] - $LocationDetailsInFreeBusy, - - [Parameter()] - [System.Object] - $WeatherEnabled, - - [Parameter()] - [System.String] - $CalendarFeedsPreferredRegion, - - [Parameter()] - [System.Boolean] - $ServiceAppointmentEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $ShowWeekNumbers, - - [Parameter()] - [System.Boolean] - $RemindersEnabled, - - [Parameter()] - [System.Object] - $WeekStartDay, - - [Parameter()] - [System.Object] - $FirstWeekOfYear, - - [Parameter()] - [System.Int32] - $DefaultMinutesToReduceShortEventsBy, - - [Parameter()] - [System.Boolean] - $AgendaMailIntroductionEnabled, - - [Parameter()] - [System.TimeSpan] - $WorkingHoursStartTime, - - [Parameter()] - [System.String] - $CalendarFeedsRootPageId, - - [Parameter()] - [System.Object] - $DailyAgendaMailSchedule, - - [Parameter()] - [System.Int32] - $DefaultMinutesToReduceLongEventsBy, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $AutoDeclineWhenBusy, - - [Parameter()] - [System.Object] - $OnlineMeetingsByDefaultEnabled, - - [Parameter()] - [System.Boolean] - $PreserveDeclinedMeetings, - - [Parameter()] - [System.Object] - $TimeIncrement, - - [Parameter()] - [System.Object] - $WorkDays, - - [Parameter()] - [System.Boolean] - $EntertainmentEventsFromEmailEnabled, - - [Parameter()] - [System.Boolean] - $EventsFromEmailEnabled, - - [Parameter()] - [System.Object] - $WeatherUnit, - - [Parameter()] - [System.Object] - $DefaultOnlineMeetingProvider, - - [Parameter()] - [System.Object] - $MailboxLocation, - - [Parameter()] - [System.Boolean] - $AgendaMailEnabled, - - [Parameter()] - [System.Boolean] - $AgendaPaneEnabled - ) -} function Set-MailboxCalendarFolder { [CmdletBinding()] @@ -12214,52 +12906,6 @@ function Set-MailboxCalendarFolder $Confirm ) } -function Set-MailboxFolderPermission -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object[]] - $AccessRights, - - [Parameter()] - [System.Object] - $SharingPermissionFlags, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $SendNotificationToUser - ) -} -function Set-MailboxIRMAccess -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Object] - $User, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $AccessLevel - ) -} function Set-MailboxPlan { [CmdletBinding()] @@ -12278,11 +12924,11 @@ function Set-MailboxPlan [Parameter()] [System.Object] - $ProhibitSendReceiveQuota, + $MaxSendSize, [Parameter()] [System.Object] - $MaxSendSize, + $ProhibitSendReceiveQuota, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -12406,10 +13052,18 @@ function Set-MailContact [System.String] $DisplayName, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.String] $CustomAttribute3, + [Parameter()] + [System.Object] + $RejectMessagesFrom, + [Parameter()] [System.Object] $RejectMessagesFromSendersOrMembers, @@ -12490,10 +13144,6 @@ function Set-MailContact [System.String] $CustomAttribute15, - [Parameter()] - [System.Object] - $RejectMessagesFrom, - [Parameter()] [System.Object] $UserSMimeCertificate, @@ -12506,10 +13156,6 @@ function Set-MailContact [System.Object] $MessageFormat, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Object] $ExtensionCustomAttribute5, @@ -12717,73 +13363,55 @@ function Set-MalwareFilterRule $ExceptIfSentToMemberOf ) } -function Set-ManagementRoleEntry +function Set-ManagementRoleAssignment { [CmdletBinding()] param( [Parameter()] - [System.String[]] - $Parameters, + [System.Object] + $RecipientGroupScope, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $CustomRecipientWriteScope, [Parameter()] [System.Object] - $Identity, + $RecipientAdministrativeUnitScope, [Parameter()] - [System.Management.Automation.SwitchParameter] - $RemoveParameter, + [System.Object] + $ExclusiveRecipientWriteScope, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AddParameter, + [System.Object] + $CustomResourceScope, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Set-ManagementScope -{ - [CmdletBinding()] - param( + [System.Object] + $Identity, + [Parameter()] [System.Object] - $RecipientRoot, + $RecipientOrganizationalUnitScope, [Parameter()] - [System.String] - $Name, + [System.Boolean] + $Enabled, [Parameter()] [System.Management.Automation.SwitchParameter] $Confirm, - [Parameter()] - [System.String] - $RecipientRestrictionFilter, - [Parameter()] [System.Object] - $Identity, + $RecipientRelativeWriteScope, [Parameter()] [System.Management.Automation.SwitchParameter] $Force ) } -function Set-MeetingInsightsSettings -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Enabled - ) -} function Set-MessageClassification { [CmdletBinding()] @@ -12810,197 +13438,23 @@ function Set-MessageClassification [Parameter()] [System.Boolean] - $PermissionMenuVisible, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Guid] - $ClassificationID, - - [Parameter()] - [System.Object] - $DisplayPrecedence, - - [Parameter()] - [System.Boolean] - $RetainClassificationEnabled - ) -} -function Set-MigrationBatch -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Byte[]] - $CSVData, - - [Parameter()] - [System.Object] - $ReportInterval, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $MoveOptions, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Update, - - [Parameter()] - [System.Object] - $NotificationEmails, - - [Parameter()] - [System.Boolean] - $SkipReports, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $ApproveSkippedItems, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $SyncNow, - - [Parameter()] - [System.Object] - $SkipMerging, - - [Parameter()] - [System.Object] - $SkipMoving, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $AddUsers, - - [Parameter()] - [System.Object] - $CompleteAfter, - - [Parameter()] - [System.Object] - $Partition, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $BadItemLimit, + $RetainClassificationEnabled, [Parameter()] [System.Boolean] - $AllowUnknownColumnsInCSV, - - [Parameter()] - [System.Object] - $StartAfter, + $PermissionMenuVisible, - [Parameter()] - [System.Object] - $LargeItemLimit - ) -} -function Set-MigrationEndpoint -{ - [CmdletBinding()] - param( [Parameter()] [System.Object] $Identity, [Parameter()] - [System.Boolean] - $AcceptUntrustedCertificates, - - [Parameter()] - [System.Object] - $MaxConcurrentMigrations, - - [Parameter()] - [System.Byte[]] - $ServiceAccountKeyFileData, - - [Parameter()] - [System.Object] - $TestMailbox, - - [Parameter()] - [System.String] - $ExchangeServer, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $SkipVerification, - - [Parameter()] - [System.Object] - $Authentication, - - [Parameter()] - [System.String] - $AppSecretKeyVaultUrl, - - [Parameter()] - [System.Object] - $Port, - - [Parameter()] - [System.String] - $ApplicationId, - - [Parameter()] - [System.Object] - $RemoteServer, - - [Parameter()] - [System.Object] - $Partition, - - [Parameter()] - [System.Object] - $MailboxPermission, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.String] - $SourceMailboxLegacyDN, - - [Parameter()] - [System.String] - $NspiServer, - - [Parameter()] - [System.Object] - $RPCProxyServer, - - [Parameter()] - [System.String] - $PublicFolderDatabaseServerLegacyDN, - - [Parameter()] - [System.Object] - $Security, + [System.Guid] + $ClassificationID, [Parameter()] [System.Object] - $MaxConcurrentIncrementalSyncs, - - [Parameter()] - [System.Management.Automation.PSCredential] - $Credentials + $DisplayPrecedence ) } function Set-MobileDeviceMailboxPolicy @@ -13019,6 +13473,10 @@ function Set-MobileDeviceMailboxPolicy [System.Boolean] $AllowUnsignedInstallationPackages, + [Parameter()] + [System.Object] + $MaxPasswordFailedAttempts, + [Parameter()] [System.Boolean] $AllowExternalDeviceManagement, @@ -13119,10 +13577,6 @@ function Set-MobileDeviceMailboxPolicy [System.Object] $AllowBluetooth, - [Parameter()] - [System.Boolean] - $WSSAccessEnabled, - [Parameter()] [System.Object] $RequireEncryptionSMIMEAlgorithm, @@ -13216,8 +13670,8 @@ function Set-MobileDeviceMailboxPolicy $AllowTextMessaging, [Parameter()] - [System.Object] - $MaxPasswordFailedAttempts, + [System.Boolean] + $WSSAccessEnabled, [Parameter()] [System.Boolean] @@ -13236,6 +13690,67 @@ function Set-MobileDeviceMailboxPolicy $Identity ) } +function Set-OfflineAddressBook +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Object] + $Versions, + + [Parameter()] + [System.Object] + $Schedule, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $ApplyMandatoryProperties, + + [Parameter()] + [System.Boolean] + $ZipOabFilesBeforeUploading, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UpgradeFromE14, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Int32] + $FullOabDownloadPreventionThreshold, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object] + $DiffRetentionPeriod, + + [Parameter()] + [System.Object[]] + $AddressLists, + + [Parameter()] + [System.Object] + $ConfiguredAttributes, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $UseDefaultAttributes, + + [Parameter()] + [System.Boolean] + $IsDefault + ) +} function Set-OMEConfiguration { [CmdletBinding()] @@ -13336,84 +13851,44 @@ function Set-Organization param( [Parameter()] [System.Management.Automation.SwitchParameter] - $Confirm, + $Force, [Parameter()] - [System.Boolean] - $UnifiedAuditLogIngestionEnabled, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + [System.Boolean] + $UnifiedAuditLogIngestionEnabled ) } function Set-OrganizationConfig { [CmdletBinding()] param( - [Parameter()] - [System.Object] - $EwsAllowMacOutlook, - - [Parameter()] - [System.Int32] - $RequiredCharsetCoverage, - - [Parameter()] - [System.Boolean] - $PublicComputersDetectionEnabled, - [Parameter()] [System.Boolean] - $OAuth2ClientProfileEnabled, + $FindTimeLockPollForAttendeesEnabled, [Parameter()] [System.Boolean] - $ActionableMessagesExtenalAccessTokenEnabled, + $ConnectorsEnabledForYammer, [Parameter()] [System.Boolean] - $EnableOutlookEvents, + $PublicFolderShowClientControl, [Parameter()] [System.Boolean] - $OutlookGifPickerDisabled, - - [Parameter()] - [System.String] - $VisibleMeetingUpdateProperties, - - [Parameter()] - [System.Object] - $EwsEnabled, + $MailTipsGroupMetricsEnabled, [Parameter()] [System.Object] - $DefaultPublicFolderIssueWarningQuota, - - [Parameter()] - [System.Boolean] - $RefreshSessionEnabled, - - [Parameter()] - [System.Boolean] - $IsGroupFoldersAndRulesEnabled, - - [Parameter()] - [System.Boolean] - $WebSuggestedRepliesDisabled, - - [Parameter()] - [System.Boolean] - $MessageRecallAlertRecipientsEnabled, + $PublicFoldersEnabled, [Parameter()] [System.Boolean] - $BookingsExposureOfStaffDetailsRestricted, - - [Parameter()] - [System.Object] - $MessageRecallEnabled, + $ReadTrackingEnabled, [Parameter()] [System.Boolean] @@ -13421,163 +13896,131 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $AutoEnableArchiveMailbox, + $BookingsNamingPolicyPrefixEnabled, [Parameter()] [System.Boolean] - $WorkspaceTenantEnabled, + $MailTipsExternalRecipientsTipsEnabled, [Parameter()] [System.Object] - $DistributionGroupDefaultOU, - - [Parameter()] - [System.Boolean] - $BookingsSocialSharingRestricted, - - [Parameter()] - [System.Int32] - $DefaultMinutesToReduceLongEventsBy, + $FocusedInboxOn, [Parameter()] [System.Object] - $PublicFoldersEnabled, + $EwsApplicationAccessPolicy, [Parameter()] [System.Boolean] - $MaskClientIpInReceivedHeadersEnabled, - - [Parameter()] - [System.Object] - $EwsAllowList, + $OAuth2ClientProfileEnabled, [Parameter()] [System.Boolean] - $BookingsAuthEnabled, + $MobileAppEducationEnabled, [Parameter()] [System.Boolean] - $AcceptedDomainApprovedSendersEnabled, + $EnableOutlookEvents, [Parameter()] [System.Boolean] - $AutomaticForcedReadReceiptEnabled, - - [Parameter()] - [System.Object] - $OnlineMeetingsByDefaultEnabled, - - [Parameter()] - [System.String] - $BookingsNamingPolicyPrefix, + $BookingsExposureOfStaffDetailsRestricted, [Parameter()] [System.Boolean] - $FindTimeLockPollForAttendeesEnabled, - - [Parameter()] - [System.Object] - $RecallReadMessagesEnabled, + $ElcProcessingDisabled, [Parameter()] [System.Boolean] - $BookingsNamingPolicyPrefixEnabled, + $UnblockUnsafeSenderPromptEnabled, [Parameter()] [System.Boolean] - $ConnectorsEnabledForSharepoint, - - [Parameter()] - [System.Object] - $EwsBlockList, + $AutoEnableArchiveMailbox, [Parameter()] [System.Boolean] - $ActivityBasedAuthenticationTimeoutEnabled, + $HybridRSVPEnabled, [Parameter()] [System.Boolean] - $OutlookMobileSingleAccountEnabled, + $RefreshSessionEnabled, [Parameter()] - [System.Object] - $ActivityBasedAuthenticationTimeoutInterval, + [System.Boolean] + $SmtpActionableMessagesEnabled, [Parameter()] [System.Boolean] - $LinkPreviewEnabled, + $ConnectorsEnabledForTeams, [Parameter()] - [System.Object] - $DefaultPublicFolderDeletedItemRetention, + [System.Boolean] + $ComplianceMLBgdCrawlEnabled, [Parameter()] [System.Boolean] $MailTipsAllTipsEnabled, + [Parameter()] + [System.Boolean] + $PostponeRoamingSignaturesUntilLater, + [Parameter()] [System.Object] - $DistributionGroupNameBlockedWordsList, + $RemotePublicFolderMailboxes, [Parameter()] [System.Boolean] - $ConnectorsEnabledForTeams, + $BlockMoveMessagesForGroupFolders, [Parameter()] - [System.Boolean] - $EndUserDLUpgradeFlowsDisabled, + [System.Int32] + $DefaultMinutesToReduceShortEventsBy, [Parameter()] [System.Object] - $MessageRecallMaxRecallableAge, + $EwsAllowEntourage, [Parameter()] - [System.Object] - $FocusedInboxOn, + [System.Boolean] + $OutlookGifPickerDisabled, [Parameter()] [System.Object] - $DefaultPublicFolderAgeLimit, + $OnlineMeetingsByDefaultEnabled, [Parameter()] [System.Boolean] - $EnableForwardingAddressSyncForMailboxes, + $ConnectorsEnabledForOutlook, [Parameter()] [System.Object] - $DefaultGroupAccessType, + $DefaultPublicFolderProhibitPostQuota, [Parameter()] - [System.Boolean] - $BlockMoveMessagesForGroupFolders, + [System.Object] + $ExchangeNotificationRecipients, [Parameter()] [System.Boolean] - $FindTimeAutoScheduleDisabled, + $MessageRemindersEnabled, [Parameter()] [System.Boolean] - $BookingsSearchEngineIndexDisabled, - - [Parameter()] - [System.Uri] - $SiteMailboxCreationURL, + $DirectReportsGroupAutoCreationEnabled, [Parameter()] [System.Boolean] - $ConnectorsEnabledForOutlook, - - [Parameter()] - [System.UInt32] - $MailTipsLargeAudienceThreshold, + $AuditDisabled, [Parameter()] [System.Boolean] - $DirectReportsGroupAutoCreationEnabled, + $BookingsAuthEnabled, [Parameter()] [System.Boolean] - $TenantAdminNotificationForDelayedDelicensingEnabled, + $OutlookMobileGCCRestrictionsEnabled, [Parameter()] [System.Management.Automation.SwitchParameter] @@ -13585,155 +14028,171 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $MessageRemindersEnabled, + $BookingsCreationOfCustomQuestionsRestricted, [Parameter()] [System.Boolean] - $PublicFolderShowClientControl, + $BookingsSmsMicrosoftEnabled, + + [Parameter()] + [System.Object] + $DefaultAuthenticationPolicy, [Parameter()] [System.Boolean] - $AppsForOfficeEnabled, + $WebPushNotificationsDisabled, [Parameter()] [System.Boolean] - $UnblockUnsafeSenderPromptEnabled, + $ActivityBasedAuthenticationTimeoutEnabled, [Parameter()] [System.Boolean] - $ConnectorsActionableMessagesEnabled, + $BookingsAddressEntryRestricted, [Parameter()] - [System.Int32] - $DefaultMinutesToReduceShortEventsBy, + [System.String] + $BookingsNamingPolicyPrefix, [Parameter()] - [System.Boolean] - $CalendarVersionStoreEnabled, + [System.Object] + $DefaultPublicFolderDeletedItemRetention, [Parameter()] - [System.Boolean] - $FindTimeOnlineMeetingOptionDisabled, + [System.Int32] + $PreferredInternetCodePageForShiftJis, [Parameter()] [System.Object] - $RemotePublicFolderMailboxes, + $ShortenEventScopeDefault, [Parameter()] - [System.Boolean] - $EndUserMailNotificationForDelayedDelicensingEnabled, + [System.Object] + $HierarchicalAddressBookRoot, [Parameter()] [System.Boolean] - $BookingsBlockedWordsEnabled, + $IsAgendaMailEnabled, [Parameter()] - [System.Object] - $DistributionGroupNamingPolicy, + [System.Boolean] + $FindTimeOnlineMeetingOptionDisabled, [Parameter()] [System.Object] - $HierarchicalAddressBookRoot, + $EwsEnabled, [Parameter()] [System.Boolean] - $AsyncSendEnabled, + $FindTimeAttendeeAuthenticationEnabled, [Parameter()] [System.Boolean] - $HybridRSVPEnabled, + $AutomaticForcedReadReceiptEnabled, [Parameter()] [System.Boolean] - $ConnectorsEnabled, + $LeanPopoutEnabled, [Parameter()] - [System.Boolean] - $PerTenantSwitchToESTSEnabled, + [System.Object] + $DistributionGroupNameBlockedWordsList, [Parameter()] [System.Int32] - $PreferredInternetCodePageForShiftJis, + $RequiredCharsetCoverage, [Parameter()] [System.Boolean] - $BookingsPhoneNumberEntryRestricted, + $AsyncSendEnabled, [Parameter()] [System.Boolean] - $MobileAppEducationEnabled, + $ConnectorsEnabledForSharepoint, [Parameter()] [System.Boolean] - $BookingsNamingPolicyEnabled, + $BookingsBlockedWordsEnabled, [Parameter()] [System.Boolean] - $BookingsAddressEntryRestricted, + $ActivityBasedAuthenticationTimeoutWithSingleSignOnEnabled, [Parameter()] [System.Boolean] - $RejectDirectSend, + $WorkspaceTenantEnabled, [Parameter()] [System.Boolean] - $BookingsSmsMicrosoftEnabled, + $BookingsNamingPolicyEnabled, + + [Parameter()] + [System.Object] + $DefaultPublicFolderAgeLimit, + + [Parameter()] + [System.String] + $VisibleMeetingUpdateProperties, [Parameter()] [System.Boolean] - $LeanPopoutEnabled, + $OutlookPayEnabled, [Parameter()] - [System.Object] - $ExchangeNotificationRecipients, + [System.UInt32] + $MailTipsLargeAudienceThreshold, [Parameter()] [System.Object] - $EwsAllowEntourage, + $DefaultGroupAccessType, [Parameter()] [System.Boolean] - $IsAgendaMailEnabled, + $CalendarVersionStoreEnabled, [Parameter()] [System.Boolean] - $CustomerLockboxEnabled, + $BookingsPaymentsEnabled, [Parameter()] - [System.Boolean] - $OutlookPayEnabled, + [System.Object] + $MessageRecallEnabled, [Parameter()] [System.Boolean] - $MailTipsMailboxSourcedTipsEnabled, + $MessageHighlightsEnabled, [Parameter()] [System.Boolean] - $OutlookTextPredictionDisabled, + $WebSuggestedRepliesDisabled, [Parameter()] [System.Boolean] - $BookingsMembershipApprovalRequired, + $DisablePlusAddressInRecipients, + + [Parameter()] + [System.Object] + $DistributionGroupNamingPolicy, [Parameter()] [System.Boolean] - $BookingsEnabled, + $PublicComputersDetectionEnabled, [Parameter()] [System.Boolean] - $SendFromAliasEnabled, + $BookingsSocialSharingRestricted, [Parameter()] - [System.Object] - $IPListBlocked, + [System.String] + $BookingsNamingPolicySuffix, [Parameter()] - [System.Object] - $DefaultPublicFolderMaxItemSize, + [System.Boolean] + $BookingsNamingPolicySuffixEnabled, [Parameter()] [System.Boolean] - $ActivityBasedAuthenticationTimeoutWithSingleSignOnEnabled, + $BookingsMembershipApprovalRequired, [Parameter()] [System.Boolean] @@ -13741,127 +14200,143 @@ function Set-OrganizationConfig [Parameter()] [System.Object] - $DefaultPublicFolderProhibitPostQuota, + $DefaultPublicFolderMovedItemRetention, + + [Parameter()] + [System.Object] + $DistributionGroupDefaultOU, [Parameter()] [System.Boolean] - $DisablePlusAddressInRecipients, + $OutlookTextPredictionDisabled, [Parameter()] [System.Boolean] - $OutlookMobileGCCRestrictionsEnabled, + $SharedDomainEmailAddressFlowEnabled, [Parameter()] - [System.Management.Automation.SwitchParameter] - $AutoExpandingArchive, + [System.Boolean] + $ConnectorsActionableMessagesEnabled, [Parameter()] [System.Boolean] - $MessageRecallAlertRecipientsReadMessagesOnlyEnabled, + $MailTipsMailboxSourcedTipsEnabled, [Parameter()] [System.Boolean] - $SharedDomainEmailAddressFlowEnabled, + $BookingsEnabled, + + [Parameter()] + [System.Boolean] + $EndUserDLUpgradeFlowsDisabled, [Parameter()] [System.Object] - $ShortenEventScopeDefault, + $RecallReadMessagesEnabled, [Parameter()] [System.Boolean] - $DelayedDelicensingEnabled, + $BookingsPhoneNumberEntryRestricted, [Parameter()] [System.Boolean] - $MailTipsGroupMetricsEnabled, + $AppsForOfficeEnabled, [Parameter()] [System.Boolean] - $ReadTrackingEnabled, + $EnableForwardingAddressSyncForMailboxes, [Parameter()] - [System.Boolean] - $SmtpActionableMessagesEnabled, + [System.Object] + $EwsAllowOutlook, [Parameter()] - [System.Boolean] - $BookingsNamingPolicySuffixEnabled, + [System.Management.Automation.SwitchParameter] + $AutoExpandingArchive, [Parameter()] [System.Boolean] - $AutodiscoverPartialDirSync, + $LinkPreviewEnabled, [Parameter()] [System.Boolean] - $BookingsCreationOfCustomQuestionsRestricted, + $BookingsSearchEngineIndexDisabled, [Parameter()] - [System.Boolean] - $AuditDisabled, + [System.Object] + $EwsAllowMacOutlook, + + [Parameter()] + [System.Object] + $EwsAllowList, + + [Parameter()] + [System.Object] + $DefaultPublicFolderMaxItemSize, [Parameter()] [System.Boolean] - $FindTimeAttendeeAuthenticationEnabled, + $MatchSenderOrganizerProperties, [Parameter()] - [System.String] - $BookingsNamingPolicySuffix, + [System.Int32] + $DefaultMinutesToReduceLongEventsBy, [Parameter()] [System.Object] - $EwsAllowOutlook, + $IPListBlocked, [Parameter()] [System.Boolean] - $ComplianceMLBgdCrawlEnabled, + $BookingsNotesEntryRestricted, [Parameter()] [System.Boolean] - $BookingsPaymentsEnabled, + $SendFromAliasEnabled, [Parameter()] [System.Boolean] - $OutlookMobileHelpShiftEnabled, + $AutodiscoverPartialDirSync, [Parameter()] - [System.Boolean] - $PostponeRoamingSignaturesUntilLater, + [System.Object] + $ActivityBasedAuthenticationTimeoutInterval, [Parameter()] [System.Boolean] - $MailTipsExternalRecipientsTipsEnabled, + $OutlookMobileSingleAccountEnabled, [Parameter()] [System.Boolean] - $BookingsNotesEntryRestricted, + $IsGroupFoldersAndRulesEnabled, [Parameter()] [System.Boolean] - $MatchSenderOrganizerProperties, + $MaskClientIpInReceivedHeadersEnabled, [Parameter()] - [System.Object] - $EwsApplicationAccessPolicy, + [System.Boolean] + $PerTenantSwitchToESTSEnabled, [Parameter()] [System.Boolean] - $MessageHighlightsEnabled, + $ConnectorsEnabled, [Parameter()] - [System.Boolean] - $ElcProcessingDisabled, + [System.Object] + $EwsBlockList, [Parameter()] [System.Boolean] - $WebPushNotificationsDisabled, + $CustomerLockboxEnabled, [Parameter()] - [System.Object] - $DefaultPublicFolderMovedItemRetention, + [System.Boolean] + $OutlookMobileHelpShiftEnabled, [Parameter()] - [System.Object] - $DefaultAuthenticationPolicy, + [System.Uri] + $SiteMailboxCreationURL, [Parameter()] [System.Int32] @@ -13869,7 +14344,11 @@ function Set-OrganizationConfig [Parameter()] [System.Boolean] - $ConnectorsEnabledForYammer + $FindTimeAutoScheduleDisabled, + + [Parameter()] + [System.Object] + $DefaultPublicFolderIssueWarningQuota ) } function Set-OrganizationRelationship @@ -14006,8 +14485,8 @@ function Set-OutboundConnector $AllAcceptedDomains, [Parameter()] - [System.Boolean] - $TestMode, + [System.Object] + $TlsDomain, [Parameter()] [System.String] @@ -14054,8 +14533,8 @@ function Set-OutboundConnector $SenderRewritingEnabled, [Parameter()] - [System.Object] - $TlsDomain, + [System.Boolean] + $TestMode, [Parameter()] [System.Object] @@ -14066,6 +14545,10 @@ function Set-OwaMailboxPolicy { [CmdletBinding()] param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + [Parameter()] [System.Int32] $DefaultClientLanguage, @@ -14094,10 +14577,6 @@ function Set-OwaMailboxPolicy [System.Object] $BlockedFileTypes, - [Parameter()] - [System.Boolean] - $FeedbackEnabled, - [Parameter()] [System.Boolean] $NpsSurveysEnabled, @@ -14124,11 +14603,7 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $WeatherEnabled, - - [Parameter()] - [System.Boolean] - $OWALightEnabled, + $AdditionalStorageProvidersAvailable, [Parameter()] [System.Boolean] @@ -14142,6 +14617,10 @@ function Set-OwaMailboxPolicy [System.Boolean] $SMimeSuppressNameChecksEnabled, + [Parameter()] + [System.Object] + $ActionForUnknownFileAndMIMETypes, + [Parameter()] [System.String] $ExternalSPMySiteHostURL, @@ -14150,17 +14629,13 @@ function Set-OwaMailboxPolicy [System.Boolean] $OfflineEnabledWeb, - [Parameter()] - [System.Object] - $HideClassicOutlookToggleOut, - [Parameter()] [System.Object] $ForceSaveMimeTypes, [Parameter()] [System.Boolean] - $JournalEnabled, + $CalendarEnabled, [Parameter()] [System.Boolean] @@ -14182,10 +14657,6 @@ function Set-OwaMailboxPolicy [System.Object] $ForceSaveFileTypes, - [Parameter()] - [System.Object] - $OutlookNewslettersAccessLevel, - [Parameter()] [System.Object] $ChangeSettingsAccountEnabled, @@ -14239,8 +14710,8 @@ function Set-OwaMailboxPolicy $DirectFileAccessOnPrivateComputersEnabled, [Parameter()] - [System.Object] - $OutlookNewslettersReactions, + [System.Boolean] + $JournalEnabled, [Parameter()] [System.Boolean] @@ -14279,20 +14750,16 @@ function Set-OwaMailboxPolicy $SatisfactionEnabled, [Parameter()] - [System.Object] - $AllowedMimeTypes, + [System.Boolean] + $OWALightEnabled, [Parameter()] [System.Object] $InstantMessagingType, - [Parameter()] - [System.Object] - $OutlookDataFile, - [Parameter()] [System.Boolean] - $AccountTransferEnabled, + $ActiveSyncIntegrationEnabled, [Parameter()] [System.Object] @@ -14312,19 +14779,15 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $AllowCopyContactsToDeviceAddressBook, - - [Parameter()] - [System.Boolean] - $MonthlyUpdatesEnabled, + $ForceWacViewingFirstOnPrivateComputers, [Parameter()] [System.Object] - $OutlookNewslettersShowMore, + $AllowedMimeTypes, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, + [System.Boolean] + $AllowCopyContactsToDeviceAddressBook, [Parameter()] [System.Object] @@ -14332,23 +14795,19 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $LocalEventsEnabled, + $PlacesEnabled, [Parameter()] [System.Boolean] - $CalendarEnabled, + $ReportJunkEmailEnabled, [Parameter()] [System.Boolean] - $ForceWacViewingFirstOnPrivateComputers, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + $UseISO885915, [Parameter()] [System.Boolean] - $UMIntegrationEnabled, + $RecoverDeletedItemsEnabled, [Parameter()] [System.Boolean] @@ -14363,8 +14822,8 @@ function Set-OwaMailboxPolicy $WebPartsFrameOptionsType, [Parameter()] - [System.Object] - $ActionForUnknownFileAndMIMETypes, + [System.String] + $SetPhotoURL, [Parameter()] [System.Boolean] @@ -14416,11 +14875,11 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $PlacesEnabled, + $UMIntegrationEnabled, [Parameter()] [System.Boolean] - $UseISO885915, + $FeedbackEnabled, [Parameter()] [System.Boolean] @@ -14428,7 +14887,11 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $RecoverDeletedItemsEnabled, + $WeatherEnabled, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefault, [Parameter()] [System.Boolean] @@ -14443,8 +14906,8 @@ function Set-OwaMailboxPolicy $AllowedFileTypes, [Parameter()] - [System.String] - $SetPhotoURL, + [System.Boolean] + $ExternalImageProxyEnabled, [Parameter()] [System.Boolean] @@ -14458,14 +14921,6 @@ function Set-OwaMailboxPolicy [System.Boolean] $FreCardsEnabled, - [Parameter()] - [System.Boolean] - $ExternalImageProxyEnabled, - - [Parameter()] - [System.Boolean] - $ActiveSyncIntegrationEnabled, - [Parameter()] [System.String] $Name, @@ -14480,7 +14935,7 @@ function Set-OwaMailboxPolicy [Parameter()] [System.Boolean] - $AdditionalStorageProvidersAvailable, + $LocalEventsEnabled, [Parameter()] [System.Boolean] @@ -14506,10 +14961,6 @@ function Set-OwaMailboxPolicy [System.Object] $Identity, - [Parameter()] - [System.Boolean] - $ReportJunkEmailEnabled, - [Parameter()] [System.Boolean] $PhoneticSupportEnabled, @@ -14560,12 +15011,12 @@ function Set-PartnerApplication $ActAsPermissions, [Parameter()] - [System.Object] - $AccountType, + [System.Boolean] + $Enabled, [Parameter()] - [System.Boolean] - $Enabled + [System.Object] + $AccountType ) } function Set-PerimeterConfig @@ -14625,6 +15076,10 @@ function Set-Place [System.String] $DisplayDeviceName, + [Parameter()] + [System.Object[]] + $Desks, + [Parameter()] [System.String] $Building, @@ -14641,6 +15096,10 @@ function Set-Place [System.Object] $Floor, + [Parameter()] + [System.Object] + $ParentType, + [Parameter()] [System.String] $VideoDeviceName, @@ -14695,10 +15154,6 @@ function Set-QuarantinePolicy { [CmdletBinding()] param( - [Parameter()] - [System.Boolean] - $IncludeMessagesFromBlockedSenderAddress, - [Parameter()] [System.Object] $MultiLanguageCustomDisclaimer, @@ -14848,6 +15303,10 @@ function Set-RemoteDomain [System.Object] $PreferredInternetCodePageForShiftJis, + [Parameter()] + [System.Boolean] + $SmtpDaneMandatoryModeEnabled, + [Parameter()] [System.String] $NonMimeCharacterSet, @@ -14874,11 +15333,11 @@ function Set-RemoteDomain [Parameter()] [System.Boolean] - $NDRDiagnosticInfoEnabled, + $NDREnabled, [Parameter()] [System.Boolean] - $NDREnabled, + $NDRDiagnosticInfoEnabled, [Parameter()] [System.Boolean] @@ -15216,116 +15675,6 @@ function Set-ResourceConfig $ResourcePropertySchema ) } -function Set-RetentionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object[]] - $RetentionPolicyTagLinks, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefaultArbitrationMailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force - ) -} -function Set-RetentionPolicyTag -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $MessageClass, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Boolean] - $MustDisplayCommentEnabled, - - [Parameter()] - [System.Object[]] - $OptionalInMailbox, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force, - - [Parameter()] - [System.Object] - $LocalizedRetentionPolicyTagName, - - [Parameter()] - [System.Object] - $LegacyManagedFolder, - - [Parameter()] - [System.Object] - $AgeLimitForRetention, - - [Parameter()] - [System.Object] - $RetentionAction, - - [Parameter()] - [System.Object] - $LocalizedComment, - - [Parameter()] - [System.String] - $Comment, - - [Parameter()] - [System.Guid] - $RetentionId, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Boolean] - $RetentionEnabled, - - [Parameter()] - [System.Boolean] - $SystemTag, - - [Parameter()] - [System.String] - $Name - ) -} function Set-RoleAssignmentPolicy { [CmdletBinding()] @@ -15343,12 +15692,12 @@ function Set-RoleAssignmentPolicy $Confirm, [Parameter()] - [System.Object] - $Identity, + [System.Management.Automation.SwitchParameter] + $IsDefault, [Parameter()] - [System.Management.Automation.SwitchParameter] - $IsDefault + [System.Object] + $Identity ) } function Set-RoleGroup @@ -15359,6 +15708,10 @@ function Set-RoleGroup [System.String] $Description, + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + [Parameter()] [System.String] $DisplayName, @@ -15385,11 +15738,7 @@ function Set-RoleGroup [Parameter()] [System.Object] - $ManagedBy, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Force + $ManagedBy ) } function Set-SafeAttachmentPolicy @@ -15604,23 +15953,6 @@ function Set-SafeLinksRule $ExceptIfSentToMemberOf ) } -function Set-ServicePrincipal -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $DisplayName, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} function Set-SharingPolicy { [CmdletBinding()] @@ -15650,158 +15982,6 @@ function Set-SharingPolicy $Enabled ) } -function Set-SweepRule -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Name, - - [Parameter()] - [System.Object] - $Sender, - - [Parameter()] - [System.String] - $Provider, - - [Parameter()] - [System.Object] - $SystemCategory, - - [Parameter()] - [System.Object] - $KeepLatest, - - [Parameter()] - [System.Object] - $SourceFolder, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Mailbox, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $DestinationFolder, - - [Parameter()] - [System.Object] - $KeepForDays, - - [Parameter()] - [System.Boolean] - $Enabled - ) -} -function Set-TeamsProtectionPolicy -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $HighConfidencePhishQuarantineTag, - - [Parameter()] - [System.String] - $AdminDisplayName, - - [Parameter()] - [System.Boolean] - $ZapEnabled, - - [Parameter()] - [System.String] - $MalwareQuarantineTag, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity - ) -} -function Set-TenantAllowBlockListItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.DateTime] - $ExpirationDate, - - [Parameter()] - [System.Object] - $ListSubType, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Block, - - [Parameter()] - [System.String] - $Notes, - - [Parameter()] - [System.Int32] - $RemoveAfter, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $OutputJson, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $NoExpiration, - - [Parameter()] - [System.String[]] - $Ids, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Allow, - - [Parameter()] - [System.String[]] - $Entries, - - [Parameter()] - [System.Object] - $ListType - ) -} -function Set-TenantAllowBlockListSpoofItems -{ - [CmdletBinding()] - param( - [Parameter()] - [System.String] - $Action, - - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.String[]] - $Ids - ) -} function Set-TransportConfig { [CmdletBinding()] @@ -15818,10 +15998,18 @@ function Set-TransportConfig [System.Boolean] $ExternalDelayDsnEnabled, + [Parameter()] + [System.Object] + $DSNConversionMode, + [Parameter()] [System.Boolean] $SmtpClientAuthenticationDisabled, + [Parameter()] + [System.Globalization.CultureInfo] + $InternalDsnDefaultLanguage, + [Parameter()] [System.Object] $MessageExpiration, @@ -15834,6 +16022,10 @@ function Set-TransportConfig [System.Boolean] $ReplyAllStormProtectionEnabled, + [Parameter()] + [System.Boolean] + $InternalDsnLanguageDetectionEnabled, + [Parameter()] [System.Boolean] $AddressBookPolicyRoutingEnabled, @@ -15851,16 +16043,16 @@ function Set-TransportConfig $Rfc2231EncodingEnabled, [Parameter()] - [System.Boolean] - $InternalDsnLanguageDetectionEnabled, + [System.Object] + $HeaderPromotionModeSetting, [Parameter()] [System.Boolean] $VoicemailJournalingEnabled, [Parameter()] - [System.Object] - $HeaderPromotionModeSetting, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.Object] @@ -15870,26 +16062,14 @@ function Set-TransportConfig [System.Boolean] $ConvertDisclaimerWrapperToEml, - [Parameter()] - [System.Object] - $ExternalDsnReportingAuthority, - [Parameter()] [System.Object] $InternalDsnReportingAuthority, - [Parameter()] - [System.Boolean] - $PreventDuplicateJournalingEnabled, - [Parameter()] [System.Int32] $JournalMessageExpirationDays, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - [Parameter()] [System.Object] $MaxRecipientEnvelopeLimit, @@ -15900,16 +16080,12 @@ function Set-TransportConfig [Parameter()] [System.Object] - $DSNConversionMode, + $ExternalDsnReportingAuthority, [Parameter()] [System.Globalization.CultureInfo] $ExternalDsnDefaultLanguage, - [Parameter()] - [System.Globalization.CultureInfo] - $InternalDsnDefaultLanguage, - [Parameter()] [System.Object] $AllowLegacyTLSClients, @@ -16853,21 +17029,52 @@ function Set-UnifiedGroup $HiddenFromAddressListsEnabled ) } -function Set-User + +function Set-UnifiedAuditLogRetentionPolicy { [CmdletBinding()] param( [Parameter()] - [System.Object] - $WindowsEmailAddress, + [System.String] + $Identity, [Parameter()] - [System.Boolean] - $IsShadowMailbox, + [System.UInt32] + $Priority, [Parameter()] [System.String] - $LastName, + $RetentionDuration, + + [Parameter()] + [System.String] + $Description, + + [Parameter()] + [System.String[]] + $Operations, + + [Parameter()] + [System.String[]] + $RecordTypes, + + [Parameter()] + [System.String[]] + $UserIds + ) +} + +function Set-User +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $MailboxRegion, + + [Parameter()] + [System.Boolean] + $IsShadowMailbox, [Parameter()] [System.String] @@ -16901,6 +17108,10 @@ function Set-User [System.String] $Pager, + [Parameter()] + [System.String] + $Name, + [Parameter()] [System.String] $PhoneticDisplayName, @@ -16921,10 +17132,6 @@ function Set-User [System.Object] $ManagedOnboardingType, - [Parameter()] - [System.Object] - $StsRefreshTokensValidFrom, - [Parameter()] [System.Management.Automation.SwitchParameter] $RemoveMailboxProvisioningConstraint, @@ -16961,14 +17168,6 @@ function Set-User [System.String] $AssistantName, - [Parameter()] - [System.Management.Automation.SwitchParameter] - $PublicFolder, - - [Parameter()] - [System.String] - $FirstName, - [Parameter()] [System.String] $Company, @@ -16979,11 +17178,11 @@ function Set-User [Parameter()] [System.String] - $SimpleDisplayName, + $Initials, [Parameter()] - [System.String] - $Initials, + [System.Management.Automation.SwitchParameter] + $Confirm, [Parameter()] [System.String] @@ -16993,6 +17192,10 @@ function Set-User [System.String] $Notes, + [Parameter()] + [System.String] + $LastName, + [Parameter()] [System.Management.Automation.SwitchParameter] $PermanentlyClearPreviousMailboxInfo, @@ -17002,8 +17205,8 @@ function Set-User $Manager, [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, + [System.Object] + $StsRefreshTokensValidFrom, [Parameter()] [System.Object] @@ -17011,7 +17214,7 @@ function Set-User [Parameter()] [System.String] - $StreetAddress, + $SimpleDisplayName, [Parameter()] [System.Object] @@ -17026,24 +17229,28 @@ function Set-User $Department, [Parameter()] - [System.Object] - $OtherHomePhone, + [System.String] + $FirstName, [Parameter()] - [System.String] - $MailboxRegion, + [System.Object] + $PostOfficeBox, [Parameter()] - [System.Boolean] - $EXOModuleEnabled, + [System.Management.Automation.SwitchParameter] + $PublicFolder, [Parameter()] - [System.Boolean] - $RemotePowerShellEnabled, + [System.Object] + $WindowsEmailAddress, [Parameter()] [System.String] - $Name, + $StreetAddress, + + [Parameter()] + [System.Boolean] + $RemotePowerShellEnabled, [Parameter()] [System.String] @@ -17055,7 +17262,7 @@ function Set-User [Parameter()] [System.Object] - $PostOfficeBox, + $OtherHomePhone, [Parameter()] [System.Object] @@ -17066,40 +17273,6 @@ function Set-User $CanHaveCloudCache ) } -function Start-MigrationBatch -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Partition - ) -} -function Stop-MigrationBatch -{ - [CmdletBinding()] - param( - [Parameter()] - [System.Management.Automation.SwitchParameter] - $Confirm, - - [Parameter()] - [System.Object] - $Identity, - - [Parameter()] - [System.Object] - $Partition - ) -} function Update-RoleGroupMember { [CmdletBinding()] @@ -17123,8 +17296,6 @@ function Update-RoleGroupMember } #endregion - - #region Microsoft.Graph.Applications function Get-MgApplication { @@ -105827,3 +105998,180 @@ function Update-MgAdminSharepointSetting } #endregion + +function Get-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $OptionalInMailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IncludeSystemTags, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Object[]] + $Types + ) +} +function New-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Object] + $AgeLimitForRetention, + + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Boolean] + $MustDisplayCommentEnabled, + + [Parameter()] + [System.String] + $Name, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultAutoGroupPolicyTag, + + [Parameter()] + [System.Object] + $LocalizedRetentionPolicyTagName, + + [Parameter()] + [System.Object] + $LocalizedComment, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $IsDefaultModeratedRecipientsPolicyTag, + + [Parameter()] + [System.Object] + $RetentionAction, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.Object] + $Type, + + [Parameter()] + [System.Boolean] + $SystemTag + ) +} +function Remove-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Object] + $Identity + ) +} +function Set-RetentionPolicyTag +{ + [CmdletBinding()] + param( + [Parameter()] + [System.String] + $MessageClass, + + [Parameter()] + [System.Object] + $Identity, + + [Parameter()] + [System.Boolean] + $MustDisplayCommentEnabled, + + [Parameter()] + [System.Object[]] + $OptionalInMailbox, + + [Parameter()] + [System.Object] + $Mailbox, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Force, + + [Parameter()] + [System.Object] + $LocalizedRetentionPolicyTagName, + + [Parameter()] + [System.Object] + $LegacyManagedFolder, + + [Parameter()] + [System.Object] + $AgeLimitForRetention, + + [Parameter()] + [System.Object] + $RetentionAction, + + [Parameter()] + [System.Object] + $LocalizedComment, + + [Parameter()] + [System.String] + $Comment, + + [Parameter()] + [System.Guid] + $RetentionId, + + [Parameter()] + [System.Management.Automation.SwitchParameter] + $Confirm, + + [Parameter()] + [System.Boolean] + $RetentionEnabled, + + [Parameter()] + [System.Boolean] + $SystemTag, + + [Parameter()] + [System.String] + $Name + ) +} From 6666d46e6606aed9a8bc5abe77e2512647f8dd77 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Sat, 8 Feb 2025 11:16:16 -0500 Subject: [PATCH 06/26] Update Microsoft365DSC.PPTenantSettings.Tests.ps1 --- .../Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 index 9454ac6b15..eb17590094 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 @@ -55,6 +55,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { DisableBingVideoSearch = $false DisableShareWithEveryone = $false EnableGuestsToMake = $false + EnableDesktopFlowDataPolicyManagement = $false ShareWithColleaguesUserLimit = 10000 Credential = $Credential } @@ -106,6 +107,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { DisableTrialEnvironmentCreationByNonAdminUsers = $testParams.DisableTrialEnvironmentCreationByNonAdminUsers DisableCapacityAllocationByEnvironmentAdmins = $testParams.DisableCapacityAllocationByEnvironmentAdmins DisableSupportTicketsVisibleByAllUsers = $testParams.DisableSupportTicketsVisibleByAllUsers + EnableDesktopFlowDataPolicyManagement = $false powerPlatform = @( @{ search = @{ From 4caf02ea76576ec2b65ca59343d6020cb43c8434 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Sat, 8 Feb 2025 16:40:13 +0000 Subject: [PATCH 07/26] Updated Resources and Cmdlet documentation pages --- .../exchange/EXORetentionPolicyTag.md | 169 ++++++++++++++++++ .../power-platform/PPTenantSettings.md | 1 + 2 files changed, 170 insertions(+) create mode 100644 docs/docs/resources/exchange/EXORetentionPolicyTag.md diff --git a/docs/docs/resources/exchange/EXORetentionPolicyTag.md b/docs/docs/resources/exchange/EXORetentionPolicyTag.md new file mode 100644 index 0000000000..6ab9ecb2f0 --- /dev/null +++ b/docs/docs/resources/exchange/EXORetentionPolicyTag.md @@ -0,0 +1,169 @@ +# EXORetentionPolicyTag + +## Parameters + +| Parameter | Attribute | DataType | Description | Allowed Values | +| --- | --- | --- | --- | --- | +| **Identity** | Key | String | The Identity parameter specifies the name of the tag. | | +| **Comment** | Write | String | The Description parameter specifies a comment for the tag. | | +| **AgeLimitForRetention** | Write | String | The AgeLimitForRetention parameter specifies the age at which retention is enforced on an item. The age limit corresponds to the number of days from the date the item was delivered, or the date an item was created if it wasn't delivered. If this parameter isn't present and the RetentionEnabled parameter is set to $true, an error is returned. | | +| **MessageClass** | Write | String | The MessageClass parameter specifies the message type to which the tag applies. If not specified, the default value is set to *. | | +| **MustDisplayCommentEnabled** | Write | Boolean | The MustDisplayCommentEnabled parameter specifies whether the comment can be hidden. The default value is $true. | | +| **RetentionAction** | Write | String | The RetentionAction parameter specifies the action for the retention policy. | | +| **RetentionEnabled** | Write | Boolean | The RetentionEnabled parameter specifies whether the tag is enabled. When set to $false, the tag is disabled, and no retention action is taken on messages that have the tag applied. | | +| **Type** | Write | String | The Type parameter specifies the type of retention tag being created. | | +| **Ensure** | Write | String | Present ensures the instance exists, absent ensures it is removed. | `Absent`, `Present` | +| **Credential** | Write | PSCredential | Credentials of the workload's Admin | | +| **ApplicationId** | Write | String | Id of the Azure Active Directory application to authenticate with. | | +| **TenantId** | Write | String | Id of the Azure Active Directory tenant used for authentication. | | +| **CertificateThumbprint** | Write | String | Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication. | | +| **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | | +| **AccessTokens** | Write | StringArray[] | Access token used for authentication. | | + + +## Description + +Manage Exchange Online retention policy tags. + +## Permissions + +### Exchange + +To authenticate with Microsoft Exchange, this resource required the following permissions: + +#### Roles + +- Organization Management, Recipient Management + +#### Role Groups + +- Organization Management, Help Desk + +## Examples + +### Example 1 + +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. + +```powershell +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} +``` + +### Example 2 + +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. + +```powershell +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my modified tag"; #Drift + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} +``` + +### Example 3 + +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. + +```powershell +Configuration Example +{ + param( + [Parameter()] + [System.String] + $ApplicationId, + + [Parameter()] + [System.String] + $TenantId, + + [Parameter()] + [System.String] + $CertificateThumbprint + ) + Import-DscResource -ModuleName Microsoft365DSC + node localhost + { + EXORetentionPolicyTag "RetentionPolicyTag" + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Absent"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } + } +} +``` + diff --git a/docs/docs/resources/power-platform/PPTenantSettings.md b/docs/docs/resources/power-platform/PPTenantSettings.md index 3abd28ac3d..7420f8d4de 100644 --- a/docs/docs/resources/power-platform/PPTenantSettings.md +++ b/docs/docs/resources/power-platform/PPTenantSettings.md @@ -40,6 +40,7 @@ | **DisableHelpSupportCopilot** | Write | Boolean | TBD | | | **DisableSurveyScreenshots** | Write | Boolean | TBD | | | **WalkMeOptOut** | Write | Boolean | When set to true this will disable the Walk Me guidance. | | +| **useSupportBingSearchByAllUsers** | Write | Boolean | TBD | | | **DisableNPSCommentsReachout** | Write | Boolean | When set to true this will disable the NPS Comments Reachout. | | | **DisableNewsletterSendout** | Write | Boolean | When set to true this will disable the monthly newsletters. | | | **DisableEnvironmentCreationByNonAdminUsers** | Write | Boolean | When set to true this will disable production environment creation by non-admin users. | | From cfcc76d8692be5d8bc57d04072c539c01c428983 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Sat, 8 Feb 2025 16:42:09 +0000 Subject: [PATCH 08/26] Updated Schema Definition --- Modules/Microsoft365DSC/SchemaDefinition.json | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/Modules/Microsoft365DSC/SchemaDefinition.json b/Modules/Microsoft365DSC/SchemaDefinition.json index 0b2e35b51d..fb76ed84a5 100644 --- a/Modules/Microsoft365DSC/SchemaDefinition.json +++ b/Modules/Microsoft365DSC/SchemaDefinition.json @@ -21650,6 +21650,86 @@ } ] }, + { + "ClassName": "MSFT_EXORetentionPolicyTag", + "Parameters": [ + { + "CIMType": "String", + "Name": "Identity", + "Option": "Key" + }, + { + "CIMType": "String", + "Name": "Comment", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "AgeLimitForRetention", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "MessageClass", + "Option": "Write" + }, + { + "CIMType": "Boolean", + "Name": "MustDisplayCommentEnabled", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "RetentionAction", + "Option": "Write" + }, + { + "CIMType": "Boolean", + "Name": "RetentionEnabled", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "Type", + "Option": "Write" + }, + { + "CIMType": "string", + "Name": "Ensure", + "Option": "Write" + }, + { + "CIMType": "MSFT_Credential", + "Name": "Credential", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "ApplicationId", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "TenantId", + "Option": "Write" + }, + { + "CIMType": "String", + "Name": "CertificateThumbprint", + "Option": "Write" + }, + { + "CIMType": "Boolean", + "Name": "ManagedIdentity", + "Option": "Write" + }, + { + "CIMType": "String[]", + "Name": "AccessTokens", + "Option": "Write" + } + ] + }, { "ClassName": "MSFT_EXORoleAssignmentPolicy", "Parameters": [ @@ -54918,6 +54998,11 @@ "Name": "WalkMeOptOut", "Option": "Write" }, + { + "CIMType": "boolean", + "Name": "useSupportBingSearchByAllUsers", + "Option": "Write" + }, { "CIMType": "boolean", "Name": "DisableNPSCommentsReachout", From 20fd0b491751d4d46d12aebdecf7a61f751ea676 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Sat, 8 Feb 2025 16:42:48 +0000 Subject: [PATCH 09/26] Updated {Create} EXO Integration Tests --- .../M365DSCIntegration.EXO.Create.Tests.ps1 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1 b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1 index 95c4d3a8bd..6e8a00cb1a 100644 --- a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1 +++ b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1 @@ -985,6 +985,20 @@ TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; } + EXORetentionPolicyTag 'RetentionPolicyTag' + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } EXORoleAssignmentPolicy 'ConfigureRoleAssignmentPolicy' { Name = "Integration Policy" From 8d8b83c86da4657c77c98cb8ec1284e5e54a0700 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Sat, 8 Feb 2025 16:43:41 +0000 Subject: [PATCH 10/26] Updated {Update} EXO Integration Tests --- .../M365DSCIntegration.EXO.Update.Tests.ps1 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Update.Tests.ps1 b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Update.Tests.ps1 index bb2783a2a1..0d1a67596b 100644 --- a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Update.Tests.ps1 +++ b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Update.Tests.ps1 @@ -1465,6 +1465,20 @@ TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; } + EXORetentionPolicyTag 'RetentionPolicyTag' + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my modified tag"; #Drift + Ensure = "Present"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } EXORoleAssignmentPolicy 'ConfigureRoleAssignmentPolicy' { Name = "Integration Policy" From 6902c3497057f304ee908280ff2d74bc756cf572 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Sat, 8 Feb 2025 16:44:17 +0000 Subject: [PATCH 11/26] Updated {Update} EXO Integration Tests --- .../M365DSCIntegration.EXO.Remove.Tests.ps1 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Remove.Tests.ps1 b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Remove.Tests.ps1 index f4d10df17d..c8a202494d 100644 --- a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Remove.Tests.ps1 +++ b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Remove.Tests.ps1 @@ -593,6 +593,20 @@ TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; } + EXORetentionPolicyTag 'RetentionPolicyTag' + { + ApplicationId = $ApplicationId; + CertificateThumbprint = $CertificateThumbprint; + Comment = "This is my tag"; + Ensure = "Absent"; + Identity = "MyTag"; + MessageClass = "*"; + MustDisplayCommentEnabled = $False; + RetentionAction = "MoveToArchive"; + RetentionEnabled = $False; + TenantId = $TenantId; + Type = "Personal"; + } EXORoleAssignmentPolicy 'ConfigureRoleAssignmentPolicy' { Name = "Integration Policy" From 8d62005ae4be115129b2acae0f3fffcbbf797a58 Mon Sep 17 00:00:00 2001 From: Fabien Tschanz Date: Tue, 11 Feb 2025 10:37:19 +0100 Subject: [PATCH 12/26] Fix export of AAD Cross Tenant Policies with additional cleanup --- CHANGELOG.md | 5 + ...enantAccessPolicyConfigurationDefault.psm1 | 6 +- ...enantAccessPolicyConfigurationPartner.psm1 | 6 +- .../MSFT_AADGroup/MSFT_AADGroup.psm1 | 30 ---- .../MSFT_AADHomeRealmDiscoveryPolicy.psm1 | 36 ----- ...ADIdentityGovernanceLifecycleWorkflow.psm1 | 93 ------------ ...MSFT_AADNetworkAccessForwardingPolicy.psm1 | 29 ---- ...SFT_AADNetworkAccessForwardingProfile.psm1 | 23 --- .../MSFT_AADRemoteNetwork.psm1 | 136 ------------------ ...MSFT_AADRoleAssignmentScheduleRequest.psm1 | 133 ----------------- .../MSFT_TeamsEmergencyCallRoutingPolicy.psm1 | 30 ---- .../MSFT_TeamsTenantDialPlan.psm1 | 47 ------ 12 files changed, 11 insertions(+), 563 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c12965902..9bb18257ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ # UNRELEASED +* AADCrossTenantAccessPolicyConfigurationDefault + * Fixes an issue with CIM class export. +* AADCrossTenantAccessPolicyConfigurationPartner + * Fixes an issue with CIM class export. + FIXES [#5711](https://github.com/microsoft/Microsoft365DSC/issues/5711) * EXORetentionPolicyTag * Initial release. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 index 5851e16ace..ee5a399167 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 @@ -507,7 +507,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BCollaborationOutbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, @@ -546,7 +546,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BDirectConnectInbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, @@ -585,7 +585,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BDirectConnectOutbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 index 1c6ac48434..5c43dd03a0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 @@ -575,7 +575,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BCollaborationOutbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, @@ -614,7 +614,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BDirectConnectInbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, @@ -653,7 +653,7 @@ function Export-TargetResource { $complexMapping = @( @{ - Name = 'B2BCollaborationInbound' + Name = 'B2BDirectConnectOutbound' CimInstanceName = 'AADCrossTenantAccessPolicyB2BSetting' IsRequired = $False }, diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 index 3adde8eeb7..1ee4fbbccf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 @@ -1342,36 +1342,6 @@ function Get-M365DSCAzureADGroupLicenses return $returnValue } -function Get-M365DSCAzureADGroupLicensesAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $AssignedLicenses - ) - - $StringContent = [System.Text.StringBuilder]::new() - $StringContent.Append('@(') | Out-Null - foreach ($assignedLicense in $AssignedLicenses) - { - $StringContent.Append("MSFT_AADGroupLicense { `r`n") | Out-Null - if ($assignedLicense.DisabledPlans.Length -gt 0) - { - $StringContent.Append(" DisabledPlans = @('" + ($assignedLicense.DisabledPlans -join "','") + "')`r`n") | Out-Null - } - else - { - $StringContent.Append(" DisabledPlans = @()`r`n") | Out-Null - } - $StringContent.Append(" SkuId = '" + $assignedLicense.SkuId + "'`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - $StringContent.Append(' )') | Out-Null - return $StringContent.ToString() -} - function Get-M365DSCCombinedLicenses { [CmdletBinding()] diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 index e9ece04bf7..8ad315b81a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 @@ -554,40 +554,4 @@ function Export-TargetResource } } -function Get-M365DSCAADHomeRealDiscoveryPolicyDefinitionAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $Definitions - ) - - $StringContent = [System.Text.StringBuilder]::new() - $StringContent.Append('@(') | Out-Null - - foreach ($definition in $Definitions) - { - $StringContent.Append("`n MSFT_AADHomeRealDiscoveryPolicyDefinition {`r`n") | Out-Null - $StringContent.Append(" PreferredDomain = '" + $definition.PreferredDomain + "'`r`n") | Out-Null - if ($null -ne $definition.AccelerateToFederatedDomain) - { - $StringContent.Append(' AccelerateToFederatedDomain = $' + $definition.AccelerateToFederatedDomain + "`r`n") | Out-Null - } - if ($null -ne $definition.AllowCloudPasswordValidation) - { - $StringContent.Append(' AllowCloudPasswordValidation = $' + $definition.AllowCloudPasswordValidation + "`r`n") | Out-Null - } - $StringContent.Append(" AlternateIdLogin = MSFT_AADHomeRealDiscoveryPolicyDefinitionAlternateIdLogin {`r`n") | Out-Null - $StringContent.Append(' Enabled = $' + $definition.AlternateIdLogin.Enabled + "`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - - $StringContent.Append(' )') | Out-Null - return $StringContent.ToString() -} - - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 index c82aa75e96..9e7a3a19ed 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 @@ -690,54 +690,6 @@ function Get-M365DSCIdentityGovernanceTasks return $taskList } -function Get-M365DSCIdentityGovernanceTasksAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $Tasks - ) - - $StringContent = [System.Text.StringBuilder]::new() - $StringContent.Append('@(') | Out-Null - - foreach ($task in $Tasks) - { - $StringContent.Append("`n MSFT_AADIdentityGovernanceTask {`r`n") | Out-Null - $StringContent.Append(" DisplayName = '" + $task.DisplayName + "'`r`n") | Out-Null - $StringContent.Append(" Description = '" + $task.Description.replace("'", "''") + "'`r`n") | Out-Null - $StringContent.Append(" Category = '" + $task.Category + "'`r`n") | Out-Null - $StringContent.Append(' IsEnabled = $' + $task.IsEnabled + "`r`n") | Out-Null - $StringContent.Append(' ExecutionSequence = ' + $task.ExecutionSequence + "`r`n") | Out-Null - $StringContent.Append(' ContinueOnError = $' + $task.ContinueOnError + "`r`n") | Out-Null - $StringContent.Append(" TaskDefinitionId = '" + $task.TaskDefinitionId + "'`r`n") | Out-Null - - if ($task.Arguments.Length -gt 0) - { - $StringContent.Append(" Arguments = @(`r`n") | Out-Null - foreach ($argument in $task.Arguments) - { - $StringContent.Append(" MSFT_AADIdentityGovernanceTaskArguments {`r`n") | Out-Null - $StringContent.Append(" Name = '" + $argument.Name + "'`r`n") | Out-Null - $StringContent.Append(" Value = '" + $argument.Value + "'`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - $StringContent.Append(" )`r`n") | Out-Null - } - else - { - $StringContent.Append(" Arguments = @()`r`n") | Out-Null - } - - $StringContent.Append(" }`r`n") | Out-Null - } - - $StringContent.Append(' )') | Out-Null - return $StringContent.ToString() -} - function Get-M365DSCIdentityGovernanceWorkflowExecutionConditions { [CmdletBinding()] @@ -770,49 +722,4 @@ function Get-M365DSCIdentityGovernanceWorkflowExecutionConditions return $executionConditionsResult } -function Get-M365DSCIdentityGovernanceWorkflowExecutionConditionsAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param ( - [Parameter(Mandatory = $true)] - [hashtable] $ExecutionConditions - ) - - $StringContent = [System.Text.StringBuilder]::new() - - # Start of execution conditions - $StringContent.Append("MSFT_IdentityGovernanceWorkflowExecutionConditions {`r`n") | Out-Null - - # Scope section - if ($null -ne $ExecutionConditions.ScopeValue) - { - $StringContent.Append(" ScopeValue = MSFT_IdentityGovernanceScope {`r`n") | Out-Null - $StringContent.Append(" Rule = '" + $ExecutionConditions.ScopeValue.Rule.replace("'", "''") + "'`r`n") | Out-Null - $StringContent.Append(" ODataType = '" + $ExecutionConditions.ScopeValue.ODataType + "'`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - - # Trigger section - if ($null -ne $ExecutionConditions.TriggerValue) - { - $StringContent.Append(" TriggerValue = MSFT_IdentityGovernanceTrigger {`r`n") | Out-Null - $StringContent.Append(' OffsetInDays = ' + $ExecutionConditions.TriggerValue.OffsetInDays + "`r`n") | Out-Null - $StringContent.Append(" TimeBasedAttribute = '" + $ExecutionConditions.TriggerValue.TimeBasedAttribute + "'`r`n") | Out-Null - $StringContent.Append(" ODataType = '" + $ExecutionConditions.TriggerValue.OdataType + "'`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - - # OdataType for executionConditions - if ($null -ne $ExecutionConditions.ODataType) - { - $StringContent.Append(" ODataType = '" + $ExecutionConditions.ODataType + "'`r`n") | Out-Null - } - - # End of execution conditions - $StringContent.Append(' }') | Out-Null - - return $StringContent.ToString() -} - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 index da66361c5d..0298a6751d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 @@ -507,34 +507,5 @@ function Get-MicrosoftGraphNetworkAccessForwardingPolicyRules return $newPolicyRules } -function Get-MicrosoftGraphNetworkAccessForwardingPolicyRulesAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $PolicyRules - ) - - $StringContent = [System.Text.StringBuilder]::new() - $StringContent.Append('@(') | Out-Null - - foreach ($rule in $PolicyRules) - { - $StringContent.Append("`n MSFT_MicrosoftGraphNetworkAccessForwardingPolicyRule {`r`n") | Out-Null - $StringContent.Append(" Name = '" + $rule.Name + "'`r`n") | Out-Null - $StringContent.Append(" ActionValue = '" + $rule.ActionValue + "'`r`n") | Out-Null - $StringContent.Append(" RuleType = '" + $rule.RuleType + "'`r`n") | Out-Null - $StringContent.Append(" Protocol = '" + $rule.Protocol + "'`r`n") | Out-Null - $StringContent.Append(' Ports = @(' + $($rule.Ports -join ', ') + ")`r`n") | Out-Null - $StringContent.Append(' Destinations = @(' + $(($rule.Destinations | ForEach-Object { "'$_'" }) -join ', ') + ")`r`n") | Out-Null - $StringContent.Append(" }`r`n") | Out-Null - } - - $StringContent.Append(' )') | Out-Null - return $StringContent.ToString() -} - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 index 2d7839aa2d..268a4fcc7d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 @@ -531,27 +531,4 @@ function Export-TargetResource } } -function Get-PoliciesAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $Policies - ) - - $StringContent = '@(' - foreach ($policy in $Policies) - { - $StringContent += "MSFT_MicrosoftGraphNetworkaccessPolicyLink {`r`n" - $StringContent += " State = '" + $policy.State + "'`r`n" - $StringContent += " PolicyLinkId = '" + $policy.PolicyLinkId + "'`r`n" - $StringContent += " Name = '" + $policy.Name + "'`r`n" - $StringContent += " }`r`n" - } - $StringContent += ' )' - return $StringContent -} - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 index f2647f6031..1fb1fa4096 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 @@ -725,140 +725,4 @@ function Get-MicrosoftGraphRemoteNetworkDeviceLinksHashtable return $newDeviceLinks } - -function Get-MicrosoftGraphRemoteNetworkDeviceLinksHashtableAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param ( - [Parameter(Mandatory = $true)] - [System.Collections.ArrayList] - $DeviceLinks - ) - - $StringContent = [System.Text.StringBuilder]::new() - $StringContent.Append('@(') | Out-Null - - foreach ($deviceLink in $DeviceLinks) - { - $StringContent.Append("`n MSFT_AADRemoteNetworkDeviceLink {`r`n") | Out-Null - - # Append main properties if not null - if ($deviceLink.Name) - { - $StringContent.Append(" Name = '" + $deviceLink.Name + "'`r`n") | Out-Null - } - if ($deviceLink.IPAddress) - { - $StringContent.Append(" IPAddress = '" + $deviceLink.IPAddress + "'`r`n") | Out-Null - } - if ($deviceLink.BandwidthCapacityInMbps) - { - $StringContent.Append(" BandwidthCapacityInMbps = '" + $deviceLink.BandwidthCapacityInMbps + "'`r`n") | Out-Null - } - if ($deviceLink.DeviceVendor) - { - $StringContent.Append(" DeviceVendor = '" + $deviceLink.DeviceVendor + "'`r`n") | Out-Null - } - - # BGP Configuration - if ($deviceLink.BgpConfiguration) - { - $bgpConfigAdded = $false - $StringContent.Append(" BgpConfiguration = MSFT_AADRemoteNetworkDeviceLinkbgpConfiguration {`r`n") | Out-Null - if ($deviceLink.BgpConfiguration.Asn) - { - $StringContent.Append(' Asn = ' + $deviceLink.BgpConfiguration.Asn + "`r`n") | Out-Null; $bgpConfigAdded = $true - } - if ($deviceLink.BgpConfiguration.LocalIPAddress) - { - $StringContent.Append(" LocalIPAddress = '" + $deviceLink.BgpConfiguration.LocalIPAddress + "'`r`n") | Out-Null; $bgpConfigAdded = $true - } - if ($deviceLink.BgpConfiguration.PeerIPAddress) - { - $StringContent.Append(" PeerIPAddress = '" + $deviceLink.BgpConfiguration.PeerIPAddress + "'`r`n") | Out-Null; $bgpConfigAdded = $true - } - if ($bgpConfigAdded) - { - $StringContent.Append(" }`r`n") | Out-Null - } - } - - # Redundancy Configuration - if ($deviceLink.RedundancyConfiguration) - { - $redundancyConfigAdded = $false - $StringContent.Append(" RedundancyConfiguration = MSFT_AADRemoteNetworkDeviceLinkRedundancyConfiguration {`r`n") | Out-Null - if ($deviceLink.RedundancyConfiguration.RedundancyTier) - { - $StringContent.Append(" RedundancyTier = '" + $deviceLink.RedundancyConfiguration.RedundancyTier + "'`r`n") | Out-Null; $redundancyConfigAdded = $true - } - if ($deviceLink.RedundancyConfiguration.ZoneLocalIPAddress) - { - $StringContent.Append(" ZoneLocalIPAddress = '" + $deviceLink.RedundancyConfiguration.ZoneLocalIPAddress + "'`r`n") | Out-Null; $redundancyConfigAdded = $true - } - if ($redundancyConfigAdded) - { - $StringContent.Append(" }`r`n") | Out-Null - } - } - - # Tunnel Configuration - if ($deviceLink.TunnelConfiguration) - { - $tunnelConfigAdded = $false - $StringContent.Append(" TunnelConfiguration = MSFT_AADRemoteNetworkDeviceLinkTunnelConfiguration {`r`n") | Out-Null - if ($deviceLink.TunnelConfiguration.PreSharedKey) - { - $StringContent.Append(" PreSharedKey = '" + $deviceLink.TunnelConfiguration.PreSharedKey + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.ZoneRedundancyPreSharedKey) - { - $StringContent.Append(" ZoneRedundancyPreSharedKey = '" + $deviceLink.TunnelConfiguration.ZoneRedundancyPreSharedKey + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.SaLifeTimeSeconds) - { - $StringContent.Append(' SaLifeTimeSeconds = ' + $deviceLink.TunnelConfiguration.SaLifeTimeSeconds + "`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.IpSecEncryption) - { - $StringContent.Append(" IPSecEncryption = '" + $deviceLink.TunnelConfiguration.IpSecEncryption + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.IpSecIntegrity) - { - $StringContent.Append(" IPSecIntegrity = '" + $deviceLink.TunnelConfiguration.IpSecIntegrity + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.IkeEncryption) - { - $StringContent.Append(" IKEEncryption = '" + $deviceLink.TunnelConfiguration.IkeEncryption + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.IkeIntegrity) - { - $StringContent.Append(" IKEIntegrity = '" + $deviceLink.TunnelConfiguration.IkeIntegrity + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.DhGroup) - { - $StringContent.Append(" DHGroup = '" + $deviceLink.TunnelConfiguration.DhGroup + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.PfsGroup) - { - $StringContent.Append(" PFSGroup = '" + $deviceLink.TunnelConfiguration.PfsGroup + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($deviceLink.TunnelConfiguration.ODataType) - { - $StringContent.Append(" ODataType = '" + $deviceLink.TunnelConfiguration.ODataType + "'`r`n") | Out-Null; $tunnelConfigAdded = $true - } - if ($tunnelConfigAdded) - { - $StringContent.Append(" }`r`n") | Out-Null - } - } - - $StringContent.Append(" }`r`n") | Out-Null - } - - $StringContent.Append(' )') | Out-Null - return $StringContent.ToString() -} - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 index 114e0c7d5a..bd1170f205 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 @@ -916,137 +916,4 @@ function Export-TargetResource } } -function Get-M365DSCAzureADEligibilityRequestTicketInfoAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.Hashtable] - $TicketInfo - ) - - if ($TicketInfo.TicketNumber -or $TicketInfo.TicketSystem) - { - $StringContent = "MSFT_AADRoleAssignmentScheduleRequestTicketInfo {`r`n" - $StringContent += " ticketNumber = '$($TicketInfo.TicketNumber)'`r`n" - $StringContent += " ticketSystem = '$($TicketInfo.TicketSystem)'`r`n" - $StringContent += " }`r`n" - return $StringContent - } - else - { - return $null - } -} - -function Get-M365DSCAzureADEligibilityRequestScheduleInfoAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param( - [Parameter(Mandatory = $true)] - [System.Collections.Hashtable] - $ScheduleInfo - ) - - $Found = $false - $StringContent = "MSFT_AADRoleAssignmentScheduleRequestSchedule {`r`n" - if ($ScheduleInfo.StartDateTime) - { - $StringContent += " startDateTime = '$($ScheduleInfo.StartDateTime)'`r`n" - } - if ($ScheduleInfo.Expiration.Duration -or $ScheduleInfo.Expiration.EndDateTime -or $ScheduleInfo.Expiration.Type) - { - $Found = $true - $StringContent += " expiration = MSFT_AADRoleAssignmentScheduleRequestScheduleExpiration`r`n" - $StringContent += " {`r`n" - if ($ScheduleInfo.Expiration.Duration) - { - $StringContent += " duration = '$($ScheduleInfo.Expiration.Duration)'`r`n" - } - if ($ScheduleInfo.Expiration.EndDateTime) - { - $StringContent += " endDateTime = '$($ScheduleInfo.Expiration.EndDateTime.ToString())'`r`n" - } - if ($ScheduleInfo.Expiration.Type) - { - $StringContent += " type = '$($ScheduleInfo.Expiration.Type)'`r`n" - } - $StringContent += " }`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.DayOfMonth -or $ScheduleInfo.Recurrence.Pattern.DaysOfWeek -or ` - $ScheduleInfo.Recurrence.Pattern.firstDayOfWeek -or $ScheduleInfo.Recurrence.Pattern.Index -or ` - $ScheduleInfo.Recurrence.Pattern.Interval -or $ScheduleInfo.Recurrence.Pattern.Month -or ` - $ScheduleInfo.Recurrence.Pattern.Type -or $ScheduleInfo.Recurrence.Range.EndDate -or $ScheduleInfo.Recurrence.Range.numberOfOccurrences -or ` - $ScheduleInfo.Recurrence.Range.recurrenceTimeZone -or $ScheduleInfo.Recurrence.Range.startDate -or ` - $ScheduleInfo.Recurrence.Range.type) - { - $StringContent += " recurrence = MSFT_AADRoleAssignmentScheduleRequestScheduleRecurrence`r`n" - $StringContent += " {`r`n" - - if ($ScheduleInfo.Recurrence.Pattern.DayOfMonth -or $ScheduleInfo.Recurrence.Pattern.DaysOfWeek -or ` - $ScheduleInfo.Recurrence.Pattern.firstDayOfWeek -or $ScheduleInfo.Recurrence.Pattern.Index -or ` - $ScheduleInfo.Recurrence.Pattern.Interval -or $ScheduleInfo.Recurrence.Pattern.Month -or ` - $ScheduleInfo.Recurrence.Pattern.Type) - { - $Found = $true - $StringContent += " pattern = MSFT_AADRoleAssignmentScheduleRequestScheduleRecurrencePattern`r`n" - $StringContent += " {`r`n" - if ($ScheduleInfo.Recurrence.Pattern.DayOfMonth) - { - $StringContent += " dayOfMonth = $($ScheduleInfo.Recurrence.Pattern.DayOfMonth)`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.DaysOfWeek) - { - $StringContent += " daysOfWeek = @($($ScheduleInfo.Recurrence.Pattern.DaysOfWeek -join ','))`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.firstDayOfWeek) - { - $StringContent += " firstDayOfWeek = '$($ScheduleInfo.Recurrence.Pattern.firstDayOfWeek)'`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.Index) - { - $StringContent += " index = '$($ScheduleInfo.Recurrence.Pattern.Index)'`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.Interval) - { - $StringContent += " interval = $($ScheduleInfo.Recurrence.Pattern.Interval.ToString())`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.Month) - { - $StringContent += " month = $($ScheduleInfo.Recurrence.Pattern.Month.ToString())`r`n" - } - if ($ScheduleInfo.Recurrence.Pattern.Type) - { - $StringContent += " type = '$($ScheduleInfo.Recurrence.Pattern.Type)'`r`n" - } - $StringContent += " }`r`n" - } - if ($ScheduleInfo.Recurrence.Range.EndDate -or $ScheduleInfo.Recurrence.Range.numberOfOccurrences -or ` - $ScheduleInfo.Recurrence.Range.recurrenceTimeZone -or $ScheduleInfo.Recurrence.Range.startDate -or ` - $ScheduleInfo.Recurrence.Range.type) - { - $Found = $true - $StringContent += " range = MSFT_AADRoleAssignmentScheduleRequestScheduleRange`r`n" - $StringContent += " {`r`n" - $StringContent += " endDate = '$($ScheduleInfo.Recurrence.Range.EndDate)'`r`n" - $StringContent += " numberOfOccurrences = $($ScheduleInfo.Recurrence.Range.numberOfOccurrences)`r`n" - $StringContent += " recurrenceTimeZone = '$($ScheduleInfo.Recurrence.Range.recurrenceTimeZone)'`r`n" - $StringContent += " startDate = '$($ScheduleInfo.Recurrence.Range.startDate)'`r`n" - $StringContent += " type = '$($ScheduleInfo.Recurrence.Range.type)'`r`n" - $StringContent += " }`r`n" - } - - $StringContent += " }`r`n" - } - $StringContent += " }`r`n" - - if ($Found) - { - return $StringContent - } - return $null -} - Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 index 3939367a25..69c147272b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 @@ -500,36 +500,6 @@ function Get-TeamsEmergencyNumbers return $result } -function ConvertTo-TeamsEmergencyNumbersString -{ - [CmdletBinding()] - [OutputType([System.String])] - param - ( - [Parameter(Mandatory = $true)] - [System.Object[]] - $Numbers - ) - - if ($null -eq $Numbers) - { - return $null - } - - $StringContent = "@(`r`n" - foreach ($number in $numbers) - { - $StringContent += " MSFT_TeamsEmergencyNumber`r`n" - $StringContent += " {`r`n" - $StringContent += " EmergencyDialString = '$($number.EmergencyDialString)'`r`n" - $StringContent += " EmergencyDialMask = '$($number.EmergencyDialMask)'`r`n" - $StringContent += " OnlinePSTNUsage = '$($number.OnlinePSTNUsage)'`r`n" - $StringContent += " }`r`n" - } - $StringContent += ' )' - return $StringContent -} - function Convert-CIMToTeamsEmergencyNumbers { [CmdletBinding()] diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 index 8b60186f45..463ce3406a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 @@ -687,51 +687,4 @@ function Get-M365DSCNormalizationRules return $result } -function Get-M365DSCNormalizationRulesAsString -{ - [CmdletBinding()] - [OutputType([System.String])] - param - ( - [Parameter(Mandatory = $true)] - [System.Object[]] - $Params - ) - - if ($null -eq $params) - { - return $null - } - $currentProperty = "@(`r`n" - - foreach ($rule in $params) - { - $currentProperty += " MSFT_TeamsVoiceNormalizationRule{`r`n" - foreach ($key in $rule.Keys) - { - if ($key -eq 'Priority') - { - $currentProperty += ' ' + $key + ' = ' + $rule[$key] + "`r`n" - } - elseif ($key -eq 'IsInternalExtension') - { - $currentProperty += ' ' + $key + " = `$" + $rule[$key] + "`r`n" - } - else - { - $value = $rule[$key] - if (-not [System.String]::IsNullOrEmpty($value)) - { - $value = $value.Replace("'", "''") - } - $currentProperty += ' ' + $key + " = '" + $value + "'`r`n" - } - } - $currentProperty += " }`r`n" - } - $currentProperty += ' )' - - return $currentProperty -} - Export-ModuleMember -Function *-TargetResource From a24465acca91353fe70b6f5772c2a7a4e0456841 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 06:35:05 -0500 Subject: [PATCH 13/26] Fixes --- CHANGELOG.md | 2 + .../MSFT_PPPowerAppPolicyUrlPatterns.psm1 | 80 ++++++++++++++----- ...SFT_PPPowerAppPolicyUrlPatterns.schema.mof | 2 +- .../MSFT_PPPowerAppsEnvironment.psm1 | 58 ++++++++++---- .../MSFT_PPTenantIsolationSettings.psm1 | 56 +++++++------ .../MSFT_PPTenantSettings.psm1 | 48 +++++++++-- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 1 + .../Microsoft365DSC/Modules/M365DSCUtil.psm1 | 2 +- .../M365DSCPowerPlatformRESTHelper.psm1 | 48 +++++++++++ 9 files changed, 229 insertions(+), 68 deletions(-) create mode 100644 Modules/Microsoft365DSC/Modules/WorkloadHelpers/M365DSCPowerPlatformRESTHelper.psm1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c12965902..e8b93b11ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * EXORetentionPolicyTag * Initial release. +* MISC + * PowerPlatform resource revamp to use direct REST API calls. # 1.25.205.1 diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 index 75ee6a2896..d942c3465d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 @@ -46,7 +46,7 @@ function Get-TargetResource $AccessTokens ) - New-M365DSCConnection -Workload 'PowerPlatforms' ` + New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters | Out-Null #Ensure the proper dependencies are installed in the current environment. @@ -65,15 +65,29 @@ function Get-TargetResource $nullResult.Ensure = 'Absent' try { - $policy = Get-AdminDlpPolicy | Where-Object -FilterScript { $_.DisplayName -eq $PolicyName } + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + $policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + + $policy = $null + foreach ($policyInfo in $policies.value) + { + if ($policyInfo.properties.displayName -eq $PolicyName) + { + $policy = $policyInfo + } + } if ($null -eq $policy) { return $nullResult } - $rules = Get-PowerAppPolicyUrlPatterns -TenantId $PPTenantId ` - -PolicyName $($policy.PolicyName) + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.name)/urlPatterns" + + $rules = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' -ErrorAction SilentlyContinue $RulesValue = @() foreach ($rule in $rules.rules) { @@ -158,7 +172,7 @@ function Set-TargetResource $AccessTokens ) - New-M365DSCConnection -Workload 'PowerPlatforms' ` + New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters | Out-Null #Ensure the proper dependencies are installed in the current environment. @@ -173,6 +187,19 @@ function Set-TargetResource Add-M365DSCTelemetryEvent -Data $data #endregion + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + $policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + + $policy = $null + foreach ($policyInfo in $policies.value) + { + if ($policyInfo.properties.displayName -eq $PolicyName) + { + $policy = $policyInfo + } + } # CREATE if ($Ensure -eq 'Present') { @@ -191,16 +218,20 @@ function Set-TargetResource $payload = $(ConvertTo-Json $body -Depth 9 -Compress) Write-Verbose -Message "Setting new Url Patterns for Policy {$($PolicyName)} with parameters:`r`n$payload" - New-PowerAppPolicyUrlPatterns -TenantId $PPTenantId ` - -PolicyName $PolicyName ` - -NewUrlPatterns $body ` - -Verbose + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.name)/urlPatterns" + + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' -Body $body + } # REMOVE elseif ($Ensure -eq 'Absent') { Write-Verbose -Message "Removing Url Patterns for Policy {$($PolicyNameValue)}" - Remove-PowerAppPolicyUrlPatterns -TenantId $PPTenantId -PolicyName $PolicyName + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.name)/urlPatterns" + + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'DELETE' -Body $body } } @@ -271,12 +302,14 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)" #Compare Cim instances + Write-Verbose -Message "Comparing CIMInstances" foreach ($key in $PSBoundParameters.Keys) { $source = $PSBoundParameters.$key $target = $CurrentValues.$key if ($source.getType().Name -like '*CimInstance*') { + Write-Verbose -Message "Comparing Complex key {$key}" $testResult = Compare-M365DSCComplexObject ` -Source ($source) ` -Target ($target) @@ -292,6 +325,7 @@ function Test-TargetResource } if ($testResult) { + Write-Verbose -Message "Testing Parameters" $testResult = Test-M365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` @@ -338,9 +372,13 @@ function Export-TargetResource $AccessTokens ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters + $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' ` + -InboundParameters $PSBoundParameters + + #Ensure the proper dependencies are installed in the current environment. Confirm-M365DSCDependencies @@ -355,12 +393,16 @@ function Export-TargetResource try { + $tenantinfo = (Get-MgContext).TenantId $Script:ExportMode = $true - $tenantInfo = Get-TenantDetailsFromGraph - [array] $policies = Get-AdminDlpPolicy -ErrorAction Stop + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + [array]$policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + $dscContent = '' - if ($policies.Length -eq 0) + if ($policies.value.Length -eq 0) { Write-Host $Global:M365DSCEmojiGreenCheckMark } @@ -369,16 +411,16 @@ function Export-TargetResource Write-Host "`r`n" -NoNewline } $i = 1 - foreach ($policy in $policies) + foreach ($policy in $policies.value) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) { $Global:M365DSCExportResourceInstancesCount++ } - Write-Host " |---[$i/$($policies.Count)] $($policy.DisplayName)" -NoNewline + Write-Host " |---[$i/$($policies.value.Count)] $($policy.properties.DisplayName)" -NoNewline $params = @{ - PPTenantId = $tenantInfo.TenantId - PolicyName = $policy.DisplayName + PPTenantId = $tenantInfo + PolicyName = $policy.properties.DisplayName Credential = $Credential ApplicationId = $ApplicationId TenantId = $TenantId @@ -395,7 +437,7 @@ function Export-TargetResource { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` -ComplexObject $Results.RuleSet ` - -CIMInstanceName 'PPPowerAPpPolicyUrlPatternsRule' + -CIMInstanceName 'PPPowerAppPolicyUrlPatternsRule' if (-Not [String]::IsNullOrWhiteSpace($complexTypeStringResult)) { $Results.RuleSet = $complexTypeStringResult diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof index 9d323799a0..e85e78fdf0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof @@ -1,5 +1,5 @@ [ClassVersion("1.0.0.0")] -class MSFT_PPPowerAPpPolicyUrlPatternsRule +class MSFT_PPPowerAppPolicyUrlPatternsRule { [Write, Description("Rule priority order.")] String order; [Write, Description("Rule classification.")] String customConnectorRuleClassification; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 index e496148206..6eba5c629e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 @@ -58,7 +58,7 @@ function Get-TargetResource ) Write-Verbose -Message "Getting configuration for PowerApps Environment {$DisplayName}" - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -78,7 +78,18 @@ function Get-TargetResource try { - $environment = Get-AdminPowerAppEnvironment -ErrorAction Stop | Where-Object -FilterScript { $_.DisplayName -match $DisplayName } + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments?`$expand=permissions&api-version=2016-11-01" + + $environments = (Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET').value + foreach ($environmentInfo in $environments) + { + if ($environmentInfo.properties.displayName -eq $DisplayName) + { + $environment = $environmentInfo + break + } + } if ($null -eq $environment) { @@ -87,14 +98,14 @@ function Get-TargetResource } Write-Verbose -Message "Found PowerApps Environment {$DisplayName}" - $environmentType = $environment.EnvironmentType + $environmentType = $environment.properties.environmentType if ($environmentType -eq 'Notspecified') { $environmentType = 'Teams' } return @{ DisplayName = $DisplayName - Location = $environment.Location + Location = $environment.location EnvironmentSKU = $environmentType Ensure = 'Present' Credential = $Credential @@ -188,7 +199,7 @@ function Set-TargetResource Add-M365DSCTelemetryEvent -Data $data #endregion - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters $CurrentValues = Get-TargetResource @PSBoundParameters @@ -205,7 +216,18 @@ function Set-TargetResource Write-Verbose -Message "Creating new PowerApps environment {$DisplayName}" try { - New-AdminPowerAppEnvironment @CurrentParameters + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/environments?api-version=2020-08-01&id=/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments" + + $newParameters = @{ + location = $Location + properties = @{ + displayName = $DisplayName + description = '' + environmentSku = $EnvironmentSku + } + } + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' -Body $newParameters } catch { @@ -220,7 +242,10 @@ function Set-TargetResource elseif ($Ensure -eq 'Absent' -and $CurrentValues.Ensure -eq 'Present') { Write-Verbose -Message "Removing existing instance of PowerApps environment {$DisplayName}" - Remove-AdminPowerAppEnvironment -EnvironmentName -$DisplayName | Out-Null + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments/$($DisplayName)/validateDelete?api-version=2018-01-01" + + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'DELETE' } } @@ -342,7 +367,7 @@ function Export-TargetResource [System.Management.Automation.PSCredential] $ApplicationSecret ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -359,7 +384,10 @@ function Export-TargetResource try { - [array]$environments = Get-AdminPowerAppEnvironment -ErrorAction Stop + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments?`$expand=permissions&api-version=2016-11-01" + + [array]$environments = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' $dscContent = '' $i = 1 @@ -371,24 +399,24 @@ function Export-TargetResource { Write-Host "`r`n" -NoNewline } - foreach ($environment in $environments) + foreach ($environment in $environments.value) { - if ($environment.EnvironmentType -ne 'Default') + if ($environment.properties.environmentType -ne 'Default') { if ($null -ne $Global:M365DSCExportResourceInstancesCount) { $Global:M365DSCExportResourceInstancesCount++ } - Write-Host " |---[$i/$($environments.Count)] $($environment.DisplayName)" -NoNewline - $environmentType = $environment.EnvironmentType + Write-Host " |---[$i/$($environments.Count)] $($environment.properties.displayName)" -NoNewline + $environmentType = $environment.properties.environmentType if ($environmentType -eq 'Notspecified') { $environmentType = 'Teams' } $Params = @{ - DisplayName = $environment.DisplayName - Location = $environment.Location + DisplayName = $environment.properties.displayName + Location = $environment.location EnvironmentSku = $environmentType Credential = $Credential ApplicationId = $ApplicationId diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 index 9c814828a6..4ed6ff5b6f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 @@ -63,7 +63,7 @@ function Get-TargetResource $tenantid = (Get-MgContext).TenantId - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -84,7 +84,9 @@ function Get-TargetResource try { - $tenantIsolationPolicy = Get-PowerAppTenantIsolationPolicy -TenantId $tenantid + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($tenantId)/tenantIsolationPolicy?api-version=2016-11-01" + $tenantIsolationPolicy = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' -Body $RequestBody if ($tenantIsolationPolicy.StatusCode -eq 403) { throw 'Invalid permission for the application. If you are using a custom app registration to authenticate, make sure it is defined as a Power Platform admin management application. For additional information refer to https://learn.microsoft.com/en-us/power-platform/admin/powershell-create-service-principal#registering-an-admin-management-application' @@ -212,7 +214,7 @@ function Set-TargetResource Add-M365DSCTelemetryEvent -Data $data #endregion - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' ` @@ -220,13 +222,16 @@ function Set-TargetResource $tenantid = (Get-MgContext).TenantId - $tenantIsolationPolicy = Get-PowerAppTenantIsolationPolicy -TenantId $tenantid - - if ($tenantIsolationPolicy.Properties.isDisabled -ne -not $Enabled) - { - $tenantIsolationPolicy.Properties.isDisabled = -not $Enabled + $tenantIsolationPolicy = @{ + properties = @{ + tenantId = $tenantId + isDisabled = $false + allowedTenants = @() + } } + $tenantIsolationPolicy.Properties.isDisabled = -not $Enabled + [Array]$existingAllowedRules = $tenantIsolationPolicy.Properties.allowedTenants if ($PSBoundParameters.ContainsKey('Rules')) @@ -237,7 +242,7 @@ function Set-TargetResource # Check if Rules exist $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName - $direction = [PSCustomObject]@{ + $direction = @{ inbound = $false outbound = $false } @@ -263,9 +268,8 @@ function Set-TargetResource } } - $newRule = [PSCustomObject]@{ + $newRule = @{ tenantId = $ruleTenantId - tenantDisplayName = '' direction = $direction } @@ -316,6 +320,7 @@ function Set-TargetResource { Write-Verbose "Checking rule for TenantName $($rule.TenantName) with direction $($rule.Direction)" $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName + Write-Verbose -Message "Found TenantName {$($rule.TenantName)}" $direction = [PSCustomObject]@{ inbound = $false @@ -383,8 +388,9 @@ function Set-TargetResource Write-Verbose 'Processing parameter RulesToExclude' foreach ($rule in $RulesToExclude) { - Write-Verbose "Checking rule for TenantName $($rule.TenantName)" + Write-Verbose "Checking rule for TenantName $($rule.TenantName) RulesToExclude" $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName + Write-Verbose -Message "Found TenantName {$($rule.TenantName)}" $removeRules = @() if ($null -ne ($existingAllowedRules | Where-Object -FilterScript { $_.tenantId -eq $ruleTenantId })) @@ -397,9 +403,10 @@ function Set-TargetResource [Array]$newRules = $existingAllowedRules | Where-Object -FilterScript { $_.tenantId -notin $removeRules } $tenantIsolationPolicy.Properties.allowedTenants = $newRules } - - Write-Verbose 'Saving changes to the tenant' - $null = Set-PowerAppTenantIsolationPolicy -TenantIsolationPolicy $tenantIsolationPolicy -TenantId $tenantId + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($tenantId)/tenantIsolationPolicy?api-version=2020-06-01" + Write-Verbose -Message "Updating with payload:`r`n$(ConvertTo-Json $tenantIsolationPolicy -Depth 20)" + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'PUT' -Body $tenantIsolationPolicy } function Test-TargetResource @@ -476,8 +483,9 @@ function Test-TargetResource Write-Verbose 'Processing parameter Rules' foreach ($rule in $Rules) { - Write-Verbose "Checking Rule for TenantName $($rule.TenantName)." + Write-Verbose "Checking Rule for TenantName $($rule.TenantName). Rules" $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName + Write-Verbose -Message "Found TenantName {$($rule.TenantName)}" $existingRule = $CurrentValues.Rules | Where-Object -FilterScript { $_.TenantName -eq $ruleTenantId } if ($null -eq $existingRule) @@ -526,8 +534,9 @@ function Test-TargetResource $driftedRules = @{} foreach ($rule in $RulesToInclude) { - Write-Verbose "Checking Rule for TenantName $($rule.TenantName)." + Write-Verbose "Checking Rule for TenantName $($rule.TenantName). RulesToInclude" $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName + Write-Verbose -Message "Found TenantName {$($rule.TenantName)}" $existingRule = $CurrentValues.Rules | Where-Object -FilterScript { $_.TenantName -eq $ruleTenantId } if ($null -eq $existingRule) @@ -561,8 +570,9 @@ function Test-TargetResource $driftedRules = @{} foreach ($rule in $RulesToExclude) { - Write-Verbose "Checking Rule for TenantName $($rule.TenantName)." + Write-Verbose "Checking Rule for TenantName $($rule.TenantName). RulesToExclude" $ruleTenantId = Get-M365TenantId -TenantName $rule.TenantName + Write-Verbose -Message "Found TenantName {$($rule.TenantName)}" $existingRule = $CurrentValues.Rules | Where-Object -FilterScript { $_.TenantName -eq $ruleTenantId } if ($null -ne $existingRule) @@ -633,12 +643,6 @@ function Export-TargetResource $ApplicationSecret ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` - -InboundParameters $PSBoundParameters - - $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' ` - -InboundParameters $PSBoundParameters - #Ensure the proper dependencies are installed in the current environment. Confirm-M365DSCDependencies @@ -747,9 +751,9 @@ function Get-M365TenantId $TenantName ) - if ($TenantName -notmatch '.onmicrosoft.com$') + if ($TenantName -eq '*') { - $TenantName += '.onmicrosoft.com' + return '*' } $result = Invoke-WebRequest "https://login.windows.net/$TenantName/.well-known/openid-configuration" -UseBasicParsing -Verbose:$false diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 index 3b257440ee..54718c4097 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 @@ -231,7 +231,7 @@ function Get-TargetResource ) Write-Verbose -Message 'Checking the Power Platform Tenant Settings Configuration' - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -252,7 +252,9 @@ function Get-TargetResource try { - $PPTenantSettings = Get-TenantSettings -ErrorAction Stop + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/listTenantSettings?api-version=2016-11-01" + $PPTenantSettings = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' return @{ IsSingleInstance = 'Yes' @@ -605,9 +607,12 @@ function Set-TargetResource $SetParameters = $PSBoundParameters $RequestBody = Get-M365DSCPowerPlatformTenantSettings -Parameters $SetParameters - Write-Verbose -Message (ConvertTo-Json $RequestBody -Depth 10) + $jsonBody = ConvertTo-Json $RequestBody -Depth 20 + Write-Verbose -Message $jsonBody - Set-TenantSettings -RequestBody $RequestBody -Verbose | Out-Null + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/updateTenantSettings?api-version=2016-11-01" + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' -Body $RequestBody } function Test-TargetResource @@ -897,7 +902,7 @@ function Export-TargetResource [System.Management.Automation.PSCredential] $ApplicationSecret ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -914,7 +919,9 @@ function Export-TargetResource try { - $settings = Get-TenantSettings -ErrorAction Stop + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/listTenantSettings?api-version=2016-11-01" + $settings = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' if ($settings.StatusCode -eq 403) { @@ -1074,4 +1081,33 @@ function Get-M365DSCPowerPlatformTenantSettings return $result } +function Set-M365DSCPPTenantSettings +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Collections.Hashtable] + $Body + ) + + $url = "$((Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatforms').ResourceUrl)/providers/Microsoft.BusinessAppPlatform/scopes/admin/updateTenantSettings?api-version=2016-11-01" + +} + +function Get-M365DSCPPTenantSettings +{ + [CmdletBinding()] + param( + [Parameter()] + [System.Collections.Hashtable] + $Body + ) + + $url = "$((Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatforms').ResourceUrl)/providers/Microsoft.BusinessAppPlatform/scopes/admin/getTenantSettings?api-version=2016-11-01" + $headers = @{ + Authorization = (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatforms').AccessToken + } + Invoke-WebRequest -Uri $url -Headers $headers -ContentType "application/json" +} + Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 9bf591d877..f59ee0c454 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -85,6 +85,7 @@ 'Modules/WorkloadHelpers/M365DSCDefenderHelper.psm1', 'Modules/WorkloadHelpers/M365DSCFabricHelper.psm1', 'Modules/WorkloadHelpers/M365DSCLicensingHelper.psm1', + 'Modules/WorkloadHelpers/M365DSCPowerPlatformRESTHelper.psm1', 'Modules/M365DSCConfigurationHelper.psm1' ) diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 index a1e21f45cc..d15247d32c 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 @@ -1882,7 +1882,7 @@ function New-M365DSCConnection ( [Parameter(Mandatory = $true)] [ValidateSet('AdminAPI', 'Azure', 'AzureDevOPS', 'DefenderForEndPoint', 'ExchangeOnline', 'Fabric', 'Intune', 'Licensing', ` - 'SecurityComplianceCenter', 'PnP', 'PowerPlatforms', ` + 'SecurityComplianceCenter', 'PnP', 'PowerPlatforms', 'PowerPlatformREST', ` 'MicrosoftTeams', 'MicrosoftGraph', 'SharePointOnlineREST', 'Tasks', 'AdminAPI')] [System.String] $Workload, diff --git a/Modules/Microsoft365DSC/Modules/WorkloadHelpers/M365DSCPowerPlatformRESTHelper.psm1 b/Modules/Microsoft365DSC/Modules/WorkloadHelpers/M365DSCPowerPlatformRESTHelper.psm1 new file mode 100644 index 0000000000..3707a0b689 --- /dev/null +++ b/Modules/Microsoft365DSC/Modules/WorkloadHelpers/M365DSCPowerPlatformRESTHelper.psm1 @@ -0,0 +1,48 @@ +function Invoke-M365DSCPowerPlatformRESTWebRequest +{ + [OutputType([PSCustomObject])] + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [System.String] + $Uri, + + [Parameter()] + [System.String] + $Method = 'GET', + + [Parameter()] + [System.Collections.Hashtable] + $Body + ) + + $headers = @{ + Authorization = (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').AccessToken + } + + $bodyValue = $null + if (-not [System.String]::IsNullOrEmpty($Body)) + { + $bodyValue = ConvertTo-Json $Body -Depth 20 -Compress + } + + try + { + $response = Invoke-WebRequest -Method $Method ` + -Uri $Uri ` + -Headers $headers ` + -Body $bodyValue ` + -ContentType 'application/json; charset=utf-8' ` + -UseBasicParsing + } + catch + { + throw $_ + } + $result = $null + if ($response.Content.Length -gt 0) + { + $result = ConvertFrom-Json $response.Content -ErrorAction SilentlyContinue + } + return $result +} From 91c5e4230fd2b5fb8cd088ac9900bf93ebf457ba Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 10:54:18 -0500 Subject: [PATCH 14/26] Changes logic for PP resources to use REST API --- CHANGELOG.md | 2 + .../MSFT_PPAdminDLPPolicy.psm1 | 137 ++++++--- ...FT_PPDLPPolicyConnectorConfigurations.psm1 | 67 +++-- ...SFT_PPPowerAppPolicyUrlPatterns.schema.mof | 2 +- .../MSFT_PPTenantIsolationSettings.psm1 | 6 +- .../Dependencies/Manifest.psd1 | 4 - .../Modules/M365DSCDRGUtil.psm1 | 4 +- ...Microsoft365DSC.PPAdminDLPPolicy.Tests.ps1 | 120 ++++++-- ...DLPPolicyConnectorConfigurations.Tests.ps1 | 278 +++++++++++++----- ...5DSC.PPPowerAppPolicyUrlPatterns.Tests.ps1 | 263 +++++++++++++---- ...oft365DSC.PPPowerAppsEnvironment.Tests.ps1 | 55 ++-- ...365DSC.PPTenantIsolationSettings.Tests.ps1 | 53 +--- ...Microsoft365DSC.PPTenantSettings.Tests.ps1 | 43 +-- 13 files changed, 709 insertions(+), 325 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8b93b11ce..065e62841f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * Initial release. * MISC * PowerPlatform resource revamp to use direct REST API calls. +* DEPENDENCIES + * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. # 1.25.205.1 diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 index db16bfe125..42338c14d7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 @@ -49,7 +49,7 @@ function Get-TargetResource [System.String[]] $AccessTokens ) - New-M365DSCConnection -Workload 'PowerPlatforms' ` + New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters | Out-Null #Ensure the proper dependencies are installed in the current environment. @@ -68,28 +68,17 @@ function Get-TargetResource $nullResult.Ensure = 'Absent' try { - if ($null -ne $Script:exportedInstances -and $Script:ExportMode) - { - if (-not [System.String]::IsNullOrEmpty($PolicyName)) - { - $instances = $Script:exportedInstances | Where-Object -FilterScript { $_.PolicyName -eq $PolicyName } - } + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" - if ($null -eq $instance) - { - $instance = $Script:exportedInstances | Where-Object -FilterScript { $_.DisplayName -eq $DisplayName } - } - } - else - { - if (-not [System.String]::IsNullOrEmpty($PolicyName)) - { - $instance = Get-AdminDlpPolicy -PolicyName $PolicyName -ErrorAction SilentlyContinue - } + $policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' - if ($null -eq $instance) + $instance = $null + foreach ($policyInfo in $policies.value) + { + if ($policyInfo.properties.displayName -eq $DisplayName) { - $instance = Get-AdminDlpPolicy | Where-Object -FilterScript { $_.DisplayName -eq $DisplayName } + $instance = $policyInfo } } if ($null -eq $instance) @@ -98,10 +87,10 @@ function Get-TargetResource } $results = @{ - DisplayName = $instance.DisplayName + DisplayName = $instance.properties.displayName PolicyName = $instance.PolicyName - Environments = $instance.Environments.name - FilterType = $instance.FilterType + Environments = [array]$instance.properties.definition.constraints.environmentFilter1.parameters.environments.name + FilterType = $instance.properties.definition.constraints.environmentFilter1.parameters.filterType Ensure = 'Present' Credential = $Credential ApplicationId = $ApplicationId @@ -191,14 +180,85 @@ function Set-TargetResource $currentInstance = Get-TargetResource @PSBoundParameters $setParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters + $schema = "https://schema.management.azure.com/providers/Microsoft.BusinessAppPlatform/schemas/2016-10-01-preview/apiPolicyDefinition.json#" + $constraints = @{} + if ($null -ne $Environments -and $Environments.Length -gt 0) + { + $environmentInfo = @() + foreach ($environment in $Environments) + { + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments/$($environment)?`$expand=permissions&api-version=2016-11-01" + + Write-Verbose -Message "Creating new policy with body:`r`n$(ConvertTo-Json $newPolicy -Depth 20)" + $environmentInfo += Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + } + + $constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = $environmentInfo + filterType = $FilterType + } + type = "environmentFilter" + } + } + } + $rules = @{ + dataFlowRule = @{ + actions = @{ + blockAction = @{ + type = "Block" + } + } + parameters = @{ + destinationApiGroup = "lbi" + sourceApiGroup = "hbi" + } + type = "DataFlowRestriction" + } + } + $CreatedTime = Get-Date -Format "o" + $policyObject = @{ + id = "" + name = "" + type = $type + tags = @{} + properties = @{ + createdTime = $CreatedTime + displayName = $DisplayName + definition = @{ + "`$schema" = $schema + defaultApiGroup = "lbi" + constraints = $constraints + apiGroups = @{ + hbi = @{ + apis = $hbiApis + description = "Business data only" + } + lbi = @{ + apis = @() + description = $lbiDescription + } + } + rules = $rules + } + } + } + # CREATE $needToUpdateNewInstance = $false $policyName = $currentInstance.PolicyName if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent') { Write-Verbose -Message "Creating new Data Policy {$DisplayName}" - $policy = New-AdminDlpPolicy -DisplayName $DisplayName - $policyName = $policy.PolicyName + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + + Write-Verbose -Message "Creating new policy with body:`r`n$(ConvertTo-Json $newPolicy -Depth 20)" + $policy = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' -Body $policyObject + $policyName = $policy.name } if ($setParameters.ContainsKey('PolicyName')) { @@ -220,13 +280,19 @@ function Set-TargetResource $setParameters.Environments = ($setParameters.Environments -join ',') } Write-Verbose -Message "Updating Data Policy {$DisplayName} with values:`r`n$(Convert-M365DscHashtableToString -Hashtable $setParameters)" - Set-AdminDlpPolicy @setParameters + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies/$($policyName)?api-version=2016-11-01" + + $policy = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'PUT' -Body $policyObject } # REMOVE elseif ($Ensure -eq 'Absent' -and $currentInstance.Ensure -eq 'Present') { Write-Verbose -Message "Removing Data Policy {$DisplayName}" - Remove-AdminDlpPolicy -PolicyName $policyName + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies/$($policyName)?api-version=2016-11-01" + + $policy = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'DELETE' } } @@ -345,7 +411,7 @@ function Export-TargetResource $AccessTokens ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -363,7 +429,10 @@ function Export-TargetResource try { $Script:ExportMode = $true - [array] $Script:exportedInstances = Get-AdminDlpPolicy -ErrorAction Stop + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + [array] $Script:exportedInstances = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' $i = 1 $dscContent = '' @@ -375,18 +444,18 @@ function Export-TargetResource { Write-Host "`r`n" -NoNewline } - foreach ($config in $Script:exportedInstances) + foreach ($config in $Script:exportedInstances.value) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) { $Global:M365DSCExportResourceInstancesCount++ } - $displayedKey = $config.DisplayName - Write-Host " |---[$i/$($Script:exportedInstances.Count)] $displayedKey" -NoNewline + $displayedKey = $config.properties.displayName + Write-Host " |---[$i/$($Script:exportedInstances.value.Count)] $displayedKey" -NoNewline $params = @{ - DisplayName = $config.DisplayName - PolicyName = $config.PolicyName + DisplayName = $config.properties.displayName + PolicyName = $config.name Credential = $Credential ApplicationId = $ApplicationId TenantId = $TenantId diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 index 2a56387cc8..e61adac2d2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 @@ -65,15 +65,29 @@ function Get-TargetResource $nullResult.Ensure = 'Absent' try { - $policy = Get-AdminDlpPolicy | Where-Object -FilterScript { $_.DisplayName -eq $PolicyName } + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + $policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + + $policy = $null + foreach ($policyInfo in $policies.value) + { + if ($policyInfo.properties.displayName -eq $PolicyName) + { + $policy = $policyInfo + } + } if ($null -eq $policy) { return $nullResult } - $ActionList = Get-PowerAppDlpPolicyConnectorConfigurations -TenantId $PPTenantId ` - -PolicyName $($policy.PolicyName) + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.Name)/policyconnectorconfigurations" + + $ActionList = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' $ActionsValue = @() foreach ($action in $ActionList.connectorActionConfigurations) { @@ -168,7 +182,7 @@ function Set-TargetResource $AccessTokens ) - New-M365DSCConnection -Workload 'PowerPlatforms' ` + New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters | Out-Null #Ensure the proper dependencies are installed in the current environment. @@ -183,9 +197,19 @@ function Set-TargetResource Add-M365DSCTelemetryEvent -Data $data #endregion - $policy = Get-AdminDlpPolicy | Where-Object -FilterScript { $_.DisplayName -eq $PolicyName } - $policyNameValue = $policy.PolicyName + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + $policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + $policy = $null + foreach ($policyInfo in $policies.value) + { + if ($policyInfo.properties.displayName -eq $PolicyName) + { + $policy = $policyInfo + } + } # CREATE if ($Ensure -eq 'Present') { @@ -214,16 +238,19 @@ function Set-TargetResource $payload = $(ConvertTo-Json $body -Depth 9 -Compress) Write-Verbose -Message "Setting Connector Configuration for Policy {$($PolicyNameValue)} with parameters:`r`n$payload" - New-PowerAppDlpPolicyConnectorConfigurations -TenantId $PPTenantId ` - -PolicyName $policyNameValue ` - -NewDlpPolicyConnectorConfigurations $body ` - -Verbose + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.Name)/policyconnectorconfigurations" + + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'POST' -Body $body } # REMOVE elseif ($Ensure -eq 'Absent') { Write-Verbose -Message "Removing Connector Configuration for Policy {$($PolicyNameValue)}" - Remove-PowerAppDlpPolicyConnectorConfigurations -TenantId $PPTenantId -PolicyName $policyNameValue + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/PowerPlatform.Governance/v1/tenants/$($PPTenantId)/policies/$($policy.Name)/policyconnectorconfigurations" + + Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'DELETE' } } @@ -361,7 +388,7 @@ function Export-TargetResource $AccessTokens ) - $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatforms' ` + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` -InboundParameters $PSBoundParameters #Ensure the proper dependencies are installed in the current environment. @@ -379,8 +406,14 @@ function Export-TargetResource try { $Script:ExportMode = $true - $tenantInfo = Get-TenantDetailsFromGraph - [array] $policies = Get-AdminDlpPolicy -ErrorAction Stop + + $uri = "https://" + (Get-MSCloudLoginConnectionProfile -Workload 'PowerPlatformREST').BapEndpoint + ` + "/providers/Microsoft.BusinessAppPlatform/scopes/admin/apiPolicies?api-version=2016-11-01" + + [array]$policies = Invoke-M365DSCPowerPlatformRESTWebRequest -Uri $uri -Method 'GET' + $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' ` + -InboundParameters $PSBoundParameters + $tenantinfo = (Get-MgContext) $dscContent = '' if ($policies.Length -eq 0) @@ -392,16 +425,16 @@ function Export-TargetResource Write-Host "`r`n" -NoNewline } $i = 1 - foreach ($policy in $policies) + foreach ($policy in $policies.value) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) { $Global:M365DSCExportResourceInstancesCount++ } - Write-Host " |---[$i/$($policies.Count)] $($policy.DisplayName)" -NoNewline + Write-Host " |---[$i/$($policies.value.Count)] $($policy.properties.DisplayName)" -NoNewline $params = @{ PPTenantId = $tenantInfo.TenantId - PolicyName = $policy.DisplayName + PolicyName = $policy.properties.displayName Credential = $Credential ApplicationId = $ApplicationId TenantId = $TenantId diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof index e85e78fdf0..463418806c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.schema.mof @@ -1,7 +1,7 @@ [ClassVersion("1.0.0.0")] class MSFT_PPPowerAppPolicyUrlPatternsRule { - [Write, Description("Rule priority order.")] String order; + [Write, Description("Rule priority order.")] UInt32 order; [Write, Description("Rule classification.")] String customConnectorRuleClassification; [Write, Description("Rule pattern.")] String pattern; }; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 index 4ed6ff5b6f..ea62755bb2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 @@ -220,11 +220,11 @@ function Set-TargetResource $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' ` -InboundParameters $PSBoundParameters - $tenantid = (Get-MgContext).TenantId + $tenantinfo = (Get-MgContext).TenantId $tenantIsolationPolicy = @{ properties = @{ - tenantId = $tenantId + tenantId = $tenantinfo isDisabled = $false allowedTenants = @() } @@ -657,6 +657,8 @@ function Export-TargetResource try { + $ConnectionMode = New-M365DSCConnection -Workload 'PowerPlatformREST' ` + -InboundParameters $PSBoundParameters if ($null -ne $Global:M365DSCExportResourceInstancesCount) { $Global:M365DSCExportResourceInstancesCount++ diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index 75ba341060..b347a24f13 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -112,10 +112,6 @@ ModuleName = 'Microsoft.Graph.Users.Actions' RequiredVersion = '2.25.0' }, - @{ - ModuleName = 'Microsoft.PowerApps.Administration.PowerShell' - RequiredVersion = '2.0.205' - }, @{ ModuleName = 'MicrosoftTeams' RequiredVersion = '6.8.0' diff --git a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 index 538080fda8..8284f7da5d 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 @@ -442,7 +442,7 @@ function Get-M365DSCDRGComplexTypeToString { $currentValue = $ComplexObject[$key] if ([System.String]::IsNullOrEmpty($currentValue)) - { + { $currentValue = $ComplexObject.$key } if (-not [System.String]::IsNullOrEmpty($currentValue) -and $currentValue.GetType().Name -ne 'Dictionary`2') @@ -601,7 +601,6 @@ function Compare-M365DSCComplexObject [Parameter()] $Target ) - #Comparing full objects if ($null -eq $Source -and $null -eq $Target) { @@ -837,6 +836,7 @@ function Compare-M365DSCComplexObject } elseif ($targetType -eq 'String') { + Write-Verbose -Message "Parameter {$($key)} is a String" # Align line breaks if (-not [System.String]::IsNullOrEmpty($referenceObject)) { diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPAdminDLPPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPAdminDLPPolicy.Tests.ps1 index 84d3de716e..d41df4be0f 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPAdminDLPPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPAdminDLPPolicy.Tests.ps1 @@ -35,10 +35,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { return "Credentials" } - Mock -CommandName New-AdminDlpPolicy -MockWith {} - Mock -CommandName Set-AdminDlpPolicy -MockWith {} - Mock -CommandName Remove-AdminDlpPolicy -MockWith {} - # Mock Write-Host to hide output during the tests Mock -CommandName Write-Host -MockWith { } @@ -56,7 +52,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-AdminDlpPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return $null } } @@ -69,7 +65,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should create a new instance from the Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName New-AdminDLPPolicy -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 3 } } @@ -83,14 +79,28 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-AdminDlpPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - PolicyName = "MyPolicy" - DisplayName = "SuperTest" - Environments = @(@{ - name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' - }) - FilterType = 'include' + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "SuperTest" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) } } } @@ -103,7 +113,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should remove the instance from the Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName Remove-AdminDlpPolicy -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 3 } } @@ -117,14 +127,28 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-AdminDlpPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - PolicyName = "MyPolicy" - DisplayName = "SuperTest" - Environments = @(@{ - name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' - }) - FilterType = 'include' + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "SuperTest" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) } } } @@ -144,14 +168,28 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-AdminDlpPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - PolicyName = "MyPolicy" - DisplayName = "SuperTest" - Environments = @(@{ - name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' - }) - FilterType = 'include' + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "SuperTest" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) } } } @@ -166,7 +204,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should call the Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName Set-AdminDlpPolicy -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 3 } } @@ -178,10 +216,28 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-AdminDlpPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - PolicyName = "MyPolicy" - DisplayName = "SuperTest" + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "SuperTest" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) } } } diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPDLPPolicyConnectorConfigurations.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPDLPPolicyConnectorConfigurations.Tests.ps1 index bfb5d25c7e..4aa6e7bc18 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPDLPPolicyConnectorConfigurations.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPDLPPolicyConnectorConfigurations.Tests.ps1 @@ -34,21 +34,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Mock -CommandName New-M365DSCConnection -MockWith { return "Credentials" } - - Mock -commandName Remove-PowerAppDlpPolicyConnectorConfigurations -MockWith {} - Mock -commandName New-PowerAppDlpPolicyConnectorConfigurations -MockWith {} - Mock -commandName Get-TenantDetailsFromGraph -MockWith { - return @{ - TenantId = 'xxxxxxx' - } - } - Mock -commandName Get-AdminDlpPolicy -MockWith { - return @{ - PolicyName = 'DSCPolicy' - DisplayName = 'DSCPolicy' - } - } - + # Mock Write-Host to hide output during the tests Mock -CommandName Write-Host -MockWith { } @@ -74,33 +60,72 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppDlpPolicyConnectorConfigurations -MockWith { - return @{ - connectorActionConfigurations = @( - @{ - connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' - defaultConnectorActionRuleBehavior = 'Allow' - actionRules = @( - @{ - actionId = 'CreateInvitation' - behavior = 'Allow' + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } } - ) - } - ) + } + ) + } + $Global:count++ + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + connectorActionConfigurations = @( + @{ + connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' + defaultConnectorActionRuleBehavior = 'Allow' + actionRules = @( + @{ + actionId = "CreateInvitation" + behavior = "block" + } + ) + } + ) + } + } + else + { + return } } } It 'Should return Values from the Get method' { + $Global:count = 1 (Get-TargetResource @testParams).Ensure | Should -Be 'Present' } It 'Should return false from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $false } It 'Should remove the instance from the Set method' { + $Global:count = 1 Set-TargetResource @testParams - Should -Invoke -CommandName Remove-PowerAppDlpPolicyConnectorConfigurations -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -122,25 +147,61 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppDlpPolicyConnectorConfigurations -MockWith { - return @{ - connectorActionConfigurations = @( - @{ - connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' - defaultConnectorActionRuleBehavior = 'Allow' - actionRules = @( - @{ - actionId = 'CreateInvitation' - behavior = 'Block' + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } } - ) - } - ) + } + ) + } + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + connectorActionConfigurations = @( + @{ + connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' + defaultConnectorActionRuleBehavior = 'Allow' + actionRules = @( + @{ + actionId = "CreateInvitation" + behavior = "Block" + } + ) + } + ) + } + } + else + { + return } } } It 'Should return true from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $true } } @@ -163,35 +224,73 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppDlpPolicyConnectorConfigurations -MockWith { - return @{ - connectorActionConfigurations = @( - @{ - connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' - defaultConnectorActionRuleBehavior = 'Allow' - actionRules = @( - @{ - actionId = 'CreateInvitation' - behavior = 'Allow' #Drift + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } } - ) - } - ) + } + ) + } + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + connectorActionConfigurations = @( + @{ + connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' + defaultConnectorActionRuleBehavior = 'Allow' + actionRules = @( + @{ + actionId = "CreateInvitation" + behavior = "block" + } + ) + } + ) + } + } + else + { + return } } } It 'Should return Values from the Get method' { + $Global:count = 1 (Get-TargetResource @testParams).Ensure | Should -Be 'Present' } It 'Should return false from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $false } It 'Should call the Set method' { + $Global:count = 1 Set-TargetResource @testParams - Should -Invoke -CommandName New-PowerAppDlpPolicyConnectorConfigurations -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -203,24 +302,65 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppDlpPolicyConnectorConfigurations -MockWith { - return @{ - connectorActionConfigurations = @( - @{ - connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' - defaultConnectorActionRuleBehavior = 'Allow' - actionRules = @( - @{ - actionId = 'CreateInvitation' - behavior = 'Block' #Drift + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1 -or $Global:count -eq 2) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } } - ) - } - ) + } + ) + } + } + elseif ($Global:count -eq 3) + { + $Global:count++ + return @{ + connectorActionConfigurations = @( + @{ + connectorId = '/providers/Microsoft.PowerApps/apis/shared_aadinvitationmanager' + defaultConnectorActionRuleBehavior = 'Allow' + actionRules = @( + @{ + actionId = "CreateInvitation" + behavior = "block" + } + ) + } + ) + } + } + else + { + return + } + } + Mock -CommandName Get-MgContext -MockWith { + return @{ + tenantId = '1234' } } } It 'Should Reverse Engineer resource from the Export method' { + $Global:count = 1 $result = Export-TargetResource @testParams $result | Should -Not -BeNullOrEmpty } diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppPolicyUrlPatterns.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppPolicyUrlPatterns.Tests.ps1 index 0c69d915a5..5b8c67c15d 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppPolicyUrlPatterns.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppPolicyUrlPatterns.Tests.ps1 @@ -43,12 +43,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { TenantId = 'xxxxxxx' } } - Mock -commandName Get-AdminDlpPolicy -MockWith { - return @{ - PolicyName = 'DSCPolicy' - DisplayName = 'DSCPolicy' - } - } # Mock Write-Host to hide output during the tests Mock -CommandName Write-Host -MockWith { @@ -78,33 +72,71 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppPolicyUrlPatterns -MockWith { - return @{ - rules = @( - @{ - pattern = 'https://contoso.com' - customConnectorRuleClassification = 'General' - order = 1 - }, - @{ - pattern = 'https://fabrikam.com' - customConnectorRuleClassification = 'General' - order = 2 - } - ) + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) + } + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + rules = @( + @{ + pattern = 'https://contoso.com' + customConnectorRuleClassification = 'General' + order = 1 + }, + @{ + pattern = 'https://fabrikam.com' + customConnectorRuleClassification = 'General' + order = 2 + } + ) + } + } + else + { + return } } } It 'Should return Values from the Get method' { + $Global:count = 1 (Get-TargetResource @testParams).Ensure | Should -Be 'Present' } It 'Should return false from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $false } It 'Should remove the instance from the Set method' { + $Global:count = 1 Set-TargetResource @testParams - Should -Invoke -CommandName Remove-PowerAppPolicyUrlPatterns -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -129,25 +161,61 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppPolicyUrlPatterns -MockWith { - return @{ - rules = @( - @{ - pattern = 'https://contoso.com' - customConnectorRuleClassification = 'General' - order = 1 - }, - @{ - pattern = 'https://fabrikam.com' + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) + } + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + rules = @( + @{ + pattern = 'https://contoso.com' + customConnectorRuleClassification = 'General' + order = 1 + }, + @{ + pattern = 'https://fabrikam.com' customConnectorRuleClassification = 'General' order = 2 - } - ) + } + ) + } + } + else + { + return } } } It 'Should return true from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $true } } @@ -173,35 +241,73 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppPolicyUrlPatterns -MockWith { - return @{ - rules = @( - @{ - pattern = 'https://contoso.com' - customConnectorRuleClassification = 'General' - order = 1 - }, - @{ - pattern = 'https://fabrikam.com' + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) + } + } + elseif ($Global:count -eq 2) + { + $Global:count++ + return @{ + rules = @( + @{ + pattern = 'https://contoso.com' + customConnectorRuleClassification = 'General' + order = 1 + }, + @{ + pattern = 'https://fabrikam.com' customConnectorRuleClassification = 'General' order = 2 - } - ) + } + ) + } + } + else + { + return } } } It 'Should return Values from the Get method' { + $Global:count = 1 (Get-TargetResource @testParams).Ensure | Should -Be 'Present' } It 'Should return false from the Test method' { + $Global:count = 1 Test-TargetResource @testParams | Should -Be $false } It 'Should call the Set method' { + $Global:count = 1 Set-TargetResource @testParams - Should -Invoke -CommandName New-PowerAppPolicyUrlPatterns -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -213,24 +319,65 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential; } - Mock -CommandName Get-PowerAppPolicyUrlPatterns -MockWith { - return @{ - rules = @( - @{ - pattern = 'https://contoso.com' - customConnectorRuleClassification = 'General' - order = 1 - }, - @{ - pattern = 'https://fabrikam.com' + $Global:count = 1 + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { + if ($Global:count -eq 1 -or $Global:count -eq 2) + { + $Global:count++ + return @{ + value = @( + @{ + PolicyName = "MyPolicy" + properties = @{ + displayName = "DSCPolicy" + definition = @{ + constraints = @{ + environmentFilter1 = @{ + parameters = @{ + environments = @{ + name = 'Default-xxxxx-xxxxx-xxxxx-xxxxx-xxxxx' + } + filterType = 'include' + } + } + } + } + } + } + ) + } + } + elseif ($Global:count -eq 3) + { + $Global:count++ + return @{ + rules = @( + @{ + pattern = 'https://contoso.com' + customConnectorRuleClassification = 'General' + order = 1 + }, + @{ + pattern = 'https://fabrikam.com' customConnectorRuleClassification = 'General' order = 2 - } - ) + } + ) + } + } + else + { + return + } + } + Mock -CommandName Get-MgContext -MockWith { + return @{ + tenantId = '1234' } } } It 'Should Reverse Engineer resource from the Export method' { + $Global:count = 1 $result = Export-TargetResource @testParams $result | Should -Not -BeNullOrEmpty } diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppsEnvironment.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppsEnvironment.Tests.ps1 index a11b7db4cd..621f5c495f 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppsEnvironment.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPPowerAppsEnvironment.Tests.ps1 @@ -31,18 +31,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { return 'Credentials' } - Mock -CommandName Remove-AdminPowerAppEnvironment -MockWith { - return @{ - - } - } - - Mock -CommandName New-AdminPowerAppEnvironment -MockWith { - return @{ - - } - } - # Mock Write-Host to hide output during the tests Mock -CommandName Write-Host -MockWith { } @@ -64,7 +52,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Ensure = 'Present' } - Mock -CommandName Get-AdminPowerAppEnvironment -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return $null } } @@ -79,7 +67,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should create the environment in the Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName New-AdminPowerAppEnvironment -Exactly 1 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -93,11 +81,15 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Ensure = 'Present' } - Mock -CommandName Get-AdminPowerAppEnvironment -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - DisplayName = 'Test Environment' - Location = 'canada' - EnvironmentType = 'production' + value = @{ + properties = @{ + displayName = 'Test Environment' + environmentType = 'production' + } + location = 'canada' + } } } } @@ -121,11 +113,15 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Ensure = 'Absent' } - Mock -CommandName Get-AdminPowerAppEnvironment -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - DisplayName = 'Test Environment' - Location = 'canada' - EnvironmentType = 'production' + value = @{ + properties = @{ + displayName = 'Test Environment' + environmentType = 'production' + } + location = 'canada' + } } } } @@ -140,8 +136,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should delete the environment in the Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName Remove-AdminPowerAppEnvironment -Exactly 1 - Should -Invoke -CommandName New-AdminPowerAppEnvironment -Exactly 0 + Should -Invoke -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -Exactly 2 } } @@ -153,11 +148,15 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential } - Mock -CommandName Get-AdminPowerAppEnvironment -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ - DisplayName = 'Test Environment' - Location = 'canada' - EnvironmentType = 'production' + value = @{ + properties = @{ + displayName = 'Test Environment' + environmentType = 'production' + } + location = 'canada' + } } } } diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantIsolationSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantIsolationSettings.Tests.ps1 index 9e636d3b85..bab847c503 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantIsolationSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantIsolationSettings.Tests.ps1 @@ -99,7 +99,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -120,7 +120,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should enable the isolation settings and create a rule in Set method' { Set-TargetResource @testParams - Should -Invoke -CommandName 'Set-PowerAppTenantIsolationPolicy' -Exactly 1 + Should -Invoke -CommandName 'Invoke-M365DSCPowerPlatformRESTWebRequest' -Exactly 1 } } @@ -137,10 +137,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { ) Credential = $Credscredential } - - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - } - + Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -154,7 +151,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -199,10 +196,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credscredential } - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - $global:M365DSCTenantId = $TenantIsolationPolicy.properties.allowedTenants[0].tenantId - } - Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -216,7 +209,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -249,8 +242,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $global:M365DSCTenantId = '' It 'Should enable the isolation settings and create a rule in Set method' { Set-TargetResource @testParams - $global:M365DSCTenantId | Should -Be (New-HashFromTenantName -TenantName 'contoso.onmicrosoft.com') - Should -Invoke -CommandName 'Set-PowerAppTenantIsolationPolicy' -Exactly 1 + Should -Invoke -CommandName 'Invoke-M365DSCPowerPlatformRESTWebRequest' -Exactly 1 } } @@ -267,11 +259,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { ) Credential = $Credscredential } - - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - $global:M365DSCTenantIds = $TenantIsolationPolicy.properties.allowedTenants.tenantId - } - + Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -285,7 +273,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -318,8 +306,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $global:M365DSCTenantIds = '' It 'Should add a rule in Set method' { Set-TargetResource @testParams - $global:M365DSCTenantIds.Count | Should -Be 2 - Should -Invoke -CommandName 'Set-PowerAppTenantIsolationPolicy' -Exactly 1 + Should -Invoke -CommandName 'Invoke-M365DSCPowerPlatformRESTWebRequest' -Exactly 1 } } @@ -337,10 +324,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credscredential } - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - $global:M365DSCTenantIds = $TenantIsolationPolicy.properties.allowedTenants.tenantId - } - Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -354,7 +337,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -399,10 +382,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credscredential } - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - $global:M365DSCTenantIds = $TenantIsolationPolicy.properties.allowedTenants.tenantId - } - Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -416,7 +395,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -458,7 +437,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should remove a rule in Set method' { Set-TargetResource @testParams $global:M365DSCTenantIds.Count | Should -Be 1 - Should -Invoke -CommandName 'Set-PowerAppTenantIsolationPolicy' -Exactly 1 + Should -Invoke -CommandName 'Invoke-M365DSCPowerPlatformRESTWebRequest' -Exactly 1 } } @@ -476,10 +455,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credscredential } - Mock -CommandName Set-PowerAppTenantIsolationPolicy -MockWith { - $global:M365DSCTenantIds = $TenantIsolationPolicy.properties.allowedTenants.tenantId - } - Mock -CommandName Invoke-WebRequest -MockWith { if ($Uri -match 'https://login.windows.net/([A-Za-z0-9.]*)/.well-known/openid-configuration') { @@ -493,7 +468,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' @@ -545,7 +520,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Get-PowerAppTenantIsolationPolicy -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ properties = @{ tenantId = '12345678-1234-1234-1234-123456789012' diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 index eb17590094..7a82c0f798 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPTenantSettings.Tests.ps1 @@ -60,7 +60,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential } - Mock -CommandName Set-TenantSettings -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ TenantSettings = @{ WalkMeOptOut = $testParams.WalkMeOptOut @@ -72,43 +72,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { DisableTrialEnvironmentCreationByNonAdminUsers = $testParams.DisableTrialEnvironmentCreationByNonAdminUsers DisableCapacityAllocationByEnvironmentAdmins = $testParams.DisableCapacityAllocationByEnvironmentAdmins DisableSupportTicketsVisibleByAllUsers = $testParams.DisableSupportTicketsVisibleByAllUsers + EnableDesktopFlowDataPolicyManagement = $false powerPlatform = @( - @{ - search = @{ - DisableDocsSearch = $testParams.DisableDocsSearch - DisableCommunitySearch = $testParams.DisableCommunitySearch - DisableBingVideoSearch = $testParams.DisableBingVideoSearch - } - }, - @{ - powerApps = @{ - DisableShareWithEveryone = $testParams.DisableShareWithEveryone - EnableGuestsToMake = $testParams.EnableGuestsToMake - } - }, - @{ - teamsIntegration = @{ - ShareWithColleaguesUserLimit = $testParams.ShareWithColleaguesUserLimit - } - } - ) - } - } - - Mock -CommandName Get-TenantSettings -MockWith { - return @{ - TenantSettings = @{ - WalkMeOptOut = $testParams.WalkMeOptOut - DisableNPSCommentsReachout = $testParams.DisableNPSCommentsReachout - DisableNewsletterSendout = $testParams.DisableNewsletterSendout - DisableEnvironmentCreationByNonAdminUsers = $testParams.DisableEnvironmentCreationByNonAdminUsers - DisablePortalsCreationByNonAdminUsers = $testParams.DisablePortalsCreationByNonAdminUsers - DisableSurveyFeedback = $testParams.DisableSurveyFeedback - DisableTrialEnvironmentCreationByNonAdminUsers = $testParams.DisableTrialEnvironmentCreationByNonAdminUsers - DisableCapacityAllocationByEnvironmentAdmins = $testParams.DisableCapacityAllocationByEnvironmentAdmins - DisableSupportTicketsVisibleByAllUsers = $testParams.DisableSupportTicketsVisibleByAllUsers - EnableDesktopFlowDataPolicyManagement = $false - powerPlatform = @( @{ search = @{ DisableDocsSearch = $testParams.DisableDocsSearch @@ -132,7 +97,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } } - } + It 'Should return false from the Test method' { Test-TargetResource @testParams | Should -Be $false @@ -151,7 +116,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Credential = $Credential } - Mock -CommandName Get-TenantSettings -MockWith { + Mock -CommandName Invoke-M365DSCPowerPlatformRESTWebRequest -MockWith { return @{ WalkMeOptOut = $false DisableNPSCommentsReachout = $false From e39748ab2d90169a5fb9b0e135371a7cfc911f84 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 10:56:28 -0500 Subject: [PATCH 15/26] Updates --- CHANGELOG.md | 1 + Modules/Microsoft365DSC/Dependencies/Manifest.psd1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 065e62841f..8c66893365 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * PowerPlatform resource revamp to use direct REST API calls. * DEPENDENCIES * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. + * Updated MSCloudLoginAssistant to version 1.1.37. # 1.25.205.1 diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index b347a24f13..6576fd6937 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -118,7 +118,7 @@ }, @{ ModuleName = "MSCloudLoginAssistant" - RequiredVersion = "1.1.36" + RequiredVersion = "1.1.37" }, @{ ModuleName = 'PnP.PowerShell' From 52e7b2425305d2b5c237e14f58113e0eb8639dd1 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Tue, 11 Feb 2025 16:19:06 +0000 Subject: [PATCH 16/26] Updated Resources and Cmdlet documentation pages --- .../resources/power-platform/PPPowerAppPolicyUrlPatterns.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/resources/power-platform/PPPowerAppPolicyUrlPatterns.md b/docs/docs/resources/power-platform/PPPowerAppPolicyUrlPatterns.md index d658c23ba1..ebe36282a4 100644 --- a/docs/docs/resources/power-platform/PPPowerAppPolicyUrlPatterns.md +++ b/docs/docs/resources/power-platform/PPPowerAppPolicyUrlPatterns.md @@ -15,13 +15,13 @@ | **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | | | **AccessTokens** | Write | StringArray[] | Access token used for authentication. | | -### MSFT_PPPowerAPpPolicyUrlPatternsRule +### MSFT_PPPowerAppPolicyUrlPatternsRule #### Parameters | Parameter | Attribute | DataType | Description | Allowed Values | | --- | --- | --- | --- | --- | -| **order** | Write | String | Rule priority order. | | +| **order** | Write | UInt32 | Rule priority order. | | | **customConnectorRuleClassification** | Write | String | Rule classification. | | | **pattern** | Write | String | Rule pattern. | | From cbdbfa4b2dc916b58ce09c99f29070254f45eca9 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Tue, 11 Feb 2025 16:21:59 +0000 Subject: [PATCH 17/26] Updated Schema Definition --- Modules/Microsoft365DSC/SchemaDefinition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Microsoft365DSC/SchemaDefinition.json b/Modules/Microsoft365DSC/SchemaDefinition.json index fb76ed84a5..89f2ad2d95 100644 --- a/Modules/Microsoft365DSC/SchemaDefinition.json +++ b/Modules/Microsoft365DSC/SchemaDefinition.json @@ -54606,10 +54606,10 @@ ] }, { - "ClassName": "MSFT_PPPowerAPpPolicyUrlPatternsRule", + "ClassName": "MSFT_PPPowerAppPolicyUrlPatternsRule", "Parameters": [ { - "CIMType": "String", + "CIMType": "UInt32", "Name": "order", "Option": "Write" }, From 437cf9c654896b29277a3b94bd37e3709439e98f Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 17:08:29 -0500 Subject: [PATCH 18/26] AADApplication - Allow for Nullable AuthenticationBehaviors --- CHANGELOG.md | 3 +++ .../MSFT_AADApplication.psm1 | 16 +++++------ .../MSFT_AADApplication.schema.mof | 6 ++--- .../Microsoft365DSC.AADApplication.Tests.ps1 | 27 ++++++++++--------- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c66893365..5c2cccac20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ # UNRELEASED +* AADApplication + * Changing the AuthenticationBehaviors parameters to string to allow + for null values. * EXORetentionPolicyTag * Initial release. * MISC diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 index 446ac091a5..3c6911b259 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 @@ -193,15 +193,15 @@ function Get-TargetResource $complexAuthenticationBehaviors = @{} if ($null -ne $AADBetaApp.authenticationBehaviors.blockAzureADGraphAccess) { - $complexAuthenticationBehaviors.Add('BlockAzureADGraphAccess', $AADBetaApp.authenticationBehaviors.blockAzureADGraphAccess) + $complexAuthenticationBehaviors.Add('BlockAzureADGraphAccess', $AADBetaApp.authenticationBehaviors.blockAzureADGraphAccess.ToString()) } if ($null -ne $AADBetaApp.authenticationBehaviors.removeUnverifiedEmailClaim) { - $complexAuthenticationBehaviors.Add('RemoveUnverifiedEmailClaim', $AADBetaApp.authenticationBehaviors.removeUnverifiedEmailClaim) + $complexAuthenticationBehaviors.Add('RemoveUnverifiedEmailClaim', $AADBetaApp.authenticationBehaviors.removeUnverifiedEmailClaim.ToString()) } if ($null -ne $AADBetaApp.authenticationBehaviors.requireClientServicePrincipal) { - $complexAuthenticationBehaviors.Add('RequireClientServicePrincipal', $AADBetaApp.authenticationBehaviors.requireClientServicePrincipal) + $complexAuthenticationBehaviors.Add('RequireClientServicePrincipal', $AADBetaApp.authenticationBehaviors.requireClientServicePrincipal.ToString()) } if ($complexAuthenticationBehaviors.values.Where({ $null -ne $_ }).Count -eq 0) { @@ -897,10 +897,6 @@ function Set-TargetResource $tries++ } until ($null -eq $appEntity -or $tries -le 12) } - Write-Host "Ensure = $Ensure" - Write-Host "ApplicationTemplateId = $ApplicationTemplateId" - Write-Host "skipToUpdate = $skipToUpdate" - Write-Host "currentAADApp.Ensure = $($currentAADApp.Ensure))" if ($Ensure -eq 'Present' -and $currentAADApp.Ensure -eq 'Absent' -and -not $skipToUpdate) { $currentParameters.Remove('ObjectId') | Out-Null @@ -1181,11 +1177,11 @@ function Set-TargetResource $IAuthenticationBehaviors = @{ blockAzureADGraphAccess = $AuthenticationBehaviors.blockAzureADGraphAccess removeUnverifiedEmailClaim = $AuthenticationBehaviors.removeUnverifiedEmailClaim - requireClientServicePrincipal = $AuthenticationBehaviors.requireClientServicePrincipal + #requireClientServicePrincipal = $AuthenticationBehaviors.requireClientServicePrincipal } - Update-MgBetaApplication -ApplicationId $currentAADApp.Id ` - -AuthenticationBehaviors $IAuthenticationBehaviors | Out-Null + $uri = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + "beta/applications/$($currentAADApp.Id)/authenticationBehaviors" + Invoke-MgGraphRequest -Uri $uri -Method 'PATCH' -Body $IAuthenticationBehaviors } if ($needToUpdateKeyCredentials -and $KeyCredentials) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.schema.mof index d64409ef93..d34e474576 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.schema.mof @@ -107,9 +107,9 @@ class MSFT_MicrosoftGraphApiApplication [ClassVersion("1.0.0")] class MSFT_MicrosoftGraphAuthenticationBehaviors { - [Write, Description("If false, allows the app to have extended access to Azure AD Graph until June 30, 2025 when Azure AD Graph is fully retired. For more information on Azure AD retirement updates, see June 2024 update on Azure AD Graph API retirement.")] Boolean BlockAzureADGraphAccess; - [Write, Description("If true, removes the email claim from tokens sent to an application when the email address's domain can't be verified.")] Boolean RemoveUnverifiedEmailClaim; - [Write, Description("If true, requires multitenant applications to have a service principal in the resource tenant as part of authorization checks before they're granted access tokens. This property is only modifiable for multitenant resource applications that rely on access from clients without a service principal and had this behavior as set to false by Microsoft. Tenant administrators should respond to security advisories sent through Azure Health Service events and the Microsoft 365 message center.")] Boolean RequireClientServicePrincipal; + [Write, Description("If false, allows the app to have extended access to Azure AD Graph until June 30, 2025 when Azure AD Graph is fully retired. For more information on Azure AD retirement updates, see June 2024 update on Azure AD Graph API retirement.")] String BlockAzureADGraphAccess; + [Write, Description("If true, removes the email claim from tokens sent to an application when the email address's domain can't be verified.")] String RemoveUnverifiedEmailClaim; + [Write, Description("If true, requires multitenant applications to have a service principal in the resource tenant as part of authorization checks before they're granted access tokens. This property is only modifiable for multitenant resource applications that rely on access from clients without a service principal and had this behavior as set to false by Microsoft. Tenant administrators should respond to security advisories sent through Azure Health Service events and the Microsoft 365 message center.")] String RequireClientServicePrincipal; }; [ClassVersion("1.0.0")] diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADApplication.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADApplication.Tests.ps1 index e5efd37b09..97ef336910 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADApplication.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADApplication.Tests.ps1 @@ -44,7 +44,10 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Mock -CommandName Remove-MgApplication -MockWith { } - Mock -CommandName MgBetaDirectoryDeletedItemAsApplication -MockWith { + Mock -CommandName Get-MgBetaDirectoryDeletedItemAsApplication -MockWith { + } + + Mock -CommandName Invoke-MgGraphRequest -MockWith { } Mock -CommandName New-MgApplication -MockWith { @@ -72,7 +75,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { # Mock Write-Host to hide output during the tests Mock -CommandName Write-Host -MockWith { } - $Script:exportedInstances =$null + $Script:exportedInstance =$null $Script:ExportMode = $false } @@ -241,9 +244,9 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { ) } -ClientOnly AuthenticationBehaviors = New-CimInstance -ClassName MSFT_MicrosoftGraphAuthenticationBehaviors -Property @{ - blockAzureADGraphAccess = $false - removeUnverifiedEmailClaim = $true - requireClientServicePrincipal = $false + blockAzureADGraphAccess = 'false' + removeUnverifiedEmailClaim = 'true' + requireClientServicePrincipal = 'false' } -ClientOnly Api = New-CimInstance -ClassName MSFT_MicrosoftGraphapiApplication -Property @{ PreAuthorizedApplications = [CimInstance[]]@( @@ -341,9 +344,9 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $AADApp | Add-Member -MemberType NoteProperty -Name Oauth2RequirePostResponse -Value $false $AADApp | Add-Member -MemberType NoteProperty -Name PublicClient -Value $false $AADApp | Add-Member -MemberType NoteProperty -Name AuthenticationBehaviors -Value @{ - blockAzureADGraphAccess = $false - removeUnverifiedEmailClaim = $true - requireClientServicePrincipal = $false + blockAzureADGraphAccess = 'false' + removeUnverifiedEmailClaim = 'true' + requireClientServicePrincipal = 'false' } return $AADApp } @@ -422,9 +425,9 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { PublicClient = $false ReplyURLs = 'https://app.contoso.com' AuthenticationBehaviors = New-CimInstance -ClassName MSFT_MicrosoftGraphAuthenticationBehaviors -Property @{ - blockAzureADGraphAccess = $false - removeUnverifiedEmailClaim = $true - requireClientServicePrincipal = $false + blockAzureADGraphAccess = 'false' + removeUnverifiedEmailClaim = 'true' + requireClientServicePrincipal = 'false' } -ClientOnly Ensure = 'Present' Credential = $Credential @@ -452,7 +455,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It 'Should call the new method' { Set-TargetResource @testParams - Should -Invoke -CommandName 'Update-MgBetaApplication' -Exactly 1 + Should -Invoke -CommandName 'Invoke-MgGraphRequest' -Exactly 2 } } From 182fd196b2974adf4caaff98b6f60612ca778020 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 19:22:57 -0500 Subject: [PATCH 19/26] Update MSFT_AADApplication.psm1 --- .../DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 index 3c6911b259..ce42c69127 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 @@ -1177,7 +1177,7 @@ function Set-TargetResource $IAuthenticationBehaviors = @{ blockAzureADGraphAccess = $AuthenticationBehaviors.blockAzureADGraphAccess removeUnverifiedEmailClaim = $AuthenticationBehaviors.removeUnverifiedEmailClaim - #requireClientServicePrincipal = $AuthenticationBehaviors.requireClientServicePrincipal + requireClientServicePrincipal = $AuthenticationBehaviors.requireClientServicePrincipal } $uri = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + "beta/applications/$($currentAADApp.Id)/authenticationBehaviors" From a264918968116c4e5c05f26605e47f83848bdf02 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Wed, 12 Feb 2025 00:46:28 +0000 Subject: [PATCH 20/26] Updated Resources and Cmdlet documentation pages --- docs/docs/resources/azure-ad/AADApplication.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/resources/azure-ad/AADApplication.md b/docs/docs/resources/azure-ad/AADApplication.md index 264ffb29f6..65616ea17a 100644 --- a/docs/docs/resources/azure-ad/AADApplication.md +++ b/docs/docs/resources/azure-ad/AADApplication.md @@ -168,9 +168,9 @@ | Parameter | Attribute | DataType | Description | Allowed Values | | --- | --- | --- | --- | --- | -| **BlockAzureADGraphAccess** | Write | Boolean | If false, allows the app to have extended access to Azure AD Graph until June 30, 2025 when Azure AD Graph is fully retired. For more information on Azure AD retirement updates, see June 2024 update on Azure AD Graph API retirement. | | -| **RemoveUnverifiedEmailClaim** | Write | Boolean | If true, removes the email claim from tokens sent to an application when the email address's domain can't be verified. | | -| **RequireClientServicePrincipal** | Write | Boolean | If true, requires multitenant applications to have a service principal in the resource tenant as part of authorization checks before they're granted access tokens. This property is only modifiable for multitenant resource applications that rely on access from clients without a service principal and had this behavior as set to false by Microsoft. Tenant administrators should respond to security advisories sent through Azure Health Service events and the Microsoft 365 message center. | | +| **BlockAzureADGraphAccess** | Write | String | If false, allows the app to have extended access to Azure AD Graph until June 30, 2025 when Azure AD Graph is fully retired. For more information on Azure AD retirement updates, see June 2024 update on Azure AD Graph API retirement. | | +| **RemoveUnverifiedEmailClaim** | Write | String | If true, removes the email claim from tokens sent to an application when the email address's domain can't be verified. | | +| **RequireClientServicePrincipal** | Write | String | If true, requires multitenant applications to have a service principal in the resource tenant as part of authorization checks before they're granted access tokens. This property is only modifiable for multitenant resource applications that rely on access from clients without a service principal and had this behavior as set to false by Microsoft. Tenant administrators should respond to security advisories sent through Azure Health Service events and the Microsoft 365 message center. | | ### MSFT_MicrosoftGraphKeyCredential From 63448571604841a8729b1e1c1444420f52425247 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Wed, 12 Feb 2025 00:48:29 +0000 Subject: [PATCH 21/26] Updated Schema Definition --- Modules/Microsoft365DSC/SchemaDefinition.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Microsoft365DSC/SchemaDefinition.json b/Modules/Microsoft365DSC/SchemaDefinition.json index 89f2ad2d95..2bb42d5ccc 100644 --- a/Modules/Microsoft365DSC/SchemaDefinition.json +++ b/Modules/Microsoft365DSC/SchemaDefinition.json @@ -973,17 +973,17 @@ "ClassName": "MSFT_MicrosoftGraphAuthenticationBehaviors", "Parameters": [ { - "CIMType": "Boolean", + "CIMType": "String", "Name": "BlockAzureADGraphAccess", "Option": "Write" }, { - "CIMType": "Boolean", + "CIMType": "String", "Name": "RemoveUnverifiedEmailClaim", "Option": "Write" }, { - "CIMType": "Boolean", + "CIMType": "String", "Name": "RequireClientServicePrincipal", "Option": "Write" } From 732db590ff4142f3457c004da2973b4c67b26063 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 20:00:25 -0500 Subject: [PATCH 22/26] Updated ReverseDSC to Version 2.0.0.25 --- CHANGELOG.md | 1 + Modules/Microsoft365DSC/Dependencies/Manifest.psd1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c2cccac20..e7aef78070 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * DEPENDENCIES * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. * Updated MSCloudLoginAssistant to version 1.1.37. + * Updated ReverseDSC to version 2.0.0.25. # 1.25.205.1 diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index 6576fd6937..11955b9a37 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -134,7 +134,7 @@ }, @{ ModuleName = 'ReverseDSC' - RequiredVersion = '2.0.0.22' + RequiredVersion = '2.0.0.25' } ) } From e2ca23d0fd5b10dc24abb62ed52fd70b6dfe627a Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 11 Feb 2025 20:07:59 -0500 Subject: [PATCH 23/26] Update M365DSCDRGUtil.psm1 --- Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 index 8284f7da5d..a7ca267251 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 @@ -836,7 +836,6 @@ function Compare-M365DSCComplexObject } elseif ($targetType -eq 'String') { - Write-Verbose -Message "Parameter {$($key)} is a String" # Align line breaks if (-not [System.String]::IsNullOrEmpty($referenceObject)) { From 90a9288a00299d0e378cab34fe284e7d4166ec8e Mon Sep 17 00:00:00 2001 From: Fabien Tschanz Date: Fri, 7 Feb 2025 17:05:53 +0100 Subject: [PATCH 24/26] Simplify export of complex properties --- CHANGELOG.md | 1 + .../MSFT_AADAccessReviewDefinition.psm1 | 17 +- .../MSFT_AADAccessReviewPolicy.psm1 | 3 - .../MSFT_AADActivityBasedTimeoutPolicy.psm1 | 3 - .../MSFT_AADAdminConsentRequestPolicy.psm1 | 10 +- .../MSFT_AADAdministrativeUnit.psm1 | 17 +- .../MSFT_AADApplication.psm1 | 47 +---- .../MSFT_AADAttributeSet.psm1 | 3 - ...ADAuthenticationContextClassReference.psm1 | 3 - .../MSFT_AADAuthenticationFlowPolicy.psm1 | 3 +- .../MSFT_AADAuthenticationMethodPolicy.psm1 | 17 +- ...thenticationMethodPolicyAuthenticator.psm1 | 18 +- ...FT_AADAuthenticationMethodPolicyEmail.psm1 | 14 +- ...AADAuthenticationMethodPolicyExternal.psm1 | 18 +- ...FT_AADAuthenticationMethodPolicyFido2.psm1 | 18 +- ...AADAuthenticationMethodPolicyHardware.psm1 | 14 +- ...MSFT_AADAuthenticationMethodPolicySms.psm1 | 13 +- ...AADAuthenticationMethodPolicySoftware.psm1 | 14 +- ...ADAuthenticationMethodPolicyTemporary.psm1 | 14 +- ...FT_AADAuthenticationMethodPolicyVoice.psm1 | 14 +- ...SFT_AADAuthenticationMethodPolicyX509.psm1 | 24 +-- .../MSFT_AADAuthenticationRequirement.psm1 | 3 - .../MSFT_AADAuthenticationStrengthPolicy.psm1 | 3 - .../MSFT_AADAuthorizationPolicy.psm1 | 3 - .../MSFT_AADClaimsMappingPolicy.psm1 | 11 +- .../MSFT_AADConditionalAccessPolicy.psm1 | 3 - ...SFT_AADConnectorGroupApplicationProxy.psm1 | 3 - .../MSFT_AADCrossTenantAccessPolicy.psm1 | 3 - ...enantAccessPolicyConfigurationDefault.psm1 | 26 +-- ...enantAccessPolicyConfigurationPartner.psm1 | 30 +--- ...MSFT_AADCustomAuthenticationExtension.psm1 | 17 +- ..._AADCustomSecurityAttributeDefinition.psm1 | 2 - .../MSFT_AADDeviceRegistrationPolicy.psm1 | 2 - .../MSFT_AADDomain/MSFT_AADDomain.psm1 | 2 - .../MSFT_AADEnrichedAuditLogs.psm1 | 2 - ...AADEntitlementManagementAccessPackage.psm1 | 16 +- ...nagementAccessPackageAssignmentPolicy.psm1 | 27 +-- ...tlementManagementAccessPackageCatalog.psm1 | 2 - ...anagementAccessPackageCatalogResource.psm1 | 12 +- ...lementManagementConnectedOrganization.psm1 | 10 +- ...ADEntitlementManagementRoleAssignment.psm1 | 3 - ...MSFT_AADEntitlementManagementSettings.psm1 | 2 - .../MSFT_AADExternalIdentityPolicy.psm1 | 2 - .../MSFT_AADFeatureRolloutPolicy.psm1 | 2 - .../MSFT_AADFederationConfiguration.psm1 | 2 - .../MSFT_AADFilteringPolicy.psm1 | 2 - .../MSFT_AADFilteringPolicyRule.psm1 | 10 +- .../MSFT_AADFilteringProfile.psm1 | 10 +- .../MSFT_AADGroup/MSFT_AADGroup.psm1 | 10 +- .../MSFT_AADGroupEligibilitySchedule.psm1 | 10 +- .../MSFT_AADGroupLifecyclePolicy.psm1 | 3 +- .../MSFT_AADGroupsNamingPolicy.psm1 | 3 - .../MSFT_AADGroupsSettings.psm1 | 2 - .../MSFT_AADHomeRealmDiscoveryPolicy.psm1 | 12 +- .../MSFT_AADIdentityAPIConnector.psm1 | 11 +- .../MSFT_AADIdentityB2XUserFlow.psm1 | 13 +- ...ADIdentityGovernanceLifecycleWorkflow.psm1 | 17 +- ...eLifecycleWorkflowCustomTaskExtension.psm1 | 19 +- .../MSFT_AADIdentityGovernanceProgram.psm1 | 3 - ...T_AADIdentityProtectionPolicySettings.psm1 | 2 - .../MSFT_AADLifecycleWorkflowSettings.psm1 | 2 - .../MSFT_AADNamedLocationPolicy.psm1 | 3 - ...MSFT_AADNetworkAccessForwardingPolicy.psm1 | 11 +- ...SFT_AADNetworkAccessForwardingProfile.psm1 | 10 +- ...NetworkAccessSettingConditionalAccess.psm1 | 2 - ...NetworkAccessSettingCrossTenantAccess.psm1 | 2 - ...DOnPremisesPublishingProfilesSettings.psm1 | 2 - ...tionCertificateBasedAuthConfiguration.psm1 | 9 +- .../MSFT_AADPasswordRuleSettings.psm1 | 2 - .../MSFT_AADRemoteNetwork.psm1 | 10 +- ...MSFT_AADRoleAssignmentScheduleRequest.psm1 | 15 +- .../MSFT_AADRoleDefinition.psm1 | 3 - ...SFT_AADRoleEligibilityScheduleRequest.psm1 | 15 +- .../MSFT_AADRoleManagementPolicyRule.psm1 | 31 +--- .../MSFT_AADRoleSetting.psm1 | 3 - .../MSFT_AADSecurityDefaults.psm1 | 2 - .../MSFT_AADServicePrincipal.psm1 | 33 +--- .../MSFT_AADSocialIdentityProvider.psm1 | 2 - .../MSFT_AADTenantDetails.psm1 | 3 +- .../MSFT_AADTokenLifetimePolicy.psm1 | 3 - .../MSFT_AADUser/MSFT_AADUser.psm1 | 6 +- .../MSFT_AADUserFlowAttribute.psm1 | 3 - .../MSFT_AADVerifiedIdAuthority.psm1 | 11 +- .../MSFT_AADVerifiedIdAuthorityContract.psm1 | 16 +- .../MSFT_ADOOrganizationOwner.psm1 | 2 - .../MSFT_ADOPermissionGroup.psm1 | 2 - .../MSFT_ADOPermissionGroupSettings.psm1 | 16 +- .../MSFT_ADOSecurityPolicy.psm1 | 2 - .../MSFT_AzureBillingAccountPolicy.psm1 | 14 +- ...FT_AzureBillingAccountScheduledAction.psm1 | 24 +-- ..._AzureBillingAccountsAssociatedTenant.psm1 | 2 - ...FT_AzureBillingAccountsRoleAssignment.psm1 | 2 - .../MSFT_AzureDiagnosticSettings.psm1 | 15 +- ...nosticSettingsCustomSecurityAttribute.psm1 | 15 +- .../MSFT_AzureSubscription.psm1 | 2 - .../MSFT_AzureVerifiedIdFaceCheck.psm1 | 2 - .../MSFT_CommerceSelfServicePurchase.psm1 | 2 - ...nderDeviceAuthenticatedScanDefinition.psm1 | 25 +-- .../MSFT_DefenderSubscriptionPlan.psm1 | 2 - .../MSFT_EXOATPBuiltInProtectionRule.psm1 | 2 - .../MSFT_EXOAcceptedDomain.psm1 | 2 - .../MSFT_EXOActiveSyncDeviceAccessRule.psm1 | 2 - .../MSFT_EXOActiveSyncMailboxPolicy.psm1 | 2 - .../MSFT_EXOAddressBookPolicy.psm1 | 2 - .../MSFT_EXOAddressList.psm1 | 2 - .../MSFT_EXOAntiPhishPolicy.psm1 | 2 - .../MSFT_EXOAntiPhishRule.psm1 | 2 - .../MSFT_EXOApplicationAccessPolicy.psm1 | 2 - .../MSFT_EXOArcConfig/MSFT_EXOArcConfig.psm1 | 2 - .../MSFT_EXOAtpPolicyForO365.psm1 | 3 - .../MSFT_EXOAtpProtectionPolicyRule.psm1 | 2 - .../MSFT_EXOAuthenticationPolicy.psm1 | 2 - ...SFT_EXOAuthenticationPolicyAssignment.psm1 | 2 - .../MSFT_EXOAvailabilityAddressSpace.psm1 | 2 - .../MSFT_EXOAvailabilityConfig.psm1 | 2 - .../MSFT_EXOCASMailboxPlan.psm1 | 3 - .../MSFT_EXOCASMailboxSettings.psm1 | 3 - .../MSFT_EXOCalendarProcessing.psm1 | 2 - .../MSFT_EXOClientAccessRule.psm1 | 2 - .../MSFT_EXODataAtRestEncryptionPolicy.psm1 | 2 - ...ODataAtRestEncryptionPolicyAssignment.psm1 | 2 - .../MSFT_EXODataClassification.psm1 | 2 - .../MSFT_EXODataEncryptionPolicy.psm1 | 2 - .../MSFT_EXODistributionGroup.psm1 | 3 - .../MSFT_EXODkimSigningConfig.psm1 | 2 - .../MSFT_EXODnssecForVerifiedDomain.psm1 | 2 - .../MSFT_EXOEOPProtectionPolicyRule.psm1 | 2 - .../MSFT_EXOEmailAddressPolicy.psm1 | 2 - .../MSFT_EXOEmailTenantSettings.psm1 | 2 - .../MSFT_EXOExternalInOutlook.psm1 | 2 - .../MSFT_EXOFocusedInbox.psm1 | 2 - .../MSFT_EXOGlobalAddressList.psm1 | 2 - .../MSFT_EXOGroupSettings.psm1 | 3 - .../MSFT_EXOHostedConnectionFilterPolicy.psm1 | 2 - .../MSFT_EXOHostedContentFilterPolicy.psm1 | 2 - .../MSFT_EXOHostedContentFilterRule.psm1 | 2 - ...SFT_EXOHostedOutboundSpamFilterPolicy.psm1 | 2 - .../MSFT_EXOHostedOutboundSpamFilterRule.psm1 | 2 - .../MSFT_EXOIRMConfiguration.psm1 | 2 - .../MSFT_EXOInboundConnector.psm1 | 2 - .../MSFT_EXOIntraOrganizationConnector.psm1 | 2 - .../MSFT_EXOJournalRule.psm1 | 2 - .../MSFT_EXOMailContact.psm1 | 2 - .../MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 | 2 - ...MSFT_EXOMailboxAuditBypassAssociation.psm1 | 2 - ...MSFT_EXOMailboxAutoReplyConfiguration.psm1 | 2 - .../MSFT_EXOMailboxCalendarConfiguration.psm1 | 2 - .../MSFT_EXOMailboxCalendarFolder.psm1 | 2 - .../MSFT_EXOMailboxFolderPermission.psm1 | 11 +- .../MSFT_EXOMailboxIRMAccess.psm1 | 2 - .../MSFT_EXOMailboxPermission.psm1 | 3 - .../MSFT_EXOMailboxPlan.psm1 | 3 - .../MSFT_EXOMailboxSettings.psm1 | 3 - .../MSFT_EXOMalwareFilterPolicy.psm1 | 3 - .../MSFT_EXOMalwareFilterRule.psm1 | 2 - .../MSFT_EXOManagementRole.psm1 | 2 - .../MSFT_EXOManagementRoleAssignment.psm1 | 2 - .../MSFT_EXOManagementRoleEntry.psm1 | 2 - .../MSFT_EXOManagementScope.psm1 | 2 - .../MSFT_EXOMessageClassification.psm1 | 2 - .../MSFT_EXOMigration/MSFT_EXOMigration.psm1 | 2 - .../MSFT_EXOMigrationEndpoint.psm1 | 2 - .../MSFT_EXOMobileDeviceMailboxPolicy.psm1 | 2 - .../MSFT_EXOOMEConfiguration.psm1 | 2 - .../MSFT_EXOOfflineAddressBook.psm1 | 2 - .../MSFT_EXOOnPremisesOrganization.psm1 | 2 - .../MSFT_EXOOrganizationConfig.psm1 | 3 - .../MSFT_EXOOrganizationRelationship.psm1 | 2 - .../MSFT_EXOOutboundConnector.psm1 | 2 - .../MSFT_EXOOwaMailboxPolicy.psm1 | 2 - .../MSFT_EXOPartnerApplication.psm1 | 2 - .../MSFT_EXOPerimeterConfiguration.psm1 | 2 - .../MSFT_EXOPhishSimOverrideRule.psm1 | 2 - .../MSFT_EXOPlace/MSFT_EXOPlace.psm1 | 2 - .../MSFT_EXOPolicyTipConfig.psm1 | 2 - .../MSFT_EXOQuarantinePolicy.psm1 | 3 - .../MSFT_EXORecipientPermission.psm1 | 3 - .../MSFT_EXORemoteDomain.psm1 | 2 - .../MSFT_EXOReportSubmissionPolicy.psm1 | 3 - .../MSFT_EXOReportSubmissionRule.psm1 | 3 - .../MSFT_EXOResourceConfiguration.psm1 | 2 - .../MSFT_EXORetentionPolicy.psm1 | 2 - .../MSFT_EXORetentionPolicyTag.psm1 | 2 - .../MSFT_EXORoleAssignmentPolicy.psm1 | 2 - .../MSFT_EXORoleGroup/MSFT_EXORoleGroup.psm1 | 2 - .../MSFT_EXOSafeAttachmentPolicy.psm1 | 2 - .../MSFT_EXOSafeAttachmentRule.psm1 | 2 - .../MSFT_EXOSafeLinksPolicy.psm1 | 2 - .../MSFT_EXOSafeLinksRule.psm1 | 2 - .../MSFT_EXOSecOpsOverrideRule.psm1 | 2 - .../MSFT_EXOServicePrincipal.psm1 | 2 - .../MSFT_EXOSharedMailbox.psm1 | 2 - .../MSFT_EXOSharingPolicy.psm1 | 2 - .../MSFT_EXOSmtpDaneInbound.psm1 | 2 - .../MSFT_EXOSweepRule/MSFT_EXOSweepRule.psm1 | 2 - .../MSFT_EXOTeamsProtectionPolicy.psm1 | 2 - .../MSFT_EXOTenantAllowBlockListItems.psm1 | 2 - ...SFT_EXOTenantAllowBlockListSpoofItems.psm1 | 2 - .../MSFT_EXOTransportConfig.psm1 | 3 - .../MSFT_EXOTransportRule.psm1 | 2 - .../MSFT_FabricAdminTenantSettings.psm1 | 2 - .../MSFT_IntuneASRRulesPolicyWindows10.psm1 | 16 +- ...alAdministratorPasswordSolutionPolicy.psm1 | 12 +- ...tectionLocalUserGroupMembershipPolicy.psm1 | 29 +-- .../MSFT_IntuneAccountProtectionPolicy.psm1 | 16 +- ...ntuneAccountProtectionPolicyWindows10.psm1 | 18 +- ...neAndroidManagedStoreAppConfiguration.psm1 | 25 +-- ..._IntuneAntivirusExclusionsPolicyLinux.psm1 | 14 +- ..._IntuneAntivirusExclusionsPolicyMacOS.psm1 | 14 +- .../MSFT_IntuneAntivirusPolicyLinux.psm1 | 18 +- .../MSFT_IntuneAntivirusPolicyMacOS.psm1 | 18 +- ...ntivirusPolicyWindows10SettingCatalog.psm1 | 10 +- ...AppAndBrowserIsolationPolicyWindows10.psm1 | 10 +- ...wserIsolationPolicyWindows10ConfigMgr.psm1 | 10 +- .../MSFT_IntuneAppCategory.psm1 | 2 - ...FT_IntuneAppConfigurationDevicePolicy.psm1 | 17 +- .../MSFT_IntuneAppConfigurationPolicy.psm1 | 20 +-- ...MSFT_IntuneAppProtectionPolicyAndroid.psm1 | 2 - .../MSFT_IntuneAppProtectionPolicyiOS.psm1 | 2 - ...neAppleMDMPushNotificationCertificate.psm1 | 2 - ...tuneApplicationControlPolicyWindows10.psm1 | 10 +- ...tionRulesPolicyWindows10ConfigManager.psm1 | 12 +- .../MSFT_IntuneDerivedCredential.psm1 | 2 - ...eviceAndAppManagementAssignmentFilter.psm1 | 5 +- .../MSFT_IntuneDeviceCategory.psm1 | 2 - .../MSFT_IntuneDeviceCleanupRule.psm1 | 2 - ...T_IntuneDeviceCompliancePolicyAndroid.psm1 | 15 +- ...iceCompliancePolicyAndroidDeviceOwner.psm1 | 17 +- ...iceCompliancePolicyAndroidWorkProfile.psm1 | 16 +- ...SFT_IntuneDeviceCompliancePolicyMacOS.psm1 | 15 +- ...IntuneDeviceCompliancePolicyWindows10.psm1 | 22 +-- .../MSFT_IntuneDeviceCompliancePolicyiOs.psm1 | 25 +-- ...AdministrativeTemplatePolicyWindows10.psm1 | 31 +--- ...iceConfigurationCustomPolicyWindows10.psm1 | 14 +- ...rForEndpointOnboardingPolicyWindows10.psm1 | 10 +- ...onDeliveryOptimizationPolicyWindows10.psm1 | 25 +-- ...onfigurationDomainJoinPolicyWindows10.psm1 | 10 +- ...figurationEmailProfilePolicyWindows10.psm1 | 10 +- ...tionEndpointProtectionPolicyWindows10.psm1 | 170 ++---------------- ...ationFirmwareInterfacePolicyWindows10.psm1 | 9 +- ...onitoringConfigurationPolicyWindows10.psm1 | 9 +- ...tionIdentityProtectionPolicyWindows10.psm1 | 9 +- ...ImportedPfxCertificatePolicyWindows10.psm1 | 9 +- ...viceConfigurationKioskPolicyWindows10.psm1 | 17 +- ...urationNetworkBoundaryPolicyWindows10.psm1 | 16 +- ...urationPkcsCertificatePolicyWindows10.psm1 | 17 +- ...eviceConfigurationPlatformScriptMacOS.psm1 | 9 +- ...iceConfigurationPlatformScriptWindows.psm1 | 9 +- ...ationPolicyAndroidDeviceAdministrator.psm1 | 61 +------ ...ConfigurationPolicyAndroidDeviceOwner.psm1 | 110 +----------- ...urationPolicyAndroidOpenSourceProject.psm1 | 15 +- ...ConfigurationPolicyAndroidWorkProfile.psm1 | 16 +- ..._IntuneDeviceConfigurationPolicyMacOS.psm1 | 34 +--- ...uneDeviceConfigurationPolicyWindows10.psm1 | 35 +--- ...FT_IntuneDeviceConfigurationPolicyiOS.psm1 | 94 +--------- ...urationSCEPCertificatePolicyWindows10.psm1 | 18 +- ...rationSecureAssessmentPolicyWindows10.psm1 | 9 +- ...ationSharedMultiDevicePolicyWindows10.psm1 | 14 +- ...tionTrustedCertificatePolicyWindows10.psm1 | 9 +- ...DeviceConfigurationVpnPolicyWindows10.psm1 | 43 +---- ...nfigurationWindowsTeamPolicyWindows10.psm1 | 9 +- ...figurationWiredNetworkPolicyWindows10.psm1 | 9 +- ...FT_IntuneDeviceControlPolicyWindows10.psm1 | 14 +- ...ntuneDeviceEnrollmentLimitRestriction.psm1 | 2 - ...neDeviceEnrollmentPlatformRestriction.psm1 | 59 +----- ...neDeviceEnrollmentStatusPageWindows10.psm1 | 9 +- ...ntAndroidDeviceOwnerEnrollmentProfile.psm1 | 11 +- ...uneDeviceManagementComplianceSettings.psm1 | 4 +- ...ManagementEnrollmentAndroidGooglePlay.psm1 | 4 +- .../MSFT_IntuneDeviceRemediation.psm1 | 20 +-- .../MSFT_IntuneDiskEncryptionMacOS.psm1 | 9 +- ...ntuneDiskEncryptionPDEPolicyWindows10.psm1 | 10 +- .../MSFT_IntuneDiskEncryptionWindows10.psm1 | 10 +- ...dpointDetectionAndResponsePolicyLinux.psm1 | 10 +- ...dpointDetectionAndResponsePolicyMacOS.psm1 | 10 +- ...ntDetectionAndResponsePolicyWindows10.psm1 | 12 +- ...otectionPolicyWindows10SettingCatalog.psm1 | 12 +- .../MSFT_IntuneFirewallPolicyWindows10.psm1 | 10 +- ...uneFirewallRulesHyperVPolicyWindows10.psm1 | 14 +- ...FT_IntuneFirewallRulesPolicyWindows10.psm1 | 14 +- ...FirewallRulesPolicyWindows10ConfigMgr.psm1 | 14 +- .../MSFT_IntuneMobileAppsMacOSLobApp.psm1 | 34 +--- ...IntuneMobileAppsWindowsOfficeSuiteApp.psm1 | 29 +-- ...FT_IntuneMobileThreatDefenseConnector.psm1 | 2 - .../MSFT_IntunePolicySets.psm1 | 13 +- .../MSFT_IntuneRoleAssignment.psm1 | 2 - .../MSFT_IntuneRoleDefinition.psm1 | 2 - .../MSFT_IntuneRoleScopeTag.psm1 | 10 +- ...neSecurityBaselineDefenderForEndpoint.psm1 | 18 +- ...BaselineMicrosoft365AppsForEnterprise.psm1 | 18 +- ...T_IntuneSecurityBaselineMicrosoftEdge.psm1 | 10 +- .../MSFT_IntuneSecurityBaselineWindows10.psm1 | 18 +- ...SettingCatalogASRRulesPolicyWindows10.psm1 | 12 +- ...neSettingCatalogCustomPolicyWindows10.psm1 | 13 +- ...stedRootCertificateAndroidDeviceOwner.psm1 | 15 +- ...ustedRootCertificateAndroidEnterprise.psm1 | 15 +- ...tuneTrustedRootCertificateAndroidWork.psm1 | 15 +- .../MSFT_IntuneTrustedRootCertificateIOS.psm1 | 15 +- ...ConfigurationPolicyAndroidDeviceOwner.psm1 | 40 +---- ...NConfigurationPolicyAndroidEnterprise.psm1 | 40 +---- ...tuneVPNConfigurationPolicyAndroidWork.psm1 | 41 +---- .../MSFT_IntuneVPNConfigurationPolicyIOS.psm1 | 45 +---- ...ationPolicyAndroidDeviceAdministrator.psm1 | 16 +- ...ionPolicyAndroidEnterpriseDeviceOwner.psm1 | 15 +- ...ionPolicyAndroidEnterpriseWorkProfile.psm1 | 15 +- ...WifiConfigurationPolicyAndroidForWork.psm1 | 15 +- ...urationPolicyAndroidOpenSourceProject.psm1 | 15 +- ...MSFT_IntuneWifiConfigurationPolicyIOS.psm1 | 15 +- ...FT_IntuneWifiConfigurationPolicyMacOS.psm1 | 15 +- ...ntuneWifiConfigurationPolicyWindows10.psm1 | 15 +- ...tDeploymentProfileAzureADHybridJoined.psm1 | 21 +-- ...topilotDeploymentProfileAzureADJoined.psm1 | 21 +-- ...nProtectionPolicyWindows10MdmEnrolled.psm1 | 60 +------ ...rBusinessDriverUpdateProfileWindows10.psm1 | 9 +- ...BusinessFeatureUpdateProfileWindows10.psm1 | 16 +- ...BusinessQualityUpdateProfileWindows10.psm1 | 14 +- ...ForBusinessRingUpdateProfileWindows10.psm1 | 16 +- .../MSFT_O365AdminAuditLogConfig.psm1 | 3 - .../MSFT_O365ExternalConnection.psm1 | 2 - .../MSFT_O365Group/MSFT_O365Group.psm1 | 2 - .../MSFT_O365OrgCustomizationSetting.psm1 | 3 - .../MSFT_O365OrgSettings.psm1 | 3 - ...65SearchAndIntelligenceConfigurations.psm1 | 3 - .../MSFT_ODSettings/MSFT_ODSettings.psm1 | 3 - .../MSFT_PPAdminDLPPolicy.psm1 | 2 - ...FT_PPDLPPolicyConnectorConfigurations.psm1 | 9 +- .../MSFT_PPPowerAppPolicyUrlPatterns.psm1 | 9 +- .../MSFT_PPPowerAppsEnvironment.psm1 | 2 - .../MSFT_PPTenantIsolationSettings.psm1 | 11 +- .../MSFT_PPTenantSettings.psm1 | 3 - .../MSFT_PlannerBucket.psm1 | 2 - .../MSFT_PlannerPlan/MSFT_PlannerPlan.psm1 | 2 - .../MSFT_PlannerTask/MSFT_PlannerTask.psm1 | 17 +- .../MSFT_SCAuditConfigurationPolicy.psm1 | 2 - .../MSFT_SCAutoSensitivityLabelPolicy.psm1 | 2 - .../MSFT_SCAutoSensitivityLabelRule.psm1 | 17 +- .../MSFT_SCCaseHoldPolicy.psm1 | 2 - .../MSFT_SCCaseHoldRule.psm1 | 2 - .../MSFT_SCComplianceCase.psm1 | 4 - .../MSFT_SCComplianceSearch.psm1 | 5 +- .../MSFT_SCComplianceSearchAction.psm1 | 5 +- .../MSFT_SCComplianceTag.psm1 | 9 +- .../MSFT_SCDLPCompliancePolicy.psm1 | 2 - .../MSFT_SCDLPComplianceRule.psm1 | 13 +- .../MSFT_SCDeviceConditionalAccessPolicy.psm1 | 2 - .../MSFT_SCDeviceConditionalAccessRule.psm1 | 2 - .../MSFT_SCDeviceConfigurationPolicy.psm1 | 2 - .../MSFT_SCDeviceConfigurationRule.psm1 | 2 - .../MSFT_SCFilePlanPropertyAuthority.psm1 | 2 - .../MSFT_SCFilePlanPropertyCategory.psm1 | 2 - .../MSFT_SCFilePlanPropertyCitation.psm1 | 2 - .../MSFT_SCFilePlanPropertyDepartment.psm1 | 2 - .../MSFT_SCFilePlanPropertyReferenceId.psm1 | 2 - .../MSFT_SCFilePlanPropertySubCategory.psm1 | 2 - .../MSFT_SCInsiderRiskEntityList.psm1 | 18 +- .../MSFT_SCInsiderRiskPolicy.psm1 | 2 - .../MSFT_SCLabelPolicy.psm1 | 11 +- .../MSFT_SCPolicyConfig.psm1 | 92 +--------- .../MSFT_SCProtectionAlert.psm1 | 2 - ...ecordReviewNotificationTemplateConfig.psm1 | 2 - .../MSFT_SCRetentionCompliancePolicy.psm1 | 2 - .../MSFT_SCRetentionComplianceRule.psm1 | 2 - .../MSFT_SCRetentionEventType.psm1 | 2 - .../MSFT_SCRoleGroup/MSFT_SCRoleGroup.psm1 | 2 - .../MSFT_SCRoleGroupMember.psm1 | 2 - .../MSFT_SCSecurityFilter.psm1 | 2 - .../MSFT_SCSensitivityLabel.psm1 | 24 +-- .../MSFT_SCSupervisoryReviewPolicy.psm1 | 2 - .../MSFT_SCSupervisoryReviewRule.psm1 | 2 - ...MSFT_SCUnifiedAuditLogRetentionPolicy.psm1 | 2 - .../MSFT_SPOAccessControlSettings.psm1 | 2 - .../DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 | 2 - .../MSFT_SPOBrowserIdleSignout.psm1 | 3 - .../MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 | 2 - .../MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 | 2 - .../MSFT_SPOOrgAssetsLibrary.psm1 | 2 - .../MSFT_SPOPropertyBag.psm1 | 2 - .../MSFT_SPORetentionLabelsSettings.psm1 | 2 - .../MSFT_SPOSearchManagedProperty.psm1 | 3 - .../MSFT_SPOSearchResultSource.psm1 | 3 - .../MSFT_SPOSharingSettings.psm1 | 2 - .../MSFT_SPOSite/MSFT_SPOSite.psm1 | 3 - .../MSFT_SPOSiteAuditSettings.psm1 | 5 +- .../MSFT_SPOSiteDesign.psm1 | 2 - .../MSFT_SPOSiteDesignRights.psm1 | 5 +- .../MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 | 2 - .../MSFT_SPOSiteScript.psm1 | 2 - .../MSFT_SPOStorageEntity.psm1 | 2 - .../MSFT_SPOTenantCdnEnabled.psm1 | 3 - .../MSFT_SPOTenantCdnPolicy.psm1 | 9 +- .../MSFT_SPOTenantSettings.psm1 | 2 - .../MSFT_SPOTheme/MSFT_SPOTheme.psm1 | 10 +- .../MSFT_SPOUserProfileProperty.psm1 | 12 +- .../MSFT_SentinelAlertRule.psm1 | 26 +-- .../MSFT_SentinelSetting.psm1 | 2 - ...T_SentinelThreatIntelligenceIndicator.psm1 | 2 - .../MSFT_SentinelWatchlist.psm1 | 2 - .../MSFT_TeamsAppPermissionPolicy.psm1 | 2 - .../MSFT_TeamsAppSetupPolicy.psm1 | 2 - .../MSFT_TeamsAudioConferencingPolicy.psm1 | 2 - .../MSFT_TeamsCallHoldPolicy.psm1 | 2 - .../MSFT_TeamsCallParkPolicy.psm1 | 2 - .../MSFT_TeamsCallQueue.psm1 | 2 - .../MSFT_TeamsCallingPolicy.psm1 | 2 - .../MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 | 2 - .../MSFT_TeamsChannelTab.psm1 | 5 +- .../MSFT_TeamsChannelsPolicy.psm1 | 2 - .../MSFT_TeamsClientConfiguration.psm1 | 3 - .../MSFT_TeamsComplianceRecordingPolicy.psm1 | 12 +- .../MSFT_TeamsCortanaPolicy.psm1 | 2 - ...TeamsDialInConferencingTenantSettings.psm1 | 3 - .../MSFT_TeamsEmergencyCallRoutingPolicy.psm1 | 10 +- .../MSFT_TeamsEmergencyCallingPolicy.psm1 | 2 - .../MSFT_TeamsEnhancedEncryptionPolicy.psm1 | 2 - .../MSFT_TeamsEventsPolicy.psm1 | 2 - .../MSFT_TeamsFederationConfiguration.psm1 | 3 - .../MSFT_TeamsFeedbackPolicy.psm1 | 2 - .../MSFT_TeamsFilesPolicy.psm1 | 2 - .../MSFT_TeamsGroupPolicyAssignment.psm1 | 2 - .../MSFT_TeamsGuestCallingConfiguration.psm1 | 3 - .../MSFT_TeamsGuestMeetingConfiguration.psm1 | 3 - ...MSFT_TeamsGuestMessagingConfiguration.psm1 | 3 - .../MSFT_TeamsIPPhonePolicy.psm1 | 2 - .../MSFT_TeamsM365App/MSFT_TeamsM365App.psm1 | 2 - ...FT_TeamsMeetingBroadcastConfiguration.psm1 | 13 +- .../MSFT_TeamsMeetingBroadcastPolicy.psm1 | 2 - .../MSFT_TeamsMeetingConfiguration.psm1 | 3 - .../MSFT_TeamsMeetingPolicy.psm1 | 2 - .../MSFT_TeamsMessagingPolicy.psm1 | 2 - .../MSFT_TeamsMobilityPolicy.psm1 | 2 - .../MSFT_TeamsNetworkRoamingPolicy.psm1 | 2 - .../MSFT_TeamsOnlineVoiceUser.psm1 | 2 - .../MSFT_TeamsOnlineVoicemailPolicy.psm1 | 2 - ...MSFT_TeamsOnlineVoicemailUserSettings.psm1 | 3 - .../MSFT_TeamsOrgWideAppSettings.psm1 | 3 - .../MSFT_TeamsPstnUsage.psm1 | 2 - .../MSFT_TeamsShiftsPolicy.psm1 | 2 - .../MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 | 2 - .../MSFT_TeamsTemplatesPolicy.psm1 | 2 - .../MSFT_TeamsTenantDialPlan.psm1 | 12 +- .../MSFT_TeamsTenantNetworkRegion.psm1 | 2 - .../MSFT_TeamsTenantNetworkSite.psm1 | 2 - .../MSFT_TeamsTenantNetworkSubnet.psm1 | 2 - .../MSFT_TeamsTenantTrustedIPAddress.psm1 | 2 - .../MSFT_TeamsTranslationRule.psm1 | 2 - .../MSFT_TeamsUnassignedNumberTreatment.psm1 | 2 - .../MSFT_TeamsUpdateManagementPolicy.psm1 | 4 +- .../MSFT_TeamsUpgradeConfiguration.psm1 | 3 - .../MSFT_TeamsUpgradePolicy.psm1 | 5 +- .../MSFT_TeamsUser/MSFT_TeamsUser.psm1 | 2 - .../MSFT_TeamsUserCallingSettings.psm1 | 3 - .../MSFT_TeamsUserPolicyAssignment.psm1 | 2 - .../MSFT_TeamsVdiPolicy.psm1 | 2 - .../MSFT_TeamsVoiceRoute.psm1 | 2 - .../MSFT_TeamsVoiceRoutingPolicy.psm1 | 2 - .../MSFT_TeamsWorkloadPolicy.psm1 | 2 - .../Dependencies/Manifest.psd1 | 2 +- .../Modules/M365DSCDRGUtil.psm1 | 32 +++- .../Microsoft365DSC/Modules/M365DSCUtil.psm1 | 27 ++- ResourceGenerator/Module.Template.psm1 | 2 - .../Module.Workloads.Template.psm1 | 3 - ...iceEnrollmentPlatformRestriction.Tests.ps1 | 8 - .../MSFT_ResourceName/MSFT_ResourceName.psm1 | 3 - 463 files changed, 466 insertions(+), 3564 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d6119d856..7d6dfb5cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ FIXES [#5709](https://github.com/microsoft/Microsoft365DSC/issues/5709) * MISC * PowerPlatform resource revamp to use direct REST API calls. + * Simplify export behavior for all resources and complex objects. * DEPENDENCIES * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. * Updated MSCloudLoginAssistant to version 1.1.37. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1 index 5b88d542f6..3f48f58d4a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1 @@ -823,8 +823,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ScopeValue) { $complexMapping = @( @@ -959,19 +957,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ScopeValue) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ScopeValue' -IsCIMArray:$False - } - if ($Results.SettingsValue) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'SettingsValue' -IsCIMArray:$False - } - if ($Results.StageSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'StageSettings' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ScopeValue', 'SettingsValue', 'StageSettings') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1 index d741de52e3..b6241f27f9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1 @@ -318,9 +318,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 index 78c6d0dd7a..8a2c3545dd 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 @@ -534,9 +534,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 index 81ef4cb4d9..298d9ae414 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 @@ -485,9 +485,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.Reviewers) { $complexMapping = @( @@ -516,11 +513,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Reviewers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Reviewers' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('Reviewers') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 index c63ee30ee5..d605d1ceba 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 @@ -1089,7 +1089,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - if ($null -ne $Results.ScopedRoleMembers) { $complexMapping = @( @@ -1120,25 +1119,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.ScopedRoleMembers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ScopedRoleMembers' -IsCIMArray $true - } - if ($null -ne $Results.Members) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Members' -IsCIMArray $true - $currentDSCBlock = $currentDSCBlock.Replace("`",`"`r`n", '') - $currentDSCBlock = $currentDSCBlock.Replace(",`r`n", '').Replace("`");`r`n", ");`r`n") - } + -Credential $Credential ` + -NoEscape @('Members', 'ScopedRoleMembers') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 index ce42c69127..e27093e3f1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 @@ -1552,8 +1552,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Permissions.Count -gt 0) { @@ -1758,49 +1756,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Api) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Api' -IsCIMArray:$False - } - - if ($null -ne $Results.Permissions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Permissions' ` - -IsCIMArray:$True - } - - if ($Results.OptionalClaims) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OptionalClaims' -IsCIMArray:$False - } - - if ($Results.OnPremisesPublishing) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OnPremisesPublishing' -IsCIMArray:$False - } - - if ($Results.AuthenticationBehaviors) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AuthenticationBehaviors' -IsCIMArray:$False - } - - if ($Results.KeyCredentials) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KeyCredentials' -IsCIMArray:$True - } - - if ($Results.PasswordCredentials) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PasswordCredentials' -IsCIMArray:$True - } - - if ($Results.AppRoles) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppRoles' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('Api', 'Permissions', 'OptionalClaims', 'OnPremisesPublishing', 'AuthenticationBehaviors', 'KeyCredentials', 'PasswordCredentials', 'AppRoles') $dscContent.Append($currentDSCBlock) | Out-Null Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 index 938c347b5b..c549564d2b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 @@ -370,9 +370,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 index 28f7757520..c4c8e01750 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 @@ -394,9 +394,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1 index e6587bf8fc..5077e47441 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1 @@ -347,11 +347,10 @@ function Export-TargetResource ManagedIdentity = $ManagedIdentity.IsPresent AccessTokens = $AccessTokens } - $Results = Get-TargetResource @Params + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 index 5fe37db211..b5726ac698 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 @@ -646,8 +646,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.RegistrationEnforcement) { $complexMapping = @( @@ -755,20 +753,9 @@ function Export-TargetResource -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 - } + -Credential $Credential ` + -NoEscape @('RegistrationEnforcement', 'ReportSuspiciousActivitySettings', 'SystemCredentialPreferences') - if ($Results.ReportSuspiciousActivitySettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ReportSuspiciousActivitySettings' -IsCIMArray:$False - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 index 718c596575..2aa573fcff 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 @@ -928,8 +928,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.FeatureSettings) { $complexMapping = @( @@ -1016,19 +1014,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.FeatureSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FeatureSettings' -IsCIMArray:$False - } - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('FeatureSettings', 'ExcludeTargets', 'IncludeTargets') + $currentDSCBlock = Remove-M365DSCCimInstanceTrailingCharacterFromExport -DSCBlock $currentDSCBlock # FIX #3645 diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 index 8a36cdb0d9..3a0ca189c1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 @@ -589,8 +589,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -625,15 +623,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1 index 23ce0be271..ab5e2a0da1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1 @@ -573,8 +573,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -624,19 +622,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } - if ($Results.OpenIdConnectSetting) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OpenIdConnectSetting' -IsCIMArray:$False - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets', 'OpenIdConnectSetting') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 index 00d2df7dfc..16563ea3c1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 @@ -616,8 +616,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.KeyRestrictions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -665,19 +663,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.KeyRestrictions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KeyRestrictions' -IsCIMArray:$False - } - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('KeyRestrictions', 'ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1 index 1d85e1d98c..d6ef80a1b9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1 @@ -559,8 +559,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -595,15 +593,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 index c1d4ed5197..c8ca2c5e95 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 @@ -563,8 +563,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -599,15 +597,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 index 07a0658607..eca16b00a0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 @@ -562,8 +562,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -598,15 +596,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 index 72881fe434..69a3b03130 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 @@ -636,8 +636,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -672,15 +670,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - if ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 index d77839ccfb..8633d965dc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 @@ -575,8 +575,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExcludeTargets) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -611,15 +609,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - If ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 index c3b23dc7d0..188351de2b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 @@ -639,8 +639,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.AuthenticationModeConfiguration) { $complexMapping = @( @@ -717,25 +715,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.AuthenticationModeConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AuthenticationModeConfiguration' -IsCIMArray:$False - } - if ($Results.CertificateUserBindings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CertificateUserBindings' -IsCIMArray:$True - $currentDSCBlock = $currentDSCBlock.Replace('CertificateUserBindings = @("', 'CertificateUserBindings = @(') - $currentDSCBlock = $currentDSCBlock.Replace(" `",`"`r`n", '') - } - if ($Results.ExcludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludeTargets' -IsCIMArray:$True - } - If ($Results.IncludeTargets) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncludeTargets' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('AuthenticationModeConfiguration', 'CertificateUserBindings', 'ExcludeTargets', 'IncludeTargets') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 index 8ab33aa514..57813a9025 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 @@ -352,9 +352,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1 index b6574a5ca9..70ce7e0610 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1 @@ -408,9 +408,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1 index ca0f9d56af..cd7e010edf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1 @@ -586,13 +586,10 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { Write-Host "`r`n" -NoNewline Write-Host " |---[1/1] $($results.DisplayName)" -NoNewline - $results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1 index 2929e98968..880eacb003 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1 @@ -554,9 +554,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.Definition) { $complexMapping = @( @@ -605,12 +602,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Definition) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Definition' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('Definition') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 index 20c557d1a8..d671945b29 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 @@ -2355,14 +2355,11 @@ function Export-TargetResource } $Script:exportedInstance = $Policy $Results = Get-TargetResource @Params - if ([System.String]::IsNullOrEmpty($Results.DeviceFilterMode)) { $Results.Remove('DeviceFilterMode') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1 index dd84363bb8..cff64f331b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1 @@ -426,9 +426,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1 index 25b7a99202..3f443bbce0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1 @@ -354,9 +354,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 index ee5a399167..30f0b9e99c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 @@ -461,8 +461,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.B2BCollaborationInbound) { @@ -648,28 +646,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.B2BCollaborationInbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BCollaborationInbound' -IsCIMArray:$True - } - if ($Results.B2BCollaborationOutbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BCollaborationOutbound' -IsCIMArray:$True - } - if ($Results.B2BDirectConnectInbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BDirectConnectInbound' -IsCIMArray:$True - } - if ($Results.B2BDirectConnectOutbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BDirectConnectOutbound' -IsCIMArray:$True - } - if ($Results.InboundTrust) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'InboundTrust' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('B2BCollaborationInbound', 'B2BCollaborationOutbound', 'B2BDirectConnectInbound', 'B2BDirectConnectOutbound', 'InboundTrust') # Fix OrganizationName variable in CIMInstance $currentDSCBlock = $currentDSCBlock.Replace('@$OrganizationName''', "@' + `$OrganizationName") diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 index 5c43dd03a0..cda2df645e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 @@ -505,8 +505,6 @@ function Export-TargetResource $Script:exportedInstance = $entry $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.B2BCollaborationInbound) { @@ -716,32 +714,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.B2BCollaborationInbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BCollaborationInbound' -IsCIMArray:$True - } - if ($Results.B2BCollaborationOutbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BCollaborationOutbound' -IsCIMArray:$True - } - if ($Results.B2BDirectConnectInbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BDirectConnectInbound' -IsCIMArray:$True - } - if ($Results.B2BDirectConnectOutbound) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'B2BDirectConnectOutbound' -IsCIMArray:$True - } - if ($Results.InboundTrust) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'InboundTrust' -IsCIMArray:$True - } - if ($Results.AutomaticUserConsentSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AutomaticUserConsentSettings' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('B2BCollaborationInbound', 'B2BCollaborationOutbound', 'B2BDirectConnectInbound', 'B2BDirectConnectOutbound', 'InboundTrust', 'AutomaticUserConsentSettings') # Fix OrganizationName variable in CIMInstance $currentDSCBlock = $currentDSCBlock.Replace('@$OrganizationName''', "@' + `$OrganizationName") diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 index 6232ccaf5f..6335fab9bb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 @@ -626,7 +626,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $endpointConfigurationCimString = Get-M365DSCDRGComplexTypeToString ` -ComplexObject $Results.EndpointConfiguration ` -CIMInstanceName 'MSFT_AADCustomAuthenticationExtensionEndPointConfiguration' @@ -638,24 +637,12 @@ function Export-TargetResource $Results.EndPointConfiguration = $endpointConfigurationCimString $Results.ClaimsForTokenConfiguration = $ClaimsForTokenConfigurationCimString - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.EndPointConfiguration -ne $null) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EndPointConfiguration' - } - - if ($Results.ClaimsForTokenConfiguration -ne $null) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ClaimsForTokenConfiguration' -IsCIMArray $true - } + -Credential $Credential ` + -NoEscape @('EndPointConfiguration', 'ClaimsForTokenConfiguration') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1 index 10c0bc7853..9b7f1667e4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1 @@ -461,8 +461,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 index 8314222e22..ae8fb8351c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 @@ -616,8 +616,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1 index 3fa2f2b1ee..662787c772 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1 @@ -490,8 +490,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEnrichedAuditLogs/MSFT_AADEnrichedAuditLogs.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEnrichedAuditLogs/MSFT_AADEnrichedAuditLogs.psm1 index d6ec9888e5..455f00bdbf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEnrichedAuditLogs/MSFT_AADEnrichedAuditLogs.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEnrichedAuditLogs/MSFT_AADEnrichedAuditLogs.psm1 @@ -331,8 +331,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 index 7266217e16..ac8bcfa87d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 @@ -952,7 +952,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($null -ne $Results.AccessPackageResourceRoleScopes) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject ([Array]$Results.AccessPackageResourceRoleScopes) ` @@ -966,20 +965,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($null -ne $Results.AccessPackageResourceRoleScopes) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AccessPackageResourceRoleScopes' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('AccessPackageResourceRoleScopes') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` @@ -989,9 +980,6 @@ function Export-TargetResource $i++ } - #Removing extra coma between items in cim instance array created by Convert-DSCStringParamToVariable - $dscContent = $dscContent.replace(" ,`r`n", '') - return $dscContent } catch diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1 index 4e6c2792c4..2fc9486c95 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1 @@ -944,8 +944,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.AccessReviewSettings) { @@ -1083,29 +1081,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.AccessReviewSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AccessReviewSettings' - #$currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Reviewers' - } - if ($null -ne $Results.Questions ) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Questions' -IsCIMArray:$true - } - if ($null -ne $Results.RequestApprovalSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RequestApprovalSettings' - } - if ($null -ne $Results.RequestorSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RequestorSettings' - } - if ($null -ne $Results.CustomExtensionHandlers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CustomExtensionHandlers' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('AccessReviewSettings', 'Questions', 'RequestApprovalSettings', 'RequestorSettings', 'CustomExtensionHandlers') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 index 99e4030a26..8720e9fdc3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 @@ -492,8 +492,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 index c902548a83..599a262dfa 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 @@ -756,7 +756,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($null -ne $Results.Attributes) { $complexMapping = @( @@ -801,19 +800,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.Attributes) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Attributes' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Attributes') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 index 9389987bc2..43e313be69 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 @@ -799,8 +799,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.IdentitySources) { @@ -819,12 +817,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.IdentitySources) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IdentitySources' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('IdentitySources') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementRoleAssignment/MSFT_AADEntitlementManagementRoleAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementRoleAssignment/MSFT_AADEntitlementManagementRoleAssignment.psm1 index 0f76cb1c7a..ed1714019d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementRoleAssignment/MSFT_AADEntitlementManagementRoleAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementRoleAssignment/MSFT_AADEntitlementManagementRoleAssignment.psm1 @@ -476,9 +476,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementSettings/MSFT_AADEntitlementManagementSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementSettings/MSFT_AADEntitlementManagementSettings.psm1 index e2c28a72c0..945d5c3d1a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementSettings/MSFT_AADEntitlementManagementSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementSettings/MSFT_AADEntitlementManagementSettings.psm1 @@ -304,8 +304,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADExternalIdentityPolicy/MSFT_AADExternalIdentityPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADExternalIdentityPolicy/MSFT_AADExternalIdentityPolicy.psm1 index 28b76ad13a..3c1573eabd 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADExternalIdentityPolicy/MSFT_AADExternalIdentityPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADExternalIdentityPolicy/MSFT_AADExternalIdentityPolicy.psm1 @@ -344,8 +344,6 @@ function Export-TargetResource { Write-Host "`r`n" -NoNewline Write-Host ' |---[1/1] External Identity Policy' -NoNewline - $results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFeatureRolloutPolicy/MSFT_AADFeatureRolloutPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFeatureRolloutPolicy/MSFT_AADFeatureRolloutPolicy.psm1 index 9693b01227..99ce563a99 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFeatureRolloutPolicy/MSFT_AADFeatureRolloutPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFeatureRolloutPolicy/MSFT_AADFeatureRolloutPolicy.psm1 @@ -469,8 +469,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFederationConfiguration/MSFT_AADFederationConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFederationConfiguration/MSFT_AADFederationConfiguration.psm1 index ba7d827343..695426e4dc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFederationConfiguration/MSFT_AADFederationConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFederationConfiguration/MSFT_AADFederationConfiguration.psm1 @@ -466,8 +466,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicy/MSFT_AADFilteringPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicy/MSFT_AADFilteringPolicy.psm1 index 086b244212..a3eea40019 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicy/MSFT_AADFilteringPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicy/MSFT_AADFilteringPolicy.psm1 @@ -400,8 +400,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicyRule/MSFT_AADFilteringPolicyRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicyRule/MSFT_AADFilteringPolicyRule.psm1 index a54318f96d..4167de6c45 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicyRule/MSFT_AADFilteringPolicyRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringPolicyRule/MSFT_AADFilteringPolicyRule.psm1 @@ -497,8 +497,7 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($Results.Destinations) { @@ -516,12 +515,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('Destinations') - if ($Results.Destinations) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Destinations' -IsCIMArray:$true - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1 index 4545a3bc35..e83264d677 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1 @@ -492,8 +492,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Policies) { @@ -512,12 +510,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Policies) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Policies' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Policies') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 index 1ee4fbbccf..065609a14f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 @@ -1235,8 +1235,6 @@ function Export-TargetResource } $Script:exportedInstance = $group $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.AssignedLicenses) { @@ -1265,12 +1263,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.AssignedLicenses) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AssignedLicenses' - } + -Credential $Credential ` + -NoEscape @('AssignedLicenses') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 index e2d1d78b5a..04360b3fbf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupEligibilitySchedule/MSFT_AADGroupEligibilitySchedule.psm1 @@ -834,8 +834,7 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($null -ne $Results.ScheduleInfo) { $complexMapping = @( @@ -884,11 +883,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ScheduleInfo) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "ScheduleInfo" -IsCIMArray:$False - } + -Credential $Credential ` + -NoEscape @('ScheduleInfo') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupLifecyclePolicy/MSFT_AADGroupLifecyclePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupLifecyclePolicy/MSFT_AADGroupLifecyclePolicy.psm1 index 90aca0af25..42b2f9f3a3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupLifecyclePolicy/MSFT_AADGroupLifecyclePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupLifecyclePolicy/MSFT_AADGroupLifecyclePolicy.psm1 @@ -466,8 +466,7 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 index 8ee09d2353..170464b1c9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 @@ -381,11 +381,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 index e3c46d2491..4d2b9e1297 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 @@ -534,8 +534,6 @@ function Export-TargetResource } $dscContent = '' $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 index 8ad315b81a..24fa135c80 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADHomeRealmDiscoveryPolicy/MSFT_AADHomeRealmDiscoveryPolicy.psm1 @@ -489,9 +489,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.Definition) { $complexMapping = @( @@ -524,13 +521,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.Definition) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Definition' - } + -Credential $Credential ` + -NoEscape @('Definition') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 index 8c698bf6ad..8f970532a5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 @@ -686,9 +686,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params $Results.Password = "New-Object System.Management.Automation.PSCredential('Password', (ConvertTo-SecureString ('Please insert a valid Password') -AsPlainText -Force));" - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.Certificates) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -708,13 +705,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - + -Credential $Credential ` + -NoEscape @('Certificates') - if ($Results.Certificates) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Certificates' -IsCIMArray:$True - } # Replace the main password variable. $currentDSCBlock = $currentDSCBlock.Replace('"New-Object System.', 'New-Object System.').Replace(') -AsPlainText -Force));";', ') -AsPlainText -Force));') diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityB2XUserFlow/MSFT_AADIdentityB2XUserFlow.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityB2XUserFlow/MSFT_AADIdentityB2XUserFlow.psm1 index 8580f5ac01..3c4222e380 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityB2XUserFlow/MSFT_AADIdentityB2XUserFlow.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityB2XUserFlow/MSFT_AADIdentityB2XUserFlow.psm1 @@ -624,8 +624,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ApiConnectorConfiguration) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -669,15 +667,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ApiConnectorConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ApiConnectorConfiguration' -IsCIMArray:$False - } - if ($Results.UserAttributeAssignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserAttributeAssignments' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('ApiConnectorConfiguration', 'UserAttributeAssignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 index 9e7a3a19ed..5c3d804b3d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 @@ -521,9 +521,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.Tasks) { $complexMapping = @( @@ -591,17 +588,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.Tasks) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Tasks' -IsCIMArray:$true - } - if ($null -ne $Results.ExecutionConditions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'ExecutionConditions' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Tasks', 'ExecutionConditions') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1 index 1ab23ab5eb..db32aa66be 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1 @@ -519,9 +519,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($null -ne $Results.EndpointConfiguration) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -571,20 +568,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.EndpointConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EndpointConfiguration' -IsCIMArray:$False - } - if ($Results.ClientConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ClientConfiguration' -IsCIMArray:$False - } - if ($Results.CallbackConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CallbackConfiguration' -IsCIMArray:$False - } + -Credential $Credential ` + -NoEscape @('EndpointConfiguration', 'ClientConfiguration', 'CallbackConfiguration') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceProgram/MSFT_AADIdentityGovernanceProgram.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceProgram/MSFT_AADIdentityGovernanceProgram.psm1 index 1e6457a5f8..7e4b7d13e3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceProgram/MSFT_AADIdentityGovernanceProgram.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityGovernanceProgram/MSFT_AADIdentityGovernanceProgram.psm1 @@ -407,9 +407,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityProtectionPolicySettings/MSFT_AADIdentityProtectionPolicySettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityProtectionPolicySettings/MSFT_AADIdentityProtectionPolicySettings.psm1 index 3758dbb64b..63e21f8c3d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityProtectionPolicySettings/MSFT_AADIdentityProtectionPolicySettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityProtectionPolicySettings/MSFT_AADIdentityProtectionPolicySettings.psm1 @@ -317,8 +317,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1 index ae944603b0..f0811393f8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1 @@ -349,8 +349,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 index 0ec7c56c0c..f7e3d6b84c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 @@ -546,11 +546,8 @@ function Export-TargetResource } $Script:exportedInstance = $AADNamedLocation $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 index 0298a6751d..873f89c665 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingPolicy/MSFT_AADNetworkAccessForwardingPolicy.psm1 @@ -415,8 +415,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.PolicyRules) { @@ -446,13 +444,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.PolicyRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'PolicyRules' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('PolicyRules') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 index 268a4fcc7d..fcd66f8876 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessForwardingProfile/MSFT_AADNetworkAccessForwardingProfile.psm1 @@ -470,8 +470,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.Policies) { @@ -501,13 +499,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('Policies') - if ($null -ne $Results.Policies) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Policies' -IsCIMArray:$true - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingConditionalAccess/MSFT_AADNetworkAccessSettingConditionalAccess.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingConditionalAccess/MSFT_AADNetworkAccessSettingConditionalAccess.psm1 index 60f3f7faa9..83928a1dc6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingConditionalAccess/MSFT_AADNetworkAccessSettingConditionalAccess.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingConditionalAccess/MSFT_AADNetworkAccessSettingConditionalAccess.psm1 @@ -286,8 +286,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingCrossTenantAccess/MSFT_AADNetworkAccessSettingCrossTenantAccess.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingCrossTenantAccess/MSFT_AADNetworkAccessSettingCrossTenantAccess.psm1 index ac2645f8ee..a335569f95 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingCrossTenantAccess/MSFT_AADNetworkAccessSettingCrossTenantAccess.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNetworkAccessSettingCrossTenantAccess/MSFT_AADNetworkAccessSettingCrossTenantAccess.psm1 @@ -286,8 +286,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADOnPremisesPublishingProfilesSettings/MSFT_AADOnPremisesPublishingProfilesSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADOnPremisesPublishingProfilesSettings/MSFT_AADOnPremisesPublishingProfilesSettings.psm1 index c73a60ed8f..60b6d81f72 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADOnPremisesPublishingProfilesSettings/MSFT_AADOnPremisesPublishingProfilesSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADOnPremisesPublishingProfilesSettings/MSFT_AADOnPremisesPublishingProfilesSettings.psm1 @@ -298,8 +298,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADOrganizationCertificateBasedAuthConfiguration/MSFT_AADOrganizationCertificateBasedAuthConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADOrganizationCertificateBasedAuthConfiguration/MSFT_AADOrganizationCertificateBasedAuthConfiguration.psm1 index 7a37126a0b..0457189b0c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADOrganizationCertificateBasedAuthConfiguration/MSFT_AADOrganizationCertificateBasedAuthConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADOrganizationCertificateBasedAuthConfiguration/MSFT_AADOrganizationCertificateBasedAuthConfiguration.psm1 @@ -436,8 +436,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.CertificateAuthorities) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -457,11 +455,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.CertificateAuthorities) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CertificateAuthorities' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('CertificateAuthorities') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADPasswordRuleSettings/MSFT_AADPasswordRuleSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADPasswordRuleSettings/MSFT_AADPasswordRuleSettings.psm1 index 63db0e8e82..c11f56b5ba 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADPasswordRuleSettings/MSFT_AADPasswordRuleSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADPasswordRuleSettings/MSFT_AADPasswordRuleSettings.psm1 @@ -453,8 +453,6 @@ function Export-TargetResource } $dscContent = '' $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 index 1fb1fa4096..7ca809b5fc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRemoteNetwork/MSFT_AADRemoteNetwork.psm1 @@ -508,8 +508,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DeviceLinks) { @@ -554,12 +552,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.DeviceLinks) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceLinks' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('DeviceLinks') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 index bd1170f205..ff1fd4a37d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleAssignmentScheduleRequest/MSFT_AADRoleAssignmentScheduleRequest.psm1 @@ -802,8 +802,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ScheduleInfo) { $complexMapping = @( @@ -874,17 +872,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.ScheduleInfo) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'ScheduleInfo' - } - if ($null -ne $Results.TicketInfo) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'TicketInfo' - } + -Credential $Credential ` + -NoEscape @('ScheduleInfo', 'TicketInfo') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleDefinition/MSFT_AADRoleDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleDefinition/MSFT_AADRoleDefinition.psm1 index 1d77a478f7..3c2ff1fe3a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleDefinition/MSFT_AADRoleDefinition.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleDefinition/MSFT_AADRoleDefinition.psm1 @@ -472,11 +472,8 @@ function Export-TargetResource } $Script:exportedInstance = $AADRoleDefinition $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present' -and ([array]$results.RolePermissions).Length -gt 0) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 index 2e1692a9cb..380bd0b92e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 @@ -765,8 +765,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.ScheduleInfo) { @@ -808,17 +806,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ScheduleInfo) - { - $isCIMArray = $false - if ($Results.ScheduleInfo.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'ScheduleInfo' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('ScheduleInfo') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleManagementPolicyRule/MSFT_AADRoleManagementPolicyRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleManagementPolicyRule/MSFT_AADRoleManagementPolicyRule.psm1 index ece644251c..379cbe36c1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleManagementPolicyRule/MSFT_AADRoleManagementPolicyRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleManagementPolicyRule/MSFT_AADRoleManagementPolicyRule.psm1 @@ -519,8 +519,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.expirationRule) { @@ -667,34 +665,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('expirationRule', 'notificationRule', 'enablementRule', 'approvalRule', 'authenticationContextRule') - if ($Results.expirationRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'expirationRule' -IsCIMArray:$false - } - - - if ($Results.notificationRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'notificationRule' -IsCIMArray:$false - } - - - if ($Results.enablementRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'enablementRule' -IsCIMArray:$false - } - - if ($Results.approvalRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'approvalRule' -IsCIMArray:$false - } - - if ($Results.authenticationContextRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'authenticationContextRule' -IsCIMArray:$false - } $dscContent.Append($currentDSCBlock) | Out-Null Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1 index bafa544699..ea1f4955d5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1 @@ -1494,11 +1494,8 @@ function Export-TargetResource $Script:exportedInstance = $role $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADSecurityDefaults/MSFT_AADSecurityDefaults.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADSecurityDefaults/MSFT_AADSecurityDefaults.psm1 index 2f7fcdde9a..89200c212d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADSecurityDefaults/MSFT_AADSecurityDefaults.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADSecurityDefaults/MSFT_AADSecurityDefaults.psm1 @@ -350,8 +350,6 @@ function Export-TargetResource } $dscContent = '' $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 index 56b00a3eee..f8da43f8ad 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1 @@ -1031,11 +1031,8 @@ function Export-TargetResource } $Script:exportedInstance = $AADServicePrincipal $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.AppRoleAssignedTo.Count -gt 0) { $Results.AppRoleAssignedTo = Get-M365DSCAzureADServicePrincipalAssignmentAsString -Assignments $Results.AppRoleAssignedTo @@ -1080,34 +1077,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.AppRoleAssignedTo) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AppRoleAssignedTo' - } - if ($null -ne $Results.DelegatedPermissionClassifications) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DelegatedPermissionClassifications' - } - if ($null -ne $Results.KeyCredentials) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'KeyCredentials' -IsCIMArray:$True - } - - if ($null -ne $Results.PasswordCredentials) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'PasswordCredentials' -IsCIMArray:$True - } - - if ($null -ne $Results.CustomSecurityAttributes) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'CustomSecurityAttributes' - } + -Credential $Credential ` + -NoEscape @('AppRoleAssignedTo', 'DelegatedPermissionClassifications', 'KeyCredentials', 'PasswordCredentials', 'CustomSecurityAttributes') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADSocialIdentityProvider/MSFT_AADSocialIdentityProvider.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADSocialIdentityProvider/MSFT_AADSocialIdentityProvider.psm1 index 04793134bc..3c13568bc5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADSocialIdentityProvider/MSFT_AADSocialIdentityProvider.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADSocialIdentityProvider/MSFT_AADSocialIdentityProvider.psm1 @@ -408,8 +408,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 index 72a39a5eec..20126cffce 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 @@ -385,11 +385,10 @@ function Export-TargetResource IsSingleInstance = 'Yes' AccessTokens = $AccessTokens } - $Results = Get-TargetResource @Params + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTokenLifetimePolicy/MSFT_AADTokenLifetimePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTokenLifetimePolicy/MSFT_AADTokenLifetimePolicy.psm1 index ebae24d74c..eccd12e539 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTokenLifetimePolicy/MSFT_AADTokenLifetimePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTokenLifetimePolicy/MSFT_AADTokenLifetimePolicy.psm1 @@ -421,7 +421,6 @@ function Export-TargetResource } $Script:exportedInstance = $AADPolicy $Results = Get-TargetResource @Params - # Fix quotes inside the Definition's JSON; $NewDefinition = @() foreach ($item in $Results.Definition) @@ -433,8 +432,6 @@ function Export-TargetResource if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADUser/MSFT_AADUser.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADUser/MSFT_AADUser.psm1 index 269d5bc1ca..a74861f5cd 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADUser/MSFT_AADUser.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADUser/MSFT_AADUser.psm1 @@ -1093,20 +1093,16 @@ function Export-TargetResource $Script:exportedInstance = $user $Results = Get-TargetResource @Params - $Results.Password = "New-Object System.Management.Automation.PSCredential('Password', (ConvertTo-SecureString ((New-Guid).ToString()) -AsPlainText -Force));" + $Results.Password = "New-Object System.Management.Automation.PSCredential('Password', (ConvertTo-SecureString ((New-Guid).ToString()) -AsPlainText -Force))" if ($null -ne $Results.UserPrincipalName) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` -Credential $Credential - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Password' $dscContent.Append($currentDSCBlock) | Out-Null - Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName } diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADUserFlowAttribute/MSFT_AADUserFlowAttribute.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADUserFlowAttribute/MSFT_AADUserFlowAttribute.psm1 index bfdb34ae58..8b547e30a2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADUserFlowAttribute/MSFT_AADUserFlowAttribute.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADUserFlowAttribute/MSFT_AADUserFlowAttribute.psm1 @@ -407,11 +407,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthority/MSFT_AADVerifiedIdAuthority.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthority/MSFT_AADVerifiedIdAuthority.psm1 index b79636d69d..c71d4d29a5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthority/MSFT_AADVerifiedIdAuthority.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthority/MSFT_AADVerifiedIdAuthority.psm1 @@ -450,8 +450,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.KeyVaultMetadata) { @@ -477,17 +475,12 @@ function Export-TargetResource } } - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.KeyVaultMetadata) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KeyVaultMetadata' -IsCIMArray:$False - } + -Credential $Credential ` + -NoEscape @('KeyVaultMetadata') $dscContent.Append($currentDSCBlock) | Out-Null Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthorityContract/MSFT_AADVerifiedIdAuthorityContract.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthorityContract/MSFT_AADVerifiedIdAuthorityContract.psm1 index 88225c80a0..500edf7e62 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthorityContract/MSFT_AADVerifiedIdAuthorityContract.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADVerifiedIdAuthorityContract/MSFT_AADVerifiedIdAuthorityContract.psm1 @@ -495,11 +495,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.displays) { @@ -620,17 +617,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.displays) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'displays' -IsCIMArray:$true - } - - if ($Results.rules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'rules' -IsCIMArray:$false - } + -Credential $Credential ` + -NoEscape @('displays', 'rules') $dscContent.Append($currentDSCBlock) | Out-Null Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOOrganizationOwner/MSFT_ADOOrganizationOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOOrganizationOwner/MSFT_ADOOrganizationOwner.psm1 index 2302879004..12a6e4eb41 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOOrganizationOwner/MSFT_ADOOrganizationOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOOrganizationOwner/MSFT_ADOOrganizationOwner.psm1 @@ -311,8 +311,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroup/MSFT_ADOPermissionGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroup/MSFT_ADOPermissionGroup.psm1 index b09d2f4cca..99b6ff932f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroup/MSFT_ADOPermissionGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroup/MSFT_ADOPermissionGroup.psm1 @@ -530,8 +530,6 @@ function Export-TargetResource if (-not $config.principalName.StartsWith('[TEAM FOUNDATION]')) { $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroupSettings/MSFT_ADOPermissionGroupSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroupSettings/MSFT_ADOPermissionGroupSettings.psm1 index 1c1a414033..9ba66c8df7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroupSettings/MSFT_ADOPermissionGroupSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOPermissionGroupSettings/MSFT_ADOPermissionGroupSettings.psm1 @@ -469,8 +469,6 @@ function Export-TargetResource if (-not $config.principalName.StartsWith('[TEAM FOUNDATION]')) { $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($results.AllowPermissions.Length -gt 0) { $Results.AllowPermissions = Get-M365DSCADOPermissionsAsString $Results.AllowPermissions @@ -485,18 +483,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.AllowPermissions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AllowPermissions' - } - if ($null -ne $Results.DenyPermissions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DenyPermissions' - } + -Credential $Credential ` + -NoEscape @('AllowPermissions', 'DenyPermissions') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOSecurityPolicy/MSFT_ADOSecurityPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOSecurityPolicy/MSFT_ADOSecurityPolicy.psm1 index 37c748f884..ab8e0e9e11 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_ADOSecurityPolicy/MSFT_ADOSecurityPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ADOSecurityPolicy/MSFT_ADOSecurityPolicy.psm1 @@ -501,8 +501,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountPolicy/MSFT_AzureBillingAccountPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountPolicy/MSFT_AzureBillingAccountPolicy.psm1 index 7453c2986d..7c99e2cf92 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountPolicy/MSFT_AzureBillingAccountPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountPolicy/MSFT_AzureBillingAccountPolicy.psm1 @@ -423,8 +423,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.EnterpriseAgreementPolicies) { @@ -442,17 +440,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('EnterpriseAgreementPolicies') - if ($Results.EnterpriseAgreementPolicies) - { - $isCIMArray = $false - if ($Results.EnterpriseAgreementPolicies.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseAgreementPolicies' -IsCIMArray:$isCIMArray - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountScheduledAction/MSFT_AzureBillingAccountScheduledAction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountScheduledAction/MSFT_AzureBillingAccountScheduledAction.psm1 index 2fb447d83a..9665e0c074 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountScheduledAction/MSFT_AzureBillingAccountScheduledAction.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountScheduledAction/MSFT_AzureBillingAccountScheduledAction.psm1 @@ -497,8 +497,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Notification) { @@ -528,26 +526,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Notification) - { - $isCIMArray = $false - if ($Results.Notification.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Notification' -IsCIMArray:$isCIMArray - } - if ($Results.Schedule) - { - $isCIMArray = $false - if ($Results.Schedule.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Schedule' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Notification', 'Schedule') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsAssociatedTenant/MSFT_AzureBillingAccountsAssociatedTenant.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsAssociatedTenant/MSFT_AzureBillingAccountsAssociatedTenant.psm1 index 1b5dbcd84f..bf22c147e4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsAssociatedTenant/MSFT_AzureBillingAccountsAssociatedTenant.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsAssociatedTenant/MSFT_AzureBillingAccountsAssociatedTenant.psm1 @@ -399,8 +399,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsRoleAssignment/MSFT_AzureBillingAccountsRoleAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsRoleAssignment/MSFT_AzureBillingAccountsRoleAssignment.psm1 index 8abaac7b00..cb95d2e321 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsRoleAssignment/MSFT_AzureBillingAccountsRoleAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureBillingAccountsRoleAssignment/MSFT_AzureBillingAccountsRoleAssignment.psm1 @@ -426,8 +426,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettings/MSFT_AzureDiagnosticSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettings/MSFT_AzureDiagnosticSettings.psm1 index aebfa76670..edc1966955 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettings/MSFT_AzureDiagnosticSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettings/MSFT_AzureDiagnosticSettings.psm1 @@ -478,8 +478,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Categories) { @@ -498,17 +496,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Categories) - { - $isCIMArray = $false - if ($Results.Categories.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Categories' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Categories') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute.psm1 index a1add4c96c..c8b9f51a3a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute/MSFT_AzureDiagnosticSettingsCustomSecurityAttribute.psm1 @@ -479,8 +479,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Categories) { @@ -499,17 +497,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Categories) - { - $isCIMArray = $false - if ($Results.Categories.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Categories' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Categories') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureSubscription/MSFT_AzureSubscription.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureSubscription/MSFT_AzureSubscription.psm1 index f9bc25c333..19d802d25e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureSubscription/MSFT_AzureSubscription.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureSubscription/MSFT_AzureSubscription.psm1 @@ -417,8 +417,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1 index 2c7162449a..c3a46203a4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1 @@ -406,8 +406,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_CommerceSelfServicePurchase/MSFT_CommerceSelfServicePurchase.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_CommerceSelfServicePurchase/MSFT_CommerceSelfServicePurchase.psm1 index 4e3bde1a8d..f9efa70b4b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_CommerceSelfServicePurchase/MSFT_CommerceSelfServicePurchase.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_CommerceSelfServicePurchase/MSFT_CommerceSelfServicePurchase.psm1 @@ -348,8 +348,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/MSFT_DefenderDeviceAuthenticatedScanDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/MSFT_DefenderDeviceAuthenticatedScanDefinition.psm1 index 9934288449..a03e31c881 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/MSFT_DefenderDeviceAuthenticatedScanDefinition.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/MSFT_DefenderDeviceAuthenticatedScanDefinition.psm1 @@ -565,8 +565,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.ScannerAgent) { @@ -598,27 +596,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.ScanAuthenticationParams) - { - $isCIMArray = $false - if ($Results.ScanAuthenticationParams.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ScanAuthenticationParams' -IsCIMArray:$isCIMArray - } - - if ($Results.ScannerAgent) - { - $isCIMArray = $false - if ($Results.ScannerAgent.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ScannerAgent' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('ScannerAgent', 'ScanAuthenticationParams') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderSubscriptionPlan/MSFT_DefenderSubscriptionPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderSubscriptionPlan/MSFT_DefenderSubscriptionPlan.psm1 index 9c66bc6907..4ddb6383bc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderSubscriptionPlan/MSFT_DefenderSubscriptionPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderSubscriptionPlan/MSFT_DefenderSubscriptionPlan.psm1 @@ -421,8 +421,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOATPBuiltInProtectionRule/MSFT_EXOATPBuiltInProtectionRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOATPBuiltInProtectionRule/MSFT_EXOATPBuiltInProtectionRule.psm1 index ae19d28f7d..3167cf6e9d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOATPBuiltInProtectionRule/MSFT_EXOATPBuiltInProtectionRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOATPBuiltInProtectionRule/MSFT_EXOATPBuiltInProtectionRule.psm1 @@ -360,8 +360,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 index 71a19658c7..391ed417f5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 @@ -411,8 +411,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 index 001c00dc45..d7f2fc9350 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 @@ -432,8 +432,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncMailboxPolicy/MSFT_EXOActiveSyncMailboxPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncMailboxPolicy/MSFT_EXOActiveSyncMailboxPolicy.psm1 index 366a3eb245..29b3b43b7d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncMailboxPolicy/MSFT_EXOActiveSyncMailboxPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncMailboxPolicy/MSFT_EXOActiveSyncMailboxPolicy.psm1 @@ -1024,8 +1024,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 index 7c77e8bbf1..086f374ad7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 @@ -442,8 +442,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 index dc4023235d..48fc7c736c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 @@ -756,8 +756,6 @@ function Export-TargetResource } $Script:exportedInstance = $addressList $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 index 138293a897..ef723c36c2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 @@ -880,8 +880,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 index d196f9389e..2e654908ac 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 @@ -567,8 +567,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 index 2380c67839..9a9298e244 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 @@ -500,8 +500,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOArcConfig/MSFT_EXOArcConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOArcConfig/MSFT_EXOArcConfig.psm1 index 8d89120aa6..0b7d873798 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOArcConfig/MSFT_EXOArcConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOArcConfig/MSFT_EXOArcConfig.psm1 @@ -360,8 +360,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 index 0cffbfff43..d5990d04e4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 @@ -428,11 +428,8 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpProtectionPolicyRule/MSFT_EXOAtpProtectionPolicyRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpProtectionPolicyRule/MSFT_EXOAtpProtectionPolicyRule.psm1 index 87bf25ceff..4697d07d4a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpProtectionPolicyRule/MSFT_EXOAtpProtectionPolicyRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpProtectionPolicyRule/MSFT_EXOAtpProtectionPolicyRule.psm1 @@ -501,8 +501,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicy/MSFT_EXOAuthenticationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicy/MSFT_EXOAuthenticationPolicy.psm1 index 4d0cf695a3..fceae1f25b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicy/MSFT_EXOAuthenticationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicy/MSFT_EXOAuthenticationPolicy.psm1 @@ -565,8 +565,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicyAssignment/MSFT_EXOAuthenticationPolicyAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicyAssignment/MSFT_EXOAuthenticationPolicyAssignment.psm1 index 54e8be6b5c..08b774b03b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicyAssignment/MSFT_EXOAuthenticationPolicyAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAuthenticationPolicyAssignment/MSFT_EXOAuthenticationPolicyAssignment.psm1 @@ -377,8 +377,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 index da3f8cde4e..8330bf50de 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 @@ -535,8 +535,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 index 24899e665b..be8abb4441 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 @@ -373,8 +373,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 index fea20be0d1..2618c8f5c0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 @@ -442,11 +442,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxSettings/MSFT_EXOCASMailboxSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxSettings/MSFT_EXOCASMailboxSettings.psm1 index 5f3372dc52..4442bb208c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxSettings/MSFT_EXOCASMailboxSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxSettings/MSFT_EXOCASMailboxSettings.psm1 @@ -808,11 +808,8 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCalendarProcessing/MSFT_EXOCalendarProcessing.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCalendarProcessing/MSFT_EXOCalendarProcessing.psm1 index 724df67a64..6fbd0b929d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCalendarProcessing/MSFT_EXOCalendarProcessing.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCalendarProcessing/MSFT_EXOCalendarProcessing.psm1 @@ -919,8 +919,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 index 8012321f17..6a9a836de0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 @@ -587,8 +587,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicy/MSFT_EXODataAtRestEncryptionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicy/MSFT_EXODataAtRestEncryptionPolicy.psm1 index 841b9f66f8..e4f1883089 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicy/MSFT_EXODataAtRestEncryptionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicy/MSFT_EXODataAtRestEncryptionPolicy.psm1 @@ -364,8 +364,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicyAssignment/MSFT_EXODataAtRestEncryptionPolicyAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicyAssignment/MSFT_EXODataAtRestEncryptionPolicyAssignment.psm1 index dd27fd2550..bb12b61526 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicyAssignment/MSFT_EXODataAtRestEncryptionPolicyAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataAtRestEncryptionPolicyAssignment/MSFT_EXODataAtRestEncryptionPolicyAssignment.psm1 @@ -285,8 +285,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataClassification/MSFT_EXODataClassification.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataClassification/MSFT_EXODataClassification.psm1 index 6ba5dfac4f..01311545e0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataClassification/MSFT_EXODataClassification.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataClassification/MSFT_EXODataClassification.psm1 @@ -469,8 +469,6 @@ function Export-TargetResource $Script:exportedInstance = $DataClassification $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataEncryptionPolicy/MSFT_EXODataEncryptionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataEncryptionPolicy/MSFT_EXODataEncryptionPolicy.psm1 index 85cf12ad72..683d8feffa 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataEncryptionPolicy/MSFT_EXODataEncryptionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODataEncryptionPolicy/MSFT_EXODataEncryptionPolicy.psm1 @@ -459,8 +459,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1 index ad06841752..14e27556d8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1 @@ -1060,7 +1060,6 @@ function Export-TargetResource } $Script:exportedInstance = $distributionGroup $Results = Get-TargetResource @Params - if ($Results.AcceptMessagesOnlyFromSendersOrMembers.Length -eq 0) { $Results.Remove('AcceptMessagesOnlyFromSendersOrMembers') | Out-Null @@ -1076,8 +1075,6 @@ function Export-TargetResource $Results.Remove('AcceptMessagesOnlyFromDLMembers') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 index 96c36ae512..e916846218 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 @@ -445,8 +445,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODnssecForVerifiedDomain/MSFT_EXODnssecForVerifiedDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODnssecForVerifiedDomain/MSFT_EXODnssecForVerifiedDomain.psm1 index 3c39679718..a0ea65313d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXODnssecForVerifiedDomain/MSFT_EXODnssecForVerifiedDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODnssecForVerifiedDomain/MSFT_EXODnssecForVerifiedDomain.psm1 @@ -301,8 +301,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEOPProtectionPolicyRule/MSFT_EXOEOPProtectionPolicyRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEOPProtectionPolicyRule/MSFT_EXOEOPProtectionPolicyRule.psm1 index 4c11126d08..cad603a819 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEOPProtectionPolicyRule/MSFT_EXOEOPProtectionPolicyRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEOPProtectionPolicyRule/MSFT_EXOEOPProtectionPolicyRule.psm1 @@ -503,8 +503,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 index cade902f41..11f581597b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 @@ -467,8 +467,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailTenantSettings/MSFT_EXOEmailTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailTenantSettings/MSFT_EXOEmailTenantSettings.psm1 index 56e14f7bfa..e84b5d2ef9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailTenantSettings/MSFT_EXOEmailTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailTenantSettings/MSFT_EXOEmailTenantSettings.psm1 @@ -395,8 +395,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1 index ef70fdc5c5..1f6529c038 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1 @@ -367,8 +367,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOFocusedInbox/MSFT_EXOFocusedInbox.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOFocusedInbox/MSFT_EXOFocusedInbox.psm1 index 688d2e49ec..63d2a9874d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOFocusedInbox/MSFT_EXOFocusedInbox.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOFocusedInbox/MSFT_EXOFocusedInbox.psm1 @@ -320,8 +320,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 index ae51f94cdc..214a7a49b1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 @@ -736,8 +736,6 @@ function Export-TargetResource } $Script:exportedInstance = $GlobalAddressList $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGroupSettings/MSFT_EXOGroupSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGroupSettings/MSFT_EXOGroupSettings.psm1 index 53ca107e7b..429cb6a63a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGroupSettings/MSFT_EXOGroupSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGroupSettings/MSFT_EXOGroupSettings.psm1 @@ -1024,11 +1024,8 @@ function Export-TargetResource } $Script:exportedInstance = $group $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 index 0a164d5083..eade0d7447 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 @@ -485,8 +485,6 @@ function Export-TargetResource } Write-Host " |---[$i/$($HostedConnectionFilterPolicies.Length)] $($HostedConnectionFilterPolicy.Identity)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 index 6bdb698bb4..cefebc595f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 @@ -1188,8 +1188,6 @@ function Export-TargetResource } Write-Host " |---[$i/$($HostedContentFilterPolicies.Length)] $($HostedContentFilterPolicy.Identity)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 index d298fba963..5b12ce7842 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 @@ -568,8 +568,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 index a214bd520e..367eded81e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 @@ -512,8 +512,6 @@ function Export-TargetResource } Write-Host " |---[$i/$($HostedOutboundSpamFilterPolicies.Length)] $($HostedOutboundSpamFilterPolicy.Identity)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterRule/MSFT_EXOHostedOutboundSpamFilterRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterRule/MSFT_EXOHostedOutboundSpamFilterRule.psm1 index 7cd4956727..8b4ff4146d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterRule/MSFT_EXOHostedOutboundSpamFilterRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterRule/MSFT_EXOHostedOutboundSpamFilterRule.psm1 @@ -551,8 +551,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIRMConfiguration/MSFT_EXOIRMConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIRMConfiguration/MSFT_EXOIRMConfiguration.psm1 index 2bf6a7ff7e..13654bd930 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIRMConfiguration/MSFT_EXOIRMConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIRMConfiguration/MSFT_EXOIRMConfiguration.psm1 @@ -554,8 +554,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 index d35e231cf6..44b1cf9bc5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 @@ -615,8 +615,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 index 4bfed741b2..f67c5d6a49 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 @@ -442,8 +442,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOJournalRule/MSFT_EXOJournalRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOJournalRule/MSFT_EXOJournalRule.psm1 index eb84f9e020..21d38d22bf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOJournalRule/MSFT_EXOJournalRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOJournalRule/MSFT_EXOJournalRule.psm1 @@ -451,8 +451,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailContact/MSFT_EXOMailContact.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailContact/MSFT_EXOMailContact.psm1 index cb39fd5900..a01dfea3c8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailContact/MSFT_EXOMailContact.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailContact/MSFT_EXOMailContact.psm1 @@ -851,8 +851,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 index bdcd3a337f..d3c8020d57 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 @@ -416,8 +416,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAuditBypassAssociation/MSFT_EXOMailboxAuditBypassAssociation.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAuditBypassAssociation/MSFT_EXOMailboxAuditBypassAssociation.psm1 index 022c062b4b..8a8e503cdf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAuditBypassAssociation/MSFT_EXOMailboxAuditBypassAssociation.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAuditBypassAssociation/MSFT_EXOMailboxAuditBypassAssociation.psm1 @@ -295,8 +295,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAutoReplyConfiguration/MSFT_EXOMailboxAutoReplyConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAutoReplyConfiguration/MSFT_EXOMailboxAutoReplyConfiguration.psm1 index efec5952df..78fd8ac80a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAutoReplyConfiguration/MSFT_EXOMailboxAutoReplyConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAutoReplyConfiguration/MSFT_EXOMailboxAutoReplyConfiguration.psm1 @@ -550,8 +550,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarConfiguration/MSFT_EXOMailboxCalendarConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarConfiguration/MSFT_EXOMailboxCalendarConfiguration.psm1 index e248580ae4..1eb9f9aaca 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarConfiguration/MSFT_EXOMailboxCalendarConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarConfiguration/MSFT_EXOMailboxCalendarConfiguration.psm1 @@ -840,8 +840,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarFolder/MSFT_EXOMailboxCalendarFolder.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarFolder/MSFT_EXOMailboxCalendarFolder.psm1 index 516b16d47d..71ab06eb42 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarFolder/MSFT_EXOMailboxCalendarFolder.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarFolder/MSFT_EXOMailboxCalendarFolder.psm1 @@ -463,8 +463,6 @@ function Export-TargetResource $Results.Remove('SharedCalendarSyncStartDate') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxFolderPermission/MSFT_EXOMailboxFolderPermission.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxFolderPermission/MSFT_EXOMailboxFolderPermission.psm1 index a6bc9679bd..9dbaf13846 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxFolderPermission/MSFT_EXOMailboxFolderPermission.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxFolderPermission/MSFT_EXOMailboxFolderPermission.psm1 @@ -442,8 +442,6 @@ function Export-TargetResource $MailboxFolderPermissions = Get-TargetResource @Params $Result = $MailboxFolderPermissions - $Result = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Result if ($Result.UserPermissions.Count -gt 0) { $Result.UserPermissions = Get-M365DSCEXOUserPermissionsList $Result.UserPermissions @@ -452,13 +450,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Result ` - -Credential $Credential - - if ($null -ne $Result.UserPermissions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'UserPermissions' - } + -Credential $Credential ` + -NoEscape @('UserPermissions') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxIRMAccess/MSFT_EXOMailboxIRMAccess.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxIRMAccess/MSFT_EXOMailboxIRMAccess.psm1 index 3df797b6ba..827a8ba616 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxIRMAccess/MSFT_EXOMailboxIRMAccess.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxIRMAccess/MSFT_EXOMailboxIRMAccess.psm1 @@ -357,8 +357,6 @@ function Export-TargetResource } $Result = $dscIRMAccess - $Result = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Result $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPermission/MSFT_EXOMailboxPermission.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPermission/MSFT_EXOMailboxPermission.psm1 index d97fa4e9ea..d7139ca10d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPermission/MSFT_EXOMailboxPermission.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPermission/MSFT_EXOMailboxPermission.psm1 @@ -461,11 +461,8 @@ function Export-TargetResource $Script:exportedInstance = $permission $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPlan/MSFT_EXOMailboxPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPlan/MSFT_EXOMailboxPlan.psm1 index 8c34e8e991..81ad4d3b51 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPlan/MSFT_EXOMailboxPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxPlan/MSFT_EXOMailboxPlan.psm1 @@ -491,11 +491,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 index 70b56677fb..83d8d197bc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 @@ -468,11 +468,8 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 index a7403b6c22..58e4abd4aa 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 @@ -620,7 +620,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $keysToRemove = @() foreach ($key in $Results.Keys) { @@ -633,8 +632,6 @@ function Export-TargetResource { $Results.Remove($key) | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 index 535503d9d3..b7a482f856 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 @@ -521,8 +521,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 index a46721ad0e..ff432bddd5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 @@ -410,8 +410,6 @@ function Export-TargetResource } $Script:exportedInstance = $ManagementRole $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 index 4eb32acd7f..c63a09b12b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 @@ -598,8 +598,6 @@ function Export-TargetResource } $Script:exportedInstance = $assignment $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 index e1ac63c5f1..77455aff62 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 @@ -381,8 +381,6 @@ function Export-TargetResource } $Script:exportedInstance = $roleEntry $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementScope/MSFT_EXOManagementScope.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementScope/MSFT_EXOManagementScope.psm1 index 79bbb79057..e8d41be063 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementScope/MSFT_EXOManagementScope.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementScope/MSFT_EXOManagementScope.psm1 @@ -374,8 +374,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMessageClassification/MSFT_EXOMessageClassification.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMessageClassification/MSFT_EXOMessageClassification.psm1 index c0e2a83f82..a97676d432 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMessageClassification/MSFT_EXOMessageClassification.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMessageClassification/MSFT_EXOMessageClassification.psm1 @@ -526,8 +526,6 @@ function Export-TargetResource $Script:exportedInstance = $MessageClassification $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigration/MSFT_EXOMigration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigration/MSFT_EXOMigration.psm1 index c8ae0443d1..78abea8c5d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigration/MSFT_EXOMigration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigration/MSFT_EXOMigration.psm1 @@ -568,8 +568,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigrationEndpoint/MSFT_EXOMigrationEndpoint.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigrationEndpoint/MSFT_EXOMigrationEndpoint.psm1 index 56fdc880b0..8f48df139d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigrationEndpoint/MSFT_EXOMigrationEndpoint.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMigrationEndpoint/MSFT_EXOMigrationEndpoint.psm1 @@ -588,8 +588,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 index 9585ca6e9e..cadd849998 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 @@ -1165,8 +1165,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOMEConfiguration/MSFT_EXOOMEConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOMEConfiguration/MSFT_EXOOMEConfiguration.psm1 index a5ed1901fc..2e484a7d7e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOMEConfiguration/MSFT_EXOOMEConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOMEConfiguration/MSFT_EXOOMEConfiguration.psm1 @@ -523,8 +523,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 index 569a924c7f..c29177591c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 @@ -455,8 +455,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 index 2a0655f57a..9ee529b1c9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 @@ -491,8 +491,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 index 5bff23026f..c1baec1415 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 @@ -1766,11 +1766,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 index cb9a0492db..e925c86fad 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 @@ -730,8 +730,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 index b45fdedb17..92bf166f33 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 @@ -610,8 +610,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 index 2ccf08d877..6930b125cc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 @@ -1531,8 +1531,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 index bf7a6671f8..941bb8258b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 @@ -469,8 +469,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPerimeterConfiguration/MSFT_EXOPerimeterConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPerimeterConfiguration/MSFT_EXOPerimeterConfiguration.psm1 index a7a96b4e7b..4c94fafb63 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPerimeterConfiguration/MSFT_EXOPerimeterConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPerimeterConfiguration/MSFT_EXOPerimeterConfiguration.psm1 @@ -370,8 +370,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1 index a282259ff0..14c2bb4210 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1 @@ -405,8 +405,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1 index bfb60a5035..3647644998 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1 @@ -662,8 +662,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 index 750cd9ee91..43f2eec78d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 @@ -407,8 +407,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1 index 77be9e2cec..baae766306 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1 @@ -663,7 +663,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $keysToRemove = @() foreach ($key in $Results.Keys) { @@ -676,8 +675,6 @@ function Export-TargetResource { $Results.Remove($key) | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORecipientPermission/MSFT_EXORecipientPermission.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORecipientPermission/MSFT_EXORecipientPermission.psm1 index e589117126..6783242979 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORecipientPermission/MSFT_EXORecipientPermission.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORecipientPermission/MSFT_EXORecipientPermission.psm1 @@ -478,11 +478,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 index 823e835ac2..077bf74cdd 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 @@ -702,8 +702,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 index ecdfa2dbde..861b2084ec 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 @@ -693,7 +693,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $keysToRemove = @() foreach ($key in $Results.Keys) { @@ -706,8 +705,6 @@ function Export-TargetResource { $Results.Remove($key) | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionRule/MSFT_EXOReportSubmissionRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionRule/MSFT_EXOReportSubmissionRule.psm1 index 3271fc0229..a8e746d1c9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionRule/MSFT_EXOReportSubmissionRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionRule/MSFT_EXOReportSubmissionRule.psm1 @@ -425,7 +425,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $keysToRemove = @() foreach ($key in $Results.Keys) { @@ -438,8 +437,6 @@ function Export-TargetResource { $Results.Remove($key) | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOResourceConfiguration/MSFT_EXOResourceConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOResourceConfiguration/MSFT_EXOResourceConfiguration.psm1 index 70dd2d67d6..8167d4a2d1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOResourceConfiguration/MSFT_EXOResourceConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOResourceConfiguration/MSFT_EXOResourceConfiguration.psm1 @@ -372,8 +372,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicy/MSFT_EXORetentionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicy/MSFT_EXORetentionPolicy.psm1 index e167ce3330..e555b8429f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicy/MSFT_EXORetentionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicy/MSFT_EXORetentionPolicy.psm1 @@ -382,8 +382,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 index 2fcd79ac87..1229413818 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORetentionPolicyTag/MSFT_EXORetentionPolicyTag.psm1 @@ -417,8 +417,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 index 9e3f4591d9..0137e33a13 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 @@ -452,8 +452,6 @@ function Export-TargetResource } $Script:exportedInstance = $RoleAssignmentPolicy $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleGroup/MSFT_EXORoleGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleGroup/MSFT_EXORoleGroup.psm1 index ca53609d6e..55ac6c9624 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleGroup/MSFT_EXORoleGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleGroup/MSFT_EXORoleGroup.psm1 @@ -458,8 +458,6 @@ function Export-TargetResource } $Script:exportedInstance = $RoleGroup $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 index 13c8b963a0..e620cfbc1b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 @@ -554,8 +554,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 index 9366c81d52..6f4a570bf5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 @@ -546,8 +546,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 index 59fce47512..7057062411 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 @@ -577,8 +577,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 index f003b215e1..6886c632c3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 @@ -537,8 +537,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1 index 4d9292d96b..337e1f2697 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1 @@ -347,8 +347,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOServicePrincipal/MSFT_EXOServicePrincipal.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOServicePrincipal/MSFT_EXOServicePrincipal.psm1 index d888c04fd0..1c9d3d4557 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOServicePrincipal/MSFT_EXOServicePrincipal.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOServicePrincipal/MSFT_EXOServicePrincipal.psm1 @@ -372,8 +372,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 index 63c35441ce..4971386e5d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 @@ -540,8 +540,6 @@ function Export-TargetResource } $Script:exportedInstance = $mailbox $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 index f84f34b127..dbaf7f19b3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 @@ -431,8 +431,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 index e82804d280..3b68aa2239 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 @@ -358,8 +358,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSweepRule/MSFT_EXOSweepRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSweepRule/MSFT_EXOSweepRule.psm1 index 6082212593..d99960f4ed 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSweepRule/MSFT_EXOSweepRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSweepRule/MSFT_EXOSweepRule.psm1 @@ -457,8 +457,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTeamsProtectionPolicy/MSFT_EXOTeamsProtectionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTeamsProtectionPolicy/MSFT_EXOTeamsProtectionPolicy.psm1 index 02b6d344dc..888ef1179a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTeamsProtectionPolicy/MSFT_EXOTeamsProtectionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTeamsProtectionPolicy/MSFT_EXOTeamsProtectionPolicy.psm1 @@ -393,8 +393,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListItems/MSFT_EXOTenantAllowBlockListItems.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListItems/MSFT_EXOTenantAllowBlockListItems.psm1 index 16d04383d7..bc8a82a1df 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListItems/MSFT_EXOTenantAllowBlockListItems.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListItems/MSFT_EXOTenantAllowBlockListItems.psm1 @@ -512,8 +512,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListSpoofItems/MSFT_EXOTenantAllowBlockListSpoofItems.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListSpoofItems/MSFT_EXOTenantAllowBlockListSpoofItems.psm1 index 3334138476..f75e9b920e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListSpoofItems/MSFT_EXOTenantAllowBlockListSpoofItems.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTenantAllowBlockListSpoofItems/MSFT_EXOTenantAllowBlockListSpoofItems.psm1 @@ -400,8 +400,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportConfig/MSFT_EXOTransportConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportConfig/MSFT_EXOTransportConfig.psm1 index ff303d5e0e..60839914f7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportConfig/MSFT_EXOTransportConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportConfig/MSFT_EXOTransportConfig.psm1 @@ -675,11 +675,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 index 135dca0b4a..3a8ccbc211 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 @@ -2714,8 +2714,6 @@ function Export-TargetResource } $Script:exportedInstance = $TransportRule $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_FabricAdminTenantSettings/MSFT_FabricAdminTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_FabricAdminTenantSettings/MSFT_FabricAdminTenantSettings.psm1 index b99d088bab..a506bedbdf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_FabricAdminTenantSettings/MSFT_FabricAdminTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_FabricAdminTenantSettings/MSFT_FabricAdminTenantSettings.psm1 @@ -2010,8 +2010,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $newResults = ([Hashtable]$Results).Clone() foreach ($key in $Results.Keys) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneASRRulesPolicyWindows10/MSFT_IntuneASRRulesPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneASRRulesPolicyWindows10/MSFT_IntuneASRRulesPolicyWindows10.psm1 index 3a64dc91b6..c0795a1f9c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneASRRulesPolicyWindows10/MSFT_IntuneASRRulesPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneASRRulesPolicyWindows10/MSFT_IntuneASRRulesPolicyWindows10.psm1 @@ -900,25 +900,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.psm1 index 5d7d01979e..cda449ec1b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.psm1 @@ -717,9 +717,7 @@ function Export-TargetResource } $Script:exportedInstance = $policy - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($Results.Assignments) { @@ -738,12 +736,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy.psm1 index bca5bf6021..2f581166ff 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy.psm1 @@ -605,37 +605,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($Results.LocalUserGroupCollection) - { - $isCIMArray = $false - if ($Results.LocalUserGroupCollection.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'LocalUserGroupCollection' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } - - $currentDSCBlock = $currentDSCBlock.Replace("`r`n `");", "`r`n );") + -Credential $Credential ` + -NoEscape @('LocalUserGroupCollection', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicy/MSFT_IntuneAccountProtectionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicy/MSFT_IntuneAccountProtectionPolicy.psm1 index 9432b7410b..e65da7d3f4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicy/MSFT_IntuneAccountProtectionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicy/MSFT_IntuneAccountProtectionPolicy.psm1 @@ -769,25 +769,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicyWindows10/MSFT_IntuneAccountProtectionPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicyWindows10/MSFT_IntuneAccountProtectionPolicyWindows10.psm1 index fe5ee3bf23..5b5c0845a0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicyWindows10/MSFT_IntuneAccountProtectionPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAccountProtectionPolicyWindows10/MSFT_IntuneAccountProtectionPolicyWindows10.psm1 @@ -697,8 +697,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DeviceSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -745,20 +743,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DeviceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceSettings' -IsCIMArray:$True - } - if ($Results.UserSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserSettings' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('DeviceSettings', 'UserSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAndroidManagedStoreAppConfiguration/MSFT_IntuneAndroidManagedStoreAppConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAndroidManagedStoreAppConfiguration/MSFT_IntuneAndroidManagedStoreAppConfiguration.psm1 index 639479683c..7853893204 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAndroidManagedStoreAppConfiguration/MSFT_IntuneAndroidManagedStoreAppConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAndroidManagedStoreAppConfiguration/MSFT_IntuneAndroidManagedStoreAppConfiguration.psm1 @@ -675,8 +675,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -710,27 +708,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } - - if ($Results.permissionActions) - { - $isCIMArray = $false - if ($Results.permissionActions.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'permissionActions' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments', 'permissionActions') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyLinux/MSFT_IntuneAntivirusExclusionsPolicyLinux.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyLinux/MSFT_IntuneAntivirusExclusionsPolicyLinux.psm1 index 8175680a80..3153ec8c01 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyLinux/MSFT_IntuneAntivirusExclusionsPolicyLinux.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyLinux/MSFT_IntuneAntivirusExclusionsPolicyLinux.psm1 @@ -593,8 +593,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.Exclusions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -627,16 +625,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Exclusions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Exclusions' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Exclusions', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyMacOS/MSFT_IntuneAntivirusExclusionsPolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyMacOS/MSFT_IntuneAntivirusExclusionsPolicyMacOS.psm1 index 9df5842c5d..2b9434a468 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyMacOS/MSFT_IntuneAntivirusExclusionsPolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusExclusionsPolicyMacOS/MSFT_IntuneAntivirusExclusionsPolicyMacOS.psm1 @@ -594,8 +594,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.Exclusions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -628,16 +626,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Exclusions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Exclusions' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Exclusions', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyLinux/MSFT_IntuneAntivirusPolicyLinux.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyLinux/MSFT_IntuneAntivirusPolicyLinux.psm1 index 2a0a54081f..8bdfd36876 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyLinux/MSFT_IntuneAntivirusPolicyLinux.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyLinux/MSFT_IntuneAntivirusPolicyLinux.psm1 @@ -966,8 +966,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.exclusions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -1014,20 +1012,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.exclusions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'exclusions' -IsCIMArray:$True - } - if ($Results.threatTypeSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'threatTypeSettings' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('exclusions', 'threatTypeSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyMacOS/MSFT_IntuneAntivirusPolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyMacOS/MSFT_IntuneAntivirusPolicyMacOS.psm1 index 69accc9d5b..60356c037a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyMacOS/MSFT_IntuneAntivirusPolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyMacOS/MSFT_IntuneAntivirusPolicyMacOS.psm1 @@ -968,8 +968,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.exclusions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -1016,20 +1014,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.exclusions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'exclusions' -IsCIMArray:$True - } - if ($Results.threatTypeSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'threatTypeSettings' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('exclusions', 'threatTypeSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 index 42957e166c..a1394e11e9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 @@ -1691,8 +1691,6 @@ function Export-TargetResource throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -1711,12 +1709,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential -Verbose - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10.psm1 index 50a67bee62..05d4aaa18c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10.psm1 @@ -823,8 +823,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -843,12 +841,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr.psm1 index 20a73e5021..716fb0a697 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr/MSFT_IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr.psm1 @@ -811,8 +811,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -831,12 +829,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppCategory/MSFT_IntuneAppCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppCategory/MSFT_IntuneAppCategory.psm1 index d980c27c64..09da0a4c8b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppCategory/MSFT_IntuneAppCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppCategory/MSFT_IntuneAppCategory.psm1 @@ -392,8 +392,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationDevicePolicy/MSFT_IntuneAppConfigurationDevicePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationDevicePolicy/MSFT_IntuneAppConfigurationDevicePolicy.psm1 index d24c0b3b91..2b53628f21 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationDevicePolicy/MSFT_IntuneAppConfigurationDevicePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationDevicePolicy/MSFT_IntuneAppConfigurationDevicePolicy.psm1 @@ -744,8 +744,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.PermissionActions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -790,19 +788,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.PermissionActions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PermissionActions' -IsCIMArray:$True - } - if ($Results.Settings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Settings' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('PermissionActions', 'Settings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1 index f33bd6ed4e..7bbabee761 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1 @@ -533,27 +533,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.CustomSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CustomSettings' - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('CustomSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 index 6536efe50c..ca24b281b6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyAndroid/MSFT_IntuneAppProtectionPolicyAndroid.psm1 @@ -1194,8 +1194,6 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 index 4c86022073..3259200b30 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 @@ -1574,8 +1574,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushNotificationCertificate/MSFT_IntuneAppleMDMPushNotificationCertificate.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushNotificationCertificate/MSFT_IntuneAppleMDMPushNotificationCertificate.psm1 index ca54b693c3..d391f2289e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushNotificationCertificate/MSFT_IntuneAppleMDMPushNotificationCertificate.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushNotificationCertificate/MSFT_IntuneAppleMDMPushNotificationCertificate.psm1 @@ -442,8 +442,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneApplicationControlPolicyWindows10/MSFT_IntuneApplicationControlPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneApplicationControlPolicyWindows10/MSFT_IntuneApplicationControlPolicyWindows10.psm1 index 1ba3c9084f..5d46d8924f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneApplicationControlPolicyWindows10/MSFT_IntuneApplicationControlPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneApplicationControlPolicyWindows10/MSFT_IntuneApplicationControlPolicyWindows10.psm1 @@ -545,18 +545,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager.psm1 index 5defebd81a..e201ba1622 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager/MSFT_IntuneAttackSurfaceReductionRulesPolicyWindows10ConfigManager.psm1 @@ -826,9 +826,7 @@ function Export-TargetResource } $Script:exportedInstance = $policy - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($Results.Assignments) { @@ -847,12 +845,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDerivedCredential/MSFT_IntuneDerivedCredential.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDerivedCredential/MSFT_IntuneDerivedCredential.psm1 index 286b01b61f..5a4b4b3533 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDerivedCredential/MSFT_IntuneDerivedCredential.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDerivedCredential/MSFT_IntuneDerivedCredential.psm1 @@ -486,8 +486,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceAndAppManagementAssignmentFilter/MSFT_IntuneDeviceAndAppManagementAssignmentFilter.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceAndAppManagementAssignmentFilter/MSFT_IntuneDeviceAndAppManagementAssignmentFilter.psm1 index d414d64347..48e01ccca0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceAndAppManagementAssignmentFilter/MSFT_IntuneDeviceAndAppManagementAssignmentFilter.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceAndAppManagementAssignmentFilter/MSFT_IntuneDeviceAndAppManagementAssignmentFilter.psm1 @@ -450,12 +450,9 @@ function Export-TargetResource } $Script:exportedInstance = $assignmentFilter - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCategory/MSFT_IntuneDeviceCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCategory/MSFT_IntuneDeviceCategory.psm1 index c9056831c9..36d3cac5bb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCategory/MSFT_IntuneDeviceCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCategory/MSFT_IntuneDeviceCategory.psm1 @@ -361,8 +361,6 @@ function Export-TargetResource $Script:exportedInstance = $category $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCleanupRule/MSFT_IntuneDeviceCleanupRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCleanupRule/MSFT_IntuneDeviceCleanupRule.psm1 index 5bfab30d79..19dbf9cbb5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCleanupRule/MSFT_IntuneDeviceCleanupRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCleanupRule/MSFT_IntuneDeviceCleanupRule.psm1 @@ -389,8 +389,6 @@ function Export-TargetResource $Script:exportedInstance = $cleanupRule $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroid/MSFT_IntuneDeviceCompliancePolicyAndroid.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroid/MSFT_IntuneDeviceCompliancePolicyAndroid.psm1 index fffe15c4a4..026874f12d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroid/MSFT_IntuneDeviceCompliancePolicyAndroid.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroid/MSFT_IntuneDeviceCompliancePolicyAndroid.psm1 @@ -873,23 +873,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner.psm1 index edaf31214d..1951ccfd38 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner/MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner.psm1 @@ -725,24 +725,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile.psm1 index 4c9fed41d6..3468c44dff 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile.psm1 @@ -835,23 +835,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.psm1 index a5a0cb6295..c595fc2d28 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.psm1 @@ -786,24 +786,13 @@ function Export-TargetResource } } - $results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.psm1 index 50be26fa9f..653c636faf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.psm1 @@ -937,8 +937,6 @@ function Export-TargetResource throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ValidOperatingSystemBuildRanges) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -981,24 +979,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.ValidOperatingSystemBuildRanges) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ValidOperatingSystemBuildRanges' - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Assignments' ` - -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('ValidOperatingSystemBuildRanges', 'Assignments') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyiOs/MSFT_IntuneDeviceCompliancePolicyiOs.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyiOs/MSFT_IntuneDeviceCompliancePolicyiOs.psm1 index 74026b3739..c9405f38d6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyiOs/MSFT_IntuneDeviceCompliancePolicyiOs.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyiOs/MSFT_IntuneDeviceCompliancePolicyiOs.psm1 @@ -780,33 +780,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.RestrictedApps) - { - $isCIMArray = $false - if ($Results.RestrictedApps.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RestrictedApps' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('RestrictedApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10.psm1 index b2c0a5b535..c036d33b39 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10/MSFT_IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10.psm1 @@ -868,8 +868,6 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.DefinitionValues) { @@ -919,33 +917,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - if ($Results.DefinitionValues) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DefinitionValues' -IsCIMArray:$true - } - if ($Results.DefinitionValues.Definition) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Definition' - } - if ($Results.DefinitionValues.PresentationValues) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PresentationValues' - } - if ($Results.DefinitionValues.PresentationValues.KeyValuePairValues) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KeyValuePairValues' - } - - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n,`r`n" , "`r`n" ) - $currentDSCBlock = $currentDSCBlock.Replace("} Enabled = `$", "}`r`n Enabled = `$") + -Credential $Credential ` + -NoEscape @('Assignments', 'DefinitionValues', 'PresentationValues', 'KeyValuePairValues') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10.psm1 index 4f77064578..97e4f38fcb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10/MSFT_IntuneDeviceConfigurationCustomPolicyWindows10.psm1 @@ -633,8 +633,7 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($null -ne $Results.OmaSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -665,16 +664,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('OmaSettings', 'Assignments') - if ($Results.OmaSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OmaSettings' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10.psm1 index 82dd1bb726..d4fe9a9950 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10/MSFT_IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10.psm1 @@ -639,8 +639,7 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -657,11 +656,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10.psm1 index 881e4959c5..ffa6b48305 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10/MSFT_IntuneDeviceConfigurationDeliveryOptimizationPolicyWindows10.psm1 @@ -853,8 +853,6 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ( $null -ne $Results.BandwidthMode) { $complexMapping = @( @@ -932,26 +930,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.BandwidthMode) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'BandwidthMode' -IsCIMArray:$False - } - if ($Results.GroupIdSource) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'GroupIdSource' -IsCIMArray:$False - } - if ($Results.MaximumCacheSize) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MaximumCacheSize' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('BandwidthMode', 'GroupIdSource', 'MaximumCacheSize', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10.psm1 index 2d3b1ed694..9be3f2248f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10/MSFT_IntuneDeviceConfigurationDomainJoinPolicyWindows10.psm1 @@ -594,8 +594,7 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -612,11 +611,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1 index 9b507bdb55..7b07701984 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1 @@ -756,8 +756,7 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -774,11 +773,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10.psm1 index e6b523f4a4..18a75e59d2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationEndpointProtectionPolicyWindows10.psm1 @@ -5003,8 +5003,7 @@ function Export-TargetResource Write-Verbose "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed" throw "An error occured in Get-TargetResource, the policy {$($params.displayName)} will not be processed. Refer to the event viewer logs for more information." } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + if ( $null -ne $Results.BitLockerFixedDrivePolicy) { $complexMapping = @( @@ -5973,162 +5972,17 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.BitLockerFixedDrivePolicy) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'BitLockerFixedDrivePolicy' -IsCIMArray:$False - } - if ($Results.BitLockerRemovableDrivePolicy) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'BitLockerRemovableDrivePolicy' -IsCIMArray:$False - } - if ($Results.BitLockerSystemDrivePolicy) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'BitLockerSystemDrivePolicy' -IsCIMArray:$False - } - if ($Results.DefenderDetectedMalwareActions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DefenderDetectedMalwareActions' -IsCIMArray:$False - } - if ($Results.FirewallProfileDomain) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallProfileDomain' -IsCIMArray:$False - } - if ($Results.FirewallProfilePrivate) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallProfilePrivate' -IsCIMArray:$False - } - if ($Results.FirewallProfilePublic) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallProfilePublic' -IsCIMArray:$False - } - if ($Results.FirewallRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallRules' -IsCIMArray:$True - } - if ($Results.UserRightsAccessCredentialManagerAsTrustedCaller) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsAccessCredentialManagerAsTrustedCaller' -IsCIMArray:$False - } - if ($Results.UserRightsActAsPartOfTheOperatingSystem) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsActAsPartOfTheOperatingSystem' -IsCIMArray:$False - } - if ($Results.UserRightsAllowAccessFromNetwork) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsAllowAccessFromNetwork' -IsCIMArray:$False - } - if ($Results.UserRightsBackupData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsBackupData' -IsCIMArray:$False - } - if ($Results.UserRightsBlockAccessFromNetwork) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsBlockAccessFromNetwork' -IsCIMArray:$False - } - if ($Results.UserRightsChangeSystemTime) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsChangeSystemTime' -IsCIMArray:$False - } - if ($Results.UserRightsCreateGlobalObjects) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsCreateGlobalObjects' -IsCIMArray:$False - } - if ($Results.UserRightsCreatePageFile) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsCreatePageFile' -IsCIMArray:$False - } - if ($Results.UserRightsCreatePermanentSharedObjects) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsCreatePermanentSharedObjects' -IsCIMArray:$False - } - if ($Results.UserRightsCreateSymbolicLinks) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsCreateSymbolicLinks' -IsCIMArray:$False - } - if ($Results.UserRightsCreateToken) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsCreateToken' -IsCIMArray:$False - } - if ($Results.UserRightsDebugPrograms) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsDebugPrograms' -IsCIMArray:$False - } - if ($Results.UserRightsDelegation) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsDelegation' -IsCIMArray:$False - } - if ($Results.UserRightsDenyLocalLogOn) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsDenyLocalLogOn' -IsCIMArray:$False - } - if ($Results.UserRightsGenerateSecurityAudits) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsGenerateSecurityAudits' -IsCIMArray:$False - } - if ($Results.UserRightsImpersonateClient) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsImpersonateClient' -IsCIMArray:$False - } - if ($Results.UserRightsIncreaseSchedulingPriority) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsIncreaseSchedulingPriority' -IsCIMArray:$False - } - if ($Results.UserRightsLoadUnloadDrivers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsLoadUnloadDrivers' -IsCIMArray:$False - } - if ($Results.UserRightsLocalLogOn) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsLocalLogOn' -IsCIMArray:$False - } - if ($Results.UserRightsLockMemory) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsLockMemory' -IsCIMArray:$False - } - if ($Results.UserRightsManageAuditingAndSecurityLogs) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsManageAuditingAndSecurityLogs' -IsCIMArray:$False - } - if ($Results.UserRightsManageVolumes) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsManageVolumes' -IsCIMArray:$False - } - if ($Results.UserRightsModifyFirmwareEnvironment) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsModifyFirmwareEnvironment' -IsCIMArray:$False - } - if ($Results.UserRightsModifyObjectLabels) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsModifyObjectLabels' -IsCIMArray:$False - } - if ($Results.UserRightsProfileSingleProcess) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsProfileSingleProcess' -IsCIMArray:$False - } - if ($Results.UserRightsRemoteDesktopServicesLogOn) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsRemoteDesktopServicesLogOn' -IsCIMArray:$False - } - if ($Results.UserRightsRemoteShutdown) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsRemoteShutdown' -IsCIMArray:$False - } - if ($Results.UserRightsRestoreData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsRestoreData' -IsCIMArray:$False - } - if ($Results.UserRightsTakeOwnership) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserRightsTakeOwnership' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('BitLockerFixedDrivePolicy', 'BitLockerRemovableDrivePolicy', 'BitLockerSystemDrivePolicy', 'DefenderDetectedMalwareActions', + 'FirewallProfileDomain', 'FirewallProfilePrivate', 'FirewallProfilePublic', 'FirewallRules', + 'UserRightsAccessCredentialManagerAsTrustedCaller', 'UserRightsActAsPartOfTheOperatingSystem', 'UserRightsAllowAccessFromNetwork', + 'UserRightsBackupData', 'UserRightsBlockAccessFromNetwork', 'UserRightsChangeSystemTime', 'UserRightsCreateGlobalObjects', + 'UserRightsCreatePageFile', 'UserRightsCreatePermanentSharedObjects', 'UserRightsCreateSymbolicLinks', 'UserRightsCreateToken', + 'UserRightsDebugPrograms', 'UserRightsDelegation', 'UserRightsDenyLocalLogOn', 'UserRightsGenerateSecurityAudits', + 'UserRightsImpersonateClient', 'UserRightsIncreaseSchedulingPriority', 'UserRightsLoadUnloadDrivers', 'UserRightsLocalLogOn', + 'UserRightsLockMemory', 'UserRightsManageAuditingAndSecurityLogs', 'UserRightsManageVolumes', 'UserRightsModifyFirmwareEnvironment', + 'UserRightsModifyObjectLabels', 'UserRightsProfileSingleProcess', 'UserRightsRemoteDesktopServicesLogOn', 'UserRightsRemoteShutdown', + 'UserRightsRestoreData', 'UserRightsTakeOwnership', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10.psm1 index ee49f06f70..ac97a09c88 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10/MSFT_IntuneDeviceConfigurationFirmwareInterfacePolicyWindows10.psm1 @@ -991,8 +991,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -1009,11 +1007,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10.psm1 index 2aa3b01a9e..0f331ab1dc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationHealthMonitoringConfigurationPolicyWindows10.psm1 @@ -586,8 +586,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -604,11 +602,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10.psm1 index cb59478abe..6cb2d1afc3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10/MSFT_IntuneDeviceConfigurationIdentityProtectionPolicyWindows10.psm1 @@ -739,8 +739,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -757,11 +755,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10.psm1 index b6a5055181..b8196631b1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationImportedPfxCertificatePolicyWindows10.psm1 @@ -652,8 +652,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -670,11 +668,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10.psm1 index 68604bda49..0a2bb0a40b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10/MSFT_IntuneDeviceConfigurationKioskPolicyWindows10.psm1 @@ -818,8 +818,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.KioskProfiles) { $complexMapping = @( @@ -898,19 +896,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.KioskProfiles) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KioskProfiles' -IsCIMArray:$True - } - if ($Results.WindowsKioskForceUpdateSchedule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'WindowsKioskForceUpdateSchedule' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('KioskProfiles', 'WindowsKioskForceUpdateSchedule', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10.psm1 index 6a18bfa1a9..0e5da135c8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10/MSFT_IntuneDeviceConfigurationNetworkBoundaryPolicyWindows10.psm1 @@ -581,8 +581,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.WindowsNetworkIsolationPolicy) { $complexMapping = @( @@ -632,18 +630,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.WindowsNetworkIsolationPolicy) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'WindowsNetworkIsolationPolicy' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace(" ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace("`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('WindowsNetworkIsolationPolicy', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10.psm1 index f2845f7ebf..b2c35ba024 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationPkcsCertificatePolicyWindows10.psm1 @@ -772,8 +772,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.CustomSubjectAlternativeNames) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -818,19 +816,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.CustomSubjectAlternativeNames) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CustomSubjectAlternativeNames' -IsCIMArray:$True - } - if ($Results.ExtendedKeyUsages) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExtendedKeyUsages' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('CustomSubjectAlternativeNames', 'ExtendedKeyUsages', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS.psm1 index ce85830d00..b0ad632144 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS/MSFT_IntuneDeviceConfigurationPlatformScriptMacOS.psm1 @@ -620,8 +620,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -638,11 +636,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptWindows/MSFT_IntuneDeviceConfigurationPlatformScriptWindows.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptWindows/MSFT_IntuneDeviceConfigurationPlatformScriptWindows.psm1 index 58c4d3f7ec..79edb7f8d5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptWindows/MSFT_IntuneDeviceConfigurationPlatformScriptWindows.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPlatformScriptWindows/MSFT_IntuneDeviceConfigurationPlatformScriptWindows.psm1 @@ -602,8 +602,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -620,11 +618,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator.psm1 index fa5444c88c..f8a4b16e74 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceAdministrator.psm1 @@ -1290,8 +1290,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.AppsHideList) { @@ -1371,63 +1369,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.AppsHideList) - { - $isCIMArray = $false - if ($Results.AppsHideList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppsHideList' -IsCIMArray:$isCIMArray - } - if ($Results.AppsInstallAllowList) - { - $isCIMArray = $false - if ($Results.AppsInstallAllowList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppsInstallAllowList' -IsCIMArray:$isCIMArray - } - if ($Results.AppsLaunchBlockList) - { - $isCIMArray = $false - if ($Results.AppsLaunchBlockList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppsLaunchBlockList' -IsCIMArray:$isCIMArray - } - if ($Results.CompliantAppsList) - { - $isCIMArray = $false - if ($Results.CompliantAppsList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CompliantAppsList' -IsCIMArray:$isCIMArray - } - if ($Results.KioskModeApps) - { - $isCIMArray = $false - if ($Results.KioskModeApps.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KioskModeApps' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('AppsHideList', 'AppsInstallAllowList', 'AppsLaunchBlockList', 'CompliantAppsList', 'KioskModeApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner.psm1 index 57b5fe9c33..9047b174e2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneDeviceConfigurationPolicyAndroidDeviceOwner.psm1 @@ -2522,8 +2522,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.AzureAdSharedDeviceDataClearApps) { @@ -2742,110 +2740,10 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.AzureAdSharedDeviceDataClearApps) - { - $isCIMArray = $false - if ($Results.AzureAdSharedDeviceDataClearApps.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AzureAdSharedDeviceDataClearApps' -IsCIMArray:$isCIMArray - } - if ($Results.DetailedHelpText) - { - $isCIMArray = $false - if ($Results.DetailedHelpText.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DetailedHelpText' -IsCIMArray:$isCIMArray - } - if ($Results.DeviceOwnerLockScreenMessage) - { - $isCIMArray = $false - if ($Results.DeviceOwnerLockScreenMessage.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceOwnerLockScreenMessage' -IsCIMArray:$isCIMArray - } - if ($Results.GlobalProxy) - { - $isCIMArray = $false - if ($Results.GlobalProxy.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'GlobalProxy' -IsCIMArray:$isCIMArray - } - if ($Results.KioskModeAppPositions) - { - $isCIMArray = $false - if ($Results.KioskModeAppPositions.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KioskModeAppPositions' -IsCIMArray:$isCIMArray - } - - if ($Results.KioskModeApps) - { - $isCIMArray = $false - if ($Results.KioskModeApps.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KioskModeApps' -IsCIMArray:$isCIMArray - } - - if ($Results.KioskModeManagedFolders) - { - $isCIMArray = $false - if ($Results.KioskModeManagedFolders.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'KioskModeManagedFolders' -IsCIMArray:$isCIMArray -Verbose - } - - if ($Results.PersonalProfilePersonalApplications) - { - $isCIMArray = $false - if ($Results.PersonalProfilePersonalApplications.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PersonalProfilePersonalApplications' -IsCIMArray:$isCIMArray - } - if ($Results.ShortHelpText) - { - $isCIMArray = $false - if ($Results.ShortHelpText.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ShortHelpText' -IsCIMArray:$isCIMArray - } - if ($Results.SystemUpdateFreezePeriods) - { - $isCIMArray = $false - if ($Results.SystemUpdateFreezePeriods.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'SystemUpdateFreezePeriods' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('AzureAdSharedDeviceDataClearApps', 'DetailedHelpText', 'DeviceOwnerLockScreenMessage', 'GlobalProxy', + 'KioskModeAppPositions', 'KioskModeApps', 'KioskModeManagedFolders', 'PersonalProfilePersonalApplications', + 'ShortHelpText', 'SystemUpdateFreezePeriods', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject.psm1 index 2d8c33c205..450949d1a9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneDeviceConfigurationPolicyAndroidOpenSourceProject.psm1 @@ -752,8 +752,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -772,17 +770,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile.psm1 index e0f3681b6b..998399a6de 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile/MSFT_IntuneDeviceConfigurationPolicyAndroidWorkProfile.psm1 @@ -1073,7 +1073,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @Params - if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject ([Array]$Results.Assignments) -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -1088,24 +1087,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyMacOS/MSFT_IntuneDeviceConfigurationPolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyMacOS/MSFT_IntuneDeviceConfigurationPolicyMacOS.psm1 index 52b92a1cb0..626bafcbfb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyMacOS/MSFT_IntuneDeviceConfigurationPolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyMacOS/MSFT_IntuneDeviceConfigurationPolicyMacOS.psm1 @@ -1344,8 +1344,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.CompliantAppsList) { @@ -1389,36 +1387,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.CompliantAppsList) - { - $isCIMArray = $false - if ($Results.CompliantAppsList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CompliantAppsList' -IsCIMArray:$isCIMArray - } - if ($Results.PrivacyAccessControls) - { - $isCIMArray = $false - if ($Results.PrivacyAccessControls.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PrivacyAccessControls' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('CompliantAppsList', 'PrivacyAccessControls', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationPolicyWindows10.psm1 index 48bba43fc5..c0163815b5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyWindows10/MSFT_IntuneDeviceConfigurationPolicyWindows10.psm1 @@ -4783,8 +4783,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DefenderDetectedMalwareActions) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -4871,35 +4869,10 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DefenderDetectedMalwareActions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DefenderDetectedMalwareActions' -IsCIMArray:$False - } - if ($Results.EdgeHomeButtonConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EdgeHomeButtonConfiguration' -IsCIMArray:$False - } - if ($Results.EdgeSearchEngine) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EdgeSearchEngine' -IsCIMArray:$False - } - if ($Results.NetworkProxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'NetworkProxyServer' -IsCIMArray:$False - } - if ($Results.Windows10AppsForceUpdateSchedule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Windows10AppsForceUpdateSchedule' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.Replace(" ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.Replace("`r`n;`r`n" , "`r`n" ) - $currentDSCBlock = $currentDSCBlock.Replace(",`r`n", '') + -Credential $Credential ` + -NoEscape @('DefenderDetectedMalwareActions', 'EdgeHomeButtonConfiguration', 'EdgeSearchEngine', + 'NetworkProxyServer', 'Windows10AppsForceUpdateSchedule', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyiOS/MSFT_IntuneDeviceConfigurationPolicyiOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyiOS/MSFT_IntuneDeviceConfigurationPolicyiOS.psm1 index 7dd7765973..4037070830 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyiOS/MSFT_IntuneDeviceConfigurationPolicyiOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationPolicyiOS/MSFT_IntuneDeviceConfigurationPolicyiOS.psm1 @@ -3087,8 +3087,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.AppsSingleAppModeList) { @@ -3300,93 +3298,11 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.AppsSingleAppModeList) - { - $isCIMArray = $false - if ($Results.AppsSingleAppModeList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppsSingleAppModeList' -IsCIMArray:$isCIMArray - } - if ($Results.AppsVisibilityList) - { - $isCIMArray = $false - if ($Results.AppsVisibilityList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AppsVisibilityList' -IsCIMArray:$isCIMArray - } - if ($Results.CompliantAppsList) - { - $isCIMArray = $false - if ($Results.CompliantAppsList.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CompliantAppsList' -IsCIMArray:$isCIMArray - } - - if ($Results.MediaContentRatingAustralia) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingAustralia' - } - if ($Results.MediaContentRatingCanada) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingCanada' - } - if ($Results.MediaContentRatingFrance) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingFrance' - } - - if ($Results.MediaContentRatingGermany) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingGermany' - } - if ($Results.MediaContentRatingIreland) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingIreland' - } - if ($Results.MediaContentRatingJapan) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingJapan' - } - if ($Results.MediaContentRatingNewZealand) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingNewZealand' - } - if ($Results.MediaContentRatingUnitedKingdom) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingUnitedKingdom' - } - if ($Results.MediaContentRatingUnitedStates) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MediaContentRatingUnitedStates' - } - - if ($Results.NetworkUsageRules) - { - $isCIMArray = $false - if ($Results.NetworkUsageRules.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'NetworkUsageRules' -IsCIMArray:$isCIMArray - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('AppsSingleAppModeList', 'AppsVisibilityList', 'CompliantAppsList', 'MediaContentRatingAustralia', + 'MediaContentRatingCanada', 'MediaContentRatingFrance', 'MediaContentRatingGermany', 'MediaContentRatingIreland', + 'MediaContentRatingJapan', 'MediaContentRatingNewZealand', 'MediaContentRatingUnitedKingdom', + 'MediaContentRatingUnitedStates', 'NetworkUsageRules', 'Assignments') $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10.psm1 index 54316673cc..e4e0c24aab 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationSCEPCertificatePolicyWindows10.psm1 @@ -921,8 +921,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.CustomSubjectAlternativeNames) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -967,19 +965,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.CustomSubjectAlternativeNames) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CustomSubjectAlternativeNames' -IsCIMArray:$True - } - if ($Results.ExtendedKeyUsages) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExtendedKeyUsages' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('CustomSubjectAlternativeNames', 'ExtendedKeyUsages', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10.psm1 index 1f70c1b876..d4f99cb9c7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10/MSFT_IntuneDeviceConfigurationSecureAssessmentPolicyWindows10.psm1 @@ -629,8 +629,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -647,11 +645,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10.psm1 index afe8270eb4..6225c9a98e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10/MSFT_IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10.psm1 @@ -852,8 +852,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.AccountManagerPolicy) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -884,15 +882,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.AccountManagerPolicy) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AccountManagerPolicy' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('AccountManagerPolicy', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10.psm1 index 5a9676e335..d64871e6be 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10.psm1 @@ -564,8 +564,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -582,11 +580,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10.psm1 index d4ed41c151..f38e827011 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10/MSFT_IntuneDeviceConfigurationVpnPolicyWindows10.psm1 @@ -1092,8 +1092,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.AssociatedApps) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -1251,43 +1249,10 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.AssociatedApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AssociatedApps' -IsCIMArray:$True - } - if ($Results.CryptographySuite) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CryptographySuite' -IsCIMArray:$False - } - if ($Results.DnsRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DnsRules' -IsCIMArray:$True - } - if ($Results.ProxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ProxyServer' -IsCIMArray:$False - } - if ($Results.Routes) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Routes' -IsCIMArray:$True - } - if ($Results.SingleSignOnEku) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'SingleSignOnEku' -IsCIMArray:$False - } - if ($Results.TrafficRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'TrafficRules' -IsCIMArray:$True - } - if ($Results.ServerCollection) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ServerCollection' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('AssociatedApps', 'CryptographySuite', 'DnsRules', 'ProxyServer', 'Routes', + 'SingleSignOnEku', 'TrafficRules', 'ServerCollection', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10.psm1 index f884fe7186..a9434b1064 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10/MSFT_IntuneDeviceConfigurationWindowsTeamPolicyWindows10.psm1 @@ -815,8 +815,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -833,11 +831,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10.psm1 index 9bc013bcc6..a3b8a8dd59 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10/MSFT_IntuneDeviceConfigurationWiredNetworkPolicyWindows10.psm1 @@ -1127,8 +1127,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -1145,11 +1143,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceControlPolicyWindows10/MSFT_IntuneDeviceControlPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceControlPolicyWindows10/MSFT_IntuneDeviceControlPolicyWindows10.psm1 index c5bad484ed..fe8aa33a7e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceControlPolicyWindows10/MSFT_IntuneDeviceControlPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceControlPolicyWindows10/MSFT_IntuneDeviceControlPolicyWindows10.psm1 @@ -1107,8 +1107,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.PolicyRule) { $complexMapping = @( @@ -1155,16 +1153,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.PolicyRule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'PolicyRule' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('PolicyRule', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentLimitRestriction/MSFT_IntuneDeviceEnrollmentLimitRestriction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentLimitRestriction/MSFT_IntuneDeviceEnrollmentLimitRestriction.psm1 index e25503ede3..b0b3d2ad73 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentLimitRestriction/MSFT_IntuneDeviceEnrollmentLimitRestriction.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentLimitRestriction/MSFT_IntuneDeviceEnrollmentLimitRestriction.psm1 @@ -389,8 +389,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1 index 7fa57b1665..f55a482cd1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1 @@ -736,7 +736,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - if ($null -ne $Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject ([Array]$Results.Assignments) -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -854,64 +853,14 @@ function Export-TargetResource } } - - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } - - if ($null -ne $Results.IosRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IosRestriction' - } - - if ($null -ne $Results.WindowsRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'WindowsRestriction' - } - - if ($null -ne $Results.WindowsHomeSkuRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'WindowsHomeSkuRestriction' - } - - if ($null -ne $Results.WindowsMobileRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'WindowsMobileRestriction' - } - - if ($null -ne $Results.AndroidRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AndroidRestriction' - } - - if ($null -ne $Results.AndroidForWorkRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AndroidForWorkRestriction' - } - - if ($null -ne $Results.MacRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MacRestriction' - } - - if ($null -ne $Results.MacOSRestriction) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MacOSRestriction' - } + -Credential $Credential ` + -NoEscape @('Assignments', 'IosRestriction', 'WindowsRestriction', 'WindowsHomeSkuRestriction', + 'WindowsMobileRestriction', 'AndroidRestriction', 'AndroidForWorkRestriction', + 'MacRestriction','MacOSRestriction') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1 index f3d0de9f6e..90fe019289 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentStatusPageWindows10/MSFT_IntuneDeviceEnrollmentStatusPageWindows10.psm1 @@ -771,8 +771,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -789,11 +787,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 index 2a0ae38b7c..13e7de9fcb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 @@ -669,8 +669,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.QrCodeImage) { @@ -691,13 +689,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.QrCodeImage) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'QrCodeImage' -IsCIMArray:$false - - } + -Credential $Credential ` + -NoEscape @('QrCodeImage') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementComplianceSettings/MSFT_IntuneDeviceManagementComplianceSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementComplianceSettings/MSFT_IntuneDeviceManagementComplianceSettings.psm1 index c132737f12..ddaac8fff6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementComplianceSettings/MSFT_IntuneDeviceManagementComplianceSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementComplianceSettings/MSFT_IntuneDeviceManagementComplianceSettings.psm1 @@ -309,9 +309,7 @@ function Export-TargetResource Managedidentity = $ManagedIdentity.IsPresent AccessTokens = $AccessTokens } - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay.psm1 index bc3d81d905..45ae0c0e68 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay/MSFT_IntuneDeviceManagementEnrollmentAndroidGooglePlay.psm1 @@ -489,9 +489,7 @@ function Export-TargetResource } $Script:exportedInstance = $config - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceRemediation/MSFT_IntuneDeviceRemediation.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceRemediation/MSFT_IntuneDeviceRemediation.psm1 index a78ac5712a..cb643e7895 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceRemediation/MSFT_IntuneDeviceRemediation.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceRemediation/MSFT_IntuneDeviceRemediation.psm1 @@ -830,8 +830,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DetectionScriptParameters) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -892,22 +890,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DetectionScriptParameters) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DetectionScriptParameters' -IsCIMArray:$True - } - if ($Results.RemediationScriptParameters) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RemediationScriptParameters' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = (Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true).Replace("''", "'") - $currentDSCBlock = [Regex]::Replace($currentDSCBlock, "Assignment = '\r\n ", 'Assignment = ') - $currentDSCBlock = $currentDSCBlock.Replace("RunSchedule = '", 'RunSchedule = ').Replace("}'", '}') - $currentDSCBlock = [Regex]::Replace($currentDSCBlock, "\r\n '", '') - } + -Credential $Credential ` + -NoEscape @('DetectionScriptParameters', 'RemediationScriptParameters', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionMacOS/MSFT_IntuneDiskEncryptionMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionMacOS/MSFT_IntuneDiskEncryptionMacOS.psm1 index 0f686195a6..cd991d370f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionMacOS/MSFT_IntuneDiskEncryptionMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionMacOS/MSFT_IntuneDiskEncryptionMacOS.psm1 @@ -715,8 +715,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -733,11 +731,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionPDEPolicyWindows10/MSFT_IntuneDiskEncryptionPDEPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionPDEPolicyWindows10/MSFT_IntuneDiskEncryptionPDEPolicyWindows10.psm1 index 2c11642b5c..ac04d2360e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionPDEPolicyWindows10/MSFT_IntuneDiskEncryptionPDEPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionPDEPolicyWindows10/MSFT_IntuneDiskEncryptionPDEPolicyWindows10.psm1 @@ -608,8 +608,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -628,12 +626,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionWindows10/MSFT_IntuneDiskEncryptionWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionWindows10/MSFT_IntuneDiskEncryptionWindows10.psm1 index fa43d4de59..2b0661d818 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionWindows10/MSFT_IntuneDiskEncryptionWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDiskEncryptionWindows10/MSFT_IntuneDiskEncryptionWindows10.psm1 @@ -1385,8 +1385,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -1405,12 +1403,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux.psm1 index 9931623362..89b9198b65 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux/MSFT_IntuneEndpointDetectionAndResponsePolicyLinux.psm1 @@ -586,8 +586,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -606,12 +604,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS.psm1 index f140d4822b..dc7768a098 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS/MSFT_IntuneEndpointDetectionAndResponsePolicyMacOS.psm1 @@ -586,8 +586,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -606,12 +604,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10.psm1 index 5ad4f2487d..da387b3a9d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10/MSFT_IntuneEndpointDetectionAndResponsePolicyWindows10.psm1 @@ -626,9 +626,7 @@ function Export-TargetResource } $Script:exportedInstance = $policy - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($Results.Assignments) { @@ -647,12 +645,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog.psm1 index 7c8a5b6c3b..408dc07ce9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog/MSFT_IntuneExploitProtectionPolicyWindows10SettingCatalog.psm1 @@ -569,9 +569,7 @@ function Export-TargetResource } $Script:exportedInstance = $policy - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($Results.Assignments) { @@ -590,12 +588,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallPolicyWindows10/MSFT_IntuneFirewallPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallPolicyWindows10/MSFT_IntuneFirewallPolicyWindows10.psm1 index 2bce4bc977..224e055b73 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallPolicyWindows10/MSFT_IntuneFirewallPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallPolicyWindows10/MSFT_IntuneFirewallPolicyWindows10.psm1 @@ -1721,8 +1721,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -1741,12 +1739,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesHyperVPolicyWindows10/MSFT_IntuneFirewallRulesHyperVPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesHyperVPolicyWindows10/MSFT_IntuneFirewallRulesHyperVPolicyWindows10.psm1 index a87db4c186..ea4513640a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesHyperVPolicyWindows10/MSFT_IntuneFirewallRulesHyperVPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesHyperVPolicyWindows10/MSFT_IntuneFirewallRulesHyperVPolicyWindows10.psm1 @@ -578,8 +578,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.FirewallRuleName) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -612,16 +610,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.FirewallRuleName) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallRuleName' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('FirewallRuleName', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10/MSFT_IntuneFirewallRulesPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10/MSFT_IntuneFirewallRulesPolicyWindows10.psm1 index 59144e49e6..1b40037291 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10/MSFT_IntuneFirewallRulesPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10/MSFT_IntuneFirewallRulesPolicyWindows10.psm1 @@ -594,8 +594,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.FirewallRuleName) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -628,16 +626,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.FirewallRuleName) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallRuleName' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('FirewallRuleName', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr.psm1 index bb70bb6da3..3c2c3697d3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr/MSFT_IntuneFirewallRulesPolicyWindows10ConfigMgr.psm1 @@ -580,8 +580,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.FirewallRuleName) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -614,16 +612,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.FirewallRuleName) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FirewallRuleName' -IsCIMArray:$True - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('FirewallRuleName', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsMacOSLobApp/MSFT_IntuneMobileAppsMacOSLobApp.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsMacOSLobApp/MSFT_IntuneMobileAppsMacOSLobApp.psm1 index 37398c96b2..834f2d6533 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsMacOSLobApp/MSFT_IntuneMobileAppsMacOSLobApp.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsMacOSLobApp/MSFT_IntuneMobileAppsMacOSLobApp.psm1 @@ -831,9 +831,7 @@ function Export-TargetResource } $Script:exportedInstance = $config - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params #region complex types if ($null -ne $Results.Categories) @@ -924,34 +922,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - #region complex types - if ($null -ne $Results.Categories) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Categories' -IsCIMArray:$true - } - - if ($null -ne $Results.ChildApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ChildApps' -IsCIMArray:$true - } - - if ($null -ne $Results.LargeIcon) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'LargeIcon' -IsCIMArray:$false - } - - if ($null -ne $Results.MinimumSupportedOperatingSystem) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'MinimumSupportedOperatingSystem' -IsCIMArray:$false - } - - if ($null -ne $Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #endregion complex types + -Credential $Credential ` + -NoEscape @('Categories', 'ChildApps', 'LargeIcon', 'MinimumSupportedOperatingSystem', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp.psm1 index 20d6c03aa7..c64079a75f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp/MSFT_IntuneMobileAppsWindowsOfficeSuiteApp.psm1 @@ -890,9 +890,7 @@ function Export-TargetResource } $Script:exportedInstance = $config - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params #region complex types if ($null -ne $Results.Categories) @@ -967,29 +965,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - #region complex types - if ($null -ne $Results.Categories) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Categories' -IsCIMArray:$true - } - - if ($null -ne $Results.ExcludedApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExcludedApps' -IsCIMArray:$false - } - - # if ($null -ne $Results.LargeIcon) - # { - # $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'LargeIcon' -IsCIMArray:$false - # } - - if ($null -ne $Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #endregion complex types + -Credential $Credential ` + -NoEscape @('Categories', 'ExcludedApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileThreatDefenseConnector/MSFT_IntuneMobileThreatDefenseConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileThreatDefenseConnector/MSFT_IntuneMobileThreatDefenseConnector.psm1 index 82dda55132..45e67dd791 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileThreatDefenseConnector/MSFT_IntuneMobileThreatDefenseConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileThreatDefenseConnector/MSFT_IntuneMobileThreatDefenseConnector.psm1 @@ -607,8 +607,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntunePolicySets/MSFT_IntunePolicySets.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntunePolicySets/MSFT_IntunePolicySets.psm1 index 5b6a30ce6a..291d32f074 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntunePolicySets/MSFT_IntunePolicySets.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntunePolicySets/MSFT_IntunePolicySets.psm1 @@ -592,8 +592,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -622,15 +620,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - if ($Results.Items) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Items' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments', 'Items') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleAssignment/MSFT_IntuneRoleAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleAssignment/MSFT_IntuneRoleAssignment.psm1 index a4dac04c64..99afb20d33 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleAssignment/MSFT_IntuneRoleAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleAssignment/MSFT_IntuneRoleAssignment.psm1 @@ -681,8 +681,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleDefinition/MSFT_IntuneRoleDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleDefinition/MSFT_IntuneRoleDefinition.psm1 index e7d09130b7..61c80e2966 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleDefinition/MSFT_IntuneRoleDefinition.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleDefinition/MSFT_IntuneRoleDefinition.psm1 @@ -549,8 +549,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleScopeTag/MSFT_IntuneRoleScopeTag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleScopeTag/MSFT_IntuneRoleScopeTag.psm1 index 8875b63e68..2908e77cea 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleScopeTag/MSFT_IntuneRoleScopeTag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneRoleScopeTag/MSFT_IntuneRoleScopeTag.psm1 @@ -512,8 +512,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -532,12 +530,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineDefenderForEndpoint/MSFT_IntuneSecurityBaselineDefenderForEndpoint.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineDefenderForEndpoint/MSFT_IntuneSecurityBaselineDefenderForEndpoint.psm1 index 0e8a3d60b7..29a8fd5b30 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineDefenderForEndpoint/MSFT_IntuneSecurityBaselineDefenderForEndpoint.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineDefenderForEndpoint/MSFT_IntuneSecurityBaselineDefenderForEndpoint.psm1 @@ -1110,8 +1110,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DeviceSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -1158,20 +1156,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DeviceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceSettings' -IsCIMArray:$False - } - if ($Results.UserSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserSettings' -IsCIMArray:$False - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('DeviceSettings', 'UserSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise.psm1 index 0c03cc9cf9..69c95d0bc7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise/MSFT_IntuneSecurityBaselineMicrosoft365AppsForEnterprise.psm1 @@ -1030,8 +1030,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DeviceSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -1078,20 +1076,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DeviceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceSettings' -IsCIMArray:$False - } - if ($Results.UserSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserSettings' -IsCIMArray:$False - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('DeviceSettings', 'UserSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoftEdge/MSFT_IntuneSecurityBaselineMicrosoftEdge.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoftEdge/MSFT_IntuneSecurityBaselineMicrosoftEdge.psm1 index e3ffe104d3..74ee6ec483 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoftEdge/MSFT_IntuneSecurityBaselineMicrosoftEdge.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineMicrosoftEdge/MSFT_IntuneSecurityBaselineMicrosoftEdge.psm1 @@ -890,8 +890,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -910,12 +908,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineWindows10/MSFT_IntuneSecurityBaselineWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineWindows10/MSFT_IntuneSecurityBaselineWindows10.psm1 index a648cdca11..be86364ac9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineWindows10/MSFT_IntuneSecurityBaselineWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSecurityBaselineWindows10/MSFT_IntuneSecurityBaselineWindows10.psm1 @@ -2532,8 +2532,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.DeviceSettings) { $complexMapping = @( @@ -2594,20 +2592,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DeviceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DeviceSettings' -IsCIMArray:$False - } - if ($Results.UserSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'UserSettings' -IsCIMArray:$False - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('DeviceSettings', 'UserSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10.psm1 index dd2ed165bd..ee4875daea 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10/MSFT_IntuneSettingCatalogASRRulesPolicyWindows10.psm1 @@ -1087,9 +1087,7 @@ function Export-TargetResource } $Script:exportedInstance = $policy - $Results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($Results.Assignments) { @@ -1108,12 +1106,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogCustomPolicyWindows10/MSFT_IntuneSettingCatalogCustomPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogCustomPolicyWindows10/MSFT_IntuneSettingCatalogCustomPolicyWindows10.psm1 index 112043d8d5..ce58cfdbb0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogCustomPolicyWindows10/MSFT_IntuneSettingCatalogCustomPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogCustomPolicyWindows10/MSFT_IntuneSettingCatalogCustomPolicyWindows10.psm1 @@ -609,8 +609,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.Settings) { @@ -701,16 +699,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('Settings', 'Assignments') - if ($Results.Settings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Settings' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner.psm1 index ed1149a178..8cabd1665b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner/MSFT_IntuneTrustedRootCertificateAndroidDeviceOwner.psm1 @@ -578,8 +578,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -598,17 +596,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidEnterprise/MSFT_IntuneTrustedRootCertificateAndroidEnterprise.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidEnterprise/MSFT_IntuneTrustedRootCertificateAndroidEnterprise.psm1 index 40654bdbf7..41846a6146 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidEnterprise/MSFT_IntuneTrustedRootCertificateAndroidEnterprise.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidEnterprise/MSFT_IntuneTrustedRootCertificateAndroidEnterprise.psm1 @@ -577,8 +577,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -597,17 +595,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidWork/MSFT_IntuneTrustedRootCertificateAndroidWork.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidWork/MSFT_IntuneTrustedRootCertificateAndroidWork.psm1 index 06cad0525f..f2956768ab 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidWork/MSFT_IntuneTrustedRootCertificateAndroidWork.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateAndroidWork/MSFT_IntuneTrustedRootCertificateAndroidWork.psm1 @@ -578,8 +578,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -598,17 +596,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateIOS/MSFT_IntuneTrustedRootCertificateIOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateIOS/MSFT_IntuneTrustedRootCertificateIOS.psm1 index a137de6164..e529e20bee 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateIOS/MSFT_IntuneTrustedRootCertificateIOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneTrustedRootCertificateIOS/MSFT_IntuneTrustedRootCertificateIOS.psm1 @@ -579,8 +579,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -599,17 +597,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner.psm1 index 40de048354..a1c9a1dc44 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner/MSFT_IntuneVPNConfigurationPolicyAndroidDeviceOwner.psm1 @@ -841,8 +841,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -936,42 +934,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.servers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "servers" -isCIMArray:$True - } - - if ($Results.proxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "proxyServer" -isCIMArray:$True - } - - if ($Results.customData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customData" -isCIMArray:$True - } - - if ($Results.customKeyValueData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customKeyValueData" -isCIMArray:$True - } - - if ($Results.targetedMobileApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "targetedMobileApps" -isCIMArray:$True - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('servers', 'proxyServer', 'customData', 'customKeyValueData', 'targetedMobileApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise.psm1 index be32c47986..f9552e9a62 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise/MSFT_IntuneVPNConfigurationPolicyAndroidEnterprise.psm1 @@ -841,8 +841,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -936,42 +934,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.servers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "servers" -isCIMArray:$True - } - - if ($Results.proxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "proxyServer" -isCIMArray:$True - } - - if ($Results.customData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customData" -isCIMArray:$True - } - - if ($Results.customKeyValueData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customKeyValueData" -isCIMArray:$True - } - - if ($Results.targetedMobileApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "targetedMobileApps" -isCIMArray:$True - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('servers', 'proxyServer', 'customData', 'customKeyValueData', 'targetedMobileApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidWork/MSFT_IntuneVPNConfigurationPolicyAndroidWork.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidWork/MSFT_IntuneVPNConfigurationPolicyAndroidWork.psm1 index 2a700246c2..af14db28ae 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidWork/MSFT_IntuneVPNConfigurationPolicyAndroidWork.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyAndroidWork/MSFT_IntuneVPNConfigurationPolicyAndroidWork.psm1 @@ -841,9 +841,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -936,42 +933,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.servers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "servers" -isCIMArray:$True - } - - if ($Results.proxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "proxyServer" -isCIMArray:$True - } - - if ($Results.customData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customData" -isCIMArray:$True - } - - if ($Results.customKeyValueData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customKeyValueData" -isCIMArray:$True - } - - if ($Results.targetedMobileApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "targetedMobileApps" -isCIMArray:$True - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('servers', 'proxyServer', 'customData', 'customKeyValueData', 'targetedMobileApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyIOS/MSFT_IntuneVPNConfigurationPolicyIOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyIOS/MSFT_IntuneVPNConfigurationPolicyIOS.psm1 index f09c02cce3..62ceca3d57 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyIOS/MSFT_IntuneVPNConfigurationPolicyIOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneVPNConfigurationPolicyIOS/MSFT_IntuneVPNConfigurationPolicyIOS.psm1 @@ -1053,8 +1053,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -1163,47 +1161,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.server) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "server" -isCIMArray:$True - } - - if ($Results.onDemandRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "onDemandRules" -isCIMArray:$True - } - - if ($Results.proxyServer) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "proxyServer" -isCIMArray:$True - } - - if ($Results.customData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customData" -isCIMArray:$True - } - - if ($Results.customKeyValueData) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "customKeyValueData" -isCIMArray:$True - } - - if ($Results.targetedMobileApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "targetedMobileApps" -isCIMArray:$True - } - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('server', 'onDemandRules', 'proxyServer', 'customData', 'customKeyValueData', 'targetedMobileApps', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator.psm1 index 490d55da04..f19c899bb8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator/MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministrator.psm1 @@ -646,8 +646,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) @@ -667,18 +665,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner.psm1 index 28d21370f8..b3cc4f693f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseDeviceOwner.psm1 @@ -735,8 +735,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -755,17 +753,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile.psm1 index 8f3751b4b6..ee3740e9d8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile/MSFT_IntuneWifiConfigurationPolicyAndroidEnterpriseWorkProfile.psm1 @@ -643,8 +643,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -663,17 +661,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidForWork/MSFT_IntuneWifiConfigurationPolicyAndroidForWork.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidForWork/MSFT_IntuneWifiConfigurationPolicyAndroidForWork.psm1 index 10372dd382..3c4ed95c5b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidForWork/MSFT_IntuneWifiConfigurationPolicyAndroidForWork.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidForWork/MSFT_IntuneWifiConfigurationPolicyAndroidForWork.psm1 @@ -642,8 +642,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -662,17 +660,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject.psm1 index 4b2be62c0c..32042c25d7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject/MSFT_IntuneWifiConfigurationPolicyAndroidOpenSourceProject.psm1 @@ -668,8 +668,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -688,17 +686,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyIOS/MSFT_IntuneWifiConfigurationPolicyIOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyIOS/MSFT_IntuneWifiConfigurationPolicyIOS.psm1 index 7b62958ff3..4a3ec6a684 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyIOS/MSFT_IntuneWifiConfigurationPolicyIOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyIOS/MSFT_IntuneWifiConfigurationPolicyIOS.psm1 @@ -723,8 +723,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -743,17 +741,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyMacOS/MSFT_IntuneWifiConfigurationPolicyMacOS.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyMacOS/MSFT_IntuneWifiConfigurationPolicyMacOS.psm1 index 0cdaa0b8c8..0f015144f4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyMacOS/MSFT_IntuneWifiConfigurationPolicyMacOS.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyMacOS/MSFT_IntuneWifiConfigurationPolicyMacOS.psm1 @@ -709,8 +709,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -729,17 +727,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyWindows10/MSFT_IntuneWifiConfigurationPolicyWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyWindows10/MSFT_IntuneWifiConfigurationPolicyWindows10.psm1 index 690155a0c1..a844f277ac 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyWindows10/MSFT_IntuneWifiConfigurationPolicyWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWifiConfigurationPolicyWindows10/MSFT_IntuneWifiConfigurationPolicyWindows10.psm1 @@ -752,8 +752,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { @@ -772,17 +770,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.Assignments) - { - $isCIMArray = $false - if ($Results.Assignments.getType().Fullname -like '*[[\]]') - { - $isCIMArray = $true - } - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$isCIMArray - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1 index a98a709c6e..fb9515656b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1 @@ -709,8 +709,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.EnrollmentStatusScreenSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -755,22 +753,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.EnrollmentStatusScreenSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnrollmentStatusScreenSettings' -IsCIMArray:$False - } - if ($Results.OutOfBoxExperienceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OutOfBoxExperienceSettings' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace(" ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace("`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('EnrollmentStatusScreenSettings', 'OutOfBoxExperienceSettings', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 index 0e4bc38434..a3c63d5940 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 @@ -705,8 +705,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.EnrollmentStatusScreenSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -751,22 +749,9 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.EnrollmentStatusScreenSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnrollmentStatusScreenSettings' -IsCIMArray:$False - } - if ($Results.OutOfBoxExperienceSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'OutOfBoxExperienceSettings' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace(" ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace("`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('EnrollmentStatusScreenSettings', 'OutOfBoxExperienceSettings', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled.psm1 index b936dc2765..56cab47824 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled/MSFT_IntuneWindowsInformationProtectionPolicyWindows10MdmEnrolled.psm1 @@ -989,8 +989,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ( $null -ne $Results.DataRecoveryCertificate) { @@ -1190,58 +1188,12 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.DataRecoveryCertificate) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'DataRecoveryCertificate' -IsCIMArray:$False - } - if ($Results.EnterpriseInternalProxyServers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseInternalProxyServers' -IsCIMArray:$True - } - if ($Results.EnterpriseIPRanges) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseIPRanges' -IsCIMArray:$True - } - if ($Results.EnterpriseNetworkDomainNames) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseNetworkDomainNames' -IsCIMArray:$True - } - if ($Results.EnterpriseProtectedDomainNames) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseProtectedDomainNames' -IsCIMArray:$True - } - if ($Results.EnterpriseProxiedDomains) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseProxiedDomains' -IsCIMArray:$True - } - if ($Results.EnterpriseProxyServers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EnterpriseProxyServers' -IsCIMArray:$True - } - if ($Results.ExemptApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExemptApps' -IsCIMArray:$True - } - if ($Results.NeutralDomainResources) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'NeutralDomainResources' -IsCIMArray:$True - } - if ($Results.ProtectedApps) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ProtectedApps' -IsCIMArray:$True - } - if ($Results.SmbAutoEncryptedFileExtensions) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'SmbAutoEncryptedFileExtensions' -IsCIMArray:$True - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('DataRecoveryCertificate', 'EnterpriseInternalProxyServers', 'EnterpriseIPRanges', + 'EnterpriseNetworkDomainNames', 'EnterpriseProtectedDomainNames', 'EnterpriseProxiedDomains', + 'EnterpriseProxyServers', 'ExemptApps', 'NeutralDomainResources', 'ProtectedApps', + 'SmbAutoEncryptedFileExtensions', 'Assignments') + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10.psm1 index e68e13478c..e9e09a8b32 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10.psm1 @@ -562,8 +562,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($Results.Assignments) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementConfigurationPolicyAssignments @@ -580,11 +578,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10.psm1 index f344407386..c5625a8814 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessFeatureUpdateProfileWindows10.psm1 @@ -802,8 +802,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ( $null -ne $Results.RolloutSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -834,18 +832,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.RolloutSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RolloutSettings' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('RolloutSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10.psm1 index 737c1e563c..736597cee3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10.psm1 @@ -556,8 +556,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ExpeditedUpdateSettings) { $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString ` @@ -590,16 +588,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ExpeditedUpdateSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExpeditedUpdateSettings' -IsCIMArray:$False - } - - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('ExpeditedUpdateSettings', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1 index f90db0d1f3..8f9dbcede0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10.psm1 @@ -1138,8 +1138,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.InstallationSchedule) { @@ -1172,18 +1170,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.InstallationSchedule) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'InstallationSchedule' -IsCIMArray:$False - } - if ($Results.Assignments) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Assignments' -IsCIMArray:$true - } - #removing trailing commas and semi colons between items of an array of cim instances added by Convert-DSCStringParamToVariable - $currentDSCBlock = $currentDSCBlock.replace( " ,`r`n" , " `r`n" ) - $currentDSCBlock = $currentDSCBlock.replace( "`r`n;`r`n" , "`r`n" ) + -Credential $Credential ` + -NoEscape @('InstallationSchedule', 'Assignments') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 index 6b5c348513..fe3cdea2a2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 @@ -387,11 +387,8 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365ExternalConnection/MSFT_O365ExternalConnection.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365ExternalConnection/MSFT_O365ExternalConnection.psm1 index 2b8e1597e2..211f12dd35 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365ExternalConnection/MSFT_O365ExternalConnection.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365ExternalConnection/MSFT_O365ExternalConnection.psm1 @@ -416,8 +416,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 index 3b2e779975..39d015cab3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 @@ -622,8 +622,6 @@ function Export-TargetResource } $Script:exportedInstance = $group $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 index 3370394730..d5a76cfb80 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 @@ -312,12 +312,9 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $dscContent = '' if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 index aa30e5e426..42e5957451 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 @@ -1099,10 +1099,7 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $dscContent = '' - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365SearchAndIntelligenceConfigurations/MSFT_O365SearchAndIntelligenceConfigurations.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365SearchAndIntelligenceConfigurations/MSFT_O365SearchAndIntelligenceConfigurations.psm1 index 77ffde8602..066f06425a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_O365SearchAndIntelligenceConfigurations/MSFT_O365SearchAndIntelligenceConfigurations.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365SearchAndIntelligenceConfigurations/MSFT_O365SearchAndIntelligenceConfigurations.psm1 @@ -439,12 +439,9 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $dscContent = '' if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 index 0911739aed..d214ac4ac4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 @@ -668,15 +668,12 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ([System.String]::IsNullOrEmpty($Results.GrooveBlockOption)) { $Results.Remove('GrooveBlockOption') | Out-Null } $dscContent = '' - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 index 42338c14d7..144faea012 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPAdminDLPPolicy/MSFT_PPAdminDLPPolicy.psm1 @@ -465,8 +465,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 index e61adac2d2..8e70366922 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPDLPPolicyConnectorConfigurations/MSFT_PPDLPPolicyConnectorConfigurations.psm1 @@ -444,8 +444,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ConnectorActionConfigurations) { @@ -473,11 +471,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ConnectorActionConfigurations) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ConnectorActionConfigurations' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('ConnectorActionConfigurations') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 index d942c3465d..15f1e1ffcc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppPolicyUrlPatterns/MSFT_PPPowerAppPolicyUrlPatterns.psm1 @@ -430,8 +430,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.RuleSet) { @@ -451,11 +449,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.RuleSet) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'RuleSet' -IsCIMArray:$true - } + -Credential $Credential ` + -NoEscape @('RuleSet') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 index 6eba5c629e..118e6f1461 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 @@ -425,8 +425,6 @@ function Export-TargetResource ApplicationSecret = $ApplicationSecret } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 index ea62755bb2..33faa5e31a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantIsolationSettings/MSFT_PPTenantIsolationSettings.psm1 @@ -702,20 +702,13 @@ function Export-TargetResource $Results.Remove('Rules') | Out-Null } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('Rules') - if ($null -ne $Results.Rules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Rules' ` - -IsCIMArray:$True - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 index 54718c4097..11bd1daac8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 @@ -943,11 +943,8 @@ function Export-TargetResource ApplicationSecret = $ApplicationSecret } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerBucket/MSFT_PlannerBucket.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerBucket/MSFT_PlannerBucket.psm1 index c6debb4856..a021df191c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerBucket/MSFT_PlannerBucket.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerBucket/MSFT_PlannerBucket.psm1 @@ -368,8 +368,6 @@ function Export-TargetResource ManagedIdentity = $ManagedIdentity.IsPresent } $results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerPlan/MSFT_PlannerPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerPlan/MSFT_PlannerPlan.psm1 index 16830b0caa..067e34c96c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerPlan/MSFT_PlannerPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerPlan/MSFT_PlannerPlan.psm1 @@ -404,8 +404,6 @@ function Export-TargetResource Write-Host " [$j/$($plans.Length)] $($plan.Title)" $results = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1 index a4cd0a15e6..c0cf761fbf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PlannerTask/MSFT_PlannerTask.psm1 @@ -757,8 +757,7 @@ function Export-TargetResource { $result.Remove('AssignedUsers') | Out-Null } - $result = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Result + if ($result.Attachments.Length -gt 0) { $result.Attachments = Convert-M365DSCPlannerTaskAssignmentToCIMArray -Attachments $result.Attachments @@ -788,18 +787,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $result ` - -Credential $Credential - - if ($result.Attachments.Length -gt 0) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Attachments' - } - if ($result.Checklist.Length -gt 0) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Checklist' - } + -Credential $Credential ` + -NoEscape @('Attachments', 'Checklist') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 index 1f84087395..11c7a99f29 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 @@ -365,8 +365,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Workload $policy.Workload - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelPolicy/MSFT_SCAutoSensitivityLabelPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelPolicy/MSFT_SCAutoSensitivityLabelPolicy.psm1 index dc659bae0e..13cbacbeb9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelPolicy/MSFT_SCAutoSensitivityLabelPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelPolicy/MSFT_SCAutoSensitivityLabelPolicy.psm1 @@ -854,8 +854,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Name $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelRule/MSFT_SCAutoSensitivityLabelRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelRule/MSFT_SCAutoSensitivityLabelRule.psm1 index 8460c67ed5..0155f89f80 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelRule/MSFT_SCAutoSensitivityLabelRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAutoSensitivityLabelRule/MSFT_SCAutoSensitivityLabelRule.psm1 @@ -1194,26 +1194,13 @@ function Export-TargetResource $Results.HeaderMatchesPatterns = ConvertTo-HeadersMatchesPatternString -Patterns $Results.HeaderMatchesPatterns } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('ContentContainsSensitiveInformation', 'ExceptIfContentContainsSensitiveInformation', 'HeaderMatchesPatterns') - if ($null -ne $Results.ContentContainsSensitiveInformation ) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ContentContainsSensitiveInformation' -IsCIMArray $IsSitCIMArray - } - if ($null -ne $Results.ExceptIfContentContainsSensitiveInformation ) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExceptIfContentContainsSensitiveInformation' -IsCIMArray $IsCIMArray - } - if ($null -ne $Results.HeaderMatchesPatterns) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'HeaderMatchesPatterns' -IsCIMArray $false - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 index 6420562be2..1592752345 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 @@ -518,8 +518,6 @@ function Export-TargetResource -Name $policy.Name ` -Case $case.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 index ef9f56b911..2d8b0ee8a8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 @@ -411,8 +411,6 @@ function Export-TargetResource $Results = Get-TargetResource @PSBoundParameters ` -Name $Rule.Name ` -Policy $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 index a7428b5b52..a290aa6ce1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 @@ -405,8 +405,6 @@ function Export-TargetResource $Script:exportedInstance = $Case $Results = Get-TargetResource @PSBoundParameters -Name $Case.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $dscContent += Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` @@ -423,8 +421,6 @@ function Export-TargetResource { Write-Host " GDPR: [$i/$($Cases.Count)] $($Case.Name)" -NoNewline $Results = Get-TargetResource @PSBoundParameters -Name $Case.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 index 983dba9f12..bdf5a0d863 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 @@ -550,8 +550,6 @@ function Export-TargetResource $Script:exportedInstance = $search $Results = Get-TargetResource @PSBoundParameters -Name $search.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $dscContent += Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` @@ -585,8 +583,7 @@ function Export-TargetResource } Write-Host " |---[$i/$($searches.Name.Count)] $($search.Name)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 index 36aaea95cf..8ff3608aa5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 @@ -580,8 +580,6 @@ function Export-TargetResource } $Script:exportedInstance = $action $Results = Get-TargetResource @PSBoundParameters @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` @@ -625,8 +623,7 @@ function Export-TargetResource $Params.Action = 'Retention' } $Results = Get-TargetResource @PSBoundParameters @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $dscContent += Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 index dc98e40394..70d1422644 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 @@ -565,17 +565,12 @@ function Export-TargetResource $Script:exportedInstance = $tag $Results = Get-TargetResource @PSBoundParameters -Name $tag.Name $Results.FilePlanProperty = Get-SCFilePlanPropertyAsString $Results.FilePlanProperty - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.FilePlanProperty) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'FilePlanProperty' - } + -Credential $Credential ` + -NoEscape @('FilePlanProperty') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 index b1838b303d..2e20b467d2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 @@ -974,8 +974,6 @@ function Export-TargetResource Write-Host " |---[$i/$($policies.Count)] $($policy.Name)" -NoNewline $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Name $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 index 1d16bbf1b8..bc4e098b75 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 @@ -1518,22 +1518,13 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential + -Credential $Credential ` + -NoEscape @('ContentContainsSensitiveInformation', 'ExceptIfContentContainsSensitiveInformation') - if ($null -ne $Results.ContentContainsSensitiveInformation ) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ContentContainsSensitiveInformation' -IsCIMArray $IsSitCIMArray - } - if ($null -ne $Results.ExceptIfContentContainsSensitiveInformation ) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ExceptIfContentContainsSensitiveInformation' -IsCIMArray $IsCIMArray - } $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 index 35e85c6136..cc60f1d53f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 @@ -391,8 +391,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Name $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessRule/MSFT_SCDeviceConditionalAccessRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessRule/MSFT_SCDeviceConditionalAccessRule.psm1 index dc887d1bf9..9ffcdafe98 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessRule/MSFT_SCDeviceConditionalAccessRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessRule/MSFT_SCDeviceConditionalAccessRule.psm1 @@ -1042,8 +1042,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 index ed9e1de087..191c79f31b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 @@ -393,8 +393,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Name $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationRule/MSFT_SCDeviceConfigurationRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationRule/MSFT_SCDeviceConfigurationRule.psm1 index 0718875772..9182f7e9fa 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationRule/MSFT_SCDeviceConfigurationRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationRule/MSFT_SCDeviceConfigurationRule.psm1 @@ -1027,8 +1027,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 index 0b2b70ffa6..dd4e1ef5b8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 @@ -362,8 +362,6 @@ function Export-TargetResource $Script:exportedInstance = $Property $Results = Get-TargetResource @PSBoundParameters -Name $Property.DisplayName - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 index 5dd84e82ba..af58b6337f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 @@ -364,8 +364,6 @@ function Export-TargetResource $Script:exportedInstance = $Property $Results = Get-TargetResource @PSBoundParameters -Name $Property.DisplayName - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 index 5fb975d4dd..f99e5c5f5d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 @@ -389,8 +389,6 @@ function Export-TargetResource $Script:exportedInstance = $Property $Results = Get-TargetResource @PSBoundParameters -Name $Property.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 index 5caf4b1160..229e640442 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 @@ -363,8 +363,6 @@ function Export-TargetResource $Script:exportedInstance = $Property $Results = Get-TargetResource @PSBoundParameters -Name $Property.DisplayName - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 index 422737c0d0..3ce8b39b14 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 @@ -363,8 +363,6 @@ function Export-TargetResource $Script:exportedInstance = $Property $Results = Get-TargetResource @PSBoundParameters -Name $Property.DisplayName - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 index 1c787d68db..f617b28d30 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 @@ -392,8 +392,6 @@ function Export-TargetResource $Results = Get-TargetResource @PSBoundParameters ` -Name $Property.DisplayName ` -Category $parent.DisplayName - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskEntityList/MSFT_SCInsiderRiskEntityList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskEntityList/MSFT_SCInsiderRiskEntityList.psm1 index 2248c4e427..8b153fbae1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskEntityList/MSFT_SCInsiderRiskEntityList.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskEntityList/MSFT_SCInsiderRiskEntityList.psm1 @@ -1113,7 +1113,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($null -ne $Results.Domains -and $Results.Domains.Length -gt 0 -and ` ($Results.ListType -eq 'CustomDomainLists' -or $Results.ListType -eq 'DomainLists')) { @@ -1126,26 +1125,13 @@ function Export-TargetResource $Results.Sites = ConvertTo-M365DSCSCInsiderRiskSiteToString -Sites $Results.Sites } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.Domains -and ` - ($Results.ListType -eq 'CustomDomainLists' -or $Results.ListType -eq 'DomainLists')) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Domains' -IsCIMArray $true - } - - if ($null -ne $Results.Sites -and ` - ($Results.ListType -eq 'CustomSiteLists' -or $Results.ListType -eq 'SiteLists')) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'Sites' -IsCIMArray $true - } + -Credential $Credential ` + -NoEscape @('Domains', 'Sites') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskPolicy/MSFT_SCInsiderRiskPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskPolicy/MSFT_SCInsiderRiskPolicy.psm1 index 584a732ad9..bcf2365adf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskPolicy/MSFT_SCInsiderRiskPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCInsiderRiskPolicy/MSFT_SCInsiderRiskPolicy.psm1 @@ -2740,8 +2740,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCLabelPolicy/MSFT_SCLabelPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCLabelPolicy/MSFT_SCLabelPolicy.psm1 index cfa1b4179d..98d2feef56 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCLabelPolicy/MSFT_SCLabelPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCLabelPolicy/MSFT_SCLabelPolicy.psm1 @@ -878,19 +878,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.AdvancedSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AdvancedSettings' ` - -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('AdvancedSettings') Write-Host $Global:M365DSCEmojiGreenCheckMark $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCPolicyConfig/MSFT_SCPolicyConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCPolicyConfig/MSFT_SCPolicyConfig.psm1 index 73129306fd..ddbfc85e45 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCPolicyConfig/MSFT_SCPolicyConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCPolicyConfig/MSFT_SCPolicyConfig.psm1 @@ -1302,7 +1302,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } $Results = Get-TargetResource @Params - if ($null -ne $Results.BusinessJustificationList) { $Results.BusinessJustificationList = ConvertTo-BusinessJustificationListString -ObjectHash $Results.BusinessJustificationList @@ -1363,98 +1362,15 @@ function Export-TargetResource $Results.QuarantineParameters = ConvertTo-QuarantineParametersString -ObjectHash $Results.QuarantineParameters } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.QuarantineParameters) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'QuarantineParameters' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.BusinessJustificationList) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'BusinessJustificationList' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.DLPAppGroups) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DLPAppGroups' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.DLPNetworkShareGroups) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DLPNetworkShareGroups' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.DLPPrinterGroups) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DLPPrinterGroups' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.DLPRemovableMediaGroups) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'DLPRemovableMediaGroups' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.SiteGroups) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'SiteGroups' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.UnallowedApp) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'UnallowedApp' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.UnallowedCloudSyncApp) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'UnallowedCloudSyncApp' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.UnallowedBluetoothApp) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'UnallowedBluetoothApp' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.UnallowedBrowser) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'UnallowedBrowser' ` - -IsCIMArray:$true - } - - if ($null -ne $Results.EvidenceStoreSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'EvidenceStoreSettings' ` - -IsCIMArray:$false - } + -Credential $Credential ` + -NoEscape @('QuarantineParameters', 'BusinessJustificationList', 'DLPAppGroups', 'DLPNetworkShareGroups', + 'DLPPrinterGroups', 'DLPRemovableMediaGroups', 'SiteGroups', 'UnallowedApp', 'UnallowedCloudSyncApp', + 'UnallowedBluetoothApp', 'UnallowedBrowser', 'EvidenceStoreSettings') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCProtectionAlert/MSFT_SCProtectionAlert.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCProtectionAlert/MSFT_SCProtectionAlert.psm1 index 29e58bf67b..1ce551a933 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCProtectionAlert/MSFT_SCProtectionAlert.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCProtectionAlert/MSFT_SCProtectionAlert.psm1 @@ -672,8 +672,6 @@ function Export-TargetResource Write-Host " |---[$i/$($totalAlerts)] $($alert.Name)" -NoNewline $Script:exportedInstance = $alert $Results = Get-TargetResource @PSBoundParameters -Name $Alert.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRecordReviewNotificationTemplateConfig/MSFT_SCRecordReviewNotificationTemplateConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRecordReviewNotificationTemplateConfig/MSFT_SCRecordReviewNotificationTemplateConfig.psm1 index 0c53f3c54a..8539c5d87e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRecordReviewNotificationTemplateConfig/MSFT_SCRecordReviewNotificationTemplateConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRecordReviewNotificationTemplateConfig/MSFT_SCRecordReviewNotificationTemplateConfig.psm1 @@ -348,8 +348,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 index c972c13b56..2600666f06 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 @@ -1092,8 +1092,6 @@ function Export-TargetResource $Script:exportedInstance = $policy $Results = Get-TargetResource @PSBoundParameters -Name $policy.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 index 6ac1ecce7a..6f6633d8d6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 @@ -603,8 +603,6 @@ function Export-TargetResource { $Results.Remove('ExpirationDateOption') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionEventType/MSFT_SCRetentionEventType.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionEventType/MSFT_SCRetentionEventType.psm1 index f74a1393ea..6475034cbd 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionEventType/MSFT_SCRetentionEventType.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionEventType/MSFT_SCRetentionEventType.psm1 @@ -380,8 +380,6 @@ function Export-TargetResource $Script:exportedInstance = $eventType $Results = Get-TargetResource @PSBoundParameters -Name $eventType.Name - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroup/MSFT_SCRoleGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroup/MSFT_SCRoleGroup.psm1 index 517628bec6..ef4ed18cdf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroup/MSFT_SCRoleGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroup/MSFT_SCRoleGroup.psm1 @@ -431,8 +431,6 @@ function Export-TargetResource } $Script:exportedInstance = $RoleGroup $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroupMember/MSFT_SCRoleGroupMember.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroupMember/MSFT_SCRoleGroupMember.psm1 index bf15678b89..81f1c4563c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroupMember/MSFT_SCRoleGroupMember.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRoleGroupMember/MSFT_SCRoleGroupMember.psm1 @@ -416,8 +416,6 @@ function Export-TargetResource } $Script:exportedInstance = $RoleGroup $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSecurityFilter/MSFT_SCSecurityFilter.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSecurityFilter/MSFT_SCSecurityFilter.psm1 index dc60cd9e3e..d6c8fdecf6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSecurityFilter/MSFT_SCSecurityFilter.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSecurityFilter/MSFT_SCSecurityFilter.psm1 @@ -552,8 +552,6 @@ function Export-TargetResource $Results = Get-M365DSCSCMapSecurityFilter -Filter $filter -Credential $Credential -ApplicationId $ApplicationId ` -TenantId $TenantId -CertificateThumbprint $CertificateThumbprint -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 index f612a1a7ac..a6e6ce5f13 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 @@ -1688,32 +1688,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($null -ne $Results.AdvancedSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AdvancedSettings' ` - -IsCIMArray:$True - } - if ($null -ne $Results.LocaleSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'LocaleSettings' ` - -IsCIMArray:$True - } - if ($null -ne $Results.AutoLabelingSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'AutoLabelingSettings' ` - -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('AdvancedSettings', 'LocaleSettings', 'AutoLabelingSettings') Write-Host $Global:M365DSCEmojiGreenCheckMark $dscContent += $currentDSCBlock diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 index 8811df299b..ea4c2bc03e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 @@ -420,8 +420,6 @@ function Export-TargetResource $Results = Get-TargetResource @PSBoundParameters ` -Name $policy.Name ` -Reviewers 'Microsoft365DSC' - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 index ad755078a8..6f21521850 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 @@ -395,8 +395,6 @@ function Export-TargetResource $Results = Get-TargetResource @PSBoundParameters ` -Name $rule.Name ` -Policy $rule.Policy - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCUnifiedAuditLogRetentionPolicy/MSFT_SCUnifiedAuditLogRetentionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCUnifiedAuditLogRetentionPolicy/MSFT_SCUnifiedAuditLogRetentionPolicy.psm1 index 54bb6f8024..73be622128 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SCUnifiedAuditLogRetentionPolicy/MSFT_SCUnifiedAuditLogRetentionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCUnifiedAuditLogRetentionPolicy/MSFT_SCUnifiedAuditLogRetentionPolicy.psm1 @@ -444,8 +444,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params $Results.Remove('Identity') | Out-Null - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 index 3d02a61f7c..02b67df29d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 @@ -539,8 +539,6 @@ function Export-TargetResource $dscContent = '' $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 index b4b2cf069e..0e571b4f62 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 @@ -440,8 +440,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1 index 35fa74917c..32beaf414c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1 @@ -386,11 +386,8 @@ function Export-TargetResource $dscContent = '' $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 index 4e04ecc4ad..f7155edb07 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 @@ -385,8 +385,6 @@ function Export-TargetResource } $dscContent = '' $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 index 9ac76e9940..ffb1ed89d0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 @@ -687,8 +687,6 @@ function Export-TargetResource $Script:exportedInstance = $hub $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOOrgAssetsLibrary/MSFT_SPOOrgAssetsLibrary.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOOrgAssetsLibrary/MSFT_SPOOrgAssetsLibrary.psm1 index 62cd260221..c5b684973e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOOrgAssetsLibrary/MSFT_SPOOrgAssetsLibrary.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOOrgAssetsLibrary/MSFT_SPOOrgAssetsLibrary.psm1 @@ -503,8 +503,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 index a96e8024a9..b38d493297 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 @@ -460,8 +460,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName 'SPOPropertyBag' ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPORetentionLabelsSettings/MSFT_SPORetentionLabelsSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPORetentionLabelsSettings/MSFT_SPORetentionLabelsSettings.psm1 index 30ce946dac..72ae68416a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPORetentionLabelsSettings/MSFT_SPORetentionLabelsSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPORetentionLabelsSettings/MSFT_SPORetentionLabelsSettings.psm1 @@ -345,8 +345,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 index 8d0ac5298a..5c1f4be4e2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 @@ -964,11 +964,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 2) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 index cfd3d78ac8..a9819d0462 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 @@ -652,11 +652,8 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 2) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 index 0b0153d63e..d6fde35a71 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 @@ -865,8 +865,6 @@ function Export-TargetResource { $Results.Remove('RequireAnonymousLinksExpireInDays') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 index 0e036b3634..915388468a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 @@ -983,7 +983,6 @@ function Export-TargetResource { $Script:exportedInstance = $site $Results = Get-TargetResource @Params - if ([System.String]::IsNullOrEmpty($Results.SharingDomainRestrictionMode)) { $Results.Remove('SharingDomainRestrictionMode') | Out-Null @@ -1009,8 +1008,6 @@ function Export-TargetResource $Results.Remove('HubUrl') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 index 608fdea4df..e4b565160b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 @@ -374,16 +374,13 @@ function Export-TargetResource AccessTokens = $AccessTokens } - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ([System.String]::IsNullOrEmpty($Results.AuditFlags)) { $Results.AuditFlags = 'None' } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 index 452cf6e844..6cda7d2e85 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 @@ -519,8 +519,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 index aa9ef5291c..01a2999dc3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 @@ -456,8 +456,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` @@ -485,8 +483,7 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 index 9d3ff9c03f..fc8249e1d4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 @@ -574,8 +574,6 @@ function Export-TargetResource $Results = Get-TargetResource @Params if ($Results.Ensure -eq 'Present') { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteScript/MSFT_SPOSiteScript.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteScript/MSFT_SPOSiteScript.psm1 index 013255de19..62042afbe3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteScript/MSFT_SPOSiteScript.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteScript/MSFT_SPOSiteScript.psm1 @@ -513,8 +513,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 index 7d432498df..8e72d0bde0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 @@ -495,8 +495,6 @@ function Export-TargetResource } Write-Host " |---[$i/$($storageEntities.Length)] $($storageEntity.Key)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnEnabled/MSFT_SPOTenantCdnEnabled.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnEnabled/MSFT_SPOTenantCdnEnabled.psm1 index 32d83984f1..9823bde678 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnEnabled/MSFT_SPOTenantCdnEnabled.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnEnabled/MSFT_SPOTenantCdnEnabled.psm1 @@ -376,11 +376,8 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 index 76c1a467ff..66ca03ba55 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 @@ -385,11 +385,8 @@ function Export-TargetResource Write-Host "`r`n |---[1/2] Public" -NoNewline $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $dscContent += Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` @@ -421,12 +418,10 @@ function Export-TargetResource Credential = $Credential } Write-Host ' |---[2/2] Private' -NoNewline - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 index cdc32fb589..02eb3c30bb 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 @@ -858,8 +858,6 @@ function Export-TargetResource { $Results.Remove('MinCompatibilityLevel') | Out-Null } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 index 41683bf973..76128b39f8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 @@ -430,8 +430,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.Palette) { $complexMapping = @( @@ -459,12 +457,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.Palette) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Palette' - } + -Credential $Credential ` + -NoEscape @('Palette') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 index d491711ba1..8539e144d3 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 @@ -343,7 +343,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($Results.Properties) @@ -377,19 +376,12 @@ function Export-TargetResource } } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($null -ne $Results.Properties) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'Properties' ` - -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('Properties') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelAlertRule/MSFT_SentinelAlertRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelAlertRule/MSFT_SentinelAlertRule.psm1 index e4dd52b9d4..b602bb44c6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelAlertRule/MSFT_SentinelAlertRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelAlertRule/MSFT_SentinelAlertRule.psm1 @@ -1035,8 +1035,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ( $null -ne $Results.EventGroupingSettings) { @@ -1182,28 +1180,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - if ($Results.EventGroupingSettings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EventGroupingSettings' -IsCIMArray:$False - } - if ($Results.CustomDetails) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'CustomDetails' -IsCIMArray:$False - } - if ($Results.EntityMappings) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EntityMappings' -IsCIMArray:$True - } - if ($Results.AlertDetailsOverride) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'AlertDetailsOverride' -IsCIMArray:$True - } - if ($Results.IncidentConfiguration) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'IncidentConfiguration' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('EventGroupingSettings', 'CustomDetails', 'EntityMappings', 'AlertDetailsOverride', 'IncidentConfiguration') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelSetting/MSFT_SentinelSetting.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelSetting/MSFT_SentinelSetting.psm1 index 8f54467eb3..e727411d5b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelSetting/MSFT_SentinelSetting.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelSetting/MSFT_SentinelSetting.psm1 @@ -447,8 +447,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelThreatIntelligenceIndicator/MSFT_SentinelThreatIntelligenceIndicator.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelThreatIntelligenceIndicator/MSFT_SentinelThreatIntelligenceIndicator.psm1 index 15590bef76..6a6d8459a9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelThreatIntelligenceIndicator/MSFT_SentinelThreatIntelligenceIndicator.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelThreatIntelligenceIndicator/MSFT_SentinelThreatIntelligenceIndicator.psm1 @@ -625,8 +625,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelWatchlist/MSFT_SentinelWatchlist.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelWatchlist/MSFT_SentinelWatchlist.psm1 index 19b7c297c5..d255d5dc2b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelWatchlist/MSFT_SentinelWatchlist.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SentinelWatchlist/MSFT_SentinelWatchlist.psm1 @@ -564,8 +564,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppPermissionPolicy/MSFT_TeamsAppPermissionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppPermissionPolicy/MSFT_TeamsAppPermissionPolicy.psm1 index 14878ad0e0..fa0d5450d7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppPermissionPolicy/MSFT_TeamsAppPermissionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppPermissionPolicy/MSFT_TeamsAppPermissionPolicy.psm1 @@ -478,8 +478,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppSetupPolicy/MSFT_TeamsAppSetupPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppSetupPolicy/MSFT_TeamsAppSetupPolicy.psm1 index e3e7159296..1cc2bb9c44 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppSetupPolicy/MSFT_TeamsAppSetupPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAppSetupPolicy/MSFT_TeamsAppSetupPolicy.psm1 @@ -474,8 +474,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAudioConferencingPolicy/MSFT_TeamsAudioConferencingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAudioConferencingPolicy/MSFT_TeamsAudioConferencingPolicy.psm1 index fded758d97..8c20144744 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAudioConferencingPolicy/MSFT_TeamsAudioConferencingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsAudioConferencingPolicy/MSFT_TeamsAudioConferencingPolicy.psm1 @@ -402,8 +402,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallHoldPolicy/MSFT_TeamsCallHoldPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallHoldPolicy/MSFT_TeamsCallHoldPolicy.psm1 index e579f66ffe..62c0d5a09b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallHoldPolicy/MSFT_TeamsCallHoldPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallHoldPolicy/MSFT_TeamsCallHoldPolicy.psm1 @@ -397,8 +397,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallParkPolicy/MSFT_TeamsCallParkPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallParkPolicy/MSFT_TeamsCallParkPolicy.psm1 index 4bba4ec0e3..1f262ba3dc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallParkPolicy/MSFT_TeamsCallParkPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallParkPolicy/MSFT_TeamsCallParkPolicy.psm1 @@ -436,8 +436,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallQueue/MSFT_TeamsCallQueue.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallQueue/MSFT_TeamsCallQueue.psm1 index 411c4bf3b7..17f0ede9c8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallQueue/MSFT_TeamsCallQueue.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallQueue/MSFT_TeamsCallQueue.psm1 @@ -967,8 +967,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 index 3dad5be03f..5b04416d8a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 @@ -601,8 +601,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 index 6d23a4d767..1526c79991 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 @@ -446,8 +446,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelTab/MSFT_TeamsChannelTab.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelTab/MSFT_TeamsChannelTab.psm1 index 325e64db5d..43237a9ef5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelTab/MSFT_TeamsChannelTab.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelTab/MSFT_TeamsChannelTab.psm1 @@ -611,12 +611,9 @@ function Export-TargetResource ManagedIdentity = $ManagedIdentity.IsPresent AccessTokens = $AccessTokens } - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 3) { - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 index c99cb8340f..286ae99c30 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 @@ -408,8 +408,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 index 92381749be..fd22f04830 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 @@ -477,7 +477,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -485,8 +484,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsComplianceRecordingPolicy/MSFT_TeamsComplianceRecordingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsComplianceRecordingPolicy/MSFT_TeamsComplianceRecordingPolicy.psm1 index 886cc70548..c1335310a2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsComplianceRecordingPolicy/MSFT_TeamsComplianceRecordingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsComplianceRecordingPolicy/MSFT_TeamsComplianceRecordingPolicy.psm1 @@ -582,8 +582,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results if ($null -ne $Results.ComplianceRecordingApplications) { @@ -613,14 +611,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.ComplianceRecordingApplications) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'ComplianceRecordingApplications' -IsCIMArray:$True - $currentDSCBlock = $currentDSCBlock.Replace('ComplianceRecordingApplications = @("', 'ComplianceRecordingApplications = @(') - $currentDSCBlock = $currentDSCBlock.Replace(" `",`"`r`n", '') - - } + -Credential $Credential ` + -NoEscape @('ComplianceRecordingApplications') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCortanaPolicy/MSFT_TeamsCortanaPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCortanaPolicy/MSFT_TeamsCortanaPolicy.psm1 index aeec8721b6..c3cb0b5612 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCortanaPolicy/MSFT_TeamsCortanaPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCortanaPolicy/MSFT_TeamsCortanaPolicy.psm1 @@ -400,8 +400,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsDialInConferencingTenantSettings/MSFT_TeamsDialInConferencingTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsDialInConferencingTenantSettings/MSFT_TeamsDialInConferencingTenantSettings.psm1 index 8aded19030..81daf5c399 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsDialInConferencingTenantSettings/MSFT_TeamsDialInConferencingTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsDialInConferencingTenantSettings/MSFT_TeamsDialInConferencingTenantSettings.psm1 @@ -402,7 +402,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -410,8 +409,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 index 69c147272b..b3ba27d5b9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 @@ -412,8 +412,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $result = Get-TargetResource @params - $result = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Result if ($null -ne $result.EmergencyNumbers) { @@ -442,12 +440,8 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Result ` - -Credential $Credential - - if ($Result.EmergencyNumbers) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'EmergencyNumbers' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('EmergencyNumbers') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 index bbe6d1c31c..0061f55a1b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 @@ -433,8 +433,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEnhancedEncryptionPolicy/MSFT_TeamsEnhancedEncryptionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEnhancedEncryptionPolicy/MSFT_TeamsEnhancedEncryptionPolicy.psm1 index f39d450d19..2651f22043 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEnhancedEncryptionPolicy/MSFT_TeamsEnhancedEncryptionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEnhancedEncryptionPolicy/MSFT_TeamsEnhancedEncryptionPolicy.psm1 @@ -410,8 +410,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEventsPolicy/MSFT_TeamsEventsPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEventsPolicy/MSFT_TeamsEventsPolicy.psm1 index 0584446165..f4a2bac8ac 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEventsPolicy/MSFT_TeamsEventsPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEventsPolicy/MSFT_TeamsEventsPolicy.psm1 @@ -490,8 +490,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1 index d738830901..0c1f19da63 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1 @@ -435,7 +435,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -443,8 +442,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFeedbackPolicy/MSFT_TeamsFeedbackPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFeedbackPolicy/MSFT_TeamsFeedbackPolicy.psm1 index 6ebb842782..f9c8b447de 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFeedbackPolicy/MSFT_TeamsFeedbackPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFeedbackPolicy/MSFT_TeamsFeedbackPolicy.psm1 @@ -452,8 +452,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFilesPolicy/MSFT_TeamsFilesPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFilesPolicy/MSFT_TeamsFilesPolicy.psm1 index 5be346f706..039b5d8023 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFilesPolicy/MSFT_TeamsFilesPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsFilesPolicy/MSFT_TeamsFilesPolicy.psm1 @@ -403,8 +403,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 index 3260e575c5..6b9b5ef5ce 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 @@ -444,8 +444,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } #$results = Get-TargetResource @getParams - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 index bb0da3b858..0397b988c0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 @@ -287,7 +287,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -295,8 +294,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 index 77b0865be6..fd500ceef5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 @@ -340,7 +340,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -348,8 +347,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 index bb6a3ae46b..a43920a584 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 @@ -405,7 +405,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -413,8 +412,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsIPPhonePolicy/MSFT_TeamsIPPhonePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsIPPhonePolicy/MSFT_TeamsIPPhonePolicy.psm1 index dd1d474aad..fdc7547315 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsIPPhonePolicy/MSFT_TeamsIPPhonePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsIPPhonePolicy/MSFT_TeamsIPPhonePolicy.psm1 @@ -474,8 +474,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsM365App/MSFT_TeamsM365App.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsM365App/MSFT_TeamsM365App.psm1 index c25212738f..ce787cc6a5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsM365App/MSFT_TeamsM365App.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsM365App/MSFT_TeamsM365App.psm1 @@ -471,8 +471,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 index c8eaec0c08..cb8ae46f8d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 @@ -354,8 +354,7 @@ function Export-TargetResource } Add-ConfigurationDataEntry -Node 'NonNodeData' -Key 'SdnApiToken' -Value '**********'` -Description 'API Token for the Teams SDN Provider for Meeting Broadcast' - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -363,20 +362,14 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $results.SdnApiToken = '$ConfigurationData.Settings.SdnApiToken' - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock ` - -ParameterName 'SdnApiToken' + -Credential $Credential ` + -NoEscape @('SdnApiToken') $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 index e6fbe6d536..72d239698b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 @@ -382,8 +382,6 @@ function Export-TargetResource } Write-Host " |---[$i/$($policies.Length)] $($policy.Identity)" -NoNewline $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 index d49a104cd4..45be0ba70b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 @@ -447,7 +447,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -455,8 +454,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 index fad94d5ab4..3eee6fa3f9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 @@ -1427,8 +1427,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 index ee64f5a2e6..bc6f84c94e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 @@ -667,8 +667,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMobilityPolicy/MSFT_TeamsMobilityPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMobilityPolicy/MSFT_TeamsMobilityPolicy.psm1 index c355d536cd..51f327d22f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMobilityPolicy/MSFT_TeamsMobilityPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMobilityPolicy/MSFT_TeamsMobilityPolicy.psm1 @@ -432,8 +432,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsNetworkRoamingPolicy/MSFT_TeamsNetworkRoamingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsNetworkRoamingPolicy/MSFT_TeamsNetworkRoamingPolicy.psm1 index 6526a1aa2c..a4f553da30 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsNetworkRoamingPolicy/MSFT_TeamsNetworkRoamingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsNetworkRoamingPolicy/MSFT_TeamsNetworkRoamingPolicy.psm1 @@ -410,8 +410,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1 index f62e7c92bd..893c81c1ed 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1 @@ -344,8 +344,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailPolicy/MSFT_TeamsOnlineVoicemailPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailPolicy/MSFT_TeamsOnlineVoicemailPolicy.psm1 index 09ffdae6d3..c2c8b02e21 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailPolicy/MSFT_TeamsOnlineVoicemailPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailPolicy/MSFT_TeamsOnlineVoicemailPolicy.psm1 @@ -425,8 +425,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailUserSettings/MSFT_TeamsOnlineVoicemailUserSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailUserSettings/MSFT_TeamsOnlineVoicemailUserSettings.psm1 index e0523347e2..49769f009c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailUserSettings/MSFT_TeamsOnlineVoicemailUserSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoicemailUserSettings/MSFT_TeamsOnlineVoicemailUserSettings.psm1 @@ -443,7 +443,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -451,8 +450,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOrgWideAppSettings/MSFT_TeamsOrgWideAppSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOrgWideAppSettings/MSFT_TeamsOrgWideAppSettings.psm1 index 808449ce9d..63cff07eb7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOrgWideAppSettings/MSFT_TeamsOrgWideAppSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsOrgWideAppSettings/MSFT_TeamsOrgWideAppSettings.psm1 @@ -227,7 +227,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -235,8 +234,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsPstnUsage/MSFT_TeamsPstnUsage.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsPstnUsage/MSFT_TeamsPstnUsage.psm1 index d1a7909943..d75c2ff333 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsPstnUsage/MSFT_TeamsPstnUsage.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsPstnUsage/MSFT_TeamsPstnUsage.psm1 @@ -327,8 +327,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsShiftsPolicy/MSFT_TeamsShiftsPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsShiftsPolicy/MSFT_TeamsShiftsPolicy.psm1 index ccbb63e5b5..645b64eedf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsShiftsPolicy/MSFT_TeamsShiftsPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsShiftsPolicy/MSFT_TeamsShiftsPolicy.psm1 @@ -479,8 +479,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 index e739efbf41..3192e7e7c4 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 @@ -751,8 +751,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTemplatesPolicy/MSFT_TeamsTemplatesPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTemplatesPolicy/MSFT_TeamsTemplatesPolicy.psm1 index 8554f7b9cf..b666f3ef03 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTemplatesPolicy/MSFT_TeamsTemplatesPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTemplatesPolicy/MSFT_TeamsTemplatesPolicy.psm1 @@ -367,8 +367,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 index 463ce3406a..f3da84714a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantDialPlan/MSFT_TeamsTenantDialPlan.psm1 @@ -523,9 +523,7 @@ function Export-TargetResource ManagedIdentity = $ManagedIdentity.IsPresent AccessTokens = $AccessTokens } - $results = Get-TargetResource @params - $results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results + $Results = Get-TargetResource @Params if ($null -ne $Results.NormalizationRules) { @@ -555,14 +553,10 @@ function Export-TargetResource -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` - -Credential $Credential - if ($Results.NormalizationRules) - { - $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'NormalizationRules' -IsCIMArray:$True - } + -Credential $Credential ` + -NoEscape @('NormalizationRules') $dscContent += $currentDSCBlock - Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName $i++ diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkRegion/MSFT_TeamsTenantNetworkRegion.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkRegion/MSFT_TeamsTenantNetworkRegion.psm1 index e76bc57615..88949fe94c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkRegion/MSFT_TeamsTenantNetworkRegion.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkRegion/MSFT_TeamsTenantNetworkRegion.psm1 @@ -397,8 +397,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSite/MSFT_TeamsTenantNetworkSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSite/MSFT_TeamsTenantNetworkSite.psm1 index 126461bbee..2303884ae9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSite/MSFT_TeamsTenantNetworkSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSite/MSFT_TeamsTenantNetworkSite.psm1 @@ -475,8 +475,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSubnet/MSFT_TeamsTenantNetworkSubnet.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSubnet/MSFT_TeamsTenantNetworkSubnet.psm1 index bf2c416dfe..ef72225d66 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSubnet/MSFT_TeamsTenantNetworkSubnet.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantNetworkSubnet/MSFT_TeamsTenantNetworkSubnet.psm1 @@ -411,8 +411,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantTrustedIPAddress/MSFT_TeamsTenantTrustedIPAddress.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantTrustedIPAddress/MSFT_TeamsTenantTrustedIPAddress.psm1 index 6ef451fc3c..6212a71a5e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantTrustedIPAddress/MSFT_TeamsTenantTrustedIPAddress.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTenantTrustedIPAddress/MSFT_TeamsTenantTrustedIPAddress.psm1 @@ -399,8 +399,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTranslationRule/MSFT_TeamsTranslationRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTranslationRule/MSFT_TeamsTranslationRule.psm1 index dea41406fb..5bca17a3b2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTranslationRule/MSFT_TeamsTranslationRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTranslationRule/MSFT_TeamsTranslationRule.psm1 @@ -410,8 +410,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUnassignedNumberTreatment/MSFT_TeamsUnassignedNumberTreatment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUnassignedNumberTreatment/MSFT_TeamsUnassignedNumberTreatment.psm1 index 4c541c296a..e6847affe9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUnassignedNumberTreatment/MSFT_TeamsUnassignedNumberTreatment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUnassignedNumberTreatment/MSFT_TeamsUnassignedNumberTreatment.psm1 @@ -439,8 +439,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 index 6471f9806d..babb5c92bf 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 @@ -444,12 +444,10 @@ function Export-TargetResource AccessTokens = $AccessTokens } $result = Get-TargetResource @params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $result $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` - -Results $Results ` + -Results $result ` -Credential $Credential $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 index 4219381e06..71e6528132 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 @@ -301,7 +301,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -309,8 +308,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 index 3788ba9b77..2c949f35ba 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 @@ -324,8 +324,7 @@ function Export-TargetResource ManagedIdentity = $ManagedIdentity.IsPresent AccessTokens = $AccessTokens } - $Results = Get-TargetResource @params - + $Results = Get-TargetResource @Params if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1) { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -333,8 +332,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 index e309152a79..970a688cc0 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 @@ -394,8 +394,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $results = Get-TargetResource @getParams - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserCallingSettings/MSFT_TeamsUserCallingSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserCallingSettings/MSFT_TeamsUserCallingSettings.psm1 index f746d4300f..f4e98a21b5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserCallingSettings/MSFT_TeamsUserCallingSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserCallingSettings/MSFT_TeamsUserCallingSettings.psm1 @@ -466,7 +466,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - if ($Results.Ensure -eq 'Present') { if ($null -ne $Global:M365DSCExportResourceInstancesCount) @@ -474,8 +473,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserPolicyAssignment/MSFT_TeamsUserPolicyAssignment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserPolicyAssignment/MSFT_TeamsUserPolicyAssignment.psm1 index 649b7a09f1..c56b564f1c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserPolicyAssignment/MSFT_TeamsUserPolicyAssignment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUserPolicyAssignment/MSFT_TeamsUserPolicyAssignment.psm1 @@ -906,8 +906,6 @@ function Export-TargetResource $Global:M365DSCExportResourceInstancesCount++ } - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVdiPolicy/MSFT_TeamsVdiPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVdiPolicy/MSFT_TeamsVdiPolicy.psm1 index 2e99a597f2..4b13c24b65 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVdiPolicy/MSFT_TeamsVdiPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVdiPolicy/MSFT_TeamsVdiPolicy.psm1 @@ -397,8 +397,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoute/MSFT_TeamsVoiceRoute.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoute/MSFT_TeamsVoiceRoute.psm1 index e1a9114b8a..c989568c98 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoute/MSFT_TeamsVoiceRoute.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoute/MSFT_TeamsVoiceRoute.psm1 @@ -432,8 +432,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoutingPolicy/MSFT_TeamsVoiceRoutingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoutingPolicy/MSFT_TeamsVoiceRoutingPolicy.psm1 index 6ffccdd547..a915abdb8b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoutingPolicy/MSFT_TeamsVoiceRoutingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsVoiceRoutingPolicy/MSFT_TeamsVoiceRoutingPolicy.psm1 @@ -363,8 +363,6 @@ function Export-TargetResource AccessTokens = $AccessTokens } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsWorkloadPolicy/MSFT_TeamsWorkloadPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsWorkloadPolicy/MSFT_TeamsWorkloadPolicy.psm1 index 0207e09db2..dd730cad24 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsWorkloadPolicy/MSFT_TeamsWorkloadPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsWorkloadPolicy/MSFT_TeamsWorkloadPolicy.psm1 @@ -462,8 +462,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index 6576fd6937..11955b9a37 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -134,7 +134,7 @@ }, @{ ModuleName = 'ReverseDSC' - RequiredVersion = '2.0.0.22' + RequiredVersion = '2.0.0.25' } ) } diff --git a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 index 8284f7da5d..981bfb5246 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1 @@ -250,6 +250,7 @@ function Get-M365DSCDRGComplexTypeToHashtable function Get-M365DSCDRGComplexTypeToString { [CmdletBinding()] + [OutputType([System.String])] param( [Parameter()] $ComplexObject, @@ -306,6 +307,12 @@ function Get-M365DSCDRGComplexTypeToString $currentProperty += Get-M365DSCDRGComplexTypeToString -IsArray @splat } + # Add an indented new line after the last item in the array + if ($currentProperty.Count -gt 0) + { + $currentProperty[-1] += "`r`n" + $indent + } + #PowerShell returns all non-captured stream output, not just the argument of the return statement. #An empty array is mangled into $null in the process. #However, an array can be preserved on return by prepending it with the array construction operator (,) @@ -425,7 +432,7 @@ function Get-M365DSCDRGComplexTypeToString { $nestedPropertyString = "`$null`r`n" } - $currentProperty += $nestedPropertyString + $currentProperty += $nestedPropertyString + "`r`n" } if ($IsArray) { @@ -472,30 +479,36 @@ function Get-M365DSCDRGComplexTypeToString } } } + $indent = '' $indent = ' ' * ($IndentLevel -1) + if ($key -in $ComplexTypeMapping.Name) { $currentProperty += "`r`n" } $currentProperty += "$indent}" + <# if ($IsArray -or $IndentLevel -gt 4) { $currentProperty += "`r`n" } + #> #Indenting last parenthesis when the cim instance is an array + <# if ($IndentLevel -eq 5) { $indent = ' ' * ($IndentLevel -2) $currentProperty += $indent } + #> $emptyCIM = $currentProperty.Replace(' ', '').Replace("`r`n", '') if ($emptyCIM -eq "MSFT_$CIMInstanceName{}") { - $currentProperty = $null + $currentProperty = [string]::Empty } if ($null -ne $currentProperty) @@ -505,6 +518,7 @@ function Get-M365DSCDRGComplexTypeToString $currentProperty = [regex]::Replace($currentProperty, $fancySingleQuotes, "''") $currentProperty = [regex]::Replace($currentProperty, $fancyDoubleQuotes, '"') } + return $currentProperty } @@ -538,11 +552,12 @@ function Get-M365DSCDRGSimpleObjectTypeToString { $key = 'odataType' } - $returnValue = $Space + $Key + " = '" + $Value + "'`r`n" + $Value = $Value.Replace('`', '``').Replace('$', '`$').Replace('"', '`"') + $returnValue = $Space + $Key + ' = "' + $Value + """`r`n" } '*.DateTime' { - $returnValue = $Space + $Key + " = '" + $Value + "'`r`n" + $returnValue = $Space + $Key + ' = "' + $Value + """`r`n" } '*[[\]]' { @@ -561,11 +576,12 @@ function Get-M365DSCDRGSimpleObjectTypeToString { '*.String' { - $returnValue += "$whitespace'$item'$newline" + $item = $item.Replace('`', '``').Replace('$', '`$').Replace('"', '`"') + $returnValue += "$whitespace""$item""$newline" } '*.DateTime' { - $returnValue += "$whitespace'$item'$newline" + $returnValue += "$whitespace""$item""$newline" } Default { @@ -573,7 +589,8 @@ function Get-M365DSCDRGSimpleObjectTypeToString } } } - if ($Value.count -gt 1) + + if ($Value.Count -gt 1) { $returnValue += "$Space)`r`n" } @@ -588,6 +605,7 @@ function Get-M365DSCDRGSimpleObjectTypeToString $returnValue = $Space + $Key + ' = ' + $Value + "`r`n" } } + return $returnValue } diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 index d15247d32c..f329c58844 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 @@ -3595,6 +3595,7 @@ function Update-M365DSCExportAuthenticationResults $Results ) + $noEscape = @() if ($Results.ContainsKey('ManagedIdentity') -and -not $Results.ManagedIdentity) { $Results.Remove('ManagedIdentity') @@ -3664,6 +3665,7 @@ function Update-M365DSCExportAuthenticationResults if (-not [System.String]::IsNullOrEmpty($Results.ApplicationId)) { $Results.ApplicationId = "`$ConfigurationData.NonNodeData.ApplicationId" + $noEscape += 'ApplicationId' } else { @@ -3679,6 +3681,7 @@ function Update-M365DSCExportAuthenticationResults if (-not [System.String]::IsNullOrEmpty($Results.CertificateThumbprint)) { $Results.CertificateThumbprint = "`$ConfigurationData.NonNodeData.CertificateThumbprint" + $noEscape += 'CertificateThumbprint' } else { @@ -3694,6 +3697,7 @@ function Update-M365DSCExportAuthenticationResults if (-not [System.String]::IsNullOrEmpty($Results.CertificatePath)) { $Results.CertificatePath = "`$ConfigurationData.NonNodeData.CertificatePath" + $noEscape += 'CertificatePath' } else { @@ -3709,6 +3713,7 @@ function Update-M365DSCExportAuthenticationResults if (-not [System.String]::IsNullOrEmpty($Results.TenantId)) { $Results.TenantId = "`$ConfigurationData.NonNodeData.TenantId" + $noEscape += 'TenantId' } else { @@ -3724,6 +3729,7 @@ function Update-M365DSCExportAuthenticationResults if (-not [System.String]::IsNullOrEmpty($Results.ApplicationSecret)) { $Results.ApplicationSecret = "New-Object System.Management.Automation.PSCredential ('ApplicationSecret', (ConvertTo-SecureString `$ConfigurationData.NonNodeData.ApplicationSecret -AsPlainText -Force))" + $noEscape += 'ApplicationSecret' } else { @@ -3755,9 +3761,14 @@ function Update-M365DSCExportAuthenticationResults if ($null -ne $Results.AccessTokens) { $results.AccessTokens = "`$ConfigurationData.NonNodeData.AccessTokens" + $noEscape += 'AccessTokens' } } - return $Results + + return @{ + Results = $Results + NoEscape = $noEscape + } } <# @@ -3792,9 +3803,19 @@ function Get-M365DSCExportContentForResource [Parameter()] [System.Management.Automation.PSCredential] - $Credential + $Credential, + + [Parameter()] + [System.String[]] + $NoEscape ) + $withoutAuthentication = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` + -Results $Results + $Results = $withoutAuthentication.Results + $NoEscape += $withoutAuthentication.NoEscape + $NoEscape = $NoEscape | Select-Object -Unique + $OrganizationName = '' if ($ConnectionMode -like 'ServicePrincipal*' -or ` $ConnectionMode -eq 'ManagedIdentity') @@ -3928,7 +3949,7 @@ function Get-M365DSCExportContentForResource $content = [System.Text.StringBuilder]::New() [void]$content.Append(" $ResourceName `"$instanceName`"`r`n") [void]$content.Append(" {`r`n") - $partialContent = Get-DSCBlock -Params $Results -ModulePath $ModulePath + $partialContent = Get-DSCBlock -Params $Results -ModulePath $ModulePath -NoEscape $NoEscape # Test for both Credentials and CredentialsWithApplicationId if ($ConnectionMode -match 'Credentials') { diff --git a/ResourceGenerator/Module.Template.psm1 b/ResourceGenerator/Module.Template.psm1 index b614ece1d0..edc823ecdb 100644 --- a/ResourceGenerator/Module.Template.psm1 +++ b/ResourceGenerator/Module.Template.psm1 @@ -399,8 +399,6 @@ function Export-TargetResource $Script:exportedInstance = $config $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results <#ConvertComplexToString#><#AssignmentsConvertComplexToString#> $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` diff --git a/ResourceGenerator/Module.Workloads.Template.psm1 b/ResourceGenerator/Module.Workloads.Template.psm1 index 126b1ffb45..180965557b 100644 --- a/ResourceGenerator/Module.Workloads.Template.psm1 +++ b/ResourceGenerator/Module.Workloads.Template.psm1 @@ -253,9 +253,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceEnrollmentPlatformRestriction.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceEnrollmentPlatformRestriction.Tests.ps1 index 4df8666dd7..79ec6f2d2f 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceEnrollmentPlatformRestriction.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceEnrollmentPlatformRestriction.Tests.ps1 @@ -25,14 +25,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $secpasswd = ConvertTo-SecureString ((New-Guid).ToString()) -AsPlainText -Force $Credential = New-Object System.Management.Automation.PSCredential ('tenantadmin@mydomain.com', $secpasswd) - #Mock -CommandName Update-M365DSCExportAuthenticationResults -MockWith { - # return @{} - #} - - #Mock -CommandName Get-M365DSCExportContentForResource -MockWith { - - #} - Mock -CommandName Confirm-M365DSCDependencies -MockWith { } diff --git a/dev-package/Modules/Microsoft365DSC/DSCResources/MSFT_ResourceName/MSFT_ResourceName.psm1 b/dev-package/Modules/Microsoft365DSC/DSCResources/MSFT_ResourceName/MSFT_ResourceName.psm1 index b3846eb047..95ec3baee9 100644 --- a/dev-package/Modules/Microsoft365DSC/DSCResources/MSFT_ResourceName/MSFT_ResourceName.psm1 +++ b/dev-package/Modules/Microsoft365DSC/DSCResources/MSFT_ResourceName/MSFT_ResourceName.psm1 @@ -338,9 +338,6 @@ function Export-TargetResource } $Results = Get-TargetResource @Params - $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` - -Results $Results - $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` From 127dbc6be217a62b1f309fd96ec252fdbb933f2e Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 12 Feb 2025 09:21:52 -0500 Subject: [PATCH 25/26] Release 1.25.212.1 --- CHANGELOG.md | 2 +- .../MSFT_AADIdentityAPIConnector.psm1 | 1 + Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 40 +++++++++---------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84a6c4f592..1884200ed5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * AADGroupEligibilitySchedule * FIXES [#5741] Missing -All variable which prevented enumeration of more than 100 Groups -# UNRELEASED +# 1.25.212.1 * AADApplication * Changing the AuthenticationBehaviors parameters to string to allow diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 index 8f970532a5..b18994fc1b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADIdentityAPIConnector/MSFT_AADIdentityAPIConnector.psm1 @@ -715,6 +715,7 @@ function Export-TargetResource # Replace the certificate variables. $currentDSCBlock = $currentDSCBlock.Replace("'New-Object System.", "New-Object System.").Replace(" -Force))'", " -Force))") $currentDSCBlock = $currentDSCBlock.Replace("(ConvertTo-SecureString (''", "(ConvertTo-SecureString ('").Replace("''Password''", "'Password'").Replace("'') -AsPlainText", "') -AsPlainText") + $currentDSCBlock = $currentDSCBlock.Replace(''') -AsPlainText -Force))"', "') -AsPlainText -Force))") $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index f59ee0c454..4b22c9ecf0 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2025-02-05 +# Generated on: 2025-02-12 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.25.205.1' + ModuleVersion = '1.25.212.1' # Supported PSEditions # CompatiblePSEditions = @() @@ -149,28 +149,26 @@ IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true' # ReleaseNotes of this module - ReleaseNotes = '* AADConditionalAccessPolicy - * Changed the InsiderRiskTypes property to a string array. -* AADConnectorGroupApplicationProxy - * Fixes an issue where the Get-TargetResource was not able to retrieve - instances by names. -* AADGroup - * Refactored logic for CIM Instance evaluation in Test-TargetResource. -* AADServicePrincipal - * Fixes comparison of assigned roles for null values. - FIXES [#5717](https://github.com/microsoft/Microsoft365DSC/issues/5717) -* CommerceSelfServicePurchase + ReleaseNotes = '* AADApplication + * Changing the AuthenticationBehaviors parameters to string to allow + for null values. +* AADCrossTenantAccessPolicyConfigurationDefault + * Fixes an issue with CIM class export. +* AADCrossTenantAccessPolicyConfigurationPartner + * Fixes an issue with CIM class export. + FIXES [#5711](https://github.com/microsoft/Microsoft365DSC/issues/5711) +* EXORetentionPolicyTag * Initial release. -* SCPolicyConfig - * Fixes and issue where Get-TargetResource was returning an empty array - instead of a null value when no values were defined. -* SCRoleGroupMember - * Error handling if the Members parameter is omitted. +* EXOSmtpDaneInbound + * Updated authentication properties to align with MOF definition. + FIXES [#5709](https://github.com/microsoft/Microsoft365DSC/issues/5709) * MISC - * Changed the CIMInstance logic of various resources to us common logic. - * Added support for specifying a proxy in Update-M365DSCModule. + * PowerPlatform resource revamp to use direct REST API calls. + * Simplify export behavior for all resources and complex objects. * DEPENDENCIES - * Updated MSCloudLoginAssistant to version 1.1.36.' + * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. + * Updated MSCloudLoginAssistant to version 1.1.37. + * Updated ReverseDSC to version 2.0.0.25.' # Flag to indicate whether the module requires explicit user acceptance for install/update # RequireLicenseAcceptance = $false From 74856bfeff7c5148da60acea6187a66f0b18e509 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 12 Feb 2025 09:53:53 -0500 Subject: [PATCH 26/26] Updated DSCParser --- CHANGELOG.md | 1 + Modules/Microsoft365DSC/Dependencies/Manifest.psd1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1884200ed5..ef0b025c9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ * Simplify export behavior for all resources and complex objects. * DEPENDENCIES * Removed dependency on Microsoft.PowerApps.Administration.PowerShell. + * Updated DSCParser to version 2.0.0.15. * Updated MSCloudLoginAssistant to version 1.1.37. * Updated ReverseDSC to version 2.0.0.25. diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index 11955b9a37..9ed829c60a 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -18,7 +18,7 @@ }, @{ ModuleName = 'DSCParser' - RequiredVersion = '2.0.0.14' + RequiredVersion = '2.0.0.15' }, @{ ModuleName = 'ExchangeOnlineManagement'