maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #792 from PowerShell/andschwa/assembly-load

Browse source 
Try Assembly.Load correctly
This commit is contained in:
Andy Schwartzmeyer 2016-04-08 19:22:21 -07:00 committed by Andrew Schwartzmeyer
parent 80b15f64e2 839014b599
commit 3f00751159
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs
View file

@ -186,10 +186,12 @@ namespace System.Management.Automation
// Try loading it from the TPA list. All PowerShell dependencies are in the
// TPA list when published with dotnet-cli.
asmLoaded = Assembly.Load(assemblyName);
try
{
asmLoaded = Assembly.Load(assemblyName);
}
// If it wasn't there, try loading from path
if (asmLoaded == null)
catch (FileNotFoundException)
{
asmLoaded = asmFilePath.EndsWith(".ni.dll", StringComparison.OrdinalIgnoreCase)
? LoadFromNativeImagePath(asmFilePath, null)
@ -250,9 +252,12 @@ namespace System.Management.Automation
// Try loading it from the TPA list. All PowerShell dependencies are in the
// TPA list when published with dotnet-cli.
asmLoaded = Assembly.Load(assemblyName);
if (asmLoaded == null)
try
{
asmLoaded = Assembly.Load(assemblyName);
}
// If it wasn't there, try loading from path
catch (FileNotFoundException)
{
// Load the assembly through 'LoadFromNativeImagePath' or 'LoadFromAssemblyPath'
asmLoaded = assemblyPath.EndsWith(".ni.dll", StringComparison.OrdinalIgnoreCase)
@ -520,4 +525,4 @@ namespace System.Management.Automation
}
}
#endif
#endif