ignore the assemblies(IsILOnly=false)

yangzhongke · Mar 17, 2022 · f6b8996 · f6b8996
1 parent 52b5ce0
commit f6b8996
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 65 deletions.
diff --git a/Zack.DotNetTrimmerLib/AssemblyTrimmer.cs b/Zack.DotNetTrimmerLib/AssemblyTrimmer.cs
@@ -1,9 +1,21 @@
 using dnlib.DotNet;
+using dnlib.DotNet.MD;
 
 namespace Zack.DotNetTrimmerLib
 {
     static class AssemblyTrimmer
     {
+        public static void TrimAssemblies(string rootDir, HashSet<string> loadedTypes)
+        {
+            foreach (var asmFile in Directory.GetFiles(rootDir, "*.dll", SearchOption.AllDirectories))
+            {
+                if (PEHelpers.IsManagedAssembly(asmFile))
+                {
+                    TrimAssembly(asmFile, loadedTypes);
+                }                
+            }
+        }
+
         /// <summary>
         /// clear the bodies of methods of unused classes in loadedAssemblies
         /// </summary>
@@ -17,7 +29,6 @@ public static void TrimAssembly(string asmFile, HashSet<string> loadedTypes)
                 //Assembly contains more than IL code cannot be trimmed as expected.
                 //https://github.com/Washi1337/AsmResolver/issues/267
                 if (!module.IsILOnly) return;
-
                 List<TypeDef> typesToBeRemoved = new List<TypeDef>();
                 foreach (var type in module.Types)
                 {
@@ -40,6 +51,7 @@ public static void TrimAssembly(string asmFile, HashSet<string> loadedTypes)
                     }
                 }
                 //if module.IsILOnly, NativeWrite should be used instead of Write
+                //module.Write(memStream);
                 module.Write(memStream);
             }
             memStream.Position = 0;

diff --git a/Zack.DotNetTrimmerLib/JsonCleaner.cs b/Zack.DotNetTrimmerLib/JsonCleaner.cs
diff --git a/Zack.DotNetTrimmerLib/Trimmer.cs b/Zack.DotNetTrimmerLib/Trimmer.cs
@@ -108,17 +108,11 @@ public void Run()
             .Where(asmPath => !IsFileIgnored(asmPath) && IsManagedAssembly(asmPath)).ToArray();
             var assembliesNotLoaded = allDllFiles.Where(d => !recordFileInfo.LoadedAssemblies.Contains(Path.GetFileName(d)));
             var totalSize = assembliesNotLoaded.Select(f => new FileInfo(f).Length).Sum() * 1.0 / (1024 * 1024);
-
-            /*
-            foreach(var asmFile in recordFileInfo.LoadedAssemblies)
-            {
-                if (!File.Exists(asmFile)) return;
-                AssemblyTrimmer.TrimAssembly(asmFile, recordFileInfo.LoadedTypes);
-            }*/
             foreach (var file in assembliesNotLoaded)
             {
                 File.Delete(file);
             }
+            AssemblyTrimmer.TrimAssemblies(startupDir, recordFileInfo.LoadedTypes);
             IOHelpers.RemoveFiles(startupDir, "*.pdb");
             IOHelpers.RemoveFiles(startupDir, "*.runtimeconfig.json");
             IOHelpers.RemoveFiles(startupDir, "*.deps.json");