updates

Author: Friedrich Weinmann

PSModuleDevelopment/bin/PSModuleDevelopment.dll

@@ -154,8 +154,10 @@
 				Parameters = $step.Parameters | ConvertTo-PSFHashtable
 				ProjectName = $projectObject.Name
 				StepName = $step.Name
+				ParametersFromArtifacts = $step.ParametersFromArtifacts | ConvertTo-PSFHashtable
 			}
 			if (-not $parameters.Parameters) { $parameters.Parameters = @{ } }
+			if (-not $parameters.ParametersFromArtifacts) { $parameters.ParametersFromArtifacts = @{ } }
 			try { $null = & $actionObject.Action $parameters }
 			catch {
 				Write-StepResult @resultDef -Status Failed -Data $_ -ContinueLabel main

PSModuleDevelopment/bin/PSModuleDevelopment.pdb

@@ -11,6 +11,10 @@
 		The hashtable containing the currently specified parameters from the step configuration within the build project file.
 		Only settings not already defined there are taken from configuration.
 	
+	.PARAMETER FromArtifacts
+		The hashtable mapping parameters from artifacts.
+		This allows dynamically assigning artifacts to parameters.
+	
 	.PARAMETER ProjectName
 		The name of the project being executed.
 		Supplementary parameters taken from configuration will pick up settings based on this name:
@@ -23,7 +27,7 @@
 	
 	.EXAMPLE
 		PS C:\> Resolve-PSMDBuildStepParameter -Parameters $actualParameters -ProjectName VMDeployment -StepName 'Create Session'
-	
+		
 		Adds parameters provided through configuration.
 #>
 	[CmdletBinding()]
@@ -32,6 +36,10 @@
 		[hashtable]
 		$Parameters,
 
+		[Parameter(Mandatory = $true)]
+		[hashtable]
+		$FromArtifacts,
+		
 		[Parameter(Mandatory = $true)]
 		[string]
 		$ProjectName,
@@ -42,15 +50,19 @@
 	)
 
 	process {
+		# Process parameters from Configuration
 		$configObject = Select-PSFConfig -FullName "PSModuleDevelopment.BuildParam.$ProjectName.$StepName.*"
-		if (-not $configObject) { return $Parameters }
-		
 		foreach ($property in $configObject.PSObject.Properties) {
 			if ($property.Name -in '_Name', '_FullName', '_Depth', '_Children') { continue }
 			if ($Parameters.ContainsKey($property.Name)) { continue }
 			$Parameters[$property.Name] = $property.Value
 		}
 
+		# Process parameters from Artifacts
+		foreach ($pair in $FromArtifacts.GetEnumerator()) {
+			$Parameters[$pair.Key] = (Get-PSMDBuildArtifact -Name $pair.Value).Value
+		}
+		
 		$Parameters
 	}
 }

PSModuleDevelopment/bin/PSModuleDevelopment.xml

@@ -0,0 +1,74 @@
+$action = {
+	param (
+		$Parameters
+	)
+	
+	$rootPath = $Parameters.RootPath
+	$actualParameters = $Parameters.Parameters
+	$actualParameters = Resolve-PSMDBuildStepParameter -Parameters $actualParameters -FromArtifacts $Parameters.ParametersFromArtifacts -ProjectName $Parameters.ProjectName -StepName $Parameters.StepName
+	
+	#region Process Parameters
+	if (-not $actualParameters.Command) {
+		throw "Mandatory parameter: Command not specified"
+	}
+	
+	if ($actualParameters.Command -is [System.Management.Automation.ScriptBlock]) {
+		$scriptblock = $actualParameters.Command
+	}
+	else {
+		try { $scriptblock = [scriptblock]::Create($actualParameters.Command) }
+		catch {
+			throw "Error parsing command '$($actualParameters.Command)' : $_"
+		}
+	}
+	
+	$actualArguments = foreach ($argument in $actualParameters.ArgumentList) {
+		if ($argument -isnot [string]) {
+			$argument
+			continue
+		}
+		if ($argument -notlike '%!*!%') {
+			$argument
+			continue
+		}
+		$artifactName = $argument -replace '^%!(.+)!%$', '$1'
+		$artifactObject = Get-PSMDBuildArtifact -Name $artifactName
+		if (-not $artifactObject) { throw "Artifact for arguments not found: $artifactName" }
+		$artifactObject.Value
+	}
+	
+	$inSession = $null
+	if ($actualParameters.InSession) {
+		if ($actualParameters.InSession -is [System.Management.Automation.Runspaces.PSSession]) {
+			$inSession = $actualParameters.InSession
+		}
+		$artifactObject = Get-PSMDBuildArtifact -Name $actualParameters.InSession
+		if (-not $artifactObject) { throw "Artifact for parameter InSession not found: $($actualParameters.InSession)" }
+		if ($artifactObject.Value -isnot [System.Management.Automation.Runspaces.PSSession]) { throw "Artifact for parameter InSession ($($actualParameters.InSession)) is not a pssession!" }
+		$inSession = $artifactObject.Value
+	}
+	#endregion Process Parameters
+	
+	#region Execution
+	$invokeParam = @{
+		ScriptBlock	 = $scriptblock
+		ArgumentList = $actualArguments
+	}
+	if ($inSession) { $invokeParam.Session = $inSession }
+	try { Invoke-Command @invokeParam -ErrorAction Stop }
+	catch { throw }
+	#endregion Execution
+}
+
+$params = @{
+	Name	    = 'command'
+	Action	    = $action
+	Description = 'Execute a scriptblock'
+	Parameters  = @{
+		Command		 = '(mandatory) Scriptcode to run'
+		ArgumentList = 'Any number of arguments to pass to the command. To insert artifacts, specify a string with the special notation "%!ArtifactName!%"'
+		InSession    = 'Execute the scriptfile in the target PSSession. Either provide a full session object or an artifact name pointing at one.'
+	}
+}
+
+Register-PSMDBuildAction @params

PSModuleDevelopment/functions/build/Invoke-PSMDBuildProject.ps1

@@ -5,7 +5,26 @@
 
 	$rootPath = $Parameters.RootPath
 	$actualParameters = $Parameters.Parameters
-	$actualParameters = Resolve-PSMDBuildStepParameter -Parameters $actualParameters -ProjectName $Parameters.ProjectName -StepName $Parameters.StepName
+	$actualParameters = Resolve-PSMDBuildStepParameter -Parameters $actualParameters -FromArtifacts $Parameters.ParametersFromArtifacts -ProjectName $Parameters.ProjectName -StepName $Parameters.StepName
+	
+	#region Utility Functions
+	function ConvertTo-PSSession {
+		[CmdletBinding()]
+		param (
+			[Parameter(ValueFromPipeline = $true)]
+			$InputObject
+		)
+		process {
+			if ($InputObject -is [System.Management.Automation.Runspaces.PSSession]) {
+				return $InputObject
+			}
+			$artifactValue = (Get-PSMDBuildArtifact -Name $InputObject).Value
+			if ($artifactValue -is [System.Management.Automation.Runspaces.PSSession]) {
+				return $artifactValue
+			}
+		}
+	}
+	#endregion Utility Functions
 
 	if (-not ($actualParameters.Path -and $actualParameters.Destination)) {
 		throw "Invalid parameters! Specify both Path and Destination."
@@ -18,18 +37,18 @@
 	if ($actualParameters.Recurse) { $copyParam.Recurse = $true }
 	if ($actualParameters.Force) { $copyParam.Force = $true }
 	if ($actualParameters.FromSession) {
-		$artifact = Get-PSMDBuildArtifact -Name $actualParameters.FromSession
-		if (-not $artifact) {
+		$fromSession = $actualParameters.FromSession | ConvertTo-PSSession
+		if (-not $fromSession) {
 			throw "FromSession $($actualParameters.FromSession) not found!"
 		}
-		$copyParam.FromSession = $artifact.Value
+		$copyParam.FromSession = $fromSession
 	}
 	if ($actualParameters.ToSession) {
-		$artifact = Get-PSMDBuildArtifact -Name $actualParameters.ToSession
-		if (-not $artifact) {
+		$toSession = $actualParameters.ToSession | ConvertTo-PSSession
+		if (-not $toSession) {
 			throw "ToSession $($actualParameters.ToSession) not found!"
 		}
-		$copyParam.ToSession = $artifact.Value
+		$copyParam.ToSession = $toSession
 	}
 	foreach ($path in $paths) {
 		try { Copy-Item @copyParam -Path $path -ErrorAction Stop }

PSModuleDevelopment/functions/build/Resolve-PSMDBuildStepParameter.ps1

@@ -5,7 +5,7 @@
 
 	$rootPath = $Parameters.RootPath
 	$actualParameters = $Parameters.Parameters
-	$actualParameters = Resolve-PSMDBuildStepParameter -Parameters $actualParameters -ProjectName $Parameters.ProjectName -StepName $Parameters.StepName
+	$actualParameters = Resolve-PSMDBuildStepParameter -Parameters $actualParameters -FromArtifacts $Parameters.ParametersFromArtifacts -ProjectName $Parameters.ProjectName -StepName $Parameters.StepName
 
 	if (-not $actualParameters.ArtifactName) { throw "No ArtifactName specified! Unable to publish remoting session for build." }
 	if (-not ($actualParameters.VMName -or $actualParameters.ComputerName)) { throw "Neither ComputerName nor VMName specified, unable to connect to nothing!" }