Updated error handling on import

Friedrich Weinmann · Friedrich Weinmann · commit b593a2762f4c · 2018-11-04T16:27:15.000+01:00
diff --git a/PSFramework/PSFramework.psm1 b/PSFramework/PSFramework.psm1
@@ -53,8 +53,12 @@ function Import-ModuleFile
 		$Path
 	)
 	
-	if ($doDotSource) { . (Resolve-Path $Path) }
-	else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path).ProviderPath))), $null, $null) }
+	try
+	{
+		if ($doDotSource) { . (Resolve-Path $Path) }
+		else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path).ProviderPath))), $null, $null) }
+	}
+	catch { throw (New-Object System.Exception("Failed to import $(Resolve-Path $Path) _ $_", $_.Exception)) }
 }
 
 #region Load individual files

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,12 @@ function Import-ModuleFile`
`53`	`53`	`$Path`
`54`	`54`	`)`
`55`	`55`
`56`		`- if ($doDotSource) { . (Resolve-Path $Path) }`
`57`		`- else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path).ProviderPath))), $null, $null) }`
	`56`	`+ try`
	`57`	`+ {`
	`58`	`+ if ($doDotSource) { . (Resolve-Path $Path) }`
	`59`	`+ else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText((Resolve-Path $Path).ProviderPath))), $null, $null) }`
	`60`	`+ }`
	`61`	`+ catch { throw (New-Object System.Exception("Failed to import $(Resolve-Path $Path) _ $_", $_.Exception)) }`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`#region Load individual files`