From 2ee87d4f2904efca3cac34c1eed01c688f1e6608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20Kr=C3=BCger?=
 <15608729+andikrueger@users.noreply.github.com>
Date: Wed, 15 Feb 2023 10:05:40 +0100
Subject: [PATCH] fixes #2802

---
 CHANGELOG.md                                  |  2 +
 .../Microsoft365DSC/Modules/M365DSCUtil.psm1  | 40 +++++++++----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d714c0c00..f3fbff8582 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
index d10e3d53a9..1a7af7065c 100644
--- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
+++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -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'"}
@@ -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
     )