pjbgf · sakgoyal · May 26, 2025
diff --git a/src/dotnet-ildasm.Benchmarks/AutoIndentationOverhead.cs b/src/dotnet-ildasm.Benchmarks/AutoIndentationOverhead.cs
@@ -5,54 +5,50 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Toolchains.CsProj;
-using DotNet.Ildasm;
 using DotNet.Ildasm.Adapters;
 using Mono.Cecil;
+using static BenchmarkDotNet.Toolchains.DotNetCli.NetCoreAppSettings;
 
-namespace dotnet_ildasm.Benchmarks
+namespace DotNet.Ildasm.Benchmarks
 {
     public class MultipleRuntimes : ManualConfig
     {
         public MultipleRuntimes()
         {
-            Add(Job.Default.With(CsProjCoreToolchain.NetCoreApp21));
-            Add(Job.Default.With(CsProjClassicNetToolchain.Net461));
+            AddJob(Job.Default.WithToolchain(CsProjCoreToolchain.From(NetCoreApp80)));
+            AddJob(Job.Default.WithToolchain(CsProjCoreToolchain.From(NetCoreApp90)));
         }
     }
-    
+
     [Config(typeof(MultipleRuntimes))]
     public class AutoIndentationOverhead
     {
-        internal static readonly Lazy<AssemblyDefinition> SampleAssembly = new Lazy<AssemblyDefinition>(() =>
-            Mono.Cecil.AssemblyDefinition.ReadAssembly(
+        internal static readonly Lazy<AssemblyDefinition> SampleAssembly = new(static () =>
+            AssemblyDefinition.ReadAssembly(
                 typeof(Program).Assembly.GetManifestResourceStream(
                     "dotnet-ildasm.Benchmarks.Sample.dotnet-ildasm.Sample.exe")));
 
         private static readonly MethodDefinition MethodDefinition;
 
         static AutoIndentationOverhead()
         {
-            var type = SampleAssembly.Value.MainModule.Types.FirstOrDefault(x => x.Name == "PublicClass");
-            MethodDefinition = type.Methods.FirstOrDefault(x => x.Name == "UsingTryCatch");
+            var type = SampleAssembly.Value.MainModule.Types.FirstOrDefault(static x => x.Name == "PublicClass");
+            MethodDefinition = type.Methods.FirstOrDefault(static x => x.Name == "UsingTryCatch");
         }
 
         [Benchmark]
         public void NoIndentation()
         {
-            using (var fileStreamOutputWriter = new FileStreamOutputWriter(Path.GetTempFileName()))
-            {
-                MethodDefinition.WriteILBody(fileStreamOutputWriter);
-            }
+            using var fileStreamOutputWriter = new FileStreamOutputWriter(Path.GetTempFileName());
+            MethodDefinition.WriteILBody(fileStreamOutputWriter);
         }
 
         [Benchmark]
         public void AutoIndentation()
         {
-            using (var outputWriter = new FileStreamOutputWriter(Path.GetTempFileName()))
-            using (var autoIndentOutputWriter = new AutoIndentOutputWriter(outputWriter))
-            {
-                MethodDefinition.WriteILBody(autoIndentOutputWriter);
-            }
+            using var outputWriter = new FileStreamOutputWriter(Path.GetTempFileName());
+            using var autoIndentOutputWriter = new AutoIndentOutputWriter(outputWriter);
+            MethodDefinition.WriteILBody(autoIndentOutputWriter);
         }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Benchmarks/Program.cs b/src/dotnet-ildasm.Benchmarks/Program.cs
@@ -1,15 +1,12 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
-using System.IO;
-using System.Reflection;
+using BenchmarkDotNet.Running;
 
-namespace dotnet_ildasm.Benchmarks
+namespace DotNet.Ildasm.Benchmarks
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             BenchmarkRunner.Run<AutoIndentationOverhead>();
         }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Benchmarks/dotnet-ildasm.Benchmarks.csproj b/src/dotnet-ildasm.Benchmarks/dotnet-ildasm.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Sample\dotnet-ildasm.Sample.dll" />
@@ -16,10 +16,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\dotnet-ildasm\dotnet-ildasm.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/dotnet-ildasm.Sample/Classes/Attributes.cs b/src/dotnet-ildasm.Sample/Classes/Attributes.cs
@@ -32,7 +32,7 @@ public bool SomeMethodWithAttributeOnReturnValue()
             return true;
         }
 
-        public bool SomeMethodWithAttributeOnParameter([SomeAttribute]string arg1, [AnotherAttribute]bool arg2)
+        public bool SomeMethodWithAttributeOnParameter([SomeAttribute] string arg1, [AnotherAttribute] bool arg2)
         {
             return true;
         }

diff --git a/src/dotnet-ildasm.Sample/Classes/DerivedPublicClass.cs b/src/dotnet-ildasm.Sample/Classes/DerivedPublicClass.cs
@@ -16,4 +16,4 @@ public sealed override void PublicAbstractSealedMethod()
         {
         }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Sample/Classes/NestedClass.cs b/src/dotnet-ildasm.Sample/Classes/NestedClass.cs
@@ -2,14 +2,16 @@
 
 namespace dotnet_ildasm.Sample.Classes
 {
-    public class ParentClass 
+    public class ParentClass
     {
-		public class NestedClass {
-			public string SomeMethod() { return "aaaaa"; }
-		}
+        public class NestedClass
+        {
+            public string SomeMethod() { return "aaaaa"; }
+        }
 
-		public NestedClass CreateNestedClass() {
-			return new NestedClass();
-		}
-	}
+        public NestedClass CreateNestedClass()
+        {
+            return new NestedClass();
+        }
+    }
 }
diff --git a/src/dotnet-ildasm.Sample/Classes/PublicAbstractClass.cs b/src/dotnet-ildasm.Sample/Classes/PublicAbstractClass.cs
@@ -3,11 +3,11 @@ namespace dotnet_ildasm.Sample.Classes
     public abstract class PublicAbstractClass
     {
         public abstract void PublicAbstractMethod();
-        
+
         public abstract void PublicAbstractSealedMethod();
 
         public void PublicImplementedMethod()
         {
         }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Sample/Classes/PublicClass.cs b/src/dotnet-ildasm.Sample/Classes/PublicClass.cs
@@ -12,11 +12,11 @@ public void PublicVoidMethod()
         {
             PublicVoidMethodSingleParameter(null);
         }
-        
+
         public void PublicVoidMethodSingleParameter(string parameter1)
         {
         }
-        
+
         public void PublicVoidMethodTwoParameters(string parameter1, int parameter2)
         {
         }
@@ -27,7 +27,7 @@ public void PublicVoidMethodParams(params string[] parameters)
 
         public void UsingIF(int parameter)
         {
-            int localVariable = 5; 
+            int localVariable = 5;
             if (parameter > 10)
             {
                 UsingTryCatch(localVariable);

diff --git a/src/dotnet-ildasm.Sample/Classes/StaticClass.cs b/src/dotnet-ildasm.Sample/Classes/StaticClass.cs
@@ -10,11 +10,11 @@ public static void Method1()
         {
             Method2();
         }
-        
+
         public static void Method2()
         {
         }
-        
+
         public static IntPtr Method3()
         {
             return IntPtr.Zero;

diff --git a/src/dotnet-ildasm.Sample/Structs/PublicStruct.cs b/src/dotnet-ildasm.Sample/Structs/PublicStruct.cs
@@ -7,8 +7,8 @@ public PublicStruct(int x, int y)
             X = x;
             Y = y;
         }
-        
+
         public int X;
         public int Y;
     }
-}
+}
diff --git a/src/dotnet-ildasm.Sample/dotnet-ildasm.Sample.csproj b/src/dotnet-ildasm.Sample/dotnet-ildasm.Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>dotnet_ildasm.Sample</RootNamespace>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/dotnet-ildasm.Tests/CommandHandlerShould.cs b/src/dotnet-ildasm.Tests/CommandHandlerShould.cs
@@ -1,14 +1,13 @@
 using System;
-using DotNet.Ildasm;
 using NSubstitute;
 using Xunit;
 
 namespace DotNet.Ildasm.Tests
 {
     public class CommandHandlerShould
     {
-        private Func<CommandArgument, int> _executor;
-        private Func<string, int> _showHelp;
+        private readonly Func<CommandArgument, int> _executor;
+        private readonly Func<string, int> _showHelp;
 
         public CommandHandlerShould()
         {
@@ -99,4 +98,4 @@ public void Execute_Command_With_Assembly_And_Item()
         //     _showHelp.Received(1).Invoke();
         // }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Tests/Configuration/ItemFilterShould.cs b/src/dotnet-ildasm.Tests/Configuration/ItemFilterShould.cs
@@ -1,4 +1,3 @@
-using System;
 using DotNet.Ildasm.Configuration;
 using Xunit;
 
@@ -39,17 +38,17 @@ public void Parse_MethodName_By_Itself()
         [Fact]
         public void Ignore_Empty_Filter()
         {
-            string itemFilter = String.Empty;
+            string itemFilter = string.Empty;
             var filterParser = new ItemFilter(itemFilter);
-            
+
             Assert.Null(filterParser.Class);
             Assert.Null(filterParser.Method);
         }
 
         [Fact]
         public void Know_When_No_Filter_Is_Set()
         {
-            string itemFilter = String.Empty;
+            string itemFilter = string.Empty;
             var filterParser = new ItemFilter(itemFilter);
 
             Assert.False(filterParser.HasFilter);
@@ -82,4 +81,4 @@ public void Know_When_Both_Filters_Are_Set()
             Assert.True(filterParser.HasFilter);
         }
     }
-}
+}
diff --git a/src/dotnet-ildasm.Tests/ConsoleOutputDisassemblerShould.cs b/src/dotnet-ildasm.Tests/ConsoleOutputDisassemblerShould.cs
@@ -17,7 +17,7 @@ public ConsoleOutputDisassemblerShould()
             _assemblyDefinitionResolver = Substitute.For<IAssemblyDefinitionResolver>();
             _assemblyProcessorMock = Substitute.For<IAssemblyDecompiler>();
 
-            var assemblyDefinition = Mono.Cecil.AssemblyDefinition.CreateAssembly(
+            var assemblyDefinition = AssemblyDefinition.CreateAssembly(
                 new AssemblyNameDefinition("test", Version.Parse("1.0.0")),
                 "Module1", ModuleKind.Dll);
 
@@ -40,7 +40,7 @@ public void Not_Execute_If_Assembly_File_Does_Not_Exist()
         public void Write_Assembly_ExternalReferences_then_AssemblySection()
         {
             var disassembler = new ConsoleOutputDisassembler(_assemblyProcessorMock, _assemblyDefinitionResolver);
-            
+
             disassembler.Execute(new CommandArgument(), new ItemFilter(string.Empty));
 
             Received.InOrder(() =>
@@ -49,12 +49,12 @@ public void Write_Assembly_ExternalReferences_then_AssemblySection()
                 _assemblyProcessorMock.WriteAssemblySection(Arg.Any<AssemblyDefinition>());
             });
         }
-        
+
         [Fact]
         public void Write_AssemblySection_then_ModuleSection()
         {
             var disassembler = new ConsoleOutputDisassembler(_assemblyProcessorMock, _assemblyDefinitionResolver);
-            
+
             disassembler.Execute(new CommandArgument(), new ItemFilter(string.Empty));
 
             Received.InOrder(() =>
@@ -63,12 +63,12 @@ public void Write_AssemblySection_then_ModuleSection()
                 _assemblyProcessorMock.WriteModuleSection(Arg.Any<ModuleDefinition>());
             });
         }
-        
+
         [Fact]
         public void Write_ModuleSection_then_ModuleTypes()
         {
             var disassembler = new ConsoleOutputDisassembler(_assemblyProcessorMock, _assemblyDefinitionResolver);
-            
+
             disassembler.Execute(new CommandArgument(), new ItemFilter(string.Empty));
 
             Received.InOrder(() =>
@@ -82,7 +82,7 @@ public void Write_ModuleSection_then_ModuleTypes()
         public void Write_Nothing_But_ModuleTypes_When_Filter_Is_Set()
         {
             var disassembler = new ConsoleOutputDisassembler(_assemblyProcessorMock, _assemblyDefinitionResolver);
-            
+
             disassembler.Execute(new CommandArgument(), new ItemFilter("PublicClass::PublicVoidMethod"));
 
             _assemblyProcessorMock.Received(0).WriteAssemblyExternalReferences(Arg.Any<AssemblyDefinition>());
@@ -91,4 +91,4 @@ public void Write_Nothing_But_ModuleTypes_When_Filter_Is_Set()
             _assemblyProcessorMock.Received(1).WriteModuleTypes(Arg.Any<Collection<TypeDefinition>>(), Arg.Any<ItemFilter>());
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ public sealed override void PublicAbstractSealedMethod() @@
             {
             }
         }
-    }
+    }