Skip to content
Permalink
Browse files

[Build] Bump Android SDK version from 5.0 to 8.1 (Google Play recent …

…requirement for new app and .NET Standard 2.0 also requires 8.0+)
  • Loading branch information
xen2 committed Jan 8, 2019
1 parent 4780b50 commit 8e38e7f907ac32c25846335291e26004b7ea9258
Showing with 31 additions and 31 deletions.
  1. +4 −4 sources/core/Xenko.Core/build/Xenko.Core.props
  2. +1 −1 ...editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/$ProjectName$.csproj.t4
  3. +1 −1 ...ko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Properties/AndroidManifest.xml.t4
  4. +1 −1 sources/engine/Xenko.Assets/XenkoConfig.cs
  5. +1 −1 sources/engine/Xenko.Audio.Tests/Properties/AndroidManifest.xml
  6. +1 −1 sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Android.csproj
  7. +1 −1 sources/engine/Xenko.Engine.Tests/Properties/AndroidManifest.xml
  8. +1 −1 sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj
  9. +1 −1 sources/engine/Xenko.Graphics.Regression/Properties/AndroidManifest.xml
  10. +1 −1 sources/engine/Xenko.Graphics.Tests.10_0/Properties/AndroidManifest.xml
  11. +1 −1 sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Android.csproj
  12. +1 −1 sources/engine/Xenko.Graphics.Tests.11_0/Properties/AndroidManifest.xml
  13. +1 −1 sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Android.csproj
  14. +1 −1 sources/engine/Xenko.Graphics.Tests/Properties/AndroidManifest.xml
  15. +1 −1 sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Android.csproj
  16. +1 −1 sources/engine/Xenko.Input.Tests/Properties/AndroidManifest.xml
  17. +1 −1 sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj
  18. +1 −1 sources/engine/Xenko.Navigation.Tests/Properties/AndroidManifest.xml
  19. +1 −1 sources/engine/Xenko.Particles.Tests/Properties/AndroidManifest.xml
  20. +1 −1 sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj
  21. +1 −1 sources/engine/Xenko.Physics.Tests/Properties/AndroidManifest.xml
  22. +1 −1 sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj
  23. +1 −1 sources/engine/Xenko.UI.Tests/Properties/AndroidManifest.xml
  24. +1 −1 sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Android.csproj
  25. +3 −3 sources/targets/Xenko.Core.PreSettings.targets
  26. +1 −1 sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Properties/AndroidManifest.xml.t4
@@ -8,10 +8,10 @@
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<LanguageTargets>$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets</LanguageTargets>
</PropertyGroup>
<!-- Support for TargetFramework monoandroid50 -->
<PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid50' ">
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFramework>monoandroid50</TargetFramework>
<!-- Support for TargetFramework monoandroid81 -->
<PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid81' ">
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFramework>monoandroid81</TargetFramework>
<TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
<XenkoPlatformDefines>XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;NET45</XenkoPlatformDefines>
<AndroidSupportedAbis>armeabi-v7a%3barmeabi%3bx86</AndroidSupportedAbis>
@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace><#= Properties.Namespace #></RootNamespace>
<AssemblyName><#= Properties.PackageName #></AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,7 +1,7 @@
<#@ template inherits="ProjectTemplateTransformation" language="C#" #>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="<#= Properties.PackageGameName #>" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="<#= Properties.PackageGameDisplayName #>" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
</manifest>
@@ -164,7 +164,7 @@ internal static void RegisterSolutionPlatforms()
{
Name = PlatformType.Android.ToString(),
Type = PlatformType.Android,
TargetFramework = "monoandroid50",
TargetFramework = "monoandroid81",
IsAvailable = IsVSComponentAvailableAnyVersion(XamarinAndroidComponents)
};
androidPlatform.DefineConstants.Add("XENKO_PLATFORM_MONO_MOBILE");
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Audio.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Audio" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Audio.Tests</RootNamespace>
<AssemblyName>Xenko.Audio.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Engine.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Engine" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -16,7 +16,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Engine.Tests</RootNamespace>
<AssemblyName>Xenko.Engine.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="Xenko.Graphics.RegressionTests">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:label="Graphics Regression Tests"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests_10_0" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Graphics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Graphics.Tests</RootNamespace>
<AssemblyName>Xenko.Graphics.Tests.10_0</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests_11_0" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Graphics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Graphics.Tests</RootNamespace>
<AssemblyName>Xenko.Graphics.Tests.11_0</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko.Graphics.Tests" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
@@ -10,7 +10,7 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Input.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Input" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Input.Tests</RootNamespace>
<AssemblyName>Xenko.Input.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Navigation.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko.Navigation.Tests" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Particles.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Particles" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Particles.Tests</RootNamespace>
<AssemblyName>Xenko.Particles.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Physics.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko Physics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.Physics.Tests</RootNamespace>
<AssemblyName>Xenko.Physics.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.UI.Tests" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="Xenko UI" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
@@ -11,7 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xenko.UI.Tests</RootNamespace>
<AssemblyName>Xenko.UI.Tests</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
@@ -40,7 +40,7 @@
<XenkoRuntimeTargetFrameworks>netstandard2.0</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Windows;')) And '$(XenkoRuntimeWindowsDotNet)' == 'true'">$(XenkoRuntimeTargetFrameworks);net461</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';UWP;'))">$(XenkoRuntimeTargetFrameworks);uap10.0.16299</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Android;'))">$(XenkoRuntimeTargetFrameworks);monoandroid50</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Android;'))">$(XenkoRuntimeTargetFrameworks);monoandroid81</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';iOS;'))">$(XenkoRuntimeTargetFrameworks);xamarinios10</XenkoRuntimeTargetFrameworks>

<XenkoRuntimeIdentifiers Condition="'$(XenkoRuntimeNetStandardNoRuntimeIdentifiers)' != 'true' And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoPlatforms.Contains(';Windows;'))">$(XenkoRuntimeIdentifiers);win</XenkoRuntimeIdentifiers>
@@ -61,7 +61,7 @@

<!-- UpToDate check doesn't work with multi-TFM projects! https://github.com/dotnet/project-system/issues/2487 -->
<!--<DisableFastUpToDateCheck Condition="$(TargetFrameworks.Contains(';')) Or $(RuntimeIdentifiers.Contains(';'))">true</DisableFastUpToDateCheck>-->
<!--<TargetFrameworks>net461;uap10.0.16299;monoandroid50;xamarinios10;netstandard2.0</TargetFrameworks>-->
<!--<TargetFrameworks>net461;uap10.0.16299;monoandroid81;xamarinios10;netstandard2.0</TargetFrameworks>-->
</PropertyGroup>

<Target Name="GetPackagingOutputs" Condition=" '$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' == 'true' " />
@@ -95,7 +95,7 @@
<XenkoPlatform Condition=" ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(RuntimeIdentifier.StartsWith('linux')) ">Linux</XenkoPlatform>
<XenkoPlatform Condition=" ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(RuntimeIdentifier.StartsWith('osx')) ">macOS</XenkoPlatform>
<XenkoPlatform Condition=" $(TargetFramework.StartsWith('uap10.0')) ">UWP</XenkoPlatform>
<XenkoPlatform Condition=" '$(TargetFramework)' == 'monoandroid50' ">Android</XenkoPlatform>
<XenkoPlatform Condition=" '$(TargetFramework)' == 'monoandroid81' ">Android</XenkoPlatform>
<XenkoPlatform Condition=" '$(TargetFramework)' == 'xamarinios10' ">iOS</XenkoPlatform>
<!-- Default fallback -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Windows</XenkoPlatform>
@@ -1,7 +1,7 @@
<#@ template inherits="ProjectTemplateTransformation" language="C#" #>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="<#= ProjectName #>" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
<application android:icon="@drawable/icon" android:label="<#= ProjectName #>" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />

0 comments on commit 8e38e7f

Please sign in to comment.
You can’t perform that action at this time.