Merge pull request #251 from enisn/xf/dependencies

Add MonoAndroid.12 Support
enisn · Mar 24, 2022 · 67f4222 · 67f4222
2 parents 1516a5b + a78bbb0
commit 67f4222
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Xamarin.Forms.InputKit/Platforms/Droid/AutoCompleteViewRenderer.cs b/src/Xamarin.Forms.InputKit/Platforms/Droid/AutoCompleteViewRenderer.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Android.Content;
 using Android.Content.Res;
-#if MONOANDROID10_0 || MONOANDROID11_0
+#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
 using AndroidX.AppCompat.Widget;
 using Google.Android.Material.TextField;
 #else

diff --git a/src/Xamarin.Forms.InputKit/Platforms/Droid/MenuEffect.cs b/src/Xamarin.Forms.InputKit/Platforms/Droid/MenuEffect.cs
@@ -1,6 +1,6 @@
 using Android.Content;
 using Android.OS;
-#if MONOANDROID10_0 || MONOANDROID11_0
+#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
 using AndroidX.AppCompat.Widget;
 #else
 using Android.Support.V7.Widget;
@@ -32,7 +32,7 @@ protected override void OnAttached()
                 Effect.Parent.OnPopupRequest += OnPopupRequest;
 
             Context context = Config.CurrentActivity;
-#if MONOANDROID10_0 || MONOANDROID11_0
+#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
             Context wrapper = new Android.Views.ContextThemeWrapper(context, Resource.Style.MyPopupMenu);
 #else
             Context wrapper = new Android.Support.V7.View.ContextThemeWrapper(context, Resource.Style.MyPopupMenu);

diff --git a/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj b/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.1.2">
 
   <PropertyGroup>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;Xamarin.iOS10;uap10.0.19041</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0;Xamarin.iOS10;uap10.0.19041</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;Xamarin.iOS10</TargetFrameworks>
 
     <AssemblyName>Plugin.InputKit</AssemblyName>
@@ -53,7 +53,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid11.0' OR '$(TargetFramework)' == 'MonoAndroid10.0' OR '$(TargetFramework)' == 'MonoAndroid90'">
+  <ItemGroup Condition="$(TargetFramework.Contains('MonoAndroid'))">
     <Compile Include="Platforms\Droid\**\*.cs" />
 
     <AndroidResource Include="Resources\drawable\*.xml" />