diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2017-04-15 02:37:52 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2017-04-17 21:13:05 +0300 |
| commit | e196a9dbe0b5f37ff8b44cbfe0c2d3d6220fe4bc (patch) | |
| tree | b0725eeae4ae71d56c452b1bd37b492fde9f2dd7 /main/MonoDevelop.props | |
| parent | 32b3b43b4c7d8af84181afc5c497c4895b9834c4 (diff) | |
[build] Fix warnings in common props import
Diffstat (limited to 'main/MonoDevelop.props')
| -rw-r--r-- | main/MonoDevelop.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/MonoDevelop.props b/main/MonoDevelop.props index 55fbe3f65b..0bbf46f27c 100644 --- a/main/MonoDevelop.props +++ b/main/MonoDevelop.props @@ -6,7 +6,7 @@ <CustomAfterMicrosoftCommonTargets>$(MonoDevelopRootDir)\msbuild\MonoDevelop.AfterCommon.targets</CustomAfterMicrosoftCommonTargets> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> </PropertyGroup> - <Import Project="$(MonoDevelopRootDir)\msbuild\MonoDevelop.BeforeCommon.props" /> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> + <!-- import common targets if they were not imported already by an MSBuild Sdk --> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="'$(MicrosoftCommonPropsHasBeenImported)' != 'true'" /> <Import Project="$(MonoDevelopRootDir)\msbuild\MonoDevelop.AfterCommon.props" /> </Project> |