Merge branch 'development' into createObjects

Author: FriedrichWeinmann

PSModuleDevelopment/PSModuleDevelopment.psd1

@@ -4,7 +4,7 @@
 	RootModule = 'PSModuleDevelopment.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '2.2.10.128'
+	ModuleVersion = '2.2.10.134'
 
 	# ID used to uniquely identify this module
 	GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6'
@@ -27,7 +27,7 @@
 	# Modules that must be imported into the global environment prior to importing
 	# this module
 	RequiredModules	       = @(
-		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.6.205' }
+		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.6.214' }
 		@{ ModuleName = 'string'; ModuleVersion = '1.0.0' }
 	)
 
@@ -102,6 +102,7 @@
 		'Set-PSMDStagingRepository'
 		'Show-PSMDSyntax'
 		'Split-PSMDScriptFile'
+		'Test-PSMDClmCompatibility'
     )
 
 	# Cmdlets to export from this module
@@ -115,6 +116,7 @@
 		'build'
 		'dotnetnew'
 		'find'
+		'ftype'
 		'hex'
 		'imt'
 		'ipmod'

PSModuleDevelopment/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.2.10.134 (2022-03-17)
+
++ New: Test-PSMDClmCompatibility - Tests, whether the targeted file would have trouble executing under Constrained Language Mode.
++ New: alias ftype --> Find-PSMDType
++ Upd: Action: connect-pssession - added Credential parameter
++ Upd: Get-PsmdBuildAction - improved output format
++ Upd: Get-PsmdBuildProject - added support for psd1 documents
++ Fix: New-PSMDBuildProject - Would register relative paths for the current project
+
 ## 2.2.10.128 (2021-11-11)
 
 + New: Action: deployModule - Deploys a module to the target computer(s)

PSModuleDevelopment/functions/assembly/Find-PSMDType.ps1

@@ -55,6 +55,7 @@
 	
 		Finds all types that inherit from the Runspace class
 #>
+	[Alias('ftype')]
 	[CmdletBinding()]
 	Param (
 		[string]
@@ -127,4 +128,4 @@
 			}
 		}
 	}
-}
+}

PSModuleDevelopment/functions/build/Get-PSMDBuildProject.ps1

@@ -42,19 +42,21 @@
 	)
 
 	process {
-		#region By Path
 		if ($Path) {
 			$importPath = $Path
 			if ($Name) { $importPath = Join-Path -Path $Path -ChildPath "$Name.build.json" }
-			
-			Get-Content -Path $importPath -Encoding UTF8 | ConvertFrom-Json
+			if (-not (Test-Path -Path $importPath)) {
+				$importPath = Join-Path -Path $Path -ChildPath "$Name.build.psd1"
+			}
 		}
-		#endregion By Path
-		
-		#region Selected
 		else {
-			Get-Content -Path (Get-PSFConfigValue -FullName 'PSModuleDevelopment.Build.Project.Selected') -Encoding UTF8 | ConvertFrom-Json
+			$importPath = Get-PSFConfigValue -FullName 'PSModuleDevelopment.Build.Project.Selected'
+		}
+
+		if (-not (Test-Path -Path $importPath)) {
+			throw "Path not found: $importPath"
 		}
-		#endregion Selected
+		if ($importPath -like "*.psd1") { Import-PSFPowerShellDataFile -Path $importPath }
+		else { Get-Content -Path $importPath -Encoding UTF8 | ConvertFrom-Json }
 	}
 }

PSModuleDevelopment/functions/build/Invoke-PSMDBuildProject.ps1

@@ -118,7 +118,7 @@
 	}
 	process {
 		$projectObject = Get-PSMDBuildProject -Path $projectPath
-		$steps = $projectObject.Steps | Sort-Object Weight
+		$steps = $projectObject.Steps | Sort-Object { $_.Weight } # Might be a hashtable
 
 		$count = 0
 		$stepResults = :main foreach ($step in $steps) {

PSModuleDevelopment/functions/build/New-PSMDBuildProject.ps1

@@ -78,13 +78,14 @@
 	)
 
 	process {
+		$resolvedPath = Resolve-PSFPath -Path $Path
 		$project = [pscustomobject]@{
 			Name		 = $Name
 			Condition    = $Condition
 			ConditionSet = $ConditionSet
 			Steps	     = @()
 		}
-		$outPath = Join-Path -Path $Path -ChildPath "$Name.build.Json"
+		$outPath = Join-Path -Path $resolvedPath -ChildPath "$Name.build.Json"
 		$project | Export-PsmdBuildProjectFile -OutPath $outPath -ErrorAction Stop
 		if (-not $NoSelect) {
 			Set-PSFConfig -Module PSModuleDevelopment -Name 'Build.Project.Selected' -Value $outPath

PSModuleDevelopment/functions/build/Resolve-PSMDBuildStepParameter.ps1

@@ -13,6 +13,12 @@
 		- Value from implicit artifact resolution: Any value that is formatted like this:
 		  "%!NameOfArtifact!%" will be replaced with the value of the artifact of the same name.
 		  This supports wildcard resolution, so "%!Session.*!%" will resolve to all artifacts with a name starting with "Session."
+		
+		Configuration-driven parameters follow this name scheme:
+		"PSModuleDevelopment.BuildParam.<project>.<step>.<parameterName>"
+
+		For example:
+		"PSModuleDevelopment.BuildParam.Admf.connect.credential"
 	
 	.PARAMETER Parameters
 		The hashtable containing the currently specified parameters from the step configuration within the build project file.