Add unmanaged assembly skipping to ILStrip task (dotnet#106267)

carlossanlop · Aug 12, 2024 · 78f5e87 · 78f5e87
1 parent c71fd55
commit 78f5e87
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.cs b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.cs
@@ -237,5 +237,19 @@ public static void StripAssembly(string assemblyFile, string outputPath)
             AssemblyDefinition assembly = AssemblyFactory.GetAssembly(assemblyFile);
             AssemblyStripper.StripAssembly(assembly, outputPath);
         }
+
+        public static bool TryStripAssembly(string assemblyFile, string outputPath)
+        {
+            try
+            {
+                StripAssembly(assemblyFile, outputPath);
+                return true;
+            }
+            // Skip unmanged assemblies
+            catch (ImageFormatException)
+            {
+                return false;
+            }
+        }
     }
 }
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs b/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs
@@ -96,10 +96,7 @@ public override bool Execute()
                                                         }
                                                     });
 
-            if (TrimIndividualMethods)
-            {
-                UpdatedAssemblies = ConvertAssembliesDictToOrderedList(_processedAssemblies, Assemblies).ToArray();
-            }
+            UpdatedAssemblies = ConvertAssembliesDictToOrderedList(_processedAssemblies, Assemblies).ToArray();
 
             if (!result.IsCompleted && !Log.HasLoggedErrors)
             {
@@ -130,7 +127,14 @@ private bool StripAssembly(ITaskItem assemblyItem)
 
         try
         {
-            AssemblyStripper.AssemblyStripper.StripAssembly (assemblyFile, outputPath);
+            if(!AssemblyStripper.AssemblyStripper.TryStripAssembly(assemblyFile, outputPath))
+            {
+                Log.LogMessage(MessageImportance.Low, $"[ILStrip] Skipping {assemblyFile} because it is not a managed assembly.");
+            }
+            else
+            {
+                _processedAssemblies.GetOrAdd(assemblyItem.ItemSpec, GetTrimmedAssemblyItem(assemblyItem, outputPath, assemblyFile));
+            }
         }
         catch (Exception ex)
         {