Bump MonoAndroid target to 13.0 (#15718)

* Bump MonoAndroid target to 13.0 * Add Boots for right Android version * OK no boots * Update build.cake * Update artifacts folders * Set right JAVA version * Update build.cake * Try another thing * Try more * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * Update Xamarin.Forms.Platform.Android.UnitTests.csproj * This then * Update build.cake * Revert "Update build.cake" This reverts commit fc74812. * Update build.cake * Update Environment.Build.props * Update Environment.Build.props * Revert "Update Environment.Build.props" This reverts commit 819c7d7. * Update Environment.Build.props * Update Environment.Build.props * Update Environment.Build.props * Update build.cake * PR Feedback * Update Xamarin.Forms.nuspec * Update dependency versions * Update Directory.Build.targets * Revert "Update Directory.Build.targets" This reverts commit a06fb7d. * Update more TargetFrameworks * Pin LiveData package to 2.5.1.2
xamarin · May 2, 2023 · 21f07e9 · 21f07e9
1 parent 52ef3fd
commit 21f07e9
Show file tree

Hide file tree

Showing 31 changed files with 145 additions and 135 deletions.
diff --git a/.nuspec/Xamarin.Forms.AppLinks.nuspec b/.nuspec/Xamarin.Forms.AppLinks.nuspec
@@ -14,22 +14,22 @@
     <description>Add support for deep linking and indexing app content using Xamarin.Forms on the Android Platform</description>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
-      <group targetFramework="MonoAndroid10.0">
-        <dependency id="Xamarin.Firebase.AppIndexing" version="119.1.0"/>        
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4"/>
-        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7"/>
+      <group targetFramework="MonoAndroid13.0">
+        <dependency id="Xamarin.Firebase.AppIndexing" version="120.0.0.11"/>        
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.5.1.2"/>
+        <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.16"/>
       </group>
     </dependencies>
     <references>
-      <group targetFramework="MonoAndroid10.0">
+      <group targetFramework="MonoAndroid13.0">
         <reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
       </group>
     </references>
   </metadata>
   <files>
     <!--Icon-->
     <file src="..\Assets\xamarin_128x128.png" target="Assets\" />
-    <file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
+    <file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid13.0" />
 
     <!--Licenses-->
     <file src="..\THIRD-PARTY-NOTICES.txt" target="Licenses\" />

diff --git a/.nuspec/Xamarin.Forms.DualScreen.nuspec b/.nuspec/Xamarin.Forms.DualScreen.nuspec
@@ -17,7 +17,7 @@
       <group>
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
-      <group targetFramework="MonoAndroid10.0">
+      <group targetFramework="MonoAndroid13.0">
         <dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
       </group>
     </dependencies>
@@ -36,9 +36,9 @@
     <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard2.0" />
 
     <!--Android 10.0-->
-    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid10.0" />
+    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid13.0" />
 
     <!--UAP-->
     <file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.dll" target="lib\uap10.0.16299" />

diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/.nuspec/Xamarin.Forms.Maps.nuspec
@@ -17,7 +17,7 @@
       <group>
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
-      <group targetFramework="MonoAndroid10.0">
+      <group targetFramework="MonoAndroid13.0">
         <dependency id="Xamarin.GooglePlayServices.Maps" version="117.0.0"/>
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
@@ -35,9 +35,9 @@
     <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\netstandard2.0" />
     <file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard2.0" />
 
-    <file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid10.0" />
+    <file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid13.0" />
 
     <file src="..\Xamarin.Forms.Maps.iOS\bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Maps.iOS.dll" target="lib\Xamarin.iOS10" />
     <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\Xamarin.iOS10" />

diff --git a/.nuspec/Xamarin.Forms.Visual.Material.nuspec b/.nuspec/Xamarin.Forms.Visual.Material.nuspec
@@ -17,13 +17,13 @@
       <group>
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
-      <group targetFramework="MonoAndroid10">
+      <group targetFramework="MonoAndroid13">
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
 
-      <group targetFramework="MonoAndroid10.0">
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.1]" />
-        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
+      <group targetFramework="MonoAndroid13.0">
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.7)" />
+        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.9)" />
       </group>
       <group targetFramework="Xamarin.iOS10">
         <dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>
@@ -41,16 +41,16 @@
     <file src="_._" target="lib\netstandard1.0\_._" />
 
     <!--Android 10-->
-    <file src="_._" target="lib\MonoAndroid10\_._" />
-    <file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
+    <file src="_._" target="lib\MonoAndroid13\_._" />
+    <file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid13\Xamarin.Forms.Visual.Material.targets" />
 
     <!--Android 10 buildTransitive-->
-    <file src="Xamarin.Forms.Visual.Material.targets" target="buildTransitive\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
+    <file src="Xamarin.Forms.Visual.Material.targets" target="buildTransitive\MonoAndroid13\Xamarin.Forms.Visual.Material.targets" />
 
     <!--Android 10.0-->
-    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid10.0" />
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid13.0" />
 
     <!--iOS-->
     <file src="..\Xamarin.Forms.Material.iOS\bin\$Configuration$\Xamarin.Forms.Material.dll" target="lib\Xamarin.iOS10" />

diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
@@ -14,19 +14,20 @@
     <description>Build native UIs for iOS, Android, UWP, macOS, Tizen and many more from a single, shared C# codebase</description>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
-      <group targetFramework="MonoAndroid10.0">
-        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.1]" />
-        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
+      <group targetFramework="MonoAndroid13.0">
+        <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.2]" />
+        <dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.9)" />
         <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.8,1.1)" />
-        <dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.6,1.4)" />
+        <dependency id="Xamarin.AndroidX.Browser" version="[1.3.0.6,1.6)" />
+        <dependency id="Xamarin.AndroidX.AppCompat" version="[1.6.0,1.7)" />
 
         <!-- Because of a misspelled reference these all need to be explicitly included so the fixed version 
           is transitively loaded  https://github.com/xamarin/AndroidX/issues/283#issuecomment-788103573 -->
-        <dependency id="Xamarin.AndroidX.Core" version="[1.6.0.1,1.9.0.1]" />
+        <dependency id="Xamarin.AndroidX.Core" version="[1.6.0.1,2.0)" />
         <dependency id="Xamarin.AndroidX.CustomView" version="[1.1.0.7,1.2)" />
-        <dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.9,1.2)" />
-        <dependency id="Xamarin.AndroidX.RecyclerView" version="[1.2.1.1,1.3)" />
-        <dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.5.1,2.4)" />
+        <dependency id="Xamarin.AndroidX.Preference" version="[1.1.1.9,1.3)" />
+        <dependency id="Xamarin.AndroidX.RecyclerView" version="[1.2.1.1,1.4)" />
+        <dependency id="Xamarin.AndroidX.Navigation.UI" version="[2.3.5.1,2.6)" />
       </group>
       <group targetFramework="uap10.0.14393">
         <dependency id="NETStandard.Library" version="2.0.1"/>
@@ -60,7 +61,7 @@
         <reference file="Xamarin.Forms.Xaml.dll" />
         <reference file="Xamarin.Forms.Platform.iOS.dll" />
       </group>
-      <group targetFramework="MonoAndroid10.0">
+      <group targetFramework="MonoAndroid13.0">
         <reference file="Xamarin.Forms.Core.dll" />
         <reference file="Xamarin.Forms.Platform.dll" />
         <reference file="Xamarin.Forms.Xaml.dll" />
@@ -174,8 +175,8 @@
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard2.0\Design" />
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard1.0\Design" />
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard1.0\Design" />
-    <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10.0\Design" />
-    <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10.0\Design" />
+    <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid13.0\Design" />
+    <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid13.0\Design" />
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\Design" />
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\uap10.0.14393\Design" />
@@ -188,23 +189,23 @@
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\tizen40\Design" />
 
     <!--Android 10-->
-    <file src="proguard.cfg" target="build\MonoAndroid10\proguard.cfg" />
-    <file src="proguard.cfg" target="buildTransitive\MonoAndroid10\proguard.cfg" />
+    <file src="proguard.cfg" target="build\MonoAndroid13\proguard.cfg" />
+    <file src="proguard.cfg" target="buildTransitive\MonoAndroid13\proguard.cfg" />
 
     <!--Android 10-->
-    <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\build\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10.0" />
-    <file src="..\build\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10.0" />
-    <file src="..\build\docs\**\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10.0" />
-    <file src="..\build\docs\**\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid10.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid10.0" />
-    <file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid10.0" />
+    <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\build\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid13.0" />
+    <file src="..\build\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid13.0" />
+    <file src="..\build\docs\**\Xamarin.Forms.Core.xml" target="lib\MonoAndroid13.0" />
+    <file src="..\build\docs\**\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid13.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid13.0" />
+    <file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid13.0" />
 
     <!--iPhone Unified-->
     <file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="lib\Xamarin.iOS10" />

diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
@@ -159,7 +159,7 @@
 
  <!-- 
     Platform Specific Targets.
-    We can't use a framework specific targets file because it breaks shared projects i.e.  /build/MonoAndroid10/Xamarin.Forms.targets
+    We can't use a framework specific targets file because it breaks shared projects i.e.  /build/MonoAndroid13/Xamarin.Forms.targets
   -->
 
   <!-- MonoAndroid targets. -->
@@ -176,7 +176,7 @@
 
   <Target Name="IncludeProguardForAndroid" Condition="'$(XFDisableDefaultProguardConfiguration)' != 'True'">
     <ItemGroup>
-      <ProguardConfiguration Include="$(MSBuildThisFileDirectory)MonoAndroid10\proguard.cfg" />
+      <ProguardConfiguration Include="$(MSBuildThisFileDirectory)MonoAndroid13\proguard.cfg" />
     </ItemGroup>
   </Target>
 

diff --git a/DualScreen/DualScreen.Android/DualScreen.Android.csproj b/DualScreen/DualScreen.Android/DualScreen.Android.csproj
@@ -17,7 +17,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
@@ -115,9 +115,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />    
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />    
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />

diff --git a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
   </ItemGroup>
 </Project>
diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
@@ -16,10 +16,10 @@
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
+    <AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v13.0</AndroidTargetFrameworkVersion>
     <TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
     <AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0.99'">Properties\AndroidManifest30.xml</AndroidManifest>
-    <AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0'">Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v13.0'">Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>

diff --git a/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml b/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Embedding.Droid.Embedding.Droid" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<application android:label="Embedding.Droid"></application>
 </manifest>
diff --git a/Environment.Build.props b/Environment.Build.props
@@ -34,7 +34,7 @@
 
   <!-- This is used by the libraries -->
   <PropertyGroup Condition="'$(AndroidTargetFrameworks)' == ''">
-    <AndroidTargetFrameworks>MonoAndroid10.0;</AndroidTargetFrameworks>
+    <AndroidTargetFrameworks>MonoAndroid13.0;</AndroidTargetFrameworks>
   </PropertyGroup>
 
   <!-- Auto install any missing Android SDKs -->