diff options
author | Roman Artemev <rartemev@microsoft.com> | 2017-03-08 15:37:31 -0800 |
---|---|---|
committer | Roman Artemev <rartemev@microsoft.com> | 2017-05-19 15:58:24 -0700 |
commit | aad6903366ed6d70f218b92bfc762feb29a73773 (patch) | |
tree | 1370d2167bc6818b89a3a5b9669a23e3967751a0 /dir.props | |
parent | 7c41871f582fedc751ee6cabd95df3fbad36d847 (diff) | |
download | coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.tar.gz coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.tar.bz2 coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.zip |
Test build fixes for Linux
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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 --> @@ -42,7 +46,7 @@ <BuildType Condition="'$(__BuildType)' == 'checked'">Checked</BuildType> <BuildOS>$(__BuildOS)</BuildOS> - <BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT</BuildOS> + <BuildOS Condition="'$(__BuildOS)' == ''">AnyOS</BuildOS> <ProjectDir>$(__ProjectDir)\</ProjectDir> <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir> @@ -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> |