Fix project reference protocol for outer build nodes (#429)

microsoft · Mar 14, 2023 · e3aa855 · e3aa855
1 parent fa23053
commit e3aa855
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/Traversal.UnitTests/TraversalTests.cs b/src/Traversal.UnitTests/TraversalTests.cs
@@ -253,14 +253,21 @@ public void StaticGraphProjectReferenceTargetsAreSetForEachTraversalTarget(strin
                 .TraversalProject(
                     null,
                     GetTempFile("dirs.proj"))
-                .Save().TryGetItems("ProjectReferenceTargets", "Targets", out IReadOnlyDictionary<string, string> items);
-
-            items.Keys.ShouldContain(target);
-
-            items[target].ShouldBe(
-                target == "Build"
-                    ? ".default"
-                    : target);
+                .Save()
+                .TryGetItems("ProjectReferenceTargets", out IReadOnlyCollection<ProjectItem> items);
+            if (target.Equals("Build") || target.Equals("Clean"))
+            {
+                string expectedTargetsMetadatumValue = target.Equals("Build") ? ".default" : target;
+                IEnumerable<ProjectItem> filteredItems = items.Where(item => item.EvaluatedInclude.Equals(target));
+                filteredItems.Where(item => item.GetMetadataValue("OuterBuild").Equals("true")
+                    && item.GetMetadataValue("Targets").Equals(expectedTargetsMetadatumValue)).ShouldNotBeEmpty();
+                filteredItems.Where(item => item.GetMetadataValue("OuterBuild").Equals(string.Empty)
+                    && item.GetMetadataValue("Targets").Equals(expectedTargetsMetadatumValue)).ShouldNotBeEmpty();
+            }
+            else
+            {
+                items.Where(item => item.GetMetadataValue("Targets").Equals(target)).ShouldNotBeEmpty();
+            }
         }
 
         [Fact]

diff --git a/src/Traversal/Sdk/Sdk.targets b/src/Traversal/Sdk/Sdk.targets
@@ -45,7 +45,9 @@
     <ProjectReferenceTargets Remove="Publish" />
     <ProjectReferenceTargets Remove="Pack" />
 
+    <ProjectReferenceTargets Include="Build" Targets=".default" OuterBuild="true" />
     <ProjectReferenceTargets Include="Build" Targets=".default" />
+    <ProjectReferenceTargets Include="Clean" Targets="Clean" OuterBuild="true" />
     <ProjectReferenceTargets Include="Clean" Targets="Clean" />
     <ProjectReferenceTargets Include="Rebuild" Targets="Rebuild" />
     <ProjectReferenceTargets Include="Test" Targets="Test" />