Skip to content

Check assembly dependency versions before loading in WinPS #1561

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

Closed
wants to merge 1 commit into from
Closed

Check assembly dependency versions before loading in WinPS #1561

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: 17 additions & 2 deletions src/PowerShellEditorServices.Hosting/EditorServicesLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ public static EditorServicesLoader Create(

// First look for the required assembly in the .NET Framework DLL dir
string baseDirAsmPath = Path.Combine(s_psesBaseDirPath, dllName);
if (File.Exists(baseDirAsmPath))
if (RequiredAssemblyExists(baseDirAsmPath, asmName))
{
logger.Log(PsesLogLevel.Diagnostic, $"Loading {args.Name} from PSES base dir into LoadFile context");
return Assembly.LoadFile(baseDirAsmPath);
}

// Then look in the shared .NET Standard directory
string asmPath = Path.Combine(s_psesDependencyDirPath, dllName);
if (File.Exists(asmPath))
if (RequiredAssemblyExists(asmPath, asmName))
{
logger.Log(PsesLogLevel.Diagnostic, $"Loading {args.Name} from PSES dependency dir into LoadFile context");
return Assembly.LoadFile(asmPath);
Expand Down Expand Up @@ -394,5 +394,20 @@ private static object GetPSVersion()
.GetMethod("get_PSVersion", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
.Invoke(null, new object[0] /* Cannot use Array.Empty, since it must work in net452 */);
}

private static bool RequiredAssemblyExists(string assemblyPath, AssemblyName requiredAssembly)
{
try
{
AssemblyName foundAsm = AssemblyName.GetAssemblyName(assemblyPath);
return foundAsm.Equals(requiredAssembly);
}
catch
{
// Do nothing
}

return false;
}
}
}