diff --git a/nuget/template/Avalonia.Android.nuspec b/nuget/template/Avalonia.Android.nuspec
index 81418e442a..deece85405 100644
--- a/nuget/template/Avalonia.Android.nuspec
+++ b/nuget/template/Avalonia.Android.nuspec
@@ -16,11 +16,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/nuget/template/Avalonia.Desktop.nuspec b/nuget/template/Avalonia.Desktop.nuspec
index b5311be8dd..70bebd3349 100644
--- a/nuget/template/Avalonia.Desktop.nuspec
+++ b/nuget/template/Avalonia.Desktop.nuspec
@@ -16,11 +16,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/nuget/template/Avalonia.Skia.Desktop.nuspec b/nuget/template/Avalonia.Skia.Desktop.nuspec
index ab962c5521..7a722e0ae8 100644
--- a/nuget/template/Avalonia.Skia.Desktop.nuspec
+++ b/nuget/template/Avalonia.Skia.Desktop.nuspec
@@ -13,7 +13,7 @@
Copyright 2015
Avalonia
-
+
diff --git a/nuget/template/Avalonia.iOS.nuspec b/nuget/template/Avalonia.iOS.nuspec
index 4d572b591b..d6b8e3fbe6 100644
--- a/nuget/template/Avalonia.iOS.nuspec
+++ b/nuget/template/Avalonia.iOS.nuspec
@@ -16,11 +16,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/nuget/template/Avalonia.nuspec b/nuget/template/Avalonia.nuspec
index 32594ebea7..55918715a1 100644
--- a/nuget/template/Avalonia.nuspec
+++ b/nuget/template/Avalonia.nuspec
@@ -16,11 +16,11 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
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 @@
..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll
True
+
+ ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll
+ True
+
@@ -76,6 +80,7 @@
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
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 @@
prompt
4
False
- SdkOnly
-
+ Full
True
False
False
armeabi,armeabi-v7a,x86
-
-
Xamarin
False
False
False
False
False
+ False
@@ -96,6 +94,10 @@
..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll
True
+
+ ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll
+ True
+
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 @@
+
+
-
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj b/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj
index 120d433834..6f3b8e0add 100644
--- a/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj
+++ b/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj
@@ -1,4 +1,4 @@
-
+
Debug
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
False
- v5.0
+ v4.4
Properties\AndroidManifest.xml
diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
index 26a675dade..1cb632b31a 100644
--- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
+++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
@@ -15,7 +15,7 @@
Resources\Resource.Designer.cs
Off
False
- v5.0
+ v4.4
true
@@ -40,7 +40,7 @@
- ..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\MonoAndroid\SkiaSharp.dll
+ ..\..\..\packages\SkiaSharp.1.49.4-beta\lib\MonoAndroid\SkiaSharp.dll
True
diff --git a/src/Skia/Avalonia.Skia.Android/packages.config b/src/Skia/Avalonia.Skia.Android/packages.config
index 374eca5c3f..93b6bf1828 100644
--- a/src/Skia/Avalonia.Skia.Android/packages.config
+++ b/src/Skia/Avalonia.Skia.Android/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
index a9939c6ef6..0e506fec42 100644
--- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
+++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
@@ -57,7 +57,7 @@
- ..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\net45\SkiaSharp.dll
+ ..\..\..\packages\SkiaSharp.1.49.4-beta\lib\net45\SkiaSharp.dll
True
@@ -116,12 +116,12 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+