Skip to content

Commit

Permalink
Merge pull request MvvmCross#87 from martijn00/UpdateSupport
Browse files Browse the repository at this point in the history 
Update packages to v23
  • Loading branch information
@martijn00
martijn00 committed Oct 2, 2015
2 parents 173cb4d + c566f74 commit d3820b6
Show file tree
Hide file tree
Showing 12 changed files with 1,624 additions and 1,505 deletions.
12 changes: 7 additions & 5 deletions Cirrious.MvvmCross.Droid.Support.AppCompat/Cirrious.MvvmCross.Droid.Support.AppCompat.csproj
View file
Expand Up @@ -40,11 +40,9 @@
<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.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
Expand All @@ -67,6 +65,10 @@
<Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MvxActionBarDrawerToggle.cs" />
Expand Down
4 changes: 2 additions & 2 deletions Cirrious.MvvmCross.Droid.Support.AppCompat/packages.config
View file
Expand Up @@ -3,6 +3,6 @@
<package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.1" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.0.1.1" targetFramework="monoandroid5" />
</packages>
5 changes: 3 additions & 2 deletions Cirrious.MvvmCross.Droid.Support.Fragging/Cirrious.MvvmCross.Droid.Support.Fragging.csproj
View file
Expand Up @@ -70,8 +70,9 @@
<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.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Cirrious.MvvmCross.Droid.Support.Fragging/packages.config
View file
Expand Up @@ -3,5 +3,5 @@
<package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.1" targetFramework="monoandroid5" />
</packages>
12 changes: 7 additions & 5 deletions ...MvvmCross.Droid.Support.RecyclerView/Cirrious.MvvmCross.Droid.Support.RecyclerView.csproj
View file
Expand Up @@ -40,11 +40,9 @@
<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.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
Expand All @@ -64,6 +62,10 @@
<Reference Include="Cirrious.MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="IMvxRecyclerAdapter.cs" />
Expand Down
4 changes: 2 additions & 2 deletions Cirrious.MvvmCross.Droid.Support.RecyclerView/packages.config
View file
Expand Up @@ -3,6 +3,6 @@
<package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.1" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.0.1.1" targetFramework="monoandroid5" />
</packages>
7 changes: 4 additions & 3 deletions Cirrious.MvvmCross.Droid.Support.V4/Cirrious.MvvmCross.Droid.Support.V4.csproj
View file
Expand Up @@ -41,9 +41,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
</Reference>
Expand All @@ -65,6 +62,10 @@
<Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MvxSwipeRefreshLayout.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Cirrious.MvvmCross.Droid.Support.V4/packages.config
View file
Expand Up @@ -3,5 +3,5 @@
<package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="monoandroid5" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.1" targetFramework="monoandroid5" />
</packages>
20 changes: 12 additions & 8 deletions Samples/Example.Droid/Example.Droid.csproj
View file
Expand Up @@ -77,17 +77,21 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Android.Support.Design.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.Design">
<HintPath>..\..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Samples/Example.Droid/Properties/AndroidManifest.xml
View file
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvvmcross.androidsupport.example">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
<application android:label="Example.Droid" android:theme="@style/Theme.AppCompat.Light">
</application>
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="21" />
<application android:label="Example.Droid" android:theme="@style/Theme.AppCompat.Light"></application>
</manifest>

0 comments on commit d3820b6

Please sign in to comment.