Merge branch 'development' into strings

Author: FriedrichWeinmann

PSModuleDevelopment/PSModuleDevelopment.psd1

@@ -4,7 +4,7 @@
 	RootModule = 'PSModuleDevelopment.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '2.2.8.104'
+	ModuleVersion = '2.2.9.106'
 
 	# 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.1.59' }
+		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.4.149' }
 		@{ ModuleName = 'string'; ModuleVersion = '0.6.1' }
 	)
 

PSModuleDevelopment/changelog.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## ???
+## 2.2.9.106 (September 10th, 2020)
 
 - New: Convert-PSMDMessage - Converts a file's use of PSFramework messages to strings.
 - Upd: Export-PSMDString - Adding support for Test-PSFShouldProcess.

PSModuleDevelopment/functions/refactor/Convert-PSMDMessage.ps1

@@ -43,6 +43,7 @@
 		#region Utility Functions
 		function Get-Text
 		{
+			[OutputType([string])]
 			[CmdletBinding()]
 			param (
 				$Value
@@ -79,6 +80,7 @@
 
 		function Get-Insert
 		{
+			[OutputType([string])]
 			[CmdletBinding()]
 			param (
 				$Value

PSModuleDevelopment/functions/refactor/Set-PSMDEncoding.ps1

@@ -62,7 +62,7 @@
 				Write-PSFMessage -Level Verbose -Message "Setting encoding for $resolvedPath" -Target $pathItem
 				try
 				{
-					if (Test-PSFShouldProcess -PSCmdlet $PSCmdlet -Target $resolvedPath -Action "Set encoding to $($Encoding.EncodingName)")
+					if (Test-PSFShouldProcess -PSCmdlet $PSCmdlet -Target $resolvedPath -Action "Set encoding to $($Encoding.Encoding.EncodingName)")
 					{
 						$text = [System.IO.File]::ReadAllText($resolvedPath)
 						[System.IO.File]::WriteAllText($resolvedPath, $text, $Encoding)

PSModuleDevelopment/internal/configurations/template.ps1

@@ -9,8 +9,8 @@ Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.ParameterDefault.Com
 Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.BinaryExtensions' -Value @('.dll', '.exe', '.pdf', '.doc', '.docx', '.xls', '.xlsx') -Initialize -Description "When creating a template, files with these extensions will be included as raw bytes and not interpreted for parameter insertion."
 
 # Define the default store. To add more stores, just add a similar setting with a different last name segment
-Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.Store.Default' -Value "$path_FileUserShared\WindowsPowerShell\PSModuleDevelopment\Templates" -Initialize -Validation "string" -Description "Path to the default directory where PSModuleDevelopment will store its templates. You can add additional stores by creating the same setting again, only changing the last name segment to a new name and configuring a separate path."
-Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.Store.PSModuleDevelopment' -Value "$script:ModuleRoot\internal\templates" -Initialize -Validation "string" -Description "Path to the templates shipped in PSModuleDevelopment"
+Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.Store.Default' -Value "$path_FileUserShared/WindowsPowerShell/PSModuleDevelopment/Templates" -Initialize -Validation "string" -Description "Path to the default directory where PSModuleDevelopment will store its templates. You can add additional stores by creating the same setting again, only changing the last name segment to a new name and configuring a separate path."
+Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.Store.PSModuleDevelopment' -Value "$script:ModuleRoot/internal/templates" -Initialize -Validation "string" -Description "Path to the templates shipped in PSModuleDevelopment"
 
 # Define the default path to create from templates in
 Set-PSFConfig -Module 'PSModuleDevelopment' -Name 'Template.OutPath' -Value '.' -Initialize -Validation 'string' -Description "The path where new files & projects should be created from templates by default."

PSModuleDevelopment/internal/scripts/variables.ps1

@@ -4,7 +4,7 @@
 	$fileUserShared = @($Env:XDG_CONFIG_DIRS -split ([IO.Path]::PathSeparator))[0]
 	if (-not $fileUserShared) { $fileUserShared = Join-Path $HOME .local/share/ }
 
-	$path_FileUserShared = Join-Path (Join-Path $fileUserShared $psVersionName) "PSFramework/"
+	$path_FileUserShared = Join-Path (Join-Path $fileUserShared $psVersionName) "PSFramework"
 }
 else
 {

build/vsts-prerequisites.ps1

@@ -3,4 +3,6 @@ Install-Module Pester -Force -SkipPublisherCheck
 Write-Host "Installing PSScriptAnalyzer" -ForegroundColor Cyan
 Install-Module PSScriptAnalyzer -Force -SkipPublisherCheck
 Write-Host "Installing PSFramework" -ForegroundColor Cyan
-Install-Module PSFramework -Force -SkipPublisherCheck
+Install-Module PSFramework -Force -SkipPublisherCheck
+Write-Host "Installing String" -ForegroundColor Cyan
+Install-Module String -Force -SkipPublisherCheck