sheldonhull
diff --git a/‎PSModuleDevelopment/PSModuleDevelopment.psd1‎
Lines changed: 1 addition & 1 deletion b/‎PSModuleDevelopment/PSModuleDevelopment.psd1‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎PSModuleDevelopment/PSModuleDevelopment.psm1‎
Lines changed: 7 additions & 0 deletions b/‎PSModuleDevelopment/PSModuleDevelopment.psm1‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎PSModuleDevelopment/bin/PSModuleDevelopment.dll‎
0 Bytes b/‎PSModuleDevelopment/bin/PSModuleDevelopment.dll‎
0 Bytes
diff --git a/‎PSModuleDevelopment/bin/PSModuleDevelopment.pdb‎
2 KB b/‎PSModuleDevelopment/bin/PSModuleDevelopment.pdb‎
2 KB
diff --git a/‎PSModuleDevelopment/bin/PSModuleDevelopment.xml‎
Lines changed: 21 additions & 0 deletions b/‎PSModuleDevelopment/bin/PSModuleDevelopment.xml‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎PSModuleDevelopment/functions/templating/Get-PSMDTemplate.ps1‎
Lines changed: 5 additions & 3 deletions b/‎PSModuleDevelopment/functions/templating/Get-PSMDTemplate.ps1‎
Lines changed: 5 additions & 3 deletions
@@ -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')
 
@@ -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"))
 {
 
@@ -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
 	{
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,9 @@`
`102`	`102`	`$prospects += $data`
`103`	`103`	`}`
`104`	`104`	`}`
	`105`	`+ #endregion Scan folders`
`105`	`106`
	`107`	`+ #region Search Stores`
`106`	`108`	`else`
`107`	`109`	`{`
`108`	`110`	`$stores = Get-PsmdTemplateStore -Filter $Store`
`@@ -111,12 +113,12 @@`
`111`	`113`	`{`
`112`	`114`	`if ($item.Ensure())`
`113`	`115`	`{`
`114`		`- $templateInfos = Get-ChildItem -Path $item.Path -Filter "$($TemplateName)-*.Info.xml" \| Where-Object { ($_.Name -replace "-\d+(\.\d+){0,3}.Info.xml$") -like $TemplateName }`
	`116`	`+ $templateInfos = Get-ChildItem -Path $item.Path -Filter "$($TemplateName)-*-Info.xml" \| Where-Object { ($_.Name -replace "-\d+(\.\d+){0,3}-Info.xml$") -like $TemplateName }`
`115`	`117`
`116`	`118`	`foreach ($info in $templateInfos)`
`117`	`119`	`{`
`118`	`120`	`$data = Import-Clixml $info.FullName`
`119`		`- $data.Path = $info.FullName -replace '\.Info\.xml$', '.xml'`
	`121`	`+ $data.Path = $info.FullName -replace '-Info\.xml$', '.xml'`
`120`	`122`	`$data.Store = $item.Name`
`121`	`123`	`$prospects += $data`
`122`	`124`	`}`
`@@ -129,7 +131,7 @@`
`129`	`131`	`}`
`130`	`132`	`}`
`131`	`133`	`}`
`132`		`- #endregion Scan folders`
	`134`	`+ #endregion Search Stores`
`133`	`135`	`}`
`134`	`136`	`end`
`135`	`137`	`{`