Fix bubbling of TargetOutputs for "Rebuild" calls (#190)

* Added meta-target "Rebuild" to the traversal sdk with the appropriate return attribute The MSBuild task only returns the TargetOutputs items explicitly set by the target called. If no specific target was called the default target returns their TargetOutput. Resolves #187 * Pin down dotnet sdk version & adjust pipeline to download via global.json to workaround issue in .NET Core 5 with Nerdbank.GitVersioning
microsoft · Jun 14, 2020 · 5ab9834 · 5ab9834
1 parent f1b207c
commit 5ab9834
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,7 +6,6 @@ variables:
   BinaryLoggerArgs: '"/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"'
   BuildConfiguration: 'Debug'
   BuildPlatform: 'Any CPU'
-  DotNetCoreVersion: '3.1.300'
 
 trigger:
   batch: true
@@ -33,9 +32,9 @@ jobs:
     vmImage: windows-latest
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET Core $(DotNetCoreVersion)'
+    displayName: 'Install .NET Core from globa.json'
     inputs:
-      version: '$(DotNetCoreVersion)'
+      useGlobalJson: true
 
   - task: MSBuild@1
     displayName: 'Build Solution'

diff --git a/global.json b/global.json
@@ -1,4 +1,8 @@
 {
+  "sdk": {
+    "version": "3.1.300",
+    "rollForward": "latestFeature"
+  },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "1.0.94"
   }

diff --git a/src/Traversal.UnitTests/TraversalTests.cs b/src/Traversal.UnitTests/TraversalTests.cs
@@ -303,8 +303,11 @@ public void WorksWhenConfigurationSpecified(string configuration)
             result.ShouldBeTrue(customMessage: () => buildOutput.GetConsoleLog());
         }
 
-        [Fact]
-        public void CollectsProjectReferenceBuildTargetOutputs()
+        [Theory]
+        [InlineData(null)]
+        [InlineData("Build")]
+        [InlineData("Rebuild")]
+        public void CollectsProjectReferenceBuildTargetOutputs(string target)
         {
             string[] projects = new[]
             {
@@ -325,7 +328,7 @@ public void CollectsProjectReferenceBuildTargetOutputs()
                     parameters: new Dictionary<string, string>
                     {
                         ["Projects"] = subTraversalProject.FullPath,
-                        ["Targets"] = "Build"
+                        ["Targets"] = target
                     })
                 .TaskOutputItem("TargetOutputs", "CollectedOutputs")
                 .TaskMessage("%(CollectedOutputs.Identity)", MessageImportance.High)
@@ -342,6 +345,7 @@ ProjectCreator GetSkeletonCSProjWithTargetOutputs(string projectName)
                                     .Target("Build", returns: "@(TestReturnItem)")
                                     .TargetItemGroup()
                                     .TargetItemInclude("TestReturnItem", "$(MSBuildThisFileName).dll")
+                                    .Target("Clean")
                                     .Save();
             }
         }

diff --git a/src/Traversal/Sdk/Sdk.targets b/src/Traversal/Sdk/Sdk.targets
@@ -140,6 +140,8 @@
              ContinueOnError="$([MSBuild]::ValueOrDefault('$(CleanContinueOnError)', '$(ContinueOnError)'))" />
   </Target>
 
+  <Target Name="Rebuild" DependsOnTargets="$(RebuildDependsOn)" Returns="@(CollectedBuildOutput)" />
+
   <Target Name="Test"
           DependsOnTargets="$(TestDependsOn)"
           Condition=" '$(IsGraphBuild)' != 'true' ">