Skip to content

Support disassembling single file bundle for ILSpy #3398

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

Merged
siegfriedpammer merged 2 commits into from
Jul 4, 2025
Merged

Support disassembling single file bundle for ILSpy #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e4d57
Support disassembling single file bundle for ILSpy
cshung Feb 13, 2025
9beb9cb
Upgrade packages
cshung Apr 13, 2025
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageVersion Include="DataGridExtensions" Version="2.6.0" />
<PackageVersion Include="DiffLib" Version="2025.0.0" />
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="9.0.1-rtm.24557.9" />
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="10.0.0-preview.4.25213.101" />
<PackageVersion Include="Iced" Version="1.21.0" />
<PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
Expand Down Expand Up @@ -40,9 +40,9 @@
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="System.Composition.AttributedModel" Version="9.0.4" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.4" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.4" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.4" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.0" />
Expand Down
4 changes: 2 additions & 2 deletions ICSharpCode.BamlDecompiler/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "6.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
"dependencies": {
Expand All @@ -32,7 +32,7 @@
},
"System.Reflection.Metadata": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "6.0.0",
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions ICSharpCode.ILSpyCmd/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"K4os.Compression.LZ4": "[1.3.8, )",
"Mono.Cecil": "[0.11.6, )",
"System.Composition.AttributedModel": "[9.0.4, )",
"System.Reflection.Metadata": "[9.0.4, )",
"System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )",
"System.Runtime.CompilerServices.Unsafe": "[6.1.2, )"
}
},
Expand Down Expand Up @@ -424,7 +424,7 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "8.0.0",
"contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg=="
},
Expand All @@ -436,9 +436,9 @@
},
"System.Reflection.Metadata": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"resolved": "9.0.4",
"contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ=="
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "10.0.0-preview.3.25171.5",
"contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "CentralTransitive",
Expand Down
8 changes: 4 additions & 4 deletions ICSharpCode.ILSpyX/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
},
"System.Reflection.Metadata": {
"type": "Direct",
"requested": "[9.0.4, )",
"resolved": "9.0.4",
"contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ=="
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "10.0.0-preview.3.25171.5",
"contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Direct",
Expand Down Expand Up @@ -73,7 +73,7 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "6.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
"dependencies": {
Expand Down
24 changes: 19 additions & 5 deletions ILSpy.ReadyToRun/ReadyToRunLanguage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Composition;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.Decompiler;
Expand Down Expand Up @@ -240,23 +242,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);
ReadOnlyMemory<byte> content = module.Reader.GetEntireImage().GetContent().AsMemory();
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
{
ReadOnlyMemory<byte> compositeContent = compositeFile.Reader.GetEntireImage().GetContent().AsMemory();
result.compositeReadyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), compositeModuleName, compositeContent);
}

}
}
}
Expand Down Expand Up @@ -288,7 +302,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)
Expand Down
3 changes: 2 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
<package pattern="Microsoft.DiaSymReader.Native" />
<package pattern="Microsoft.DiaSymReader" />
</packageSource>
<packageSource key="dotnet9-transport">
<packageSource key="dotnet10-transport">
<package pattern="ILCompiler.Reflection.ReadyToRun.Experimental" />
</packageSource>
<packageSource key="dotnet-tools">
Expand Down
Loading