From 06393aedfb61b2baf4502515d18ecc368e05f095 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Thu, 13 Feb 2025 14:44:21 -0800 Subject: [PATCH 1/3] Support disassembling single file bundle for ILSpy --- ILSpy.ReadyToRun/ReadyToRunLanguage.cs | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/ILSpy.ReadyToRun/ReadyToRunLanguage.cs b/ILSpy.ReadyToRun/ReadyToRunLanguage.cs index de2620bd7..2b7d084eb 100644 --- a/ILSpy.ReadyToRun/ReadyToRunLanguage.cs +++ b/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; @@ -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 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 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 } 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 compositeContent = compositeFile.Reader.GetEntireImage().GetContent().AsMemory(); + result.compositeReadyToRunReader = new ReadyToRunReader(new ReadyToRunAssemblyResolver(assembly), compositeModuleName, compositeContent); + } + } } } @@ -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) From b0f4fc5b992932240b36645beb2e343e1cb94ac3 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Sun, 13 Apr 2025 10:23:24 -0700 Subject: [PATCH 2/3] Upgrade packages --- Directory.Packages.props | 6 +-- ICSharpCode.BamlDecompiler/packages.lock.json | 27 ++++-------- .../ICSharpCode.Decompiler.csproj | 4 +- ICSharpCode.Decompiler/packages.lock.json | 41 ++++++++++--------- ICSharpCode.ILSpyCmd/packages.lock.json | 20 ++++----- ICSharpCode.ILSpyX/packages.lock.json | 18 ++++---- NuGet.config | 3 +- 7 files changed, 56 insertions(+), 63 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 51879bb08..8607daa90 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -40,9 +40,9 @@ - + - + diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index 06e809065..b891d214a 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -17,33 +17,24 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", + "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" } }, "System.Collections.Immutable": { "type": "CentralTransitive", - "requested": "[9.0.4, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "requested": "[10.0.0-preview.3.25171.5, )", + "resolved": "10.0.0-preview.3.25171.5", + "contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ==" }, "System.Reflection.Metadata": { "type": "CentralTransitive", - "requested": "[9.0.4, )", - "resolved": "6.0.0", - "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", + "requested": "[10.0.0-preview.3.25171.5, )", + "resolved": "10.0.0-preview.3.25171.5", + "contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw==", "dependencies": { - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "10.0.0-preview.3.25171.5" } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "CentralTransitive", - "requested": "[6.1.2, )", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" } } } diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 23a46a09a..53a45507c 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -84,8 +84,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ICSharpCode.Decompiler/packages.lock.json b/ICSharpCode.Decompiler/packages.lock.json index e44c80edb..356272070 100644 --- a/ICSharpCode.Decompiler/packages.lock.json +++ b/ICSharpCode.Decompiler/packages.lock.json @@ -29,21 +29,22 @@ }, "System.Collections.Immutable": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "requested": "[10.0.0-preview.3.25171.5, )", + "resolved": "10.0.0-preview.3.25171.5", + "contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "System.Memory": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "System.Reflection.Metadata": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", + "requested": "[10.0.0-preview.3.25171.5, )", + "resolved": "10.0.0-preview.3.25171.5", + "contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw==", "dependencies": { - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "10.0.0-preview.3.25171.5", + "System.Memory": "4.6.0" } }, "TunnelVisionLabs.ReferenceAssemblyAnnotator": { @@ -69,28 +70,28 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.0", + "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.0", + "System.Numerics.Vectors": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.0", + "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.0", + "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg==" } } } diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 891f86671..6148c0605 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -358,8 +358,8 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", + "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" } }, "icsharpcode.ilspyx": { @@ -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 @@ }, "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 @@ }, "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": { diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index aac3060dd..89590854f 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -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": { @@ -70,15 +70,15 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", + "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" } }, "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==" } } } diff --git a/NuGet.config b/NuGet.config index ccdac39a4..7f3105a6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -12,7 +13,7 @@ - + From 2edccadde36de6fcfbdf77f8fd449c99e11f4a29 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Tue, 15 Apr 2025 08:43:39 -0700 Subject: [PATCH 3/3] Avoid upgrading the packages for ICSharpCode.Decompiler.csproj --- ICSharpCode.BamlDecompiler/packages.lock.json | 23 +++++++---- .../ICSharpCode.Decompiler.csproj | 4 +- ICSharpCode.Decompiler/packages.lock.json | 41 +++++++++---------- ICSharpCode.ILSpyCmd/packages.lock.json | 4 +- ICSharpCode.ILSpyX/packages.lock.json | 4 +- 5 files changed, 42 insertions(+), 34 deletions(-) diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index b891d214a..f4e596065 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -17,24 +17,33 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", - "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" + "System.Collections.Immutable": "[6.0.0, )", + "System.Reflection.Metadata": "[6.0.0, )" } }, "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[10.0.0-preview.3.25171.5, )", - "resolved": "10.0.0-preview.3.25171.5", - "contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ==" + "resolved": "6.0.0", + "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Reflection.Metadata": { "type": "CentralTransitive", "requested": "[10.0.0-preview.3.25171.5, )", - "resolved": "10.0.0-preview.3.25171.5", - "contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw==", + "resolved": "6.0.0", + "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", "dependencies": { - "System.Collections.Immutable": "10.0.0-preview.3.25171.5" + "System.Collections.Immutable": "6.0.0" } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "CentralTransitive", + "requested": "[6.1.2, )", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" } } } diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 53a45507c..23a46a09a 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -84,8 +84,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ICSharpCode.Decompiler/packages.lock.json b/ICSharpCode.Decompiler/packages.lock.json index 356272070..e44c80edb 100644 --- a/ICSharpCode.Decompiler/packages.lock.json +++ b/ICSharpCode.Decompiler/packages.lock.json @@ -29,22 +29,21 @@ }, "System.Collections.Immutable": { "type": "Direct", - "requested": "[10.0.0-preview.3.25171.5, )", - "resolved": "10.0.0-preview.3.25171.5", - "contentHash": "7EVfTaDkWy2g0uHIAtOzylYwb/T/khQEPUMfgqTxviPjH+9Aqm/Qnrf+nzLzGdgfV8o3UXFgI7iJUM4ZHxH2hQ==", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", "dependencies": { - "System.Memory": "4.6.0", - "System.Runtime.CompilerServices.Unsafe": "6.1.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Reflection.Metadata": { "type": "Direct", - "requested": "[10.0.0-preview.3.25171.5, )", - "resolved": "10.0.0-preview.3.25171.5", - "contentHash": "+vmMtMSXPQTYqaHoLgWcd39Pwb7yGD4sCewmvVrdNzziRCBxjf6/DK8XCWzELxNsLhOmViZ4LIIr+uPa6K5pRw==", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", "dependencies": { - "System.Collections.Immutable": "10.0.0-preview.3.25171.5", - "System.Memory": "4.6.0" + "System.Collections.Immutable": "6.0.0" } }, "TunnelVisionLabs.ReferenceAssemblyAnnotator": { @@ -70,28 +69,28 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Buffers": "4.6.0", - "System.Numerics.Vectors": "4.6.0", - "System.Runtime.CompilerServices.Unsafe": "6.1.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.0", - "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" } } } diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 6148c0605..be62bf516 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -358,8 +358,8 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", - "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" + "System.Collections.Immutable": "[6.0.0, )", + "System.Reflection.Metadata": "[6.0.0, )" } }, "icsharpcode.ilspyx": { diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index 89590854f..0f162b64f 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -70,8 +70,8 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[10.0.0-preview.3.25171.5, )", - "System.Reflection.Metadata": "[10.0.0-preview.3.25171.5, )" + "System.Collections.Immutable": "[6.0.0, )", + "System.Reflection.Metadata": "[6.0.0, )" } }, "System.Collections.Immutable": {