Add support for opening .netmodules.

ICSharpCode.Decompiler/Ast/AstBuilder.cs

@@ -167,7 +167,12 @@ namespace ICSharpCode.Decompiler.Ast
 		
 		public void AddAssembly(AssemblyDefinition assemblyDefinition, bool onlyAssemblyLevel = false)
 		{
-			if (assemblyDefinition.Name.Version != null) {
+			AddAssembly(assemblyDefinition.MainModule, onlyAssemblyLevel);
+		}
+		
+		public void AddAssembly(ModuleDefinition moduleDefinition, bool onlyAssemblyLevel = false)
+		{
+			if (moduleDefinition.Assembly != null && moduleDefinition.Assembly.Name.Version != null) {
 				syntaxTree.AddChild(
 					new AttributeSection {
 						AttributeTarget = "assembly",
@@ -176,22 +181,24 @@ namespace ICSharpCode.Decompiler.Ast
 								Type = new SimpleType("AssemblyVersion")
 									.WithAnnotation(new TypeReference(
 										"System.Reflection", "AssemblyVersionAttribute",
-										assemblyDefinition.MainModule, assemblyDefinition.MainModule.TypeSystem.Corlib)),
+										moduleDefinition, moduleDefinition.TypeSystem.Corlib)),
 								Arguments = {
-									new PrimitiveExpression(assemblyDefinition.Name.Version.ToString())
+									new PrimitiveExpression(moduleDefinition.Assembly.Name.Version.ToString())
 								}
 							}
 						}
 					}, EntityDeclaration.AttributeRole);
 			}
 			
-			ConvertCustomAttributes(syntaxTree, assemblyDefinition, "assembly");
+			if (moduleDefinition.Assembly != null) {
-			ConvertSecurityAttributes(syntaxTree, assemblyDefinition, "assembly");
+				ConvertCustomAttributes(syntaxTree, moduleDefinition.Assembly, "assembly");
-			ConvertCustomAttributes(syntaxTree, assemblyDefinition.MainModule, "module");
+				ConvertSecurityAttributes(syntaxTree, moduleDefinition.Assembly, "assembly");
-			AddTypeForwarderAttributes(syntaxTree, assemblyDefinition.MainModule, "assembly");
+			}
+			ConvertCustomAttributes(syntaxTree, moduleDefinition, "module");
+			AddTypeForwarderAttributes(syntaxTree, moduleDefinition, "assembly");
 			
 			if (!onlyAssemblyLevel) {
-				foreach (TypeDefinition typeDef in assemblyDefinition.MainModule.Types) {
+				foreach (TypeDefinition typeDef in moduleDefinition.Types) {
 					// Skip the <Module> class
 					if (typeDef.Name == "<Module>") continue;
 					// Skip any hidden types

ILSpy/Languages/CSharpLanguage.cs

@@ -262,13 +262,13 @@ namespace ICSharpCode.ILSpy
 		{
 			if (options.FullDecompilation && options.SaveAsProjectDirectory != null) {
 				HashSet<string> directories = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-				var files = WriteCodeFilesInProject(assembly.AssemblyDefinition, options, directories).ToList();
+				var files = WriteCodeFilesInProject(assembly.ModuleDefinition, options, directories).ToList();
 				files.AddRange(WriteResourceFilesInProject(assembly, options, directories));
-				WriteProjectFile(new TextOutputWriter(output), files, assembly.AssemblyDefinition.MainModule);
+				WriteProjectFile(new TextOutputWriter(output), files, assembly.ModuleDefinition);
 			} else {
 				base.DecompileAssembly(assembly, output, options);
 				output.WriteLine();
-				ModuleDefinition mainModule = assembly.AssemblyDefinition.MainModule;
+				ModuleDefinition mainModule = assembly.ModuleDefinition;
 				if (mainModule.EntryPoint != null) {
 					output.Write("// Entry point: ");
 					output.WriteReference(mainModule.EntryPoint.DeclaringType.FullName + "." + mainModule.EntryPoint.Name, mainModule.EntryPoint);
@@ -296,8 +296,8 @@ namespace ICSharpCode.ILSpy
 				
 				// don't automatically load additional assemblies when an assembly node is selected in the tree view
 				using (options.FullDecompilation ? null : LoadedAssembly.DisableAssemblyLoad()) {
-					AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.AssemblyDefinition.MainModule);
+					AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.ModuleDefinition);
-					codeDomBuilder.AddAssembly(assembly.AssemblyDefinition, onlyAssemblyLevel: !options.FullDecompilation);
+					codeDomBuilder.AddAssembly(assembly.ModuleDefinition, onlyAssemblyLevel: !options.FullDecompilation);
 					codeDomBuilder.RunTransformations(transformAbortCondition);
 					codeDomBuilder.GenerateCode(output);
 				}
@@ -423,9 +423,9 @@ namespace ICSharpCode.ILSpy
 			return true;
 		}
 
-		IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(AssemblyDefinition assembly, DecompilationOptions options, HashSet<string> directories)
+		IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(ModuleDefinition module, DecompilationOptions options, HashSet<string> directories)
 		{
-			var files = assembly.MainModule.Types.Where(t => IncludeTypeWhenDecompilingProject(t, options)).GroupBy(
+			var files = module.Types.Where(t => IncludeTypeWhenDecompilingProject(t, options)).GroupBy(
 				delegate(TypeDefinition type) {
 					string file = TextView.DecompilerTextView.CleanUpName(type.Name) + this.FileExtension;
 					if (string.IsNullOrEmpty(type.Namespace)) {
@@ -443,7 +443,7 @@ namespace ICSharpCode.ILSpy
 				new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount },
 				delegate(IGrouping<string, TypeDefinition> file) {
 					using (StreamWriter w = new StreamWriter(Path.Combine(options.SaveAsProjectDirectory, file.Key))) {
-						AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.MainModule);
+						AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: module);
 						foreach (TypeDefinition type in file) {
 							codeDomBuilder.AddType(type);
 						}
@@ -461,7 +461,7 @@ namespace ICSharpCode.ILSpy
 		{
 			//AppDomain bamlDecompilerAppDomain = null;
 			//try {
-				foreach (EmbeddedResource r in assembly.AssemblyDefinition.MainModule.Resources.OfType<EmbeddedResource>()) {
+				foreach (EmbeddedResource r in assembly.ModuleDefinition.Resources.OfType<EmbeddedResource>()) {
 					string fileName;
 					Stream s = r.GetResourceStream();
 					s.Position = 0;

ILSpy/Languages/ILLanguage.cs

@@ -114,14 +114,15 @@ namespace ICSharpCode.ILSpy
 			
 			ReflectionDisassembler rd = new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken);
 			if (options.FullDecompilation)
-				rd.WriteAssemblyReferences(assembly.AssemblyDefinition.MainModule);
+				rd.WriteAssemblyReferences(assembly.ModuleDefinition);
-			rd.WriteAssemblyHeader(assembly.AssemblyDefinition);
+			if (assembly.AssemblyDefinition != null)
+				rd.WriteAssemblyHeader(assembly.AssemblyDefinition);
 			output.WriteLine();
-			rd.WriteModuleHeader(assembly.AssemblyDefinition.MainModule);
+			rd.WriteModuleHeader(assembly.ModuleDefinition);
 			if (options.FullDecompilation) {
 				output.WriteLine();
 				output.WriteLine();
-				rd.WriteModuleContents(assembly.AssemblyDefinition.MainModule);
+				rd.WriteModuleContents(assembly.ModuleDefinition);
 			}
 		}
 		

ILSpy/Languages/Language.cs

@@ -88,11 +88,15 @@ namespace ICSharpCode.ILSpy
 		public virtual void DecompileAssembly(LoadedAssembly assembly, ITextOutput output, DecompilationOptions options)
 		{
 			WriteCommentLine(output, assembly.FileName);
-			var name = assembly.AssemblyDefinition.Name;
+			if (assembly.AssemblyDefinition != null) {
-			if (name.IsWindowsRuntime) {
+				var name = assembly.AssemblyDefinition.Name;
-				WriteCommentLine(output, name.Name + " [WinRT]");
+				if (name.IsWindowsRuntime) {
+					WriteCommentLine(output, name.Name + " [WinRT]");
+				} else {
+					WriteCommentLine(output, name.FullName);
+				}
 			} else {
-				WriteCommentLine(output, name.FullName);
+				WriteCommentLine(output, assembly.ModuleDefinition.Name);
 			}
 		}
 

ILSpy/LoadedAssembly.cs

@@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpy
 	/// </summary>
 	public sealed class LoadedAssembly
 	{
-		readonly Task<AssemblyDefinition> assemblyTask;
+		readonly Task<ModuleDefinition> assemblyTask;
 		readonly AssemblyList assemblyList;
 		readonly string fileName;
 		readonly string shortName;
@@ -44,15 +44,15 @@ namespace ICSharpCode.ILSpy
 			this.assemblyList = assemblyList;
 			this.fileName = fileName;
 			
-			this.assemblyTask = Task.Factory.StartNew<AssemblyDefinition>(LoadAssembly); // requires that this.fileName is set
+			this.assemblyTask = Task.Factory.StartNew<ModuleDefinition>(LoadAssembly); // requires that this.fileName is set
 			this.shortName = Path.GetFileNameWithoutExtension(fileName);
 		}
 		
 		/// <summary>
-		/// Gets the Cecil AssemblyDefinition.
+		/// Gets the Cecil ModuleDefinition.
 		/// Can be null when there was a load error.
 		/// </summary>
-		public AssemblyDefinition AssemblyDefinition {
+		public ModuleDefinition ModuleDefinition {
 			get {
 				try {
 					return assemblyTask.Result;
@@ -62,6 +62,17 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
+		/// <summary>
+		/// Gets the Cecil AssemblyDefinition.
+		/// Is null when there was a load error; or when opening a netmodule.
+		/// </summary>
+		public AssemblyDefinition AssemblyDefinition {
+			get {
+				var module = this.ModuleDefinition;
+				return module != null ? module.Assembly : null;
+			}
+		}
+		
 		public AssemblyList AssemblyList {
 			get { return assemblyList; }
 		}
@@ -82,22 +93,22 @@ namespace ICSharpCode.ILSpy
 			get { return assemblyTask.IsFaulted; }
 		}
 		
-		AssemblyDefinition LoadAssembly()
+		ModuleDefinition LoadAssembly()
 		{
 			// runs on background thread
 			ReaderParameters p = new ReaderParameters();
 			p.AssemblyResolver = new MyAssemblyResolver(this);
-			AssemblyDefinition asm = AssemblyDefinition.ReadAssembly(fileName, p);
+			ModuleDefinition module = ModuleDefinition.ReadModule(fileName, p);
 			if (DecompilerSettingsPanel.CurrentDecompilerSettings.UseDebugSymbols) {
 				try {
-					LoadSymbols(asm.MainModule);
+					LoadSymbols(module);
 				} catch (IOException) {
 				} catch (UnauthorizedAccessException) {
 				} catch (InvalidOperationException) {
 					// ignore any errors during symbol loading
 				}
 			}
-			return asm;
+			return module;
 		}
 		
 		private void LoadSymbols(ModuleDefinition module)
@@ -244,7 +255,7 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
-		public Task ContinueWhenLoaded(Action<Task<AssemblyDefinition>> onAssemblyLoaded, TaskScheduler taskScheduler)
+		public Task ContinueWhenLoaded(Action<Task<ModuleDefinition>> onAssemblyLoaded, TaskScheduler taskScheduler)
 		{
 			return this.assemblyTask.ContinueWith(onAssemblyLoaded, taskScheduler);
 		}

ILSpy/MainWindow.xaml.cs

@@ -275,9 +275,9 @@ namespace ICSharpCode.ILSpy
 					}
 				} else {
 					foreach (LoadedAssembly asm in commandLineLoadedAssemblies) {
-						AssemblyDefinition def = asm.AssemblyDefinition;
+						ModuleDefinition def = asm.ModuleDefinition;
 						if (def != null) {
-							MemberReference mr = XmlDocKeyProvider.FindMemberByKey(def.MainModule, args.NavigateTo);
+							MemberReference mr = XmlDocKeyProvider.FindMemberByKey(def, args.NavigateTo);
 							if (mr != null) {
 								found = true;
 								JumpToReference(mr);
@@ -294,7 +294,7 @@ namespace ICSharpCode.ILSpy
 			} else if (commandLineLoadedAssemblies.Count == 1) {
 				// NavigateTo == null and an assembly was given on the command-line:
 				// Select the newly loaded assembly
-				JumpToReference(commandLineLoadedAssemblies[0].AssemblyDefinition);
+				JumpToReference(commandLineLoadedAssemblies[0].ModuleDefinition);
 			}
 			commandLineLoadedAssemblies.Clear(); // clear references once we don't need them anymore
 		}
@@ -550,6 +550,8 @@ namespace ICSharpCode.ILSpy
 				return assemblyListTreeNode.FindEventNode(((EventReference)reference).Resolve());
 			} else if (reference is AssemblyDefinition) {
 				return assemblyListTreeNode.FindAssemblyNode((AssemblyDefinition)reference);
+			} else if (reference is ModuleDefinition) {
+				return assemblyListTreeNode.FindAssemblyNode((ModuleDefinition)reference);
 			} else {
 				return null;
 			}

ILSpy/SearchPane.cs

@@ -244,11 +244,11 @@ namespace ICSharpCode.ILSpy
 					}
 					
 					foreach (var loadedAssembly in assemblies) {
-						AssemblyDefinition asm = loadedAssembly.AssemblyDefinition;
+						ModuleDefinition module = loadedAssembly.ModuleDefinition;
-						if (asm == null)
+						if (module == null)
 							continue;
 						CancellationToken cancellationToken = cts.Token;
-						foreach (TypeDefinition type in asm.MainModule.Types) {
+						foreach (TypeDefinition type in module.Types) {
 							cancellationToken.ThrowIfCancellationRequested();
 							PerformSearch(type);
 						}

ILSpy/TreeNodes/Analyzer/AnalyzedAssemblyTreeNode.cs

@@ -23,9 +23,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
 	internal class AnalyzedAssemblyTreeNode : AnalyzerEntityTreeNode
 	{
-		private readonly AssemblyDefinition analyzedAssembly;
+		private readonly ModuleDefinition analyzedAssembly;
 
-		public AnalyzedAssemblyTreeNode(AssemblyDefinition analyzedAssembly)
+		public AnalyzedAssemblyTreeNode(ModuleDefinition analyzedAssembly)
 		{
 			if (analyzedAssembly == null)
 				throw new ArgumentNullException("analyzedAssembly");
@@ -42,7 +42,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		{
 			get
 			{
-				return analyzedAssembly.Name.Name;
+				return analyzedAssembly.Name;
 			}
 		}
 

ILSpy/TreeNodes/Analyzer/AnalyzedAttributeAppliedToTreeNode.cs

@@ -94,7 +94,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			var currentAssembly = analyzedType.Module.Assembly;
 			var assemblies = analyzedType.IsPublic ? GetReferencingAssemblies(currentAssembly, ct) : GetAssemblyAndAnyFriends(currentAssembly, ct);
 
-			var results = assemblies.AsParallel().WithCancellation(ct).SelectMany(a => FindReferencesInAssembly(a.Item1, a.Item2, ct));
+			var results = assemblies.AsParallel().WithCancellation(ct).SelectMany(a => FindReferencesInAssembly(a.Item1.MainModule, a.Item2, ct));
 
 			foreach (var result in results.OrderBy(n => n.Text)) {
 				yield return result;
@@ -105,13 +105,14 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		#region standard custom attributes
 
-		private IEnumerable<AnalyzerTreeNode> FindReferencesInAssembly(AssemblyDefinition asm, TypeReference tr, CancellationToken ct)
+		private IEnumerable<AnalyzerTreeNode> FindReferencesInAssembly(ModuleDefinition module, TypeReference tr, CancellationToken ct)
 		{
 			//since we do not display modules as separate entities, coalesce the assembly and module searches
 			bool foundInAssyOrModule = false;
 
 			if ((usage & AttributeTargets.Assembly) != 0) {
-				if (asm.HasCustomAttributes) {
+				AssemblyDefinition asm = module.Assembly;
+				if (asm != null && asm.HasCustomAttributes) {
 					foreach (var attribute in asm.CustomAttributes) {
 						if (attribute.AttributeType == tr) {
 							foundInAssyOrModule = true;
@@ -126,13 +127,11 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 				//search module
 				if ((usage & AttributeTargets.Module) != 0) {
-					foreach (var module in asm.Modules) {
+					if (module.HasCustomAttributes) {
-						if (module.HasCustomAttributes) {
+						foreach (var attribute in module.CustomAttributes) {
-							foreach (var attribute in module.CustomAttributes) {
+							if (attribute.AttributeType == tr) {
-								if (attribute.AttributeType == tr) {
+								foundInAssyOrModule = true;
-									foundInAssyOrModule = true;
+								break;
-									break;
-								}
 							}
 						}
 					}
@@ -141,12 +140,12 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 
 			if (foundInAssyOrModule) {
-				yield return new AnalyzedAssemblyTreeNode(asm);
+				yield return new AnalyzedAssemblyTreeNode(module);
 			}
 
 			ct.ThrowIfCancellationRequested();
 
-			foreach (TypeDefinition type in TreeTraversal.PreOrder(asm.MainModule.Types, t => t.NestedTypes).OrderBy(t => t.FullName)) {
+			foreach (TypeDefinition type in TreeTraversal.PreOrder(module.Types, t => t.NestedTypes).OrderBy(t => t.FullName)) {
 				ct.ThrowIfCancellationRequested();
 				foreach (var result in FindReferencesWithinInType(type, tr)) {
 					ct.ThrowIfCancellationRequested();

ILSpy/TreeNodes/Analyzer/AnalyzerEntityTreeNode.cs

@@ -39,7 +39,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> removedAssemblies, ICollection<LoadedAssembly> addedAssemblies)
 		{
 			foreach (LoadedAssembly asm in removedAssemblies) {
-				if (this.Member.Module.Assembly == asm.AssemblyDefinition)
+				if (this.Member.Module == asm.ModuleDefinition)
 					return false; // remove this node
 			}
 			this.Children.RemoveAll(

ILSpy/TreeNodes/AssemblyListTreeNode.cs

@@ -132,6 +132,18 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		#region Find*Node
 
+		public AssemblyTreeNode FindAssemblyNode(ModuleDefinition module)
+		{
+			if (module == null)
+				return null;
+			App.Current.Dispatcher.VerifyAccess();
+			foreach (AssemblyTreeNode node in this.Children) {
+				if (node.LoadedAssembly.IsLoaded && node.LoadedAssembly.ModuleDefinition == module)
+					return node;
+			}
+			return null;
+		}
+		
 		public AssemblyTreeNode FindAssemblyNode(AssemblyDefinition asm)
 		{
 			if (asm == null)

ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs

@@ -72,9 +72,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			if (assemblyListNode != null) {
 				var refNode = assemblyListNode.FindAssemblyNode(parentAssembly.LoadedAssembly.LookupReferencedAssembly(r));
 				if (refNode != null) {
-					AssemblyDefinition asm = refNode.LoadedAssembly.AssemblyDefinition;
+					ModuleDefinition module = refNode.LoadedAssembly.ModuleDefinition;
-					if (asm != null) {
+					if (module != null) {
-						foreach (var childRef in asm.MainModule.AssemblyReferences)
+						foreach (var childRef in module.AssemblyReferences)
 							this.Children.Add(new AssemblyReferenceTreeNode(childRef, refNode));
 					}
 				}

ILSpy/TreeNodes/AssemblyTreeNode.cs

@@ -83,15 +83,15 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return !assembly.HasLoadError; }
 		}
 
-		void OnAssemblyLoaded(Task<AssemblyDefinition> assemblyTask)
+		void OnAssemblyLoaded(Task<ModuleDefinition> moduleTask)
 		{
 			// change from "Loading" icon to final icon
 			RaisePropertyChanged("Icon");
 			RaisePropertyChanged("ExpandedIcon");
-			if (assemblyTask.IsFaulted) {
+			if (moduleTask.IsFaulted) {
 				RaisePropertyChanged("ShowExpander"); // cannot expand assemblies with load error
 				// observe the exception so that the Task's finalizer doesn't re-throw it
-				try { assemblyTask.Wait(); }
+				try { moduleTask.Wait(); }
 				catch (AggregateException) { }
 			} else {
 				RaisePropertyChanged("Text"); // shortname might have changed
@@ -102,20 +102,19 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		protected override void LoadChildren()
 		{
-			AssemblyDefinition assemblyDefinition = assembly.AssemblyDefinition;
+			ModuleDefinition moduleDefinition = assembly.ModuleDefinition;
-			if (assemblyDefinition == null) {
+			if (moduleDefinition == null) {
 				// if we crashed on loading, then we don't have any children
 				return;
 			}
-			ModuleDefinition mainModule = assemblyDefinition.MainModule;
 
-			this.Children.Add(new ReferenceFolderTreeNode(mainModule, this));
+			this.Children.Add(new ReferenceFolderTreeNode(moduleDefinition, this));
-			if (mainModule.HasResources)
+			if (moduleDefinition.HasResources)
-				this.Children.Add(new ResourceListTreeNode(mainModule));
+				this.Children.Add(new ResourceListTreeNode(moduleDefinition));
 			foreach (NamespaceTreeNode ns in namespaces.Values) {
 				ns.Children.Clear();
 			}
-			foreach (TypeDefinition type in mainModule.Types.OrderBy(t => t.FullName)) {
+			foreach (TypeDefinition type in moduleDefinition.Types.OrderBy(t => t.FullName)) {
 				NamespaceTreeNode ns;
 				if (!namespaces.TryGetValue(type.Namespace, out ns)) {
 					ns = new NamespaceTreeNode(type.Namespace);

ILSpy/TreeNodes/DerivedTypesEntryNode.cs

@@ -27,10 +27,10 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
 	{
 		private readonly TypeDefinition type;
-		private readonly AssemblyDefinition[] assemblies;
+		private readonly ModuleDefinition[] assemblies;
 		private readonly ThreadingSupport threading;
 
-		public DerivedTypesEntryNode(TypeDefinition type, AssemblyDefinition[] assemblies)
+		public DerivedTypesEntryNode(TypeDefinition type, ModuleDefinition[] assemblies)
 		{
 			this.type = type;
 			this.assemblies = assemblies;

ILSpy/TreeNodes/DerivedTypesTreeNode.cs

@@ -61,14 +61,14 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		IEnumerable<ILSpyTreeNode> FetchChildren(CancellationToken cancellationToken)
 		{
 			// FetchChildren() runs on the main thread; but the enumerator will be consumed on a background thread
-			var assemblies = list.GetAssemblies().Select(node => node.AssemblyDefinition).Where(asm => asm != null).ToArray();
+			var assemblies = list.GetAssemblies().Select(node => node.ModuleDefinition).Where(asm => asm != null).ToArray();
 			return FindDerivedTypes(type, assemblies, cancellationToken);
 		}
 
-		internal static IEnumerable<DerivedTypesEntryNode> FindDerivedTypes(TypeDefinition type, AssemblyDefinition[] assemblies, CancellationToken cancellationToken)
+		internal static IEnumerable<DerivedTypesEntryNode> FindDerivedTypes(TypeDefinition type, ModuleDefinition[] assemblies, CancellationToken cancellationToken)
 		{
-			foreach (AssemblyDefinition asm in assemblies) {
+			foreach (ModuleDefinition module in assemblies) {
-				foreach (TypeDefinition td in TreeTraversal.PreOrder(asm.MainModule.Types, t => t.NestedTypes)) {
+				foreach (TypeDefinition td in TreeTraversal.PreOrder(module.Types, t => t.NestedTypes)) {
 					cancellationToken.ThrowIfCancellationRequested();
 					if (type.IsInterface && td.HasInterfaces) {
 						foreach (TypeReference typeRef in td.Interfaces) {

ILSpy/VB/VBLanguage.cs

@@ -72,13 +72,13 @@ namespace ICSharpCode.ILSpy.VB
 		{
 			if (options.FullDecompilation && options.SaveAsProjectDirectory != null) {
 				HashSet<string> directories = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-				var files = WriteCodeFilesInProject(assembly.AssemblyDefinition, options, directories).ToList();
+				var files = WriteCodeFilesInProject(assembly.ModuleDefinition, options, directories).ToList();
 				files.AddRange(WriteResourceFilesInProject(assembly, options, directories));
-				WriteProjectFile(new TextOutputWriter(output), files, assembly.AssemblyDefinition.MainModule);
+				WriteProjectFile(new TextOutputWriter(output), files, assembly.ModuleDefinition);
 			} else {
 				base.DecompileAssembly(assembly, output, options);
 				output.WriteLine();
-				ModuleDefinition mainModule = assembly.AssemblyDefinition.MainModule;
+				ModuleDefinition mainModule = assembly.ModuleDefinition;
 				if (mainModule.EntryPoint != null) {
 					output.Write("' Entry point: ");
 					output.WriteReference(mainModule.EntryPoint.DeclaringType.FullName + "." + mainModule.EntryPoint.Name, mainModule.EntryPoint);
@@ -106,9 +106,9 @@ namespace ICSharpCode.ILSpy.VB
 				
 				// don't automatically load additional assemblies when an assembly node is selected in the tree view
 				using (options.FullDecompilation ? null : LoadedAssembly.DisableAssemblyLoad()) {
-					AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.AssemblyDefinition.MainModule);
+					AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.ModuleDefinition);
-					codeDomBuilder.AddAssembly(assembly.AssemblyDefinition, onlyAssemblyLevel: !options.FullDecompilation);
+					codeDomBuilder.AddAssembly(assembly.ModuleDefinition, onlyAssemblyLevel: !options.FullDecompilation);
-					RunTransformsAndGenerateCode(codeDomBuilder, output, options, assembly.AssemblyDefinition.MainModule);
+					RunTransformsAndGenerateCode(codeDomBuilder, output, options, assembly.ModuleDefinition);
 				}
 			}
 		}
@@ -248,9 +248,9 @@ namespace ICSharpCode.ILSpy.VB
 			return true;
 		}
 
-		IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(AssemblyDefinition assembly, DecompilationOptions options, HashSet<string> directories)
+		IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(ModuleDefinition module, DecompilationOptions options, HashSet<string> directories)
 		{
-			var files = assembly.MainModule.Types.Where(t => IncludeTypeWhenDecompilingProject(t, options)).GroupBy(
+			var files = module.Types.Where(t => IncludeTypeWhenDecompilingProject(t, options)).GroupBy(
 				delegate(TypeDefinition type) {
 					string file = TextView.DecompilerTextView.CleanUpName(type.Name) + this.FileExtension;
 					if (string.IsNullOrEmpty(type.Namespace)) {
@@ -268,11 +268,11 @@ namespace ICSharpCode.ILSpy.VB
 				new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount },
 				delegate(IGrouping<string, TypeDefinition> file) {
 					using (StreamWriter w = new StreamWriter(Path.Combine(options.SaveAsProjectDirectory, file.Key))) {
-						AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.MainModule);
+						AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: module);
 						foreach (TypeDefinition type in file) {
 							codeDomBuilder.AddType(type);
 						}
-						RunTransformsAndGenerateCode(codeDomBuilder, new PlainTextOutput(w), options, assembly.MainModule);
+						RunTransformsAndGenerateCode(codeDomBuilder, new PlainTextOutput(w), options, module);
 					}
 				});
 			AstMethodBodyBuilder.PrintNumberOfUnhandledOpcodes();
@@ -285,7 +285,7 @@ namespace ICSharpCode.ILSpy.VB
 		{
 			//AppDomain bamlDecompilerAppDomain = null;
 			//try {
-				foreach (EmbeddedResource r in assembly.AssemblyDefinition.MainModule.Resources.OfType<EmbeddedResource>()) {
+				foreach (EmbeddedResource r in assembly.ModuleDefinition.Resources.OfType<EmbeddedResource>()) {
 					string fileName;
 					Stream s = r.GetResourceStream();
 					s.Position = 0;
@@ -306,8 +306,8 @@ namespace ICSharpCode.ILSpy.VB
 								Stream entryStream = (Stream)pair.Value;
 								entryStream.Position = 0;
 								if (fileName.EndsWith(".baml", StringComparison.OrdinalIgnoreCase)) {
-									MemoryStream ms = new MemoryStream();
+									//MemoryStream ms = new MemoryStream();
-									entryStream.CopyTo(ms);
+									//entryStream.CopyTo(ms);
 									// TODO implement extension point
 //									var decompiler = Baml.BamlResourceEntryNode.CreateBamlDecompilerInAppDomain(ref bamlDecompilerAppDomain, assembly.FileName);
 //									string xaml = null;

TestPlugin/ContextMenuCommand.cs

@@ -29,7 +29,7 @@ namespace TestPlugin
 			if (context.SelectedTreeNodes == null)
 				return;
 			AssemblyTreeNode node = (AssemblyTreeNode)context.SelectedTreeNodes[0];
-			AssemblyDefinition asm = node.LoadedAssembly.AssemblyDefinition as AssemblyDefinition;
+			AssemblyDefinition asm = node.LoadedAssembly.AssemblyDefinition;
 			if (asm != null) {
 				SaveFileDialog dlg = new SaveFileDialog();
 				dlg.FileName = node.LoadedAssembly.FileName;