diff options
| author | Simon Nattress <simonn@microsoft.com> | 2016-03-30 01:41:18 +0300 |
|---|---|---|
| committer | Simon Nattress <simonn@microsoft.com> | 2016-04-05 22:01:13 +0300 |
| commit | 13ab08458ef8f922e5ae18f6cbc9cc5f3e5d642c (patch) | |
| tree | 359c89dba615ddace3efcf54959046627c617d05 /dir.props | |
| parent | 87bc222c022785104aac9b4dbe0fd35c90ba934e (diff) | |
Roll forward to latest CLI from Rel/1.0.0
- Migrate to CLI 1.0.0-beta-002209
- Alter scripting to support CLI package layout and Azure blob URL changes
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -154,14 +154,15 @@ </ItemGroup> <PropertyGroup> - <DnuToolPath Condition="'$(DnuToolPath)'==''">$(BinDir)/tools/cli/bin/dotnet</DnuToolPath> + <DnuToolPath Condition="'$(DnuToolPath)'==''">$(BinDir)/tools/cli/dotnet</DnuToolPath> <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs> <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> - <DnuRestoreCommand Condition="'$(ParallelRestore)'=='true'">$(DnuRestoreCommand) --parallel</DnuRestoreCommand> + <!-- Parallel restore is not stable on Unix. Enable it on Windows only for now --> + <DnuRestoreCommand Condition="'$(ParallelRestore)'=='true' and '$(OsEnvironment)'=='Windows_NT'">$(DnuRestoreCommand) --parallel</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand> </PropertyGroup> |