pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge 2edccadde3 into 0bfe222cf4

pull/3398/merge
Andrew Au 4 days ago committed by GitHub
parent
0bfe222cf4 2edccadde3
commit
b5935a3cc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 41 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Directory.Packages.props
  2. 4
      ICSharpCode.BamlDecompiler/packages.lock.json
  3. 16
      ICSharpCode.ILSpyCmd/packages.lock.json
  4. 14
      ICSharpCode.ILSpyX/packages.lock.json
  5. 24
      ILSpy.ReadyToRun/ReadyToRunLanguage.cs
  6. 3
      NuGet.config

6
Directory.Packages.props
Unescape View File

@ -9,7 +9,7 @@ @@ -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" />
@ -40,9 +40,9 @@ @@ -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" />

4
ICSharpCode.BamlDecompiler/packages.lock.json
Unescape View File

@ -23,7 +23,7 @@ @@ -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": {
@ -32,7 +32,7 @@ @@ -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": {

16
ICSharpCode.ILSpyCmd/packages.lock.json
Unescape View File

@ -369,7 +369,7 @@ @@ -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, )"
}
},
@ -424,9 +424,9 @@ @@ -424,9 +424,9 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"resolved": "9.0.4",
"contentHash": "wfm2NgK22MmBe5qJjp52qzpkeDZKb4l9LbdubhZSehY1z4LS+lld6R+B+UQNb2AZRHu/QJlHxEUcRst5hIEejg=="
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "10.0.0-preview.3.25171.5",
"contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ=="
},
"System.Composition.AttributedModel": {
"type": "CentralTransitive",
@ -436,11 +436,11 @@ @@ -436,11 +436,11 @@
},
"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==",
"dependencies": {
"System.Collections.Immutable": "9.0.4"
"System.Collections.Immutable": "10.0.0-preview.3.25171.5"
}
},
"System.Runtime.CompilerServices.Unsafe": {

14
ICSharpCode.ILSpyX/packages.lock.json
Unescape View File

@ -38,11 +38,11 @@ @@ -38,11 +38,11 @@
},
"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==",
"dependencies": {
"System.Collections.Immutable": "9.0.4"
"System.Collections.Immutable": "10.0.0-preview.3.25171.5"
}
},
"System.Runtime.CompilerServices.Unsafe": {
@ -76,9 +76,9 @@ @@ -76,9 +76,9 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.4, )",
"resolved": "9.0.4",
"contentHash": "wfm2NgK22MmBe5qJjp52qzpkeDZKb4l9LbdubhZSehY1z4LS+lld6R+B+UQNb2AZRHu/QJlHxEUcRst5hIEejg=="
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "10.0.0-preview.3.25171.5",
"contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ=="
}
}
}

24
ILSpy.ReadyToRun/ReadyToRunLanguage.cs
Unescape View File

@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Composition;
using System.Diagnostics;
using System.IO;
@ -27,6 +28,7 @@ using System.Linq; @@ -27,6 +28,7 @@ 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;
@ -240,14 +242,15 @@ namespace ICSharpCode.ILSpy.ReadyToRun @@ -240,14 +242,15 @@ namespace ICSharpCode.ILSpy.ReadyToRun
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.";
@ -255,8 +258,19 @@ namespace ICSharpCode.ILSpy.ReadyToRun @@ -255,8 +258,19 @@ namespace ICSharpCode.ILSpy.ReadyToRun
}
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);
}
}
}
}
@ -288,7 +302,7 @@ namespace ICSharpCode.ILSpy.ReadyToRun @@ -288,7 +302,7 @@ namespace ICSharpCode.ILSpy.ReadyToRun
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)

3
NuGet.config
Unescape View File

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
<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">
@ -12,7 +13,7 @@ @@ -12,7 +13,7 @@
<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">

Write Preview
Loading…
Cancel
Save