Fix passing assemblies using relative path (#107536)

jkurdek · web-flow · commit 4c0973e17015 · 2024-09-09T16:53:45.000+02:00
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs b/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs
@@ -127,13 +127,14 @@ private bool StripAssembly(ITaskItem assemblyItem)
 
         try
         {
-            if(!AssemblyStripper.AssemblyStripper.TryStripAssembly(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));
+                var fullPath = assemblyItem.GetMetadata("FullPath");
+                _processedAssemblies.GetOrAdd(fullPath, GetTrimmedAssemblyItem(assemblyItem, outputPath, assemblyFile));
             }
         }
         catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -127,13 +127,14 @@ private bool StripAssembly(ITaskItem assemblyItem)`
`127`	`127`
`128`	`128`	`try`
`129`	`129`	`{`
`130`		`- if(!AssemblyStripper.AssemblyStripper.TryStripAssembly(assemblyFile, outputPath))`
	`130`	`+ if (!AssemblyStripper.AssemblyStripper.TryStripAssembly(assemblyFile, outputPath))`
`131`	`131`	`{`
`132`	`132`	`Log.LogMessage(MessageImportance.Low, $"[ILStrip] Skipping {assemblyFile} because it is not a managed assembly.");`
`133`	`133`	`}`
`134`	`134`	`else`
`135`	`135`	`{`
`136`		`- _processedAssemblies.GetOrAdd(assemblyItem.ItemSpec, GetTrimmedAssemblyItem(assemblyItem, outputPath, assemblyFile));`
	`136`	`+ var fullPath = assemblyItem.GetMetadata("FullPath");`
	`137`	`+ _processedAssemblies.GetOrAdd(fullPath, GetTrimmedAssemblyItem(assemblyItem, outputPath, assemblyFile));`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`catch (Exception ex)`