Support disassembling single file bundle for ILSpy

Author: cshung

ILSpy.ReadyToRun/ReadyToRunLanguage.cs

@@ -20,6 +20,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition;
 using System.Diagnostics;
 using System.IO;
@@ -240,23 +241,35 @@ private ReadyToRunReaderCacheEntry GetReader(LoadedAssembly assembly, MetadataFi
 					result = new ReadyToRunReaderCacheEntry();
 					try
 					{
-						if (file is not PEFile module)
+						if ((file is not PEFile module) || (module.Reader == null))
 						{
 							result.readyToRunReader = null;
 							result.failureReason = "File is not a valid PE file.";
 						}
 						else
 						{
-							result.readyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), new StandaloneAssemblyMetadata(module.Reader), module.Reader, module.FileName);
+							ImmutableArray<byte> content = module.Reader.GetEntireImage().GetContent();
+							result.readyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), new StandaloneAssemblyMetadata(module.Reader), module.Reader, module.FileName, content);
 							if (result.readyToRunReader.Machine != Machine.Amd64 && result.readyToRunReader.Machine != Machine.I386)
 							{
 								result.failureReason = $"Architecture {result.readyToRunReader.Machine} is not currently supported.";
 								result.readyToRunReader = null;
 							}
 							else if (result.readyToRunReader.OwnerCompositeExecutable != null)
 							{
-								string compositePath = Path.Combine(Path.GetDirectoryName(module.FileName), result.readyToRunReader.OwnerCompositeExecutable);
-								result.compositeReadyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), compositePath);
+								string compositeModuleName = Path.GetFileNameWithoutExtension(result.readyToRunReader.OwnerCompositeExecutable);
+								PEFile compositeFile = assembly.GetAssemblyResolver().ResolveModule(assembly.GetMetadataFileOrNull(), compositeModuleName) as PEFile;
+								if (compositeFile == null)
+								{
+									result.readyToRunReader = null;
+									result.failureReason = "Composite File is not a valid PE file.";
+								}
+								else
+								{
+									ImmutableArray<byte> compositeContent = compositeFile.Reader.GetEntireImage().GetContent();
+									result.compositeReadyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), compositeModuleName, compositeContent);
+								}
+
 							}
 						}
 					}
@@ -288,7 +301,7 @@ public IAssemblyMetadata FindAssembly(MetadataReader metadataReader, AssemblyRef
 
 			public IAssemblyMetadata FindAssembly(string simpleName, string parentFile)
 			{
-				return GetAssemblyMetadata(assemblyResolver.ResolveModule(loadedAssembly.GetMetadataFileOrNull(), simpleName + ".dll"));
+				return GetAssemblyMetadata(assemblyResolver.ResolveModule(loadedAssembly.GetMetadataFileOrNull(), simpleName));
 			}
 
 			private IAssemblyMetadata GetAssemblyMetadata(MetadataFile module)