@@ -42,7 +42,7 @@
 	# Modules that must be imported into the global environment prior to importing
 	# this module
 	RequiredModules	       = @(
-		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.0.19' }
+		@{ ModuleName = 'PSFramework'; ModuleVersion = '1.0.35' }
 	)
 
 	# Assemblies that must be loaded prior to importing this module
 
@@ -7,6 +7,8 @@
  - Upd: Template PSFProject - Adding `-IncludAZ` switch parameter to `vsts-packageFunction.ps1`, making the template include the AZ module as managed dependency.
  - Upd: Refactored module structure to comply with current Fred Reference Architecture
  - Upd: Template PSFTests - Added localization string tests
+ - Upd: Remove-PSMDTemplate - Refactored and updated messaging / ShouldProcess implementation
+ - Upd: Find-PSMDFileContent - Updated extension filtering to be configurable and include .cs files by default.
  - Fix: Template PSFProject - Publish Folder created during build is created using `-Force`
  - Fix: Template PSFProject - Cleaning up Azure Function conversion
  - Fix: Template PSFTests - Encoding test no longer fails on core (#104)
 
@@ -1,3 +1,4 @@
 @{
 	'MeasurePSMDLinesOfCode.Processing' = 'Processing Path: {0}'
+	'Remove-PSMDTemplate.Removing.Template' = 'Removing template {0} (v{1}) from store {2}'
 }
@@ -47,10 +47,6 @@
 		$EnableException
 	)
 
-	begin
-	{
-		Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'
-	}
 	process
 	{
 		foreach ($pathItem in $Path)
 
@@ -112,7 +112,7 @@
 		$NoFolder,
 
 		[hashtable]
-		$Parameters,
+		$Parameters = @{ },
 
 		[switch]
 		$Raw,
@@ -129,8 +129,6 @@
 
 	begin
 	{
-		Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'
-		
 		#region Validate output path
 		try
 		{
 
@@ -174,10 +174,6 @@
 			& dotnet.exe new $dotNetArgs
 		}
 	}
-	end
-	{
-		
-	}
 }
 
 New-Alias -Name dotnetnew -Value New-PSMDDotNetProject -Option AllScope -Scope Global -ErrorAction Ignore
@@ -154,7 +154,6 @@
 
 	begin
 	{
-		Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'
 		#region Insert basic meta-data
 		$identifier = [regex]::Escape(( Get-PSFConfigValue -FullName 'psmoduledevelopment.template.identifier' -Fallback 'þ' ))
 		$binaryExtensions = Get-PSFConfigValue -FullName 'PSModuleDevelopment.Template.BinaryExtensions' -Fallback @('.dll', '.exe', '.pdf', '.doc', '.docx', '.xls', '.xlsx')
 
@@ -78,8 +78,6 @@
 
 	begin
 	{
-		Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'
-		
 		$templates = @()
 		switch ($PSCmdlet.ParameterSetName)
 		{
@@ -139,23 +137,15 @@
 	{
 		foreach ($item in $Template)
 		{
-			if ($PSCmdlet.ShouldProcess($item, "Remove template"))
-			{
-				try { Remove-Template -Template $item }
-				catch { Stop-PSFFunction -Message "Failed to remove template $($item)" -EnableException $EnableException -ErrorRecord $_ -Target $item -Tag 'fail', 'template', 'remove' -Continue }
-			}
+			Invoke-PSFProtectedCommand -ActionString 'Remove-PSMDTemplate.Removing.Template' -Target $item.Name -ScriptBlock {
+				Remove-Template -Template $item
+			} -EnableException $EnableException.ToBool() -PSCmdlet $PSCmdlet -Continue -ActionStringValues $item.Name, $item.Version, $item.Store
 		}
 		foreach ($item in $templates)
 		{
-			if ($PSCmdlet.ShouldProcess($item, "Remove template"))
-			{
-				try { Remove-Template -Template $item }
-				catch { Stop-PSFFunction -Message "Failed to remove template $($item)" -EnableException $EnableException -ErrorRecord $_ -Target $item -Tag 'fail', 'template', 'remove' -Continue }
-			}
+			Invoke-PSFProtectedCommand -ActionString 'Remove-PSMDTemplate.Removing.Template' -Target $item.Name -ScriptBlock {
+				Remove-Template -Template $item
+			} -EnableException $EnableException.ToBool() -PSCmdlet $PSCmdlet -Continue -ActionStringValues $item.Name, $item.Version, $item.Store
 		}
 	}
-	end
-	{
-	
-	}
 }
@@ -37,8 +37,8 @@
 		[string]
 		$Pattern,
 
-		[string[]]
-		$Extension = @(".ps1", ".psd1", ".psm1"),
+		[string]
+		$Extension = (Get-PSFConfigValue -FullName 'PSModuleDevelopment.Find.DefaultExtensions'),
 
 		[string]
 		$Path = (Get-PSFConfigValue -FullName 'PSModuleDevelopment.Module.Path'),
@@ -59,11 +59,7 @@
 	{
 		if (Test-PSFFunctionInterrupt) { return }
 
-		Get-ChildItem -Path $Path -Recurse | Where-Object Extension -In $Extension | Select-String -Pattern $Pattern
-	}
-	end
-	{
-		if (Test-PSFFunctionInterrupt) { return }
+		Get-ChildItem -Path $Path -Recurse | Where-Object Extension -Match $Extension | Select-String -Pattern $Pattern
 	}
 }
 New-Alias -Name find -Value Find-PSMDFileContent -Scope Global -Option AllScope
@@ -32,18 +32,8 @@
 
 	begin
 	{
-        $internalExecutionContext = [PSFramework.Utility.UtilityHost]::GetExecutionContextFromTLS()
-        $customArgumentCompletersProperty = $internalExecutionContext.GetType().GetProperty(
-            'CustomArgumentCompleters',
-            [System.Reflection.BindingFlags]'NonPublic, Instance'
-        )
-        $customArgumentCompleters = $customArgumentCompletersProperty.GetGetMethod($true).Invoke(
-            $internalExecutionContext,
-            [System.Reflection.BindingFlags]'Instance, NonPublic, GetProperty',
-            $null,
-            @(),
-            $psculture
-        )
+		$internalExecutionContext = [PSFramework.Utility.UtilityHost]::GetExecutionContextFromTLS()
+		$customArgumentCompleters = [PSFramework.Utility.UtilityHost]::GetPrivateProperty('CustomArgumentCompleters', $internalExecutionContext)
 	}
 	process
 	{
@@ -55,7 +45,7 @@
             {
                 if ($parameter -like $ParameterName)
                 {
-                    New-Object PSObject -Property @{
+                    [pscustomobject]@{
                         CommandName   = $name
                         ParameterName = $parameter
                         Definition    = $customArgumentCompleters[$argumentCompleter]
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`# Modules that must be imported into the global environment prior to importing`
`43`	`43`	`# this module`
`44`	`44`	`RequiredModules = @(`
`45`		`- @{ ModuleName = 'PSFramework'; ModuleVersion = '1.0.19' }`
	`45`	`+ @{ ModuleName = 'PSFramework'; ModuleVersion = '1.0.35' }`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`# Assemblies that must be loaded prior to importing this module`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`@{`
`2`	`2`	`'MeasurePSMDLinesOfCode.Processing' = 'Processing Path: {0}'`
	`3`	`+ 'Remove-PSMDTemplate.Removing.Template' = 'Removing template {0} (v{1}) from store {2}'`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,6 @@`
`47`	`47`	`$EnableException`
`48`	`48`	`)`
`49`	`49`
`50`		`- begin`
`51`		`- {`
`52`		`- Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'`
`53`		`- }`
`54`	`50`	`process`
`55`	`51`	`{`
`56`	`52`	`foreach ($pathItem in $Path)`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@`
`112`	`112`	`$NoFolder,`
`113`	`113`
`114`	`114`	`[hashtable]`
`115`		`- $Parameters,`
	`115`	`+ $Parameters = @{ },`
`116`	`116`
`117`	`117`	`[switch]`
`118`	`118`	`$Raw,`
`@@ -129,8 +129,6 @@`
`129`	`129`
`130`	`130`	`begin`
`131`	`131`	`{`
`132`		`- Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'`
`133`		`-`
`134`	`132`	`#region Validate output path`
`135`	`133`	`try`
`136`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,10 +174,6 @@`
`174`	`174`	`& dotnet.exe new $dotNetArgs`
`175`	`175`	`}`
`176`	`176`	`}`
`177`		`- end`
`178`		`- {`
`179`		`-`
`180`		`- }`
`181`	`177`	`}`
`182`	`178`
`183`	`179`	`New-Alias -Name dotnetnew -Value New-PSMDDotNetProject -Option AllScope -Scope Global -ErrorAction Ignore`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,6 @@`
`154`	`154`
`155`	`155`	`begin`
`156`	`156`	`{`
`157`		`- Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'`
`158`	`157`	`#region Insert basic meta-data`
`159`	`158`	`$identifier = [regex]::Escape(( Get-PSFConfigValue -FullName 'psmoduledevelopment.template.identifier' -Fallback 'þ' ))`
`160`	`159`	`$binaryExtensions = Get-PSFConfigValue -FullName 'PSModuleDevelopment.Template.BinaryExtensions' -Fallback @('.dll', '.exe', '.pdf', '.doc', '.docx', '.xls', '.xlsx')`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@`
`78`	`78`
`79`	`79`	`begin`
`80`	`80`	`{`
`81`		`- Write-PSFMessage -Level InternalComment -Message "Bound parameters: $($PSBoundParameters.Keys -join ", ")" -Tag 'debug', 'start', 'param'`
`82`		`-`
`83`	`81`	`$templates = @()`
`84`	`82`	`switch ($PSCmdlet.ParameterSetName)`
`85`	`83`	`{`
`@@ -139,23 +137,15 @@`
`139`	`137`	`{`
`140`	`138`	`foreach ($item in $Template)`
`141`	`139`	`{`
`142`		`- if ($PSCmdlet.ShouldProcess($item, "Remove template"))`
`143`		`- {`
`144`		`- try { Remove-Template -Template $item }`
`145`		`- catch { Stop-PSFFunction -Message "Failed to remove template $($item)" -EnableException $EnableException -ErrorRecord $_ -Target $item -Tag 'fail', 'template', 'remove' -Continue }`
`146`		`- }`
	`140`	`+ Invoke-PSFProtectedCommand -ActionString 'Remove-PSMDTemplate.Removing.Template' -Target $item.Name -ScriptBlock {`
	`141`	`+ Remove-Template -Template $item`
	`142`	`+ } -EnableException $EnableException.ToBool() -PSCmdlet $PSCmdlet -Continue -ActionStringValues $item.Name, $item.Version, $item.Store`
`147`	`143`	`}`
`148`	`144`	`foreach ($item in $templates)`
`149`	`145`	`{`
`150`		`- if ($PSCmdlet.ShouldProcess($item, "Remove template"))`
`151`		`- {`
`152`		`- try { Remove-Template -Template $item }`
`153`		`- catch { Stop-PSFFunction -Message "Failed to remove template $($item)" -EnableException $EnableException -ErrorRecord $_ -Target $item -Tag 'fail', 'template', 'remove' -Continue }`
`154`		`- }`
	`146`	`+ Invoke-PSFProtectedCommand -ActionString 'Remove-PSMDTemplate.Removing.Template' -Target $item.Name -ScriptBlock {`
	`147`	`+ Remove-Template -Template $item`
	`148`	`+ } -EnableException $EnableException.ToBool() -PSCmdlet $PSCmdlet -Continue -ActionStringValues $item.Name, $item.Version, $item.Store`
`155`	`149`	`}`
`156`	`150`	`}`
`157`		`- end`
`158`		`- {`
`159`		`-`
`160`		`- }`
`161`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,18 +32,8 @@`
`32`	`32`
`33`	`33`	`begin`
`34`	`34`	`{`
`35`		`- $internalExecutionContext = [PSFramework.Utility.UtilityHost]::GetExecutionContextFromTLS()`
`36`		`- $customArgumentCompletersProperty = $internalExecutionContext.GetType().GetProperty(`
`37`		`- 'CustomArgumentCompleters',`
`38`		`- [System.Reflection.BindingFlags]'NonPublic, Instance'`
`39`		`- )`
`40`		`- $customArgumentCompleters = $customArgumentCompletersProperty.GetGetMethod($true).Invoke(`
`41`		`- $internalExecutionContext,`
`42`		`- [System.Reflection.BindingFlags]'Instance, NonPublic, GetProperty',`
`43`		`- $null,`
`44`		`- @(),`
`45`		`- $psculture`
`46`		`- )`
	`35`	`+ $internalExecutionContext = [PSFramework.Utility.UtilityHost]::GetExecutionContextFromTLS()`
	`36`	`+ $customArgumentCompleters = [PSFramework.Utility.UtilityHost]::GetPrivateProperty('CustomArgumentCompleters', $internalExecutionContext)`
`47`	`37`	`}`
`48`	`38`	`process`
`49`	`39`	`{`
`@@ -55,7 +45,7 @@`
`55`	`45`	`{`
`56`	`46`	`if ($parameter -like $ParameterName)`
`57`	`47`	`{`
`58`		`- New-Object PSObject -Property @{`
	`48`	`+ [pscustomobject]@{`
`59`	`49`	`CommandName = $name`
`60`	`50`	`ParameterName = $parameter`
`61`	`51`	`Definition = $customArgumentCompleters[$argumentCompleter]`