From 98b9342f34a8a954fb34bddd01efd756e2330aa6 Mon Sep 17 00:00:00 2001 From: David Federman Date: Tue, 17 Feb 2026 15:36:53 -0800 Subject: [PATCH 1/2] Add ReferenceTrimmer and remove unused references --- Directory.Build.props | 3 +- Directory.Packages.props | 1 + ICSharpCode.BamlDecompiler/packages.lock.json | 24 ++++--------- .../ICSharpCode.Decompiler.Tests.csproj | 1 - ICSharpCode.ILSpyCmd/packages.lock.json | 34 +++++-------------- ICSharpCode.ILSpyX/packages.lock.json | 18 ++++------ .../ILSpy.BamlDecompiler.Tests.csproj | 3 +- ILSpy.Tests/ILSpy.Tests.csproj | 1 - 8 files changed, 26 insertions(+), 59 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1894688090..dba021e973 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ - $(NoWarn);NU1510 + $(NoWarn);NU1510;CS1591 + true diff --git a/Directory.Packages.props b/Directory.Packages.props index a625f02736..9780b15ea7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -56,6 +56,7 @@ + \ No newline at end of file diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index 700c4f3f1c..e52e22faf8 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -8,6 +8,12 @@ "resolved": "4.1.5", "contentHash": "i5z+cNu/cOcdO0AgFB8aXk8w6In2H+haaDfSgd9ImvQIK+rSHavHZIogVoAZLL8jLwYx4bAcs5b7EyuMMG4mQQ==" }, + "ReferenceTrimmer": { + "type": "Direct", + "requested": "[3.4.5, )", + "resolved": "3.4.5", + "contentHash": "I3vQerUFZ3BSrPfdpAUZX+OIEj9rf/BZ0p/Dc+KlygFHsGa3zekygNhqoPOP6/p06ql1lAcGmrqJGpsLOb6Yfw==" + }, "TomsToolbox.Composition.Analyzer": { "type": "Direct", "requested": "[2.22.2, )", @@ -15,23 +21,7 @@ "contentHash": "7gYo8ZR2eq3XkrilvUpLbTypeZy6IlD5FB8jah0YPhMOmDGhya4jJ3kfDMTTRt5m258Ou78P69mHMkG6DKZXsg==" }, "icsharpcode.decompiler": { - "type": "Project", - "dependencies": { - "System.Collections.Immutable": "[9.0.0, )", - "System.Reflection.Metadata": "[9.0.0, )" - } - }, - "System.Collections.Immutable": { - "type": "CentralTransitive", - "requested": "[10.0.3, )", - "resolved": "9.0.0", - "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" - }, - "System.Reflection.Metadata": { - "type": "CentralTransitive", - "requested": "[10.0.3, )", - "resolved": "9.0.0", - "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==" + "type": "Project" } } } diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index 5665d02226..bab7e6ac8b 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -79,7 +79,6 @@ - diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 574a41d546..198ede4624 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -52,6 +52,12 @@ "NuGet.Packaging": "7.3.0" } }, + "ReferenceTrimmer": { + "type": "Direct", + "requested": "[3.4.5, )", + "resolved": "3.4.5", + "contentHash": "I3vQerUFZ3BSrPfdpAUZX+OIEj9rf/BZ0p/Dc+KlygFHsGa3zekygNhqoPOP6/p06ql1lAcGmrqJGpsLOb6Yfw==" + }, "System.Security.Cryptography.Pkcs": { "type": "Direct", "requested": "[10.0.3, )", @@ -343,11 +349,7 @@ "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "icsharpcode.decompiler": { - "type": "Project", - "dependencies": { - "System.Collections.Immutable": "[9.0.0, )", - "System.Reflection.Metadata": "[9.0.0, )" - } + "type": "Project" }, "icsharpcode.ilspyx": { "type": "Project", @@ -355,9 +357,7 @@ "ICSharpCode.Decompiler": "[8.0.0-noversion, )", "K4os.Compression.LZ4": "[1.3.8, )", "Mono.Cecil": "[0.11.6, )", - "System.Composition.AttributedModel": "[10.0.3, )", - "System.Reflection.Metadata": "[10.0.3, )", - "System.Runtime.CompilerServices.Unsafe": "[6.1.2, )" + "System.Composition.AttributedModel": "[10.0.3, )" } }, "K4os.Compression.LZ4": { @@ -406,29 +406,11 @@ "resolved": "0.11.6", "contentHash": "f33RkDtZO8VlGXCtmQIviOtxgnUdym9xx/b1p9h91CRGOsJFxCFOFK1FDbVt1OCf1aWwYejUFa2MOQyFWTFjbA==" }, - "System.Collections.Immutable": { - "type": "CentralTransitive", - "requested": "[10.0.3, )", - "resolved": "9.0.0", - "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" - }, "System.Composition.AttributedModel": { "type": "CentralTransitive", "requested": "[10.0.3, )", "resolved": "10.0.3", "contentHash": "Pj+8+lQhO6XOm8HD4xQLf5Mxiq4z64sq5rXSwesCDUFAC4AtSmAScGuxDCyoEmr4O8p7ygxnh9FOvd9vfi3ApQ==" - }, - "System.Reflection.Metadata": { - "type": "CentralTransitive", - "requested": "[10.0.3, )", - "resolved": "10.0.3", - "contentHash": "xtgymSlbWSeg/7JEwDbyX0YWJlyBhKqZwRk0edFZ0axqZYWtGgcP09rwfzQgqYiFnpQekZ/ur9Dr9YFCKkJK0A==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "CentralTransitive", - "requested": "[6.1.2, )", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" } } } diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index 6d15f866fb..afb26fb773 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -30,6 +30,12 @@ "resolved": "0.11.6", "contentHash": "f33RkDtZO8VlGXCtmQIviOtxgnUdym9xx/b1p9h91CRGOsJFxCFOFK1FDbVt1OCf1aWwYejUFa2MOQyFWTFjbA==" }, + "ReferenceTrimmer": { + "type": "Direct", + "requested": "[3.4.5, )", + "resolved": "3.4.5", + "contentHash": "I3vQerUFZ3BSrPfdpAUZX+OIEj9rf/BZ0p/Dc+KlygFHsGa3zekygNhqoPOP6/p06ql1lAcGmrqJGpsLOb6Yfw==" + }, "System.Composition.AttributedModel": { "type": "Direct", "requested": "[10.0.3, )", @@ -65,17 +71,7 @@ "contentHash": "cMtGW5/r0ck72Jg2QwZcNTX59z+iB/B1kW84VMa/eX8L19DhHIuIcQjfK0pgLLBxd60Jl0Bj9GUolcM0MnJnZA==" }, "icsharpcode.decompiler": { - "type": "Project", - "dependencies": { - "System.Collections.Immutable": "[9.0.0, )", - "System.Reflection.Metadata": "[9.0.0, )" - } - }, - "System.Collections.Immutable": { - "type": "CentralTransitive", - "requested": "[10.0.3, )", - "resolved": "9.0.0", - "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" + "type": "Project" } } } diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj index aa80040c38..78700553b9 100644 --- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj +++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj @@ -48,9 +48,8 @@ + - - diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj index de7ff21035..c51af6cfa1 100644 --- a/ILSpy.Tests/ILSpy.Tests.csproj +++ b/ILSpy.Tests/ILSpy.Tests.csproj @@ -64,7 +64,6 @@ - all From c11804fe4c1696ab11e31444718376b4939ee720 Mon Sep 17 00:00:00 2001 From: David Federman Date: Tue, 17 Feb 2026 22:05:58 -0800 Subject: [PATCH 2/2] Fix lock files(?) --- ICSharpCode.BamlDecompiler/packages.lock.json | 18 +++++++++++- ICSharpCode.ILSpyCmd/packages.lock.json | 28 +++++++++++++++++-- ICSharpCode.ILSpyX/packages.lock.json | 12 +++++++- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index e52e22faf8..00947328d4 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -21,7 +21,23 @@ "contentHash": "7gYo8ZR2eq3XkrilvUpLbTypeZy6IlD5FB8jah0YPhMOmDGhya4jJ3kfDMTTRt5m258Ou78P69mHMkG6DKZXsg==" }, "icsharpcode.decompiler": { - "type": "Project" + "type": "Project", + "dependencies": { + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" + } + }, + "System.Collections.Immutable": { + "type": "CentralTransitive", + "requested": "[10.0.3, )", + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" + }, + "System.Reflection.Metadata": { + "type": "CentralTransitive", + "requested": "[10.0.3, )", + "resolved": "9.0.0", + "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==" } } } diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 198ede4624..f404d62491 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -349,7 +349,11 @@ "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "icsharpcode.decompiler": { - "type": "Project" + "type": "Project", + "dependencies": { + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" + } }, "icsharpcode.ilspyx": { "type": "Project", @@ -357,7 +361,9 @@ "ICSharpCode.Decompiler": "[8.0.0-noversion, )", "K4os.Compression.LZ4": "[1.3.8, )", "Mono.Cecil": "[0.11.6, )", - "System.Composition.AttributedModel": "[10.0.3, )" + "System.Composition.AttributedModel": "[10.0.3, )", + "System.Reflection.Metadata": "[10.0.3, )", + "System.Runtime.CompilerServices.Unsafe": "[6.1.2, )" } }, "K4os.Compression.LZ4": { @@ -406,11 +412,29 @@ "resolved": "0.11.6", "contentHash": "f33RkDtZO8VlGXCtmQIviOtxgnUdym9xx/b1p9h91CRGOsJFxCFOFK1FDbVt1OCf1aWwYejUFa2MOQyFWTFjbA==" }, + "System.Collections.Immutable": { + "type": "CentralTransitive", + "requested": "[10.0.3, )", + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" + }, "System.Composition.AttributedModel": { "type": "CentralTransitive", "requested": "[10.0.3, )", "resolved": "10.0.3", "contentHash": "Pj+8+lQhO6XOm8HD4xQLf5Mxiq4z64sq5rXSwesCDUFAC4AtSmAScGuxDCyoEmr4O8p7ygxnh9FOvd9vfi3ApQ==" + }, + "System.Reflection.Metadata": { + "type": "CentralTransitive", + "requested": "[10.0.3, )", + "resolved": "10.0.3", + "contentHash": "xtgymSlbWSeg/7JEwDbyX0YWJlyBhKqZwRk0edFZ0axqZYWtGgcP09rwfzQgqYiFnpQekZ/ur9Dr9YFCKkJK0A==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "CentralTransitive", + "requested": "[6.1.2, )", + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" } } } diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index afb26fb773..618e2cf4f1 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -71,7 +71,17 @@ "contentHash": "cMtGW5/r0ck72Jg2QwZcNTX59z+iB/B1kW84VMa/eX8L19DhHIuIcQjfK0pgLLBxd60Jl0Bj9GUolcM0MnJnZA==" }, "icsharpcode.decompiler": { - "type": "Project" + "type": "Project", + "dependencies": { + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" + } + }, + "System.Collections.Immutable": { + "type": "CentralTransitive", + "requested": "[10.0.3, )", + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" } } }