From 8337d21ebeff738b281912a9615514705c79037c Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 1 Dec 2016 10:08:48 +0000
Subject: [PATCH] [Xamarin.Android.Build.Tasks] Rework target order so
 _ValidateAndroidPackageProperties is called early. (#323)

Context https://bugzilla.xamarin.com/show_bug.cgi?id=46931

Rather than have a bunch of DependsOn calls to _ValidateAndroidPackageProperties we
just need to rework the order so that this target is called early as part of the
Build target.

Once we do this we can revert the commit 5fc80f27 which broke the build.
---
 .../Xamarin.Android.Common.targets                 | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 3f80995cbc3..2959b8c0dcb 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -440,6 +440,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
     _CheckForContent;
     _CheckTargetFramework;
     _RemoveLegacyDesigner;
+    _ValidateAndroidPackageProperties;
     $(BuildDependsOn);
     _CompileDex;
   </BuildDependsOn>
@@ -456,6 +457,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
     _CheckForContent;
     _CheckTargetFramework;
     _RemoveLegacyDesigner;
+    _ValidateAndroidPackageProperties;
     $(BuildDependsOn);
   </BuildDependsOn>
 </PropertyGroup>
@@ -510,7 +512,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	</ItemGroup>
 </Target>
 
-<Target Name="_ValidateAndroidPackageProperties" DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
+<Target Name="_ValidateAndroidPackageProperties">
 	<CreateProperty Value="$(ProjectDir)$(AndroidManifest)" Condition="'$(AndroidManifest)' != ''">
 		<Output TaskParameter="Value" PropertyName="_AndroidManifestAbs"/>
 	</CreateProperty>
@@ -1171,8 +1173,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <PropertyGroup>
 	<_GenerateJavaDesignerForComponentDependsOnTargets>
-		_ValidateAndroidPackageProperties
-		;_GetAdditionalResourcesFromAssemblies
+		_GetAdditionalResourcesFromAssemblies
 		;_CreateAdditionalResourceCache
 		;_CollectAdditionalResourceFiles
 	</_GenerateJavaDesignerForComponentDependsOnTargets>
@@ -1227,7 +1228,6 @@ because xbuild doesn't support framework reference assemblies.
 <PropertyGroup>
 	<_UpdateAndroidResgenDependsOnTargets>
 		_CheckForDeletedResourceFile;
-		_ValidateAndroidPackageProperties;
 		$(_OnResolveMonoAndroidSdks);
 		_GetLibraryImports;
 		_CheckDuplicateJavaLibraries;
@@ -1395,7 +1395,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <!-- Package Build -->
 <Target Name="PackageForAndroid"
-	DependsOnTargets="SetWearAppTargetToPackageForAndroid;Build;_ValidateAndroidPackageProperties;_CopyPackage" />
+	DependsOnTargets="SetWearAppTargetToPackageForAndroid;Build;_CopyPackage" />
 	
 <Target Name="_ResolveAssemblies">
 	<!--- Remove the ImplicitlyExpandDesignTimeFacades assemblies. We have already build the app there are not required for packaging  -->
@@ -1729,7 +1729,6 @@ because xbuild doesn't support framework reference assemblies.
 <PropertyGroup>
 	<_CreateBaseApkDependsOnTargets>
 		_GetAddOnPlatformLibraries;
-		_ValidateAndroidPackageProperties;
 		_GetLibraryImports;
 		_CheckDuplicateJavaLibraries;
 		_GetAdditionalResourcesFromAssemblies;
@@ -2458,13 +2457,12 @@ because xbuild doesn't support framework reference assemblies.
 	<_BuildApkDependsOnTargets>
 		Build
 		;$(_OnResolveMonoAndroidSdks)
-		;_ValidateAndroidPackageProperties
 		;_BuildApkEmbed
 	</_BuildApkDependsOnTargets>
 </PropertyGroup>
 
 <Target Name="BuildApk"	DependsOnTargets="$(_BuildApkDependsOnTargets)" />
-<Target Name="Package"	DependsOnTargets="Build;_ValidateAndroidPackageProperties;_CopyPackage" />
+<Target Name="Package"	DependsOnTargets="Build;_CopyPackage" />
 <Target Name="Sign" 	DependsOnTargets="Build;_ResolveAndroidSigningKey;_Sign" />
 
 <!-- Cleaning -->