ScrapeHeaders: Trim filenames when splitting for ;

Fixes microsoft#1838
MarijnS95 · Sep 3, 2024 · c311d46 · c311d46
1 parent 5c94c97
commit c311d46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs b/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs
@@ -94,7 +94,7 @@ public override bool Execute()
 
             if (!string.IsNullOrEmpty(this.ExcludeFromCrossarch))
             {
-                foreach (var part in this.ExcludeFromCrossarch.Split(';', System.StringSplitOptions.RemoveEmptyEntries))
+                foreach (var part in this.ExcludeFromCrossarch.Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries))
                 {
                     this.partitionsToExcludeFromCrossarch.Add(part);
                 }
@@ -201,7 +201,7 @@ private Partition[] GetPartitions()
             if (!string.IsNullOrEmpty(this.PartitionFilter))
             {
                 partitionFilter = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                foreach (var partName in this.PartitionFilter.Split(new char[] { ',', ';' }, System.StringSplitOptions.RemoveEmptyEntries))
+                foreach (var partName in this.PartitionFilter.Split(new char[] { ',', ';' }, System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries))
                 {
                     partitionFilter.Add(partName);
                 }
@@ -278,7 +278,7 @@ private bool ProcessPartition(Partition partition, string arch)
 
             if (this.AdditionalIncludes != null)
             {
-                string[] dirs = this.AdditionalIncludes.Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+                string[] dirs = this.AdditionalIncludes.Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries);
                 foreach (var dir in dirs)
                 {
                     if (!includeDirHash.Contains(dir))
@@ -465,17 +465,17 @@ private bool ProcessPartition(Partition partition, string arch)
 
         private string[] GetExclusions(ITaskItem item)
         {
-            return item.GetMetadata("Exclude").Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+            return item.GetMetadata("Exclude").Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries);
         }
 
         private string[] GetRemaps(ITaskItem item)
         {
-            return item.GetMetadata("Remap").Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+            return item.GetMetadata("Remap").Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries);
         }
 
         private string[] GetFilesFromMetadata(ITaskItem item, string name)
         {
-            string[] items = item.GetMetadata(name).Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+            string[] items = item.GetMetadata(name).Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries);
             for (int i = 0; i < items.Length; i++)
             {
                 if (!Path.IsPathRooted(items[i]))

diff --git a/sources/GeneratorSdk/MetadataTasks/TaskUtils.cs b/sources/GeneratorSdk/MetadataTasks/TaskUtils.cs
@@ -134,7 +134,7 @@ public static IEnumerable<string> GetFullPaths(IEnumerable<ITaskItem> items, str
 
         public static IEnumerable<string> GetFilesFromMetadata(this ITaskItem item, string name, string root)
         {
-            string[] items = item.GetMetadata(name).Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+            string[] items = item.GetMetadata(name).Split(';', System.StringSplitOptions.RemoveEmptyEntries | System.StringSplitOptions.TrimEntries);
             for (int i = 0; i < items.Length; i++)
             {
                 if (!Path.IsPathRooted(items[i]))