[msbuild] Remove unnecessary logic to not re-import props files. (#9418)
Props files should only be imported in one place, and never by the projects themselves, so re-importing props files shouldn't be a problem.
This commit is contained in:
Родитель
9e6ecc8e1a
Коммит
4374c5f06e
|
@ -17,13 +17,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.Mac.AppExtension.Common.targets needs to import
|
||||
Xamarin.Mac.AppExtension.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinAppExtensionCommonPropsHasBeenImported>true</_XamarinAppExtensionCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<IsXPCService Condition="'$(IsXPCService)' == ''">false</IsXPCService>
|
||||
|
||||
|
|
|
@ -21,8 +21,7 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.AppExtension.Common.props"
|
||||
Condition="'$(_XamarinAppExtensionCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.AppExtension.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -19,13 +19,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.Mac.Common.targets needs to import
|
||||
Xamarin.Mac.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinCommonPropsHasBeenImported>true</_XamarinCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.props" />
|
||||
|
||||
<!-- Story-time! MigrateToNewXMIdentifier is special because it un-does a lie we started telling from the
|
||||
|
|
|
@ -18,8 +18,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
so be careful not to add fixes here that should go into Xamarin.Mac.Common.props which is shared -->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.props"
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.targets"/>
|
||||
|
||||
|
|
|
@ -19,8 +19,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.props"
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.Mac.ObjCBinding.Common.targets needs to import
|
||||
Xamarin.Mac.ObjCBinding.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinCommonBindingPropsHasBeenImported>true</_XamarinCommonBindingPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>__UNIFIED__;__MACOS__;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -15,8 +15,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
-->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.Common.props"
|
||||
Condition="'$(_XamarinCommonBindingPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.TVOS.AppExtension.Common.targets needs to import
|
||||
Xamarin.TVOS.AppExtension.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinAppExtensionCommonPropsHasBeenImported>true</_XamarinAppExtensionCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -28,8 +28,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.AppExtension.Common.props"
|
||||
Condition="'$(_XamarinAppExtensionCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.AppExtension.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.TVOS.Common.targets needs to import
|
||||
Xamarin.TVOS.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinTVOSCommonPropsHasBeenImported>true</_XamarinTVOSCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -17,8 +17,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.props"
|
||||
Condition="'$(_XamarinTVOSCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
|
||||
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.WatchOS.App.Common.targets needs to import
|
||||
Xamarin.WatchOS.App.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinWatchOSAppCommonPropsHasBeenImported>true</_XamarinWatchOSAppCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -25,8 +25,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.App.Common.props"
|
||||
Condition="'$(_XamarinWatchOSAppCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.App.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.WatchOS.AppExtension.Common.targets needs to import
|
||||
Xamarin.WatchOS.AppExtension.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinWatchOSAppExtensionCommonPropsHasBeenImported>true</_XamarinWatchOSAppExtensionCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -32,8 +32,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.AppExtension.Common.props"
|
||||
Condition="'$(_XamarinWatchOSAppExtensionCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.AppExtension.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -18,13 +18,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.WatchOS.Common.targets needs to import
|
||||
Xamarin.WatchOS.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinWatchOSCommonPropsHasBeenImported>true</_XamarinWatchOSCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -17,8 +17,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.Common.props"
|
||||
Condition="'$(_XamarinWatchOSCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.iOS.AppExtension.Common.targets needs to import
|
||||
Xamarin.iOS.AppExtension.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinAppExtensionCommonPropsHasBeenImported>true</_XamarinAppExtensionCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -23,8 +23,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.AppExtension.Common.props"
|
||||
Condition="'$(_XamarinAppExtensionCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.AppExtension.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.iOS.Common.targets needs to import
|
||||
Xamarin.iOS.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinCommonPropsHasBeenImported>true</_XamarinCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -15,8 +15,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
|||
-->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.props"
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.iOS.Common.targets needs to import
|
||||
Xamarin.iOS.ObjCBinding.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinCommonPropsHasBeenImported>true</_XamarinCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- This is used to set that we're a binding project. It must be set before including Xamarin.Shared.props -->
|
||||
<PropertyGroup>
|
||||
<IsBindingProject>true</IsBindingProject>
|
||||
|
|
|
@ -15,8 +15,7 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
|
|||
-->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.ObjCBinding.Common.props"
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.ObjCBinding.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
|
@ -17,13 +17,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.iOS.WatchApp.Common.targets needs to import
|
||||
Xamarin.iOS.WatchApp.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinWatchAppCommonPropsHasBeenImported>true</_XamarinWatchAppCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
@ -25,8 +25,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.WatchApp.Common.props"
|
||||
Condition="'$(_XamarinWatchAppCommonPropsHasBeenImported)' != 'true'" />
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.WatchApp.Common.props" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче