From 4d2941be383e73561d8c6b6e1ed944f483912010 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Fri, 16 Jul 2021 09:50:00 -0500
Subject: [PATCH] [build] Add 'net6.0-android30.0' TargetFramework.

---
 config.json                                               | 4 ++--
 source/AndroidXProject.cshtml                             | 8 +++++---
 source/AssemblyInfo.cs                                    | 4 ++++
 ...dx.appcompat.appcompat-resources-typeforwarders.csproj | 2 +-
 .../Xamarin.Google.Android.Material.Extensions.csproj     | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/config.json b/config.json
index 19ae885e3..6c295b574 100644
--- a/config.json
+++ b/config.json
@@ -1222,8 +1222,8 @@
       {
         "groupId": "org.reactivestreams",
         "artifactId": "reactive-streams",
-        "version": "1.0.0",
-        "nugetVersion": "1.0.3",
+        "version": "1.5.0",
+        "nugetVersion": "1.5.0",
         "nugetId": "Xamarin.KotlinX.Coroutines.Android",
         "dependencyOnly": true
       }
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index 8c0e6294d..502feea8c 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -2,7 +2,7 @@
 @using System.Linq
 <Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid9.0</TargetFramework>
+    <TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     @if (!string.IsNullOrEmpty(Model.AssemblyName)) {
     <AssemblyName>@(Model.AssemblyName)</AssemblyName>
@@ -93,8 +93,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\$(TargetFramework)" />
-    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\$(TargetFramework)" />
+    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\monoandroid90" />
+    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\net6.0-android30.0" />
+    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\monoandroid90" />
+    <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\net6.0-android30.0" />
     <None Include="..\..\LICENSE.md" Pack="True" PackagePath="LICENSE.md" />
   </ItemGroup>
 
diff --git a/source/AssemblyInfo.cs b/source/AssemblyInfo.cs
index 26d808bf4..897c8fce3 100644
--- a/source/AssemblyInfo.cs
+++ b/source/AssemblyInfo.cs
@@ -6,4 +6,8 @@
 [assembly: AssemblyMetadata ("BUILD_NUMBER",    "{BUILD_NUMBER}")]
 [assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
 
+#if !NETCOREAPP
 [assembly: Android.LinkerSafe]
+#endif
+
+[assembly: AssemblyMetadata ("IsTrimmable", "True")]
diff --git a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
index 7ad5992f4..7022f5dba 100644
--- a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
+++ b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid90</TargetFramework>
+    <TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
     <AssemblyName>Xamarin.AndroidX.AppCompat.Resources</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj
index 28b5d54ce..7f1a6f3a8 100644
--- a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj
+++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid90</TargetFramework>
+    <TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Google.Android.Material.Extensions</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>