Android AOT

Author: aritchie

Directory.packages.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <ClientVersion>5.0.0-beta-0129</ClientVersion>
+        <ClientVersion>5.0.0-beta-0131</ClientVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.8"/>
@@ -15,8 +15,8 @@
         <PackageVersion Include="Shiny.Locations" Version="$(ClientVersion)"/>
         <PackageVersion Include="Shiny.Jobs" Version="$(ClientVersion)"/>
         <PackageVersion Include="Shiny.Notifications" Version="$(ClientVersion)"/>
-        <PackageVersion Include="Shiny.AiConversation" Version="1.0.0-beta-0049"/>
-        <PackageVersion Include="Shiny.AiConversation.Maui.GithubCopilot" Version="1.0.0-beta-0049"/>
+        <PackageVersion Include="Shiny.AiConversation" Version="1.0.0-beta-0050"/>
+        <PackageVersion Include="Shiny.AiConversation.Maui.GithubCopilot" Version="1.0.0-beta-0050"/>
         <PackageVersion Include="Shiny.Extensions.Localization.Generator" Version="2.0.1"/>
         <PackageVersion Include="Shiny.Extensions.MauiHosting" Version="4.1.1"/>
         <PackageVersion Include="Shiny.Extensions.Reactive" Version="4.1.1"/>

src/ShinyWonderland/ShinyWonderland.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
 
-        <TargetFrameworks>$(BaseTargetFramework);$(BaseTargetFramework)-ios;$(BaseTargetFramework)-android</TargetFrameworks>
-
+        <TargetFrameworks>$(BaseTargetFramework)-ios;$(BaseTargetFramework)-android</TargetFrameworks>
+<!--        <TargetFrameworks>$(TargetFrameworks);$(BaseTargetFramework)</TargetFrameworks>-->
         <RootNamespace>ShinyWonderland</RootNamespace>
         <SingleProject>true</SingleProject>
         <LangVersion>preview</LangVersion>
@@ -16,7 +16,7 @@
         <ApplicationId>org.shiny.wonderland</ApplicationId>
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
         <ApplicationVersion>1</ApplicationVersion>
-        <IsAotCompatible>true</IsAotCompatible>
+
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' != '$(BaseTargetFramework)'">
@@ -45,9 +45,11 @@
         <DefineConstants>$(DefineConstants);PLATFORM</DefineConstants>
         <SupportedOSPlatformVersion>26.0</SupportedOSPlatformVersion>
         <TargetPlatformVersion>36</TargetPlatformVersion>
+        <AndroidEnableMarshalMethods>false</AndroidEnableMarshalMethods>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+        <IsAotCompatible>true</IsAotCompatible>
         <PublishAot>true</PublishAot>
         <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
         <DefineConstants>$(DefineConstants);APPLE;PLATFORM</DefineConstants>