diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-10-03 15:21:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 15:21:52 -0700 |
| commit | aae414026671e3dc1ccf0f308d351ac04cc746a4 (patch) | |
| tree | 7854947379c68e2b03c476f3744db1a699cf1b6a /dir.props | |
| parent | 3716918ee67ea2e8d8271c9a214159e56687f043 (diff) | |
| download | coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.tar.gz coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.tar.bz2 coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.zip | |
Update Buildtools and Roslyn (#14228)
* Update Buildtools and Roslyn
* Fixing importing of the roslyn files on msbuild 14.0
* Correctly looking for the latest VS Installation
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -181,6 +181,6 @@ </ItemGroup> <!-- Use Roslyn Compilers to build --> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" /> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false' and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)') and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> </Project> |