Browse Source

#1208: Prevent automatic reference load in ILLanguage, if FullDecompilation is active.

pull/1213/head
Siegfried Pammer 8 years ago
parent
commit
549142c6f4
  1. 24
      ILSpy/Languages/ILLanguage.cs

24
ILSpy/Languages/ILLanguage.cs

@ -147,17 +147,21 @@ namespace ICSharpCode.ILSpy
var module = assembly.GetPEFileOrNull(); var module = assembly.GetPEFileOrNull();
var metadata = module.Metadata; var metadata = module.Metadata;
var dis = CreateDisassembler(output, options); var dis = CreateDisassembler(output, options);
dis.AssemblyResolver = module.GetAssemblyResolver();
if (options.FullDecompilation) // don't automatically load additional assemblies when an assembly node is selected in the tree view
dis.WriteAssemblyReferences(metadata); using (options.FullDecompilation ? null : LoadedAssembly.DisableAssemblyLoad()) {
if (metadata.IsAssembly) dis.AssemblyResolver = module.GetAssemblyResolver();
dis.WriteAssemblyHeader(module); if (options.FullDecompilation)
output.WriteLine(); dis.WriteAssemblyReferences(metadata);
dis.WriteModuleHeader(module); if (metadata.IsAssembly)
if (options.FullDecompilation) { dis.WriteAssemblyHeader(module);
output.WriteLine();
output.WriteLine(); output.WriteLine();
dis.WriteModuleContents(module); dis.WriteModuleHeader(module);
if (options.FullDecompilation) {
output.WriteLine();
output.WriteLine();
dis.WriteModuleContents(module);
}
} }
} }
} }

Loading…
Cancel
Save