Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build/MSBuild.Grunt.targets
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<Message Text="Grunt found: '$(GruntExecutable)'" />
</Target>

<Target Name="RunGruntBuild"
<Target Name="RunGruntBuild"
DependsOnTargets="EnsureNodeModules;EnsureGrunt"
BeforeTargets="Build"
BeforeTargets="BeforeBuild"
Condition=" Exists('$(GruntFile)') AND '$(GruntBuildTask)' != '' " >
<Exec Command="$(RunGruntBuildCmd)"
ContinueOnError="true"
Expand All @@ -48,16 +48,16 @@
<Output TaskParameter="ExitCode" PropertyName="GruntExitCode"/>
</Exec>
<ReadLinesFromFile File="$(GruntOut)">
<Output TaskParameter="Lines" ItemName="GruntOutLines"/>
<Output TaskParameter="Lines" ItemName="GruntOutLines"/>
</ReadLinesFromFile>
<Delete Files="$(GruntOut)"/>
<Warning Condition=" '$(GruntExitCode)' != '0' " Text="%(GruntOutLines.Identity)" />
<Error Condition=" '$(GruntExitCode)' != '0' " Text="$(GruntBuildTaskError)" />
</Target>

<Target Name="RunGruntClean"
<Target Name="RunGruntClean"
DependsOnTargets="EnsureNodeModules;EnsureGrunt"
AfterTargets="Clean"
BeforeTargets="AfterClean"
Condition=" Exists('$(GruntFile)') AND '$(GruntCleanTask)' != '' " >
<Exec Command="$(RunGruntCleanCmd)"
ContinueOnError="true"
Expand All @@ -66,7 +66,7 @@
<Output TaskParameter="ExitCode" PropertyName="GruntExitCode"/>
</Exec>
<ReadLinesFromFile File="$(GruntOut)">
<Output TaskParameter="Lines" ItemName="GruntOutLines"/>
<Output TaskParameter="Lines" ItemName="GruntOutLines"/>
</ReadLinesFromFile>
<Delete Files="$(GruntOut)"/>
<Warning Condition=" '$(GruntExitCode)' != '0' " Text="%(GruntOutLines.Identity)" />
Expand Down
4 changes: 2 additions & 2 deletions build/MSBuild.Gulp.targets
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<Target Name="RunGulpBuild"
DependsOnTargets="EnsureNodeModules;EnsureGulp"
BeforeTargets="Build"
BeforeTargets="BeforeBuild"
Condition=" Exists('$(GulpFile)') AND '$(GulpBuildTask)' != '' " >
<Message Text="Running Gulp: '$(GulpBuildTask)'" />
<Exec Command="$(RunGulpBuildCmd)"
Expand All @@ -58,7 +58,7 @@

<Target Name="RunGulpClean"
DependsOnTargets="EnsureNodeModules;EnsureGulp"
AfterTargets="Clean"
BeforeTargets="AfterClean"
Condition=" Exists('$(GulpFile)') AND '$(GulpCleanTask)' != '' " >
<Message Text="Running Gulp: '$(GulpCleanTask)'" />
<Exec Command="$(RunGulpCleanCmd)"
Expand Down