finalizing templates

Author: Friedrich Weinmann

PSModuleDevelopment/PSModuleDevelopment.psd1

@@ -41,7 +41,7 @@
 
 	# Modules that must be imported into the global environment prior to importing
 	# this module
-	RequiredModules		    = @(@{ ModuleName='PSFramework'; ModuleVersion= '0.9.9.19' })
+	RequiredModules		    = @(@{ ModuleName='PSFramework'; ModuleVersion= '0.9.10.23' })
 
 	# Assemblies that must be loaded prior to importing this module
 	RequiredAssemblies = @('bin\PSModuleDevelopment.dll')

PSModuleDevelopment/PSModuleDevelopment.psm1

@@ -38,6 +38,13 @@ function Import-PSMDFile
 # Perform Actions before loading the rest of the content
 . Import-PSMDFile -Path "$PSModuleRoot\internal\scripts\preload.ps1"
 
+#region Load internal functions
+foreach ($function in (Get-ChildItem "$PSModuleRoot\internal\functions" -Recurse -File -Filter "*.ps1"))
+{
+	. Import-PSMDFile -Path $function.FullName
+}
+#endregion Load internal functions
+
 #region Load functions
 foreach ($function in (Get-ChildItem "$PSModuleRoot\functions" -Recurse -File -Filter "*.ps1"))
 {

PSModuleDevelopment/bin/PSModuleDevelopment.dll

@@ -102,7 +102,9 @@
 				$prospects += $data
 			}
 		}
+		#endregion Scan folders
 
+		#region Search Stores
 		else
 		{
 			$stores = Get-PsmdTemplateStore -Filter $Store
@@ -111,12 +113,12 @@
 			{
 				if ($item.Ensure())
 				{
-					$templateInfos = Get-ChildItem -Path $item.Path -Filter "$($TemplateName)-*.Info.xml" | Where-Object { ($_.Name -replace "-\d+(\.\d+){0,3}.Info.xml$") -like $TemplateName }
+					$templateInfos = Get-ChildItem -Path $item.Path -Filter "$($TemplateName)-*-Info.xml" | Where-Object { ($_.Name -replace "-\d+(\.\d+){0,3}-Info.xml$") -like $TemplateName }
 
 					foreach ($info in $templateInfos)
 					{
 						$data = Import-Clixml $info.FullName
-						$data.Path = $info.FullName -replace '\.Info\.xml$', '.xml'
+						$data.Path = $info.FullName -replace '-Info\.xml$', '.xml'
 						$data.Store = $item.Name
 						$prospects += $data
 					}
@@ -129,7 +131,7 @@
 				}
 			}
 		}
-		#endregion Scan folders
+		#endregion Search Stores
 	}
 	end
 	{