From 4cde5ff36db491c0f449f5185808ebc0c5d5fcc9 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Mon, 7 Oct 2019 14:43:10 -0400
Subject: [PATCH] Use the `XAJavaInterop1` codegen by default

See: https://docs.microsoft.com/en-us/xamarin/android/deploy-test/building-apps/build-process#binding-project-build-properties

Basically, smaller, faster bindings - this does require 6.1 or later, so there's a condition for that.

This also bumps TargetFrameworkVersion to something a bit more sane (really I'd like to see this go to 9.0)
---
 .../Build/Platforms/Xamarin/Xamarin.Android.targets          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
index 5baaceb..304ede3 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
@@ -5,13 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v5.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v6.1</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk Condition="'$(AndroidUseLatestPlatformSdk)' == ''">false</AndroidUseLatestPlatformSdk>
     <!-- This is here to prevent a warning in the Xamarin.Android.Common.Debugging.targets when a blank is passed into _GetPrimaryCpuAbi -->
     <AdbTarget Condition="'$(AdbTarget)' == ''">none</AdbTarget>
     <AndroidClassParser Condition="'$(AndroidClassParser)' == ''">class-parse</AndroidClassParser>
+    <AndroidCodegenTarget Condition="'$(AndroidCodegenTarget)' == '' And $(TargetFrameworkVersion.TrimStart('vV')) &gt; 6.0">XAJavaInterop1</AndroidCodegenTarget>
     <AndroidUseIntermediateDesignerFile Condition=" '$(AndroidUseIntermediateDesignerFile)' == '' ">True</AndroidUseIntermediateDesignerFile>
     <DesignTimeBuild Condition=" '$(DesignTimeBuild)' == '' ">false</DesignTimeBuild>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>