diff options
author | Rui Marinho <me@ruimarinho.net> | 2016-04-16 22:07:10 +0100 |
---|---|---|
committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-16 14:07:10 -0700 |
commit | d9ed63f0add8345cf6ab1508b353dcbdacbcd97c (patch) | |
tree | 9ec0635352bad93e04325b6907c985692f612062 | |
parent | aee59bef2fe5d17bf2c0cc30daea1c6ab8a47365 (diff) | |
download | xamarin-forms-d9ed63f0add8345cf6ab1508b353dcbdacbcd97c.tar.gz xamarin-forms-d9ed63f0add8345cf6ab1508b353dcbdacbcd97c.tar.bz2 xamarin-forms-d9ed63f0add8345cf6ab1508b353dcbdacbcd97c.zip |
Update android support packages to 23.3 (#102)
13 files changed, 54 insertions, 50 deletions
diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/.nuspec/Xamarin.Forms.Maps.nuspec index 74806321..dda83719 100644 --- a/.nuspec/Xamarin.Forms.Maps.nuspec +++ b/.nuspec/Xamarin.Forms.Maps.nuspec @@ -18,8 +18,8 @@ </group> <group targetFramework="MonoAndroid10"> <dependency id="Xamarin.GooglePlayServices.Maps" version="[29.0.0.1]"/> - <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="[23.1.1.1]"/> - <dependency id="Xamarin.Android.Support.v7.AppCompat" version="[23.1.1.1]"/> + <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="[23.3.0]"/> + <dependency id="Xamarin.Android.Support.v7.AppCompat" version="[23.3.0]"/> <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/> </group> </dependencies> diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec index 9475f326..64823e3a 100644 --- a/.nuspec/Xamarin.Forms.nuspec +++ b/.nuspec/Xamarin.Forms.nuspec @@ -17,11 +17,11 @@ <dependency id="WPtoolkit" version="4.2013.08.16"/> </group> <group targetFramework="MonoAndroid10"> - <dependency id="Xamarin.Android.Support.v4" version="[23.1.1.1]"/> - <dependency id="Xamarin.Android.Support.Design" version="[23.1.1.1]"/> - <dependency id="Xamarin.Android.Support.v7.AppCompat" version="[23.1.1.1]"/> - <dependency id="Xamarin.Android.Support.v7.CardView" version="[23.1.1.1]"/> - <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="[23.1.1.1]"/> + <dependency id="Xamarin.Android.Support.v4" version="[23.3.0]"/> + <dependency id="Xamarin.Android.Support.Design" version="[23.3.0]"/> + <dependency id="Xamarin.Android.Support.v7.AppCompat" version="[23.3.0]"/> + <dependency id="Xamarin.Android.Support.v7.CardView" version="[23.3.0]"/> + <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="[23.3.0]"/> </group> </dependencies> <references> diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj index 6b2e8eac..198d8896 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj @@ -47,11 +47,11 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Android.Support.v4.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <HintPath>..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> <Private>True</Private> </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.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <HintPath>..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> <Private>True</Private> </Reference> </ItemGroup> @@ -62,9 +62,6 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project> <Name>Xamarin.Forms.Core</Name> @@ -78,6 +75,9 @@ <Name>Xamarin.Forms.Platform.Android</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> diff --git a/Stubs/Xamarin.Forms.Platform.Android/packages.config b/Stubs/Xamarin.Forms.Platform.Android/packages.config index 0dceb44c..6810816e 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/packages.config +++ b/Stubs/Xamarin.Forms.Platform.Android/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.v4" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.1" targetFramework="monoandroid60" /> -</packages> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> +</packages>
\ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index 4c7279ac..ab350370 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -119,27 +119,27 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.Design.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> <Private>True</Private> </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.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> <Private>True</Private> </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.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> diff --git a/Xamarin.Forms.ControlGallery.Android/packages.config b/Xamarin.Forms.ControlGallery.Android/packages.config index f8686500..7736e74b 100644 --- a/Xamarin.Forms.ControlGallery.Android/packages.config +++ b/Xamarin.Forms.ControlGallery.Android/packages.config @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Design" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v4" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.CardView" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.1" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid60" /> diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj index 66f81ec5..d8002a9c 100644 --- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj +++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj @@ -64,15 +64,15 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> <Private>True</Private> </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.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> diff --git a/Xamarin.Forms.Maps.Android/packages.config b/Xamarin.Forms.Maps.Android/packages.config index 3873ad93..402cec20 100644 --- a/Xamarin.Forms.Maps.Android/packages.config +++ b/Xamarin.Forms.Maps.Android/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.v4" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.1.1.1" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid60" /> diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs index ec6b4395..3d1e95dc 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs @@ -117,7 +117,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat Device.Info.PropertyChanged += DeviceInfoPropertyChanged; - SetDrawerListener(this); + AddDrawerListener(this); } UpdateBackgroundColor(newElement); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs index b93a0eb9..30733c64 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs @@ -474,7 +474,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat ToolbarNavigationClickListener = new ClickListener(Element) }; - drawerLayout.SetDrawerListener(new DrawerMultiplexedListener { Listeners = { _drawerToggle, renderer } }); + drawerLayout.AddDrawerListener(new DrawerMultiplexedListener { Listeners = { _drawerToggle, renderer } }); _drawerToggle.DrawerIndicatorEnabled = true; } diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs index d00bca1a..a9157118 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs @@ -119,7 +119,7 @@ namespace Xamarin.Forms.Platform.Android Presented = _page.IsPresented; - SetDrawerListener(this); + AddDrawerListener(this); if (element != null) element.SendViewInitialized(this); diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index da51f29a..a6d4746f 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -61,20 +61,24 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> <Reference Include="System.Net.Http" /> - <Reference Include="Xamarin.Android.Support.v7.CardView"> - <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v4"> - <HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.1\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.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Xamarin.Android.Support.v7.AppCompat"> - <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.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.3.0\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.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath> + <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath> + <Private>True</Private> </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.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> + <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath> <Private>True</Private> </Reference> </ItemGroup> diff --git a/Xamarin.Forms.Platform.Android/packages.config b/Xamarin.Forms.Platform.Android/packages.config index 115ff2bd..df870490 100644 --- a/Xamarin.Forms.Platform.Android/packages.config +++ b/Xamarin.Forms.Platform.Android/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Xamarin.Android.Support.Design" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v4" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.CardView" version="23.1.1.1" targetFramework="monoandroid60" /> - <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.1" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> </packages>
\ No newline at end of file |