Merge branch 'development' into HelpUri

Author: FriedrichWeinmann

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -1,16 +1,22 @@
-# ignore PowerShell Studio files
-*TempPoint*
-*.pssproj
 
-# ignore the settings folder and files for VSCode
+# ignore the settings folder and files for VSCode and PSS
 .vscode/*
 *.psproj
-*.psproj.psbuild
-*.psprojs
+*TempPoint*
 
-# ignore library
-library/PSFramework/obj/*
-library/PSFramework/*.user
+# Ignore staging info from Visual Studio
+library/.vs/*
 library/PSFramework/bin/*
-library/.vs/PSFramework/v15/.suo
-library/.vs/PSFramework/v15/server/*
+library/PSFramework/obj/*
+
+# ignore PowerShell Studio MetaData
+PSFramework/PSFramework.psproj
+PSFramework/PSFramework.psproj.bak
+PSFramework/PSFramework.psprojs
+PSFramework/PSFramework.psproj
+
+# ignore the TestResults
+TestResults/*
+
+# ignore the publishing Directory
+publish/*

LICENSE.md LICENSELICENSE.md renamed to LICENSE

@@ -1,3 +1,5 @@
+MIT License
+
 Copyright (c) 2017 Friedrich Weinmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

PSFramework/PSFramework.psd1

@@ -5,7 +5,7 @@
 	RootModule = 'PSFramework.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '0.9.25.107'
+	ModuleVersion = '0.10.27.135'
 
 	# ID used to uniquely identify this module
 	GUID = '8028b914-132b-431f-baa9-94a6952f21ff'
@@ -52,7 +52,7 @@
 	ScriptsToProcess = @()
 
 	# Type files (.ps1xml) to be loaded when importing this module
-	TypesToProcess = @()
+	# TypesToProcess = @('xml\PSFramework.Types.ps1xml')
 
 	# Format files (.ps1xml) to be loaded when importing this module
 	FormatsToProcess = @('xml\PSFramework.Format.ps1xml')
@@ -64,6 +64,8 @@
 	# Functions to export from this module
 	FunctionsToExport = @(
 		'Clear-PSFResultCache',
+		'ConvertFrom-PSFClixml',
+		'ConvertTo-PSFClixml',
 		'Disable-PSFTaskEngineTask',
 		'Enable-PSFTaskEngineTask',
 		'Export-PSFClixml',
@@ -80,6 +82,7 @@
 		'Get-PSFTaskEngineCache',
 		'Get-PSFTaskEngineTask',
 		'Get-PSFTypeSerializationData',
+		'Get-PSFUserChoice',
 		'Import-PSFClixml',
 		'Import-PSFCmdlet',
 		'Import-PSFConfig',
@@ -119,6 +122,7 @@
 		'Test-PSFTaskEngineCache',
 		'Test-PSFTaskEngineTask',
 		'Unregister-PSFConfig',
+		'Wait-PSFMessage',
 		'Write-PSFHostColor',
 		'Write-PSFMessageProxy'
 	)

PSFramework/PSFramework.psm1

@@ -1,20 +1,5 @@
-$script:PSModuleRoot = $PSScriptRoot
-$script:PSModuleVersion = "0.9.25.107"
-
-function Import-ModuleFile
-{
-	[CmdletBinding()]
-	Param (
-		[string]
-		$Path
-	)
-	
-	if ($doDotSource) { . $Path }
-	else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText($Path))), $null, $null) }
-}
-
-# Declare directory separating character for X-Plat compatibility
-$script:dc = [System.IO.Path]::DirectorySeparatorChar
+$script:ModuleRoot = $PSScriptRoot
+$script:ModuleVersion = "0.10.27.135"
 
 # Detect whether at some level dotsourcing was enforced
 $script:doDotSource = $false
@@ -25,26 +10,84 @@ if (($PSVersionTable.PSVersion.Major -lt 6) -or ($PSVersionTable.OS -like "*Wind
 	if ((Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\WindowsPowerShell\PSFramework\System" -Name "DoDotSource" -ErrorAction Ignore).DoDotSource) { $script:doDotSource = $true }
 }
 
-# Execute Preimport actions
-. Import-ModuleFile -Path "$($PSModuleRoot)$($dc)internal$($dc)scripts$($dc)preimport.ps1"
+<#
+Note on Resolve-Path:
+All paths are sent through Resolve-Path in order to convert them to the correct path separator.
+This allows ignoring path separators throughout the import sequence, which could otherwise cause trouble depending on OS.
+#>
 
-# Import all internal functions
-foreach ($function in (Get-ChildItem "$($PSModuleRoot)$($dc)internal$($dc)functions$($dc)*$($dc)*.ps1"))
+# Detect whether at some level loading individual module files, rather than the compiled module was enforced
+$importIndividualFiles = $false
+if ($PSFramework_importIndividualFiles) { $importIndividualFiles = $true }
+if (($PSVersionTable.PSVersion.Major -lt 6) -or ($PSVersionTable.OS -like "*Windows*"))
 {
-	. Import-ModuleFile -Path $function.FullName
+	if ((Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsPowerShell\PSFramework\System" -Name "ImportIndividualFiles" -ErrorAction Ignore).ImportIndividualFiles) { $script:doDotSource = $true }
+	if ((Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\WindowsPowerShell\PSFramework\System" -Name "ImportIndividualFiles" -ErrorAction Ignore).ImportIndividualFiles) { $script:doDotSource = $true }
 }
-
-# Import all public functions
-foreach ($function in (Get-ChildItem "$($PSModuleRoot)$($dc)functions$($dc)*$($dc)*.ps1"))
+if (Test-Path (Join-Path (Resolve-Path -Path "$($script:ModuleRoot)\..") '.git')) { $importIndividualFiles = $true }
+if (-not (Test-Path (Join-Path $script:ModuleRoot "commands.ps1"))) { $importIndividualFiles = $true }
+	
+function Import-ModuleFile
 {
-	. Import-ModuleFile -Path $function.FullName
+	<#
+		.SYNOPSIS
+			Loads files into the module on module import.
+		
+		.DESCRIPTION
+			This helper function is used during module initialization.
+			It should always be dotsourced itself, in order to proper function.
+			
+			This provides a central location to react to files being imported, if later desired
+		
+		.PARAMETER Path
+			The path to the file to load
+		
+		.EXAMPLE
+			PS C:\> . Import-ModuleFile -File $function.FullName
+	
+			Imports the file stored in $function according to import policy
+	#>
+	[CmdletBinding()]
+	Param (
+		[string]
+		$Path
+	)
+	
+	if ($doDotSource) { . (Resolve-Path $Path) }
+	else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path)))), $null, $null) }
 }
 
-
-# Execute Postimport actions
-. Import-ModuleFile -Path "$($PSModuleRoot)$($dc)internal$($dc)scripts$($dc)postimport.ps1"
-
-if ($PSCommandPath -like "*psframework.psm1*")
+if ($importIndividualFiles)
 {
-	Import-Module "$($PSModuleRoot)$($dc)bin$($dc)PSFramework.dll"
+	# Execute Preimport actions
+	. Import-ModuleFile -Path "$($script:ModuleRoot)\internal\scripts\preimport.ps1"
+	
+	# Import all internal functions
+	foreach ($function in (Get-ChildItem "$($script:ModuleRoot)\internal\functions" -Filter "*.ps1" -Recurse -ErrorAction Ignore))
+	{
+		. Import-ModuleFile -Path $function.FullName
+	}
+	
+	# Import all public functions
+	foreach ($function in (Get-ChildItem "$($script:ModuleRoot)\functions" -Filter "*.ps1" -Recurse -ErrorAction Ignore))
+	{
+		. Import-ModuleFile -Path $function.FullName
+	}
+	
+	# Execute Postimport actions
+	. Import-ModuleFile -Path "$($script:ModuleRoot)\internal\scripts\postimport.ps1"
+}
+else
+{
+	if (Test-Path (Join-Path $script:ModuleRoot "resourcesBefore.ps1"))
+	{
+		. Import-ModuleFile -Path "$($script:ModuleRoot)\resourcesBefore.ps1"
+	}
+	
+	. Import-ModuleFile -Path "$($script:ModuleRoot)\commands.ps1"
+	
+	if (Test-Path (Join-Path $script:ModuleRoot "resourcesAfter.ps1"))
+	{
+		. Import-ModuleFile -Path "$($script:ModuleRoot)\resourcesAfter.ps1"
+	}
 }