Skip to content

Update PS should try to load the assembly from file path first before… #5161

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
daxian-dbw merged 4 commits into from
Nov 3, 2017
Merged

Update PS should try to load the assembly from file path first before… #5161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f3af82
Update PS should try to load the assembly from file path first before…
Oct 19, 2017
2aac3cf
update the fix resolving the comment
chunqingchen Oct 31, 2017
e69642c
address comments
chunqingchen Nov 1, 2017
a017c7a
[Feature] address comments
chunqingchen Nov 1, 2017
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/System.Management.Automation/engine/ExecutionContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,21 +1196,19 @@ internal void RemoveAssembly(string name)
}
}


[SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadWithPartialName")]
[SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
internal static Assembly LoadAssembly(string name, string filename, out Exception error)
{
// First we try to load the assembly based on the filename

Assembly loadedAssembly = null;
error = null;

if (!String.IsNullOrEmpty(filename))
{
try
{
loadedAssembly = Assembly.LoadFrom(filename);
return loadedAssembly;
}
catch (FileNotFoundException fileNotFound)
{
Expand All @@ -1219,17 +1217,22 @@ internal static Assembly LoadAssembly(string name, string filename, out Exceptio
catch (FileLoadException fileLoadException)
{
error = fileLoadException;
return null;
}
catch (BadImageFormatException badImage)
{
error = badImage;
return null;
}
catch (SecurityException securityException)
{
error = securityException;
return null;
}
}
else if (!String.IsNullOrEmpty(name))

// Then we try to load the assembly based on the given name
if (!String.IsNullOrEmpty(name))
{
string fixedName = null;
// Remove the '.dll' if it's there...
Expand All @@ -1252,8 +1255,6 @@ internal static Assembly LoadAssembly(string name, string filename, out Exceptio
catch (FileLoadException fileLoadException)
{
error = fileLoadException;
// this is a legitimate error on CoreCLR for a newly emited with Add-Type assemblies
// they cannot be loaded by name, but we are only interested in importing them by path
}
catch (BadImageFormatException badImage)
Copy link
Member

@daxian-dbw daxian-dbw Nov 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments in the catch (FileLoadException fileLoadException) block right above this line seems not needed anymore, since we now try loading from path first.

Copy link
Contributor Author

@chunqingchen chunqingchen Nov 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved

{
Expand All @@ -1265,7 +1266,11 @@ internal static Assembly LoadAssembly(string name, string filename, out Exceptio
}
}

// We either return the loaded Assembly, or return null.
// If the assembly is loaded, we ignore error as it may come from the filepath loading.
if (loadedAssembly != null)
{
error = null;
}
return loadedAssembly;
}

Expand Down
19 changes: 19 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,24 @@ namespace ModuleCmdlets
$results[0] | Should Be $path
$results[1] | Should BeExactly "BinaryModuleCmdlet1 exported by the ModuleCmdlets module."
}

It "PS should try to load the assembly from assembly name if file path doesn't exist" {

$psdFile = Join-Path $TESTDRIVE test.psd1
$nestedModule = Join-Path NOExistedPath Microsoft.PowerShell.Commands.Utility.dll
New-ModuleManifest -Path $psdFile -NestedModules $nestedModule
try
{
$module = Import-Module $psdFile -PassThru
$module.NestedModules | Should Not BeNullOrEmpty
$assemblyLocation = [Microsoft.PowerShell.Commands.AddTypeCommand].Assembly.Location
$module.NestedModules.ImplementingAssembly.Location | Should Be $assemblyLocation
}
finally
{
Remove-Module $module -ErrorAction SilentlyContinue
}

}
}