Skip to content

Commit

Permalink
Merge pull request #2904 from andikrueger/issue2802
Browse files Browse the repository at this point in the history
fixes #2802
  • Loading branch information
NikCharlebois authored Feb 15, 2023
2 parents 196259d + 2ee87d4 commit a0d6bba
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
FIXES [2565](https://github.com/microsoft/Microsoft365DSC/issues/2565)
* Fixed the JSON conversion depth for the New-M365DSCConfigurationToJSON cmdlet.
FIXES [#2891](https://github.com/microsoft/Microsoft365DSC/issues/2891)
* Added new ParameterSet for Export-M365DSConfiguration
FIXES [[#2802](https://github.com/microsoft/Microsoft365DSC/issues/2802)]

# 1.23.208.1

Expand Down
40 changes: 20 additions & 20 deletions Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ Export-M365DSCConfiguration -Components @("AADApplication", "AADConditionalAcces
Export-M365DSCConfiguration -Mode 'Default' -ApplicationId '2560bb7c-bc85-415f-a799-841e10ec4f9a' -TenantId 'contoso.sharepoint.com' -ApplicationSecret 'abcdefghijkl'
.Example
Export-M365DSCConfiguration -Components @("AADApplication", "AADConditionalAccessPolicy", "AADGroupsSettings") -Credential $Credential -Path 'C:\DSC\Config.ps1'
Export-M365DSCConfiguration -Components @("AADApplication", "AADConditionalAccessPolicy", "AADGroupsSettings") -Credential $Credential -Path 'C:\DSC' -FileName 'MyConfig.ps1'
.Example
Export-M365DSCConfiguration -Credential $Credential -Filters @{AADApplication = "DisplayName eq 'MyApp'"}
Expand All @@ -976,79 +976,79 @@ Public
#>
function Export-M365DSCConfiguration
{
[CmdletBinding()]
[CmdletBinding(DefaultParameterSetName = 'Export')]
param(
[Parameter()]
[Parameter(ParameterSetName = 'WebUI')]
[Switch]
$LaunchWebUI,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$Path,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$FileName,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$ConfigurationName,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String[]]
$Components,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[ValidateSet('AAD', 'SPO', 'EXO', 'INTUNE', 'SC', 'OD', 'O365', 'PLANNER', 'PP', 'TEAMS')]
[System.String[]]
$Workloads,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[ValidateSet('Lite', 'Default', 'Full')]
[System.String]
$Mode = 'Default',

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[ValidateRange(1, 100)]
$MaxProcesses,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.Boolean]
$GenerateInfo = $false,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.Collections.Hashtable]
$Filters,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$ApplicationId,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$TenantId,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$ApplicationSecret,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$CertificateThumbprint,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.Management.Automation.PSCredential]
$Credential,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.Management.Automation.PSCredential]
$CertificatePassword,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[System.String]
$CertificatePath,

[Parameter()]
[Parameter(ParameterSetName = 'Export')]
[Switch]
$ManagedIdentity
)
Expand Down

0 comments on commit a0d6bba

Please sign in to comment.