Skip to content

Try Assembly.Load correctly #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andyleejordan merged 1 commit into from
Apr 9, 2016
Merged

Try Assembly.Load correctly #792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,12 @@ protected override Assembly Load(AssemblyName assemblyName)

// 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)
Expand Down Expand Up @@ -250,9 +252,12 @@ internal Assembly LoadFrom(string assemblyPath)

// 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)
Expand Down Expand Up @@ -520,4 +525,4 @@ public static void SetPowerShellAssemblyLoadContext([MarshalAs(stringType)]strin
}
}

#endif
#endif