Merge pull request #57 from PowershellFrameworkCollective/development

2.2.5.31

Author: FriedrichWeinmann

PSModuleDevelopment/PSModuleDevelopment.psd1

@@ -4,7 +4,7 @@
 	RootModule = 'PSModuleDevelopment.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '2.2.5.30'
+	ModuleVersion = '2.2.5.31'
 
 	# ID used to uniquely identify this module
 	GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6'

PSModuleDevelopment/PSModuleDevelopment.psm1

@@ -1,5 +1,5 @@
 $script:PSModuleRoot = $PSScriptRoot
-$script:PSModuleVersion = "2.2.5.30"
+$script:PSModuleVersion = "2.2.5.31"
 
 $script:doDotSource = $false
 if (Get-PSFConfigValue -FullName PSModuleDevelopment.Import.DoDotSource) { $script:doDotSource = $true }

PSModuleDevelopment/changelog.md

@@ -1,4 +1,7 @@
 # Changelog
+## 2.2.5.31 (September 29th, 2018)
+ - Fix: Template PSFProject dependencies installed correctly
+ 
 ## 2.2.5.30 (September 12th, 2018)
  - Upd: Template integrated NUnit Test Reporting
  - Upd: Template support for compiled module files
@@ -77,4 +80,4 @@ Split-PSMDScriptFile: Exports all functions in a file and creates new files, one
  - New Alias: hex --> Get-HelpEx
 
 ## 1.2.0.0 (August 15th, 2016):
- - New function: Get-ExHelp
+ - New function: Get-ExHelp

templates/PSFProject/build/vsts-prerequisites.ps1

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

templates/PSFProject/install.ps1

@@ -16,6 +16,10 @@
 	
 	.PARAMETER UserMode
 		The downloaded module will be moved to the user profile, rather than program files.
+		
+	.PARAMETER Scope
+		By default, the downloaded module will be moved to program files.
+		Setting this to 'CurrentUser' installs to the userprofile of the current user.
 
 	.PARAMETER Force
 		The install script will overwrite an existing module.
@@ -28,6 +32,10 @@ Param (
 	[switch]
 	$UserMode,
 
+	[ValidateSet('AllUsers', 'CurrentUser')]
+	[string]
+	$Scope = "AllUsers",
+	
 	[switch]
 	$Force
 )
@@ -43,6 +51,15 @@ $BaseUrl = "https://github.com/<InsertUsernameHere>/þnameþ"
 $SubFolder = "þnameþ"
 #endregion Configuration for cloning script
 
+#region Parameter Calculation
+$doUserMode = $false
+if ($UserMode) { $doUserMode = $true }
+if ($install_CurrentUser) { $doUserMode = $true }
+if ($Scope -eq 'CurrentUser') { $doUserMode = $true }
+
+if ($install_Branch) { $Branch = $install_Branch }
+#endregion Parameter Calculation
+
 #region Utility Functions
 function Compress-Archive
 {