From aad802a1561f9107e8369426d93ecb0deb6fc33a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Sun, 10 Jul 2016 11:26:08 +0200
Subject: [PATCH] Update Android projects

---
 src/Android/Avalonia.Android/Avalonia.Android.csproj  |  5 +++++
 src/Android/Avalonia.Android/app.config               | 11 +++++++++++
 src/Android/Avalonia.Android/packages.config          |  1 +
 .../Avalonia.AndroidTestApplication.csproj            | 10 ++++++----
 .../Avalonia.AndroidTestApplication/packages.config   |  3 ++-
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 src/Android/Avalonia.Android/app.config

diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index f528695814..88e66c441a 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -49,6 +49,10 @@
       <HintPath>..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Reflection" />
     <Reference Include="System.ObjectModel" />
     <Reference Include="System.Threading.Tasks" />
@@ -76,6 +80,7 @@
     <Compile Include="SystemDialogImpl.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
   </ItemGroup>
diff --git a/src/Android/Avalonia.Android/app.config b/src/Android/Avalonia.Android/app.config
new file mode 100644
index 0000000000..fc064cedfb
--- /dev/null
+++ b/src/Android/Avalonia.Android/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.InteropServices.WindowsRuntime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Android/Avalonia.Android/packages.config b/src/Android/Avalonia.Android/packages.config
index d1231d2e25..057d0855b8 100644
--- a/src/Android/Avalonia.Android/packages.config
+++ b/src/Android/Avalonia.Android/packages.config
@@ -9,6 +9,7 @@
   <package id="System.Linq" version="4.1.0" targetFramework="monoandroid44" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="monoandroid44" />
+  <package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid44" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid44" />
   <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid44" />
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 299cbd6bc0..a90acabed0 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -48,20 +48,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-    <AndroidLinkSkip />
+    <AndroidLinkMode>Full</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <BundleAssemblies>False</BundleAssemblies>
     <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
     <Debugger>Xamarin</Debugger>
     <AotAssemblies>False</AotAssemblies>
     <EnableLLVM>False</EnableLLVM>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
     <EnableProguard>False</EnableProguard>
     <DevInstrumentationEnabled>False</DevInstrumentationEnabled>
+    <DebugSymbols>False</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -96,6 +94,10 @@
       <HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Android/Avalonia.AndroidTestApplication/packages.config b/src/Android/Avalonia.AndroidTestApplication/packages.config
index f9279e6a16..1b636d41d6 100644
--- a/src/Android/Avalonia.AndroidTestApplication/packages.config
+++ b/src/Android/Avalonia.AndroidTestApplication/packages.config
@@ -10,14 +10,15 @@
   <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid44" />
   <package id="System.Globalization" version="4.0.11" targetFramework="monoandroid44" />
   <package id="System.Linq" version="4.1.0" targetFramework="monoandroid44" />
+  <package id="System.Reactive" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reactive.Linq" version="3.0.0" targetFramework="monoandroid44" />
+  <package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="monoandroid44" />
   <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid44" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid44" />
   <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid44" />
   <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid44" />
-  <package id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" targetFramework="monoandroid44" />
   <package id="System.Threading" version="4.0.11" targetFramework="monoandroid44" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid44" />
 </packages>
\ No newline at end of file