summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorDavis Goodin <dagood@microsoft.com>2016-03-30 10:03:53 -0500
committerDavis Goodin <dagood@microsoft.com>2016-03-30 10:38:44 -0500
commite2aa428f40d85b84f7de4a13124dcd96ec600a1c (patch)
treeb2c64c0c52ce9de4b6677431a633c0ce509eef2b /dir.props
parent817fec1799d13c089b14ed168f8c691b00e4d5e9 (diff)
downloadcoreclr-e2aa428f40d85b84f7de4a13124dcd96ec600a1c.tar.gz
coreclr-e2aa428f40d85b84f7de4a13124dcd96ec600a1c.tar.bz2
coreclr-e2aa428f40d85b84f7de4a13124dcd96ec600a1c.zip
Upgrade dotnet cli version.
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props3
1 files changed, 2 insertions, 1 deletions
diff --git a/dir.props b/dir.props
index 153f2f2160..8b599ca4fa 100644
--- a/dir.props
+++ b/dir.props
@@ -62,7 +62,7 @@
<PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
<ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir>
- <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/bin/</DotnetCliPath>
+ <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
<BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore>
<TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir>
@@ -112,6 +112,7 @@
<DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand>
<DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
<DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
+ <DnuRestoreCommand Condition="'$(InferRuntimes)'!='false'">$(DnuRestoreCommand) --infer-runtimes</DnuRestoreCommand>
</PropertyGroup>
<!--