[msbuild] Move a few more properties to the shared files so that they…

…'re before they participate in conditions.
dotnet · Jul 27, 2021 · 0c9fff2 · 0c9fff2
1 parent 9158dcc
commit 0c9fff2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.props b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@@ -190,6 +190,8 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 	<PropertyGroup>
 		<ArchiveOnBuild Condition="'$(ArchiveOnBuild)' == ''">false</ArchiveOnBuild>
 		<IsAppExtension Condition="'$(IsAppExtension)' == ''">false</IsAppExtension>
+		<IsWatchExtension Condition="'$(IsWatchExtension)' == ''">false</IsWatchExtension>
+		<IsWatchApp Condition="'$(IsWatchApp)' == ''">false</IsWatchApp>
 
 		<!-- Xamarin.iOS projects use MtouchEnableSGenConc, and Xamarin.Mac projects use EnableSGenConc -->
 		<!-- Going forward we're sticking with EnableSGenConc, but we'll accept MtouchEnableSGenConc if it's set -->

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
@@ -31,8 +31,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<MtouchProjectDirectory>$(MSBuildProjectDirectory)</MtouchProjectDirectory>
 		<MtouchVerbosity Condition="$(MtouchVerbosity) == ''">2</MtouchVerbosity>
 
-		<IsWatchExtension Condition="'$(IsWatchExtension)' == ''">False</IsWatchExtension>
-		<IsWatchApp Condition="'$(IsWatchApp)' == ''">False</IsWatchApp>
 		<IpaIncludeArtwork Condition="'$(IpaIncludeArtwork)' == ''">False</IpaIncludeArtwork>
 		<BuildIpa Condition="'$(BuildIpa)' == ''">False</BuildIpa>
 		<BuildSessionId></BuildSessionId>