Merge pull request #3961 from mavasani/MultipleFiles

Ensure that we do not add duplicate public API files for multi-tfm pr…
dotnet · Aug 6, 2020 · 9a179e3 · 9a179e3
2 parents 17181ac + 0f87aa4
commit 9a179e3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/PublicApiAnalyzers/Core/CodeFixes/DeclarePublicApiFix.cs b/src/PublicApiAnalyzers/Core/CodeFixes/DeclarePublicApiFix.cs
@@ -295,10 +295,15 @@ protected override async Task<Solution> GetChangedSolutionAsync(CancellationToke
                     newSolution = newSolution.WithAdditionalDocumentText(pair.Key, pair.Value);
                 }
 
+                // NOTE: We need to avoid creating duplicate files for multi-tfm projects. See https://github.com/dotnet/roslyn-analyzers/issues/3952.
+                using var uniqueProjectPaths = PooledHashSet<string>.GetInstance();
                 foreach (KeyValuePair<ProjectId, SourceText> pair in addedPublicSurfaceAreaText)
                 {
                     var project = newSolution.GetProject(pair.Key);
-                    newSolution = AddPublicApiFiles(project, pair.Value);
+                    if (uniqueProjectPaths.Add(project.FilePath ?? project.Name))
+                    {
+                        newSolution = AddPublicApiFiles(project, pair.Value);
+                    }
                 }
 
                 return newSolution;