Merge pull request #1 from Microsoft/users/tihuang/fixvsbuild

revert change that break forward compat
microsoft · Apr 1, 2015 · 6ddb807 · 6ddb807
2 parents b6795d3 + 570c851
commit 6ddb807
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Tasks/VSBuild/VSBuild.ps1 b/Tasks/VSBuild/VSBuild.ps1
@@ -62,6 +62,9 @@ if (!$solutionFiles)
     throw "No solution with search pattern '$solution' was found."
 }
 
+Write-Verbose "Creating a new timeline for logging events"
+$timeline = Start-Timeline -Context $distributedTaskContext 
+
 $args = $msbuildArgs;
 if ($platform)
 {
@@ -120,7 +123,7 @@ if ($cleanBuild)
 {
     foreach ($sf in $solutionFiles)  
     {
-        Invoke-MSBuild $sf -Targets Clean -LogFile "$sf-clean.log" -ToolLocation $msBuildLocation -CommandLineArgs $args -NoTimelineLogger:$noTimelineLogger
+        Invoke-MSBuild $sf -Timeline $timeline -Targets Clean -LogFile "$sf-clean.log" -ToolLocation $msBuildLocation -CommandLineArgs $args -NoTimelineLogger:$noTimelineLogger
     }
 }
 
@@ -149,7 +152,7 @@ foreach ($sf in $solutionFiles)
         }
     }
 
-    Invoke-MSBuild $sf -LogFile "$sf.log" -ToolLocation $msBuildLocation -CommandLineArgs $args  -NoTimelineLogger:$noTimelineLogger
+    Invoke-MSBuild $sf -Timeline $timeline -LogFile "$sf.log" -ToolLocation $msBuildLocation -CommandLineArgs $args  -NoTimelineLogger:$noTimelineLogger
 }
 
 Write-Verbose "Leaving script VSBuild.ps1"
diff --git a/Tasks/VSBuild/task.json b/Tasks/VSBuild/task.json
@@ -8,7 +8,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 7
+        "Patch": 6
     },
     "demands": [
         "msbuild",