Skip to content

Commit

Permalink
Find custom.props in parent dir (#4946)
Browse files Browse the repository at this point in the history
* Update LkgToolset.props

Fix build break - custom.props in parent directory

* Update LkgToolset.props
  • Loading branch information
Scottj1s authored Dec 10, 2024
1 parent 7b78272 commit ff735c5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion LkgToolset.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<PropertyGroup Condition="'$(Platform)'=='x86'">
<WorkaroundLkgWin32>true</WorkaroundLkgWin32>
<Platform>Win32</Platform>
<CustomProps>$([MSBuild]::GetPathOfFileAbove('custom.props', '$(MSBuildThisFileDirectory)'))</CustomProps>
</PropertyGroup>
<Import Project="custom.props" Condition="Exists('custom.props') and '$(WorkaroundLkgWin32)'=='true'" />
<Import Project="$(CustomProps)" Condition="Exists('$(CustomProps)') and '$(WorkaroundLkgWin32)'=='true'" />
<PropertyGroup Condition="'$(WorkaroundLkgWin32)'=='true'">
<Platform>x86</Platform>
</PropertyGroup>
Expand Down

0 comments on commit ff735c5

Please sign in to comment.