diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-02-18 00:01:53 +0300 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-02-23 20:24:16 +0300 |
| commit | 44f179607213459f6f7a9043a43c9b16ef1cd25f (patch) | |
| tree | 0c71c246c21b7b63430555520cf91c3b2392859a /build.proj | |
| parent | 331690a2293d497e3727f2cb4e99b55e5c2e3da8 (diff) | |
Add new dotnet CLI, buildtools, and fixes to make restore work.
Include capitalization fixes for NETNative packages to avoid xplat nuget race condition.
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/build.proj b/build.proj index 4f6bfbae21..e0e0c6f926 100644 --- a/build.proj +++ b/build.proj @@ -51,23 +51,10 @@ <Target Name="BatchRestorePackages"> <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)" 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="ErrorAndContinue" - Condition="'$(SkipGatherRestoreDirs)' != 'true'" /> - <Exec Command="$(DnuRestoreCommand) @(DnuRestoreDir->'"%(Identity)"', ' ')" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" - ContinueOnError="ErrorAndContinue" - Condition="'$(SkipGatherRestoreDirs)' == 'true'" /> + ContinueOnError="ErrorAndContinue" /> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> </Target> @@ -107,4 +94,4 @@ <RemoveDir Directories="$(BinDir)" /> </Target> -</Project>
\ No newline at end of file +</Project> |