Adjustments

Author: stan-sz

src/Analyzer/ReferenceTrimmerAnalyzer.cs

@@ -249,7 +249,7 @@ private static void WriteFile(string filePath, string text)
         return null;
     }
 
-    // File format: tab-separated fields (AssemblyPath, Kind, Spec), one reference per line.
+    // File format: tab-separated fields (AssemblyPath, Kind, Spec, AdditionalSpec), one reference per line.
     // Keep in sync with SaveDeclaredReferences in CollectDeclaredReferencesTask.cs.
     private static IEnumerable<DeclaredReference> ReadDeclaredReferences(SourceText sourceText)
     {
@@ -267,6 +267,7 @@ private static IEnumerable<DeclaredReference> ReadDeclaredReferences(SourceText
 
             int firstTab = -1;
             int secondTab = -1;
+            int thirdTab = -1;
             for (int i = start; i < end; i++)
             {
                 if (sourceText[i] == '\t')
@@ -275,21 +276,26 @@ private static IEnumerable<DeclaredReference> ReadDeclaredReferences(SourceText
                     {
                         firstTab = i;
                     }
-                    else
+                    else if (secondTab == -1)
                     {
                         secondTab = i;
+                    }
+                    else
+                    {
+                        thirdTab = i;
                         break;
                     }
                 }
             }
 
-            if (firstTab == -1 || secondTab == -1)
+            if (firstTab == -1 || secondTab == -1 || thirdTab == -1)
             {
                 yield break;
             }
 
             string assemblyPath = sourceText.ToString(TextSpan.FromBounds(start, firstTab));
-            string spec = sourceText.ToString(TextSpan.FromBounds(secondTab + 1, end));
+            string spec = sourceText.ToString(TextSpan.FromBounds(secondTab + 1, thirdTab));
+            string additionalSpec = sourceText.ToString(TextSpan.FromBounds(thirdTab + 1, end));
 
             // Determine kind without allocating a string. The three possible values are
             // "Reference" (len 9), "ProjectReference" (len 16), "PackageReference" (len 16).
@@ -312,7 +318,7 @@ private static IEnumerable<DeclaredReference> ReadDeclaredReferences(SourceText
                 continue;
             }
 
-            yield return new DeclaredReference(assemblyPath, kind, spec);
+            yield return new DeclaredReference(assemblyPath, kind, spec, additionalSpec);
         }
     }
 }

src/Tasks/CollectDeclaredReferencesTask.cs

@@ -476,7 +476,7 @@ private static bool IsSuppressed(ITaskItem item, string warningId)
         return false;
     }
 
-    // File format: tab-separated fields (AssemblyPath, Kind, Spec), one reference per line.
+    // File format: tab-separated fields (AssemblyPath, Kind, Spec, AdditionalSpec), one reference per line.
     // Keep in sync with ReadDeclaredReferences in ReferenceTrimmerAnalyzer.cs.
     private static void SaveDeclaredReferences(IReadOnlyList<DeclaredReference> declaredReferences, string filePath)
     {
@@ -497,6 +497,8 @@ private static void SaveDeclaredReferences(IReadOnlyList<DeclaredReference> decl
             writer.Append(kindString);
             writer.Append(fieldDelimiter);
             writer.Append(reference.Spec);
+            writer.Append(fieldDelimiter);
+            writer.Append(reference.AdditionalSpec);
             writer.AppendLine();
         }