diff options
| author | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 11:24:09 -0700 |
|---|---|---|
| committer | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 13:30:31 -0700 |
| commit | a16a8a852077b0c471cf12ef75dc5e8a41333533 (patch) | |
| tree | dac36f93f17ea00ec6f704fd04c5251ef83210d0 /dir.props | |
| parent | c41d51e46069b3b21b8a0361688e2557586f353c (diff) | |
| download | coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.gz coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.bz2 coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.zip | |
Revert "Fixed tests build on Linux"
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -26,11 +26,7 @@ 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> - <RunningOnCore>false</RunningOnCore> - <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore> - <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop> - <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop> - <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45> + <BuildToolsTargets45>true</BuildToolsTargets45> </PropertyGroup> <!-- Common properties --> @@ -46,7 +42,7 @@ <BuildType Condition="'$(__BuildType)' == 'checked'">Checked</BuildType> <BuildOS>$(__BuildOS)</BuildOS> - <BuildOS Condition="'$(__BuildOS)' == ''">AnyOS</BuildOS> + <BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT</BuildOS> <ProjectDir>$(__ProjectDir)\</ProjectDir> <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir> @@ -72,8 +68,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> |