Browse Source
Upgraded target Android SDK to 11.0 (API level 30).
pull/5689/head
José Pedro
5 years ago
No known key found for this signature in database
GPG Key ID: B8247B9301707B83
5 changed files with
6 additions and
6 deletions
-
samples/ControlCatalog.Android/ControlCatalog.Android.csproj
-
samples/ControlCatalog.Android/Properties/AndroidManifest.xml
-
src/Android/Avalonia.Android/Avalonia.Android.csproj
-
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
-
src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml
|
|
|
@ -16,7 +16,7 @@ |
|
|
|
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> |
|
|
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> |
|
|
|
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk> |
|
|
|
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion> |
|
|
|
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion> |
|
|
|
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> |
|
|
|
</PropertyGroup> |
|
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
|
|
|
|
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
<?xml version="1.0" encoding="utf-8"?> |
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ControlCatalog.Android" android:versionCode="1" android:versionName="1.0" android:installLocation="auto"> |
|
|
|
<uses-sdk android:targetSdkVersion="29" /> |
|
|
|
<uses-sdk android:targetSdkVersion="30" /> |
|
|
|
<application android:label="ControlCatalog.Android"></application> |
|
|
|
</manifest> |
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
<Project Sdk="MSBuild.Sdk.Extras"> |
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>monoandroid90</TargetFramework> |
|
|
|
<TargetFramework>monoandroid11.0</TargetFramework> |
|
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
|
</PropertyGroup> |
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -16,7 +16,7 @@ |
|
|
|
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> |
|
|
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> |
|
|
|
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk> |
|
|
|
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion> |
|
|
|
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion> |
|
|
|
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> |
|
|
|
</PropertyGroup> |
|
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
|
|
|
@ -150,4 +150,4 @@ |
|
|
|
<Import Project="..\..\..\build\System.Memory.props" /> |
|
|
|
<Import Project="..\..\..\build\AndroidWorkarounds.props" /> |
|
|
|
<Import Project="..\..\..\build\LegacyProject.targets" /> |
|
|
|
</Project> |
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
<?xml version="1.0" encoding="utf-8"?> |
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Avalonia.AndroidTestApplication" android:versionCode="1" android:versionName="1.0" android:installLocation="auto"> |
|
|
|
<uses-sdk android:targetSdkVersion="29" /> |
|
|
|
<uses-sdk android:targetSdkVersion="30" /> |
|
|
|
<application android:label="Avalonia.AndroidTestApplication" android:icon="@drawable/Icon" android:hardwareAccelerated="true"></application> |
|
|
|
<uses-permission android:name="android.permission.INTERNET" /> |
|
|
|
</manifest> |
