Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 855f7da

Browse files
committed
Add RoslynIncompatibleMsbuildVersion condition on Roslyn import
Due to merge conflict this condition got removed so adding it back to allow for older msbuild versions to work (at least temporarily).
1 parent 897e4c7 commit 855f7da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/dir.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
</PropertyGroup>
7979

8080
<!-- Use Roslyn Compilers to build -->
81-
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" />
82-
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" />
81+
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false' and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" />
82+
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)') and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" />
8383

8484
<PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
8585
<!-- When we do a traversal build we get all packages up front, don't restore them again -->

0 commit comments

Comments
 (0)