From 53d9f348e772417c7fcfa9fea384afa3d82c0127 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 28 Oct 2020 13:07:50 -0700
Subject: [PATCH] fix manifest execution point

---
 src/Mobile.BuildTools/AndroidManifest.targets | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Mobile.BuildTools/AndroidManifest.targets b/src/Mobile.BuildTools/AndroidManifest.targets
index ce83bfcb..f653e434 100644
--- a/src/Mobile.BuildTools/AndroidManifest.targets
+++ b/src/Mobile.BuildTools/AndroidManifest.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Project>
 
   <UsingTask TaskName="Mobile.BuildTools.Tasks.TemplateManifestTask"
@@ -9,11 +9,11 @@
       MobileBuildToolsInit;
       $(BeforeGenerateAndroidManifest);
     </BeforeGenerateAndroidManifest>
-    <AfterGenerateAndroidManifest>
+    <_OnResolveMonoAndroidSdks>
       HandleAndroidManifest;
       AutomaticBuildVersioning;
-      $(AfterGenerateAndroidManifest);
-    </AfterGenerateAndroidManifest>
+      $(_OnResolveMonoAndroidSdks);
+    </_OnResolveMonoAndroidSdks>
 </PropertyGroup>
 
   <Target Name="_MBTGatherManifests"
@@ -35,8 +35,13 @@
   </Target>
 
   <Target Name="HandleAndroidManifest"
-          AfterTargets="_GenerateJavaStubs;_SetLatestTargetFrameworkVersion"
+          AfterTargets="_MBTGatherManifests"
           DependsOnTargets="MobileBuildToolsInit">
+    <PropertyGroup>
+      <_InputManifestToHandle>$(InputAndroidManifest)</_InputManifestToHandle>
+      <_InputManifestToHandle Condition=" Exists('$(TemplateAppManifest)') ">$(TemplateAppManifest)</_InputManifestToHandle>
+      <ProcessedAppManifest Condition=" $(_InputManifestToHandle) == $(TemplateAppManifest) ">$(ProcessedAppManifest)</ProcessedAppManifest>
+    </PropertyGroup>
     <TemplateManifestTask ConfigurationPath="$(BuildToolsConfigFilePath)"
                           ProjectName="$(MSBuildProjectName)"
                           ProjectDirectory="$(MSBuildProjectDirectory)"
@@ -45,13 +50,13 @@
                           IntermediateOutputPath="$(IntermediateOutputPath)"
                           TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
                           ReferenceAssemblyPaths="$(_XATargetFrameworkDirectories)"
-                          ManifestPath="$(InputAndroidManifest)"
+                          ManifestPath="$(_InputManifestToHandle)"
                           OutputManifestPath="$(ProcessedAppManifest)"
                           Condition="$(BuildToolsEnableTemplateManifests)" />
   </Target>
 
   <Target Name="AutomaticBuildVersioning"
-          AfterTargets="HandleAndroidManifest;HandleTokenizedInfoPlist"
+          AfterTargets="HandleAndroidManifest"
           DependsOnTargets="MobileBuildToolsInit">
 
     <AutomaticBuildVersioningTask ConfigurationPath="$(BuildToolsConfigFilePath)"