From f55b2e42c8a8ebf3d638e70cc0e1a2da09dd225e Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Tue, 1 Oct 2019 13:16:42 -0400
Subject: [PATCH 1/3] Expect proguard configs in TF Version dir

---
 source/AndroidXTargets.cshtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/AndroidXTargets.cshtml b/source/AndroidXTargets.cshtml
index f3622f3d..2a60798d 100644
--- a/source/AndroidXTargets.cshtml
+++ b/source/AndroidXTargets.cshtml
@@ -4,6 +4,8 @@
 @using System.Xml.Linq
 @functions 
 {
+  public static string GetTargetFrameworkVersion() { return "monoandroid90"; }
+
   public static void RemoveXmlns(XElement e)
   {
     e.Name = e.Name.LocalName;
@@ -21,7 +23,7 @@
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.ProguardFile != null) {
-    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\..\proguard\proguard.txt">
+    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\..\proguard\@(GetTargetFrameworkVersion())\proguard.txt">
       <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
     </ProguardConfiguration>
       }

From f323236391e3000e57d103dd2e877908bc75154d Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Tue, 1 Oct 2019 13:17:50 -0400
Subject: [PATCH 2/3] Put proguard file in TF dir

---
 source/AndroidXProject.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index 33f58855..7519f08b 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -69,14 +69,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\$(TargetFramework)" />
+    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\$(TargetFramework)\" />
   </ItemGroup>
 
   @if (@Model.MavenArtifacts.Count > 0) {
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.ProguardFile != null) {
-    <None Include="..\..\@(art.ProguardFile)" Pack="True" PackagePath="proguard\" />
+    <None Include="..\..\@(art.ProguardFile)" Pack="True" PackagePath="proguard\$(TargetFramework)\" />
       }
     }
   </ItemGroup>

From 8c6268ddb679ea85e9dd07b914ba51837626f6f4 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jodick@microsoft.com>
Date: Tue, 1 Oct 2019 13:19:31 -0400
Subject: [PATCH 3/3] Update MSBuild sdk extras

---
 source/AndroidXProject.cshtml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index 7519f08b..a990686a 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -1,5 +1,5 @@
 @using System.Linq
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -171,10 +171,4 @@
     </ItemGroup>
   }
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.68" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
-
 </Project>