Skip to content

Commit 67f4222

Browse files
authored
Merge pull request #251 from enisn/xf/dependencies
Add MonoAndroid.12 Support
2 parents 1516a5b + a78bbb0 commit 67f4222

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/Xamarin.Forms.InputKit/Platforms/Droid/AutoCompleteViewRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.ComponentModel;
22
using Android.Content;
33
using Android.Content.Res;
4-
#if MONOANDROID10_0 || MONOANDROID11_0
4+
#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
55
using AndroidX.AppCompat.Widget;
66
using Google.Android.Material.TextField;
77
#else

src/Xamarin.Forms.InputKit/Platforms/Droid/MenuEffect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Android.Content;
22
using Android.OS;
3-
#if MONOANDROID10_0 || MONOANDROID11_0
3+
#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
44
using AndroidX.AppCompat.Widget;
55
#else
66
using Android.Support.V7.Widget;
@@ -32,7 +32,7 @@ protected override void OnAttached()
3232
Effect.Parent.OnPopupRequest += OnPopupRequest;
3333

3434
Context context = Config.CurrentActivity;
35-
#if MONOANDROID10_0 || MONOANDROID11_0
35+
#if MONOANDROID10_0 || MONOANDROID11_0 || MONOANDROID12_0
3636
Context wrapper = new Android.Views.ContextThemeWrapper(context, Resource.Style.MyPopupMenu);
3737
#else
3838
Context wrapper = new Android.Support.V7.View.ContextThemeWrapper(context, Resource.Style.MyPopupMenu);

src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
22

33
<PropertyGroup>
4-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;Xamarin.iOS10;uap10.0.19041</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0;Xamarin.iOS10;uap10.0.19041</TargetFrameworks>
55
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;Xamarin.iOS10</TargetFrameworks>
66

77
<AssemblyName>Plugin.InputKit</AssemblyName>
@@ -53,7 +53,7 @@
5353
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
5454
</ItemGroup>
5555

56-
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid11.0' OR '$(TargetFramework)' == 'MonoAndroid10.0' OR '$(TargetFramework)' == 'MonoAndroid90'">
56+
<ItemGroup Condition="$(TargetFramework.Contains('MonoAndroid'))">
5757
<Compile Include="Platforms\Droid\**\*.cs" />
5858

5959
<AndroidResource Include="Resources\drawable\*.xml" />

0 commit comments

Comments
 (0)