Merge pull request #257 from PowershellFrameworkCollective/development

0.10.30.165

Author: FriedrichWeinmann

PSFramework/PSFramework.psd1

@@ -5,7 +5,7 @@
 	RootModule = 'PSFramework.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '0.10.29.160'
+	ModuleVersion = '0.10.30.165'
 
 	# ID used to uniquely identify this module
 	GUID = '8028b914-132b-431f-baa9-94a6952f21ff'
@@ -93,6 +93,7 @@
 		'Import-PSFLocalizedString',
 		'Install-PSFLoggingProvider',
 		'Invoke-PSFCommand',
+		'Join-PSFPath',
 		'New-PSFLicense',
 		'New-PSFMessageLevelModifier',
 		'New-PSFSupportPackage',
@@ -107,6 +108,7 @@
 		'Register-PSFTeppArgumentCompleter',
 		'Register-PSFTeppScriptblock',
 		'Register-PSFTypeSerializationData',
+		'Remove-PSFAlias',
 		'Remove-PSFLicense',
 		'Remove-PSFMessageLevelModifier',
 		'Reset-PSFConfig',

PSFramework/PSFramework.psm1

@@ -58,7 +58,7 @@ function Import-ModuleFile
 		if ($doDotSource) { . (Resolve-Path $Path) }
 		else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path).ProviderPath))), $null, $null) }
 	}
-	catch { throw (New-Object System.Exception("Failed to import $(Resolve-Path $Path) _ $_", $_.Exception)) }
+	catch { throw (New-Object System.Exception("Failed to import $(Resolve-Path $Path) : $_", $_.Exception)) }
 }
 
 #region Load individual files

PSFramework/bin/PSFramework.dll

@@ -1,4 +1,11 @@
 # CHANGELOG
+## 0.10.30.165 : 2018-12-01
+ - New: Command Join-PSFPath performs multi-segment path joins and path normalization
+ - New: Command Remove-PSFAlias deletes global aliases
+ - New: Configuration setting to define current language
+ - Upd: PsfValidatePattern now supports localized strings using the `ErrorString` property.
+ - Fix: Race condition / concurrent access on license content during import with ramping up CPU availability
+
 ## 0.10.29.160 : 2018-11-04
  - New: Command ConvertTo-PSFHashtable converts objects into hashtables
  - New: Command Get-PSFPipeline grants access to the current pipeline and all its works.

PSFramework/bin/PSFramework.pdb

@@ -0,0 +1,5 @@
+@{
+	Assembly_UtilityHost_AliasNotFound = 'Failed to find alias: {0}'
+	Assembly_UtilityHost_AliasProtected = 'The alias "{0}" is protected and cannot be removed!'
+	Assembly_UtilityHost_AliasReadOnly = 'The alias "{0}" is read only! To remove it, also specify the "-Force" parameter.'
+}

PSFramework/bin/PSFramework.xml

@@ -0,0 +1,3 @@
+@{
+	Configuration_ValidateLanguage  = '{0} is not recognized as a legal language code, such as "en-US" or "de-DE"'
+}

PSFramework/changelog.md

@@ -31,7 +31,6 @@
 	
 		Returns a list of all registered licenses for products that have commercial licenses and are libraries.
 #>
-	
 	[CmdletBinding(PositionalBinding = $false, HelpUri = 'https://psframework.org/documentation/commands/PSFramework/Get-PSFLicense')]
 	[OutputType([PSFramework.License.License])]
 	param (
@@ -50,31 +49,11 @@
 		$Manufacturer = "*"
 	)
 
-	$licenses = [PSFramework.License.LicenseHost]::Get() | Where-Object { ($_.Product -like $Filter) -and ($_.Manufacturer -like $Manufacturer) }
-	if ($PSBoundParameters.ContainsKey("ProductType"))
-	{
-		$temp = $licenses
-		$licenses = @()
-		
-		:main foreach ($l in $temp)
-		{
-			foreach ($type in $ProductType)
-			{
-				if ($l.ProductType -eq $type)
-				{
-					$licenses += $l
-					continue main
-				}
-			}
-		}
-	}
-	
-	if ($PSBoundParameters.ContainsKey("LicenseType"))
-	{
-		$licenses | Where-Object { ($_.LicenseType.ToString() -match $LicenseType.ToString()) -and ($_.Manufacturer -like $Manufacturer) -and ($_.Product -like $Filter) }
-	}
-	else
-	{
-		$licenses | Where-Object { ($_.Manufacturer -like $Manufacturer) -and ($_.Product -like $Filter) }
+	[PSFramework.License.LicenseHost]::Get() | Where-Object {
+		if ($_.Product -notlike $Filter) { return $false }
+		if ($_.Manufacturer -notlike $Manufacturer) { return $false }
+		if ($ProductType -and ($_.ProductType -notin $ProductType)) { return $false }
+		if ($licenseType -and -not ($_.LicenseType -band $LicenseType)) { return $false }
+		return $true
 	}
 }

PSFramework/en-us/stringsAssembly.psd1

@@ -80,7 +80,6 @@
 	
 		This registers the Awesome Test Product as licensed under the common FreeBSD license.
 #>
-	
 	[CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = 'Low', HelpUri = 'https://psframework.org/documentation/commands/PSFramework/New-PSFLicense')]
 	[OutputType([PSFramework.License.License])]
 	param
@@ -123,21 +122,22 @@
 	)
 
 	# Create and fill object
-	$license = New-Object PSFramework.License.License
-	$license.Product = $Product
-	$license.Manufacturer = $Manufacturer
-	$license.ProductVersion = $ProductVersion
-	$license.ProductType = $ProductType
-	$license.LicenseName = $Name
-	$license.LicenseVersion = $Version
-	$license.LicenseDate = $Date
-	$license.LicenseType = $Type
-	$license.LicenseText = $Text
-	$license.Description = $Description
-	$license.Parent = $Parent
+	$license = New-Object PSFramework.License.License -Property @{
+		Product	       = $Product
+		Manufacturer   = $Manufacturer
+		ProductVersion = $ProductVersion
+		ProductType    = $ProductType
+		LicenseName    = $Name
+		LicenseVersion = $Version
+		LicenseDate    = $Date
+		LicenseType    = $Type
+		LicenseText    = $Text
+		Description    = $Description
+		Parent		   = $Parent
+	}
 	if ($PSCmdlet.ShouldProcess("$($license.Product) $($license.ProductVersion) ($($license.LicenseName))", "Create License"))
 	{
-		if (-not ([PSFramework.License.LicenseHost]::Get() | Where-Object { ($_.Product -eq $license.Product) -and ($_.ProductVersion -eq $license.ProductVersion) }))
+		if (-not ([PSFramework.License.LicenseHost]::Get($license)))
 		{
 			[PSFramework.License.LicenseHost]::Add($license)
 		}