CopyXrmSolutionComponentsCommand -IncludePatches in Tasks

BuildTools/Xrm.CI.Framework.BuildTools/Lib/xRMCIFramework/9.0.0/CopySolutionComponents.ps1

@@ -1,19 +1,21 @@
 #
-# Filename: ExtractSolution.ps1
+# Filename: CopySolutionComponents.ps1
 #
 param(
 [string]$FromSolutionName, #The unique CRM solution name
 [string]$ToSolutionName, #The unique CRM solution name
+[bool]$IncludePatches=$False, #Defines if include solution components from patches solutions.
 [string]$CrmConnectionString, #The connection string as per CRM Sdk
 [int]$Timeout=360
 ) 
 
 $ErrorActionPreference = "Stop"
 
-Write-Verbose 'Entering MoveSolutionComponent.ps1'
+Write-Verbose 'Entering CopySolutionComponents.ps1'
 
 Write-Verbose "FromSolutionName = $FromSolutionName"
 Write-Verbose "ToSolutionName = $ToSolutionName"
+Write-Verbose "IncludePatches = $IncludePatches"
 Write-Verbose "ConnectionString = $CrmConnectionString"
 Write-Verbose "Timeout = $Timeout"
 
@@ -27,6 +29,6 @@ Write-Verbose "Importing CIToolkit: $xrmCIToolkit"
 Import-Module $xrmCIToolkit
 Write-Verbose "Imported CIToolkit"
 
-Copy-XrmSolutionComponents -FromSolutionName $FromSolutionName -ToSolutionName $ToSolutionName -ConnectionString $CrmConnectionString -Timeout $Timeout -Verbose
+Copy-XrmSolutionComponents -FromSolutionName $FromSolutionName -ToSolutionName $ToSolutionName -IncludePatches $IncludePatches -ConnectionString $CrmConnectionString -Timeout $Timeout -Verbose
 
-Write-Verbose 'Leaving MoveSolutionComponent.ps1'
+Write-Verbose 'Leaving CopySolutionComponents.ps1'

BuildTools/Xrm.CI.Framework.BuildTools/Tasks/MSCRMCopySolutionComponents/MSCRMCopySolutionComponents.ps1

@@ -10,12 +10,14 @@ Write-Verbose 'Entering MSCRMCopySolutionComponents.ps1'
 $crmConnectionString = Get-VstsInput -Name crmConnectionString -Require
 $fromSolutionName = Get-VstsInput -Name fromSolutionName -Require
 $toSolutionName = Get-VstsInput -Name toSolutionName -Require
+$includePatches = Get-VstsInput -Name includePatches -AsBool
 $crmConnectionTimeout = Get-VstsInput -Name crmConnectionTimeout -Require -AsInt
 
 #Print Verbose
 Write-Verbose "crmConnectionString = $crmConnectionString"
 Write-Verbose "fromSolutionName = $fromSolutionName"
 Write-Verbose "toSolutionName = $toSolutionName"
+Write-Verbose "includePatches = $includePatches"
 Write-Verbose "crmConnectionTimeout = $crmConnectionTimeout"
 
 #MSCRM Tools
@@ -27,6 +29,6 @@ if (-not $mscrmToolsPath)
 	Write-Error "MSCRM_Tools_Path not found. Add 'Power DevOps Tool Installer' before this task."
 }
 
-& "$mscrmToolsPath\xRMCIFramework\9.0.0\CopySolutionComponents.ps1" -fromSolutionName "$fromSolutionName" -toSolutionName "$toSolutionName" -crmConnectionString "$CrmConnectionString" -Timeout $crmConnectionTimeout
+& "$mscrmToolsPath\xRMCIFramework\9.0.0\CopySolutionComponents.ps1" -fromSolutionName "$fromSolutionName" -toSolutionName "$toSolutionName" -includePatches $includePatches -crmConnectionString "$CrmConnectionString" -Timeout $crmConnectionTimeout
 
 Write-Verbose 'Leaving MSCRMCopySolutionComponents.ps1'

BuildTools/Xrm.CI.Framework.BuildTools/Tasks/MSCRMCopySolutionComponents/task.json

@@ -13,8 +13,8 @@
   "demands": [],
   "version": {
     "Major": 12,
-    "Minor": 0,
-    "Patch": 2
+    "Minor": 1,
+    "Patch": 0
   },
   "minimumAgentVersion": "1.95.0",
   "instanceNameFormat": "Add components from : $(fromSolutionName) to $(toSolutionName)",
@@ -43,6 +43,14 @@
       "required": true,
       "helpMarkDown": "The unique name of the target solution"
     },
+    {
+      "name": "includePatches",
+      "type": "boolean",
+      "label": "Include Patches",
+      "defaultValue": "false",
+      "required": false,
+      "helpMarkDown": "If set to true will include components from patches solutions"
+    },
     {
       "name": "crmConnectionTimeout",
       "type": "string",

tasks-yaml-schema.md

@@ -140,6 +140,7 @@
     crmConnectionString: {String}
     fromSolutionName:{String}
     toSolutionName: {String}
+    includePatches: {Boolean}
 ```
 
 ### MSCRM Split Plugin Assembly