Update nuget and android pkgs

clairernovotny · Nov 28, 2014 · cd25c79 · cd25c79
1 parent c87c099
commit cd25c79
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/.nuget/nuget.exe b/.nuget/nuget.exe
diff --git a/src/Ninject.Android.Tests/Ninject.Android.Tests.csproj b/src/Ninject.Android.Tests/Ninject.Android.Tests.csproj
@@ -43,6 +43,16 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <AndroidLinkSkip>Xamarin.Forms.Platform.Android%3bXamarin.Forms.Core%3bXamarin.Forms.Xaml</AndroidLinkSkip>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+    <BundleAssemblies>False</BundleAssemblies>
+    <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
+    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
+    <AndroidStoreUncompressedFileExtensions />
+    <MandroidI18n />
+    <JavaMaximumHeapSize />
+    <JavaOptions />
+    <MonoDroidExtraArgs />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentAssertions, Version=3.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
@@ -62,8 +72,12 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\packages\Xamarin.Android.Support.v4.19.1.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v13">
+      <HintPath>..\..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.Support.v4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>

diff --git a/src/Ninject.Android.Tests/Properties/AndroidManifest.xml b/src/Ninject.Android.Tests/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Ninject.Android.Tests" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15" />
+	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15" />
 	<application android:label="Ninject.Android.Tests" android:icon="@drawable/Icon"></application>
 </manifest>
diff --git a/src/Ninject.Android.Tests/packages.config b/src/Ninject.Android.Tests/packages.config
@@ -2,7 +2,8 @@
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="MonoAndroid403" />
   <package id="FluentAssertions.Xamarin" version="3.2.1" targetFramework="MonoAndroid403" />
-  <package id="Xamarin.Android.Support.v4" version="19.1.0" targetFramework="MonoAndroid403" />
+  <package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid403" />
+  <package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid403" />
   <package id="Xamarin.Forms" version="1.3.0.6275-pre1" targetFramework="MonoAndroid403" />
   <package id="xunit" version="2.0.0-beta5-build2785" targetFramework="MonoAndroid403" />
   <package id="xunit.abstractions" version="2.0.0-beta5-build2785" targetFramework="MonoAndroid403" />