Remove ClrFacade.Load

Instead, rely on intercepting Assembly.Load
This commit is contained in:
Andrew Schwartzmeyer authored and Andrew Schwartzmeyer committed 2016-06-28 18:31:38 -07:00
1 parent 6356a5a778
commit c78732d226
7 files changed
+9 -35

No files matched your search

@@ -1559,7 +1559,7 @@ namespace System.Management.Automation
try
{
loadedAssembly = ClrFacade.Load(new AssemblyName(assemblyString));
loadedAssembly = Assembly.Load(new AssemblyName(assemblyString));
}
catch (FileNotFoundException fileNotFound)
{
@@ -5674,7 +5674,7 @@ if($paths) {
try
{
// WARNING: DUPLICATE CODE see RunspaceConfigForSingleShell
assembly = ClrFacade.Load(new AssemblyName(psSnapInInfo.AssemblyName));
assembly = Assembly.Load(new AssemblyName(psSnapInInfo.AssemblyName));
}
catch (BadImageFormatException e)
{
@@ -662,7 +662,7 @@ namespace System.Management.Automation.Remoting
{
try
{
result = ClrFacade.Load(new AssemblyName(assemblyName));
result = Assembly.Load(new AssemblyName(assemblyName));
}
catch (FileLoadException e)
{
@@ -667,7 +667,7 @@ namespace System.Management.Automation
}
else
{
providerAssembly = ClrFacade.Load(providerInfo.AssemblyName);
providerAssembly = Assembly.Load(providerInfo.AssemblyName);
}
try
@@ -618,7 +618,7 @@ namespace System.Management.Automation.Runspaces
try
{
// WARNING: DUPLICATE CODE see InitialSessionState
assembly = ClrFacade.Load(new AssemblyName(mshsnapinInfo.AssemblyName));
assembly = Assembly.Load(new AssemblyName(mshsnapinInfo.AssemblyName));
}
catch (FileLoadException e)
{
@@ -279,32 +279,6 @@ namespace System.Management.Automation
#endif
}
/// <summary>
/// Porting note: Load assembly by name through the AssemblyLoadContext.
/// This is to ensure that the types get cached.
/// </summary>
internal static Assembly Load(AssemblyName assembly)
{
#if CORECLR
return PSAssemblyLoadContext.LoadFromAssemblyName(assembly);
#else
return Assembly.Load(assembly);
#endif
}
/// <summary>
/// Same as the above, but overloaded for a name in a string.
/// </summary>
internal static Assembly Load(string assembly)
{
#if CORECLR
return PSAssemblyLoadContext.LoadFromAssemblyName(new AssemblyName(assembly));
#else
return Assembly.Load(assembly);
#endif
}
/// <summary>
/// Facade for EnumBuilder.CreateTypeInfo
/// </summary>