admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load assembly from module base path before trying to load from GAC (#8073)

Browse Source 
[Breaking Change]
When a binary module has the module assembly in GAC, we load the assembly from GAC before trying to load it from module base path.

This change attempts to load it from module base path before looking up in GAC.
This commit is contained in:
Aditya Patwardhan
2018-11-05 10:41:53 -08:00
committed by Travis Plunk
parent 54874180ce
commit b5ab2ddd40
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+6 -4
View File
@@ -4505,13 +4505,15 @@ namespace Microsoft.PowerShell.Commands
result += extension;
}
//For dlls, we cannot get the path from the provider.
//We need to load the assembly and then get the path.
//If the module is already loaded, this is not expensive since the assembly is already loaded in the AppDomain
// For dlls, we cannot get the path from the provider.
// We need to load the assembly and then get the path.
// If the module is already loaded, this is not expensive since the assembly is already loaded in the AppDomain
// If the dll is not loaded, we load it from the resolved path.
// We attempt to load it from the resolved path before we try to look up in GAC on Windows.
if (!string.IsNullOrEmpty(ext) && ext.Equals(".dll", StringComparison.OrdinalIgnoreCase))
{
Exception ignored = null;
Assembly assembly = ExecutionContext.LoadAssembly(name, null, out ignored);
Assembly assembly = ExecutionContext.LoadAssembly(name, result, out ignored);
if (assembly != null)
{
result = assembly.Location;
test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
+17
View File
@@ -179,6 +179,23 @@ namespace ModuleCmdlets
}
}
It 'Should load from ModuleBase path before looking up in GAC' -Skip:(-not $IsWindows) {
$module = Get-Module PSScheduledJob -ListAvailable -SkipEditionCheck
$moduleBasePath = Split-Path $module.Path
$destPath = New-Item -ItemType Directory -Path "$TestDrive/PSScheduledJob"
$gacAssemblyPath = (Get-ChildItem "${env:WinDir}\Microsoft.NET\assembly\GAC_MSIL\Microsoft.PowerShell.ScheduledJob" -Recurse -Filter 'Microsoft.PowerShell.ScheduledJob.dll').FullName
# Copy format, type and psd1
Copy-Item "$moduleBasePath/PSScheduledJob*.*" -Destination $destPath -Force
# Copy assembly to temp module folder"
Copy-Item $gacAssemblyPath -Destination $destPath -Force
# Use a different pwsh so that we do not have the PSScheduledJob module already loaded.
$loadedAssemblyLocation = pwsh -noprofile -c "Import-Module $destPath -Force; [Microsoft.PowerShell.ScheduledJob.AddJobTriggerCommand].Assembly.Location"
$loadedAssemblyLocation | Should -BeLike "$TestDrive*\Microsoft.PowerShell.ScheduledJob.dll"
}
}
Describe "Import-Module should be case insensitive" -Tags 'CI' {