summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorRoman Artemev <rartemev@microsoft.com>2017-06-01 19:27:23 (GMT)
committerGitHub <noreply@github.com>2017-06-01 19:27:23 (GMT)
commitf86fd75c111fc28554f1c846a8abc472cc2f67b6 (patch)
tree43010c7bfde2f634d15de8006a734993798d8ffb /dir.props
parent148d418dca9045167e1e5b74129faa78d9c5ed73 (diff)
parentdf8dca2f2f3a5dd22b9db727e581a3c13fbe403a (diff)
downloadcoreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.zip
coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.gz
coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.bz2
Merge pull request #11860 from rartemev/fix_tests_build_4
Fixed tests build on Linux
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props10
1 files changed, 7 insertions, 3 deletions
diff --git a/dir.props b/dir.props
index 0ceb7fe..65f3074 100644
--- a/dir.props
+++ b/dir.props
@@ -26,7 +26,11 @@
as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks.
-->
<PropertyGroup>
- <BuildToolsTargets45>true</BuildToolsTargets45>
+ <RunningOnCore>false</RunningOnCore>
+ <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore>
+ <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop>
+ <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop>
+ <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45>
</PropertyGroup>
<!-- Common properties -->
@@ -68,8 +72,8 @@
<PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir>
<PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
- <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir>
- <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
+ <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools\</ToolsDir>
+ <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli\</DotnetCliPath>
<OverrideToolHost>$(DotnetCliPath)dotnet</OverrideToolHost>
<BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore>