diff options
| author | Matt Ellis <matell@microsoft.com> | 2016-02-08 08:41:10 +0300 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2016-02-08 08:41:10 +0300 |
| commit | ab5420032a59aff2c4e3df1d3e2bf921f809c10d (patch) | |
| tree | cfa53a6c05685a4a0f56137bd32f7e217b7944df /build.proj | |
| parent | e5066d378f3d881eba94ddd4df43be1046011f3f (diff) | |
Fix internal TFS build break
The internal TFS build does not work correctly with the new
GatherDirectoriesToRestore task since it does not use the same restore
commands as our open builds. To unblock the build, disable this task when
building our TFS sources in favor of the old slower way.
[tfs-changeset: 1573223]
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build.proj b/build.proj index 350d041207..9a4e598165 100644 --- a/build.proj +++ b/build.proj @@ -52,12 +52,14 @@ <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> <!-- restore all project.jsons in one pass for perf & to avoid concurrency problems with dnu --> - <GatherDirectoriesToRestore RootDirectories="@(DnuRestoreDir)"> + <GatherDirectoriesToRestore RootDirectories="@(DnuRestoreDir)" Condition="'$(SkipGatherRestoreDirs)' != 'true'"> <Output TaskParameter="DirectoriesToRestore" ItemName="ExpandedDnuRestoreDir" /> </GatherDirectoriesToRestore> - <Exec Command="$(DnuRestoreCommand) "%(ExpandedDnuRestoreDir.Identity)"" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" ContinueOnError="WarnAndContinue" /> + <Exec Command="$(DnuRestoreCommand) "%(ExpandedDnuRestoreDir.Identity)"" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" ContinueOnError="WarnAndContinue" Condition="'$(SkipGatherRestoreDirs)' != 'true'" /> + + <Exec Command="$(DnuRestoreCommand) "%(DnuRestoreDir.Identity)"" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" ContinueOnError="WarnAndContinue" Condition="'$(SkipGatherRestoreDirs)' == 'true'" /> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> </Target> |