From 4e795b91311de0268807f60f511522a59a3f130c Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 8 Sep 2015 20:22:19 -0400 Subject: [PATCH] Bump Support and GPS packages to 22/26 Conflicts: Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj Supportv7/Pallete/Supportv7Pallete/packages.config --- .../ActionBarSherlock.csproj | 5 +- .../ActionBarSherlock/packages.config | 3 +- .../Mono.ActionbarsherlockTest.csproj | 5 +- .../ActionBarSherlockTest/packages.config | 3 +- .../HelloSwipeViewWithTabs.csproj | 5 +- .../HelloSwipeViewWithTabs/packages.config | 3 +- .../HelloFacebookSample.csproj | 4 +- .../HelloFacebookSampleActivity.cs | 10 +- Facebook/HelloFacebookSample/packages.config | 2 +- .../Xamarin.Facebook/Xamarin.Facebook.csproj | 10 +- Facebook/Xamarin.Facebook/packages.config | 2 +- FilePickerExample/FilePickerExample.csproj | 8 +- .../Properties/AndroidManifest.xml | 6 +- FilePickerExample/packages.config | 2 +- .../Properties/AndroidManifest.xml | 5 +- .../SupportLibFragments.csproj | 7 +- .../SupportLibFragments/packages.config | 2 +- .../FusedLocationProvider.csproj | 8 +- .../FusedLocationProvider/packages.config | 8 +- .../GooglePlayServices.csproj | 6 +- .../GooglePlayServices/packages.config | 6 +- GraphicsAndAnimation/AnimationsDemo.csproj | 6 +- GraphicsAndAnimation/packages.config | 4 - .../LeaderboardsAndAchievementsDemo.csproj | 8 +- .../packages.config | 8 +- .../Notifications.Android.csproj | 8 +- .../Notifications.Android/packages.config | 2 +- .../SimpleMapDemo/SimpleMapDemo.csproj | 6 +- .../SimpleMapDemo/packages.config | 6 +- .../SimpleMapDemo_Froyo.csproj | 6 +- .../SimpleMapDemo_Froyo/packages.config | 6 +- MonoIO/MonoIO.csproj | 16 ++- MonoIO/Properties/AndroidManifest.xml | 2 +- MonoIO/Resources/layout/blocks_content.xml | 23 +--- MonoIO/packages.config | 3 +- .../Mono.SlidingMenu/Mono.SlidingMenu.csproj | 4 - SlidingMenu/Mono.SlidingMenu/packages.config | 4 - .../Properties/AndroidManifest.xml | 2 +- .../SlidingMenuExample.csproj | 4 +- .../SlidingMenuExample/packages.config | 2 +- Support4/Support4/Support4.csproj | 7 +- Support4/Support4/packages.config | 3 +- .../ActionBarCompat-ListPopupMenu.csproj | 4 +- .../packages.config | 4 +- .../Supportv7Toolbar/Supportv7Toolbar.csproj | 4 +- .../Toolbar/Supportv7Toolbar/packages.config | 6 +- .../Supportv7Pallete/Supportv7Pallete.csproj | 12 +- .../Pallete/Supportv7Pallete/packages.config | 10 +- .../ViewPagerIndicator.csproj | 2 +- .../ViewPagerIndicator/packages.config | 2 +- .../Properties/AndroidManifest.xml | 2 +- .../ViewPagerIndicator-Example.csproj | 7 +- .../packages.config | 2 +- .../ViewPagerIndicator.csproj | 4 +- .../ViewPagerIndicator/packages.config | 2 +- .../AppUsageStatistics.csproj | 6 +- android5.0/AppUsageStatistics/packages.config | 6 +- .../CardViewSample/CardViewSample.csproj | 4 +- .../CardViewSample/packages.config | 2 +- android5.0/Cheesesquare/Cheesesquare.csproj | 20 +-- android5.0/Cheesesquare/MainActivity.cs | 2 +- android5.0/Cheesesquare/packages.config | 10 +- .../DirectorySelection.csproj | 6 +- android5.0/DirectorySelection/packages.config | 4 +- .../ElevationDrag/ElevationDrag.csproj | 2 +- .../ElevationDrag/packages.config | 2 +- .../GoogleIO2014Master.csproj | 12 +- .../GoogleIO2014Master/packages.config | 8 +- .../JobScheduler/JobScheduler.csproj | 8 -- .../JobScheduler/JobScheduler/packages.config | 5 - .../AndroidLSamples/AndroidLSamples.csproj | 12 +- .../AndroidLSamples/packages.config | 8 +- .../MessagingService/MessagingService.csproj | 2 +- android5.0/MessagingService/packages.config | 2 +- .../NavigationDrawer/NavigationDrawer.csproj | 8 +- .../NavigationDrawer/packages.config | 4 +- .../RecyclerViewSample.csproj | 4 +- .../RecyclerViewSample/packages.config | 4 +- .../RecyclerViewer/RecyclerViewer.csproj | 121 +----------------- .../RecyclerViewer/packages.config | 6 +- .../ThemeSwitcher/ThemeSwitcher.csproj | 2 +- .../ThemeSwitcher/packages.config | 3 +- android5.0/Topeka/Topeka/Topeka.csproj | 10 +- android5.0/Topeka/Topeka/packages.config | 6 +- .../AdMobExample/AdMobExample.csproj | 11 +- .../AdMobExample/AdMobExample/packages.config | 9 +- .../Analytics/Analytics/Analytics.csproj | 11 +- .../Analytics/Analytics/packages.config | 9 +- .../AppIndexing/AppIndexing.csproj | 74 +---------- .../AppIndexing/AppIndexing/packages.config | 28 +--- .../AppInvite/AppInvite/AppInvite.csproj | 13 +- .../AppInvite/AppInvite/packages.config | 11 +- .../BasicHistoryApi/BasicHistoryApi.csproj | 15 +-- .../BasicHistoryApi/packages.config | 13 +- .../BasicHistorySessions.csproj | 12 +- .../BasicHistorySessions/packages.config | 12 +- .../BasicRecordingApi.csproj | 15 +-- .../BasicRecordingApi/packages.config | 13 +- .../BasicSensorsApi/BasicSensorsApi.csproj | 23 ++-- .../BasicSensorsApi/packages.config | 13 +- .../GCMSample/GCMSample/GCMSample.csproj | 16 +-- .../GCMSample/GCMSample/packages.config | 8 +- .../ActivityRecognition.csproj | 24 ++-- .../ActivityRecognition/packages.config | 12 +- .../BasicLocationSample.csproj | 13 +- .../BasicLocationSample/packages.config | 11 +- .../Geofencing/Geofencing/Geofencing.csproj | 21 ++- .../Geofencing/Geofencing/packages.config | 11 +- .../LocationAddress/LocationAddress.csproj | 13 +- .../LocationAddress/packages.config | 11 +- .../LocationSettings/LocationSettings.csproj | 18 +-- .../LocationSettings/packages.config | 10 +- .../LocationUpdates/LocationUpdates.csproj | 13 +- .../LocationUpdates/packages.config | 11 +- .../ConnectionsQuickstart.csproj | 17 +-- .../ConnectionsQuickstart/packages.config | 9 +- .../SigninQuickstart/SigninQuickstart.csproj | 16 +-- .../SigninQuickstart/packages.config | 8 +- tv/TvLeanback/TvLeanback/DetailsActivity.cs | 4 + .../TvLeanback/LeanbackDetailsFragment.cs | 17 ++- tv/TvLeanback/TvLeanback/MainFragment.cs | 13 +- tv/TvLeanback/TvLeanback/SearchFragment.cs | 9 +- tv/TvLeanback/TvLeanback/TvLeanback.csproj | 8 +- .../TvLeanback/VertivalGridFragment.cs | 17 ++- tv/TvLeanback/TvLeanback/packages.config | 6 +- .../Resources/values/attrs.xml | 1 - .../VisualGameController.csproj | 7 +- .../VisualGameController/packages.config | 5 +- wear/AgendaData/AgendaData/AgendaData.csproj | 6 +- wear/AgendaData/AgendaData/packages.config | 6 +- wear/AgendaData/Wearable/Wearable.csproj | 18 +-- wear/AgendaData/Wearable/packages.config | 10 +- wear/DataLayer/DataLayer/DataLayer.csproj | 6 +- wear/DataLayer/DataLayer/packages.config | 6 +- wear/DataLayer/Wearable/Wearable.csproj | 14 +- wear/DataLayer/Wearable/packages.config | 10 +- .../DelayedConfirmationApp.csproj | 11 +- .../DelayedConfirmationApp/packages.config | 5 +- .../DelayedConfirmationWear.csproj | 15 ++- .../DelayedConfirmationWear/MainActivity.cs | 15 ++- .../Properties/AndroidManifest.xml | 2 +- .../DelayedConfirmationWear/packages.config | 11 +- wear/ElizaChat/ElizaChat/ElizaChat.csproj | 9 +- .../ElizaChat/Properties/AndroidManifest.xml | 1 + wear/ElizaChat/ElizaChat/packages.config | 5 +- .../Application/Application.csproj | 18 +-- .../Application/packages.config | 8 +- .../Wearable/DisconnectListenerService.cs | 1 + .../Wearable/Wearable.csproj | 14 +- .../Wearable/packages.config | 6 +- .../FlashlightSample/FlashlightSample.csproj | 6 +- .../FlashlightSample/MainActivity.cs | 23 ++-- .../FlashlightSample/packages.config | 2 +- wear/Geofencing/Geofencing/Geofencing.csproj | 14 +- wear/Geofencing/Geofencing/MainActivity.cs | 5 +- wear/Geofencing/Geofencing/packages.config | 10 +- wear/Geofencing/Wearable/Wearable.csproj | 14 +- wear/Geofencing/Wearable/packages.config | 10 +- .../GridViewPager/GridViewPagerSample.csproj | 6 +- .../GridViewPager/packages.config | 6 +- .../JumpingJack/CounterFragment.cs | 5 +- .../JumpingJack/JumpingJack.csproj | 13 +- wear/JumpingJack/JumpingJack/MainActivity.cs | 6 +- wear/JumpingJack/JumpingJack/PagerAdapter.cs | 12 +- .../Properties/AndroidManifest.xml | 2 +- .../JumpingJack/SettingsFragment.cs | 2 +- wear/JumpingJack/JumpingJack/packages.config | 4 + wear/Quiz/Quiz/Quiz.csproj | 6 +- wear/Quiz/Quiz/packages.config | 6 +- wear/Quiz/Wearable/Wearable.csproj | 12 +- wear/Quiz/Wearable/packages.config | 8 +- .../RecipeAssistant/RecipeAssistant.csproj | 2 +- .../RecipeAssistant/packages.config | 2 +- .../SkeletonWear/GridExampleActivity.cs | 24 ++-- .../Properties/AndroidManifest.xml | 4 +- .../Resources/layout/main_activity.xml | 24 +--- .../SkeletonWear/SkeletonWear.csproj | 11 +- .../SkeletonWear/SkeletonWear/packages.config | 5 +- .../Properties/AndroidManifest.xml | 2 +- .../Resources/values/Strings.xml | 2 +- .../SynchronizedNotifications.csproj | 11 +- .../SynchronizedNotifications/packages.config | 5 +- .../Wearable/Properties/AndroidManifest.xml | 12 +- .../Wearable/Resources/values/strings.xml | 2 +- .../Wearable/Wearable.csproj | 11 +- .../Wearable/packages.config | 5 +- wear/Timer/Timer/Timer.csproj | 15 ++- wear/Timer/Timer/WearableListItemLayout.cs | 56 +++----- wear/Timer/Timer/packages.config | 7 +- .../Properties/AndroidManifest.xml | 4 +- .../WatchViewStub/WatchViewStubSample.csproj | 11 +- .../WatchViewStub/packages.config | 5 +- 192 files changed, 750 insertions(+), 1040 deletions(-) mode change 100755 => 100644 FilePickerExample/Properties/AndroidManifest.xml mode change 100755 => 100644 FragmentsWalkthrough/SupportLibFragments/Properties/AndroidManifest.xml delete mode 100644 GraphicsAndAnimation/packages.config mode change 100755 => 100644 LocalNotifications/Notifications.Android/Notifications.Android.csproj mode change 100755 => 100644 LocalNotifications/Notifications.Android/packages.config delete mode 100644 SlidingMenu/Mono.SlidingMenu/packages.config delete mode 100644 android5.0/JobScheduler/JobScheduler/packages.config create mode 100644 wear/JumpingJack/JumpingJack/packages.config diff --git a/ActionBarSherlock/ActionBarSherlock/ActionBarSherlock.csproj b/ActionBarSherlock/ActionBarSherlock/ActionBarSherlock.csproj index 35ae96573..7aa261576 100644 --- a/ActionBarSherlock/ActionBarSherlock/ActionBarSherlock.csproj +++ b/ActionBarSherlock/ActionBarSherlock/ActionBarSherlock.csproj @@ -42,11 +42,8 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ActionBarSherlock/ActionBarSherlock/packages.config b/ActionBarSherlock/ActionBarSherlock/packages.config index 7795016ef..ede6aea18 100644 --- a/ActionBarSherlock/ActionBarSherlock/packages.config +++ b/ActionBarSherlock/ActionBarSherlock/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/ActionBarSherlock/ActionBarSherlockTest/Mono.ActionbarsherlockTest.csproj b/ActionBarSherlock/ActionBarSherlockTest/Mono.ActionbarsherlockTest.csproj index f7b80dc94..834be009d 100644 --- a/ActionBarSherlock/ActionBarSherlockTest/Mono.ActionbarsherlockTest.csproj +++ b/ActionBarSherlock/ActionBarSherlockTest/Mono.ActionbarsherlockTest.csproj @@ -43,11 +43,8 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ActionBarSherlock/ActionBarSherlockTest/packages.config b/ActionBarSherlock/ActionBarSherlockTest/packages.config index 7795016ef..ede6aea18 100644 --- a/ActionBarSherlock/ActionBarSherlockTest/packages.config +++ b/ActionBarSherlock/ActionBarSherlockTest/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/ActionBarViewPager/HelloSwipeViewWithTabs/HelloSwipeViewWithTabs.csproj b/ActionBarViewPager/HelloSwipeViewWithTabs/HelloSwipeViewWithTabs.csproj index 662a8d0a8..1e80bd40e 100644 --- a/ActionBarViewPager/HelloSwipeViewWithTabs/HelloSwipeViewWithTabs.csproj +++ b/ActionBarViewPager/HelloSwipeViewWithTabs/HelloSwipeViewWithTabs.csproj @@ -42,11 +42,8 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ActionBarViewPager/HelloSwipeViewWithTabs/packages.config b/ActionBarViewPager/HelloSwipeViewWithTabs/packages.config index 7795016ef..ede6aea18 100644 --- a/ActionBarViewPager/HelloSwipeViewWithTabs/packages.config +++ b/ActionBarViewPager/HelloSwipeViewWithTabs/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/Facebook/HelloFacebookSample/HelloFacebookSample.csproj b/Facebook/HelloFacebookSample/HelloFacebookSample.csproj index 988a047ca..6f78704dd 100644 --- a/Facebook/HelloFacebookSample/HelloFacebookSample.csproj +++ b/Facebook/HelloFacebookSample/HelloFacebookSample.csproj @@ -16,7 +16,7 @@ Assets HelloFacebookSample Properties\AndroidManifest.xml - v2.3 + v5.0 true @@ -44,7 +44,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/Facebook/HelloFacebookSample/HelloFacebookSampleActivity.cs b/Facebook/HelloFacebookSample/HelloFacebookSampleActivity.cs index e2d7fb72f..ff7bdb6c0 100644 --- a/Facebook/HelloFacebookSample/HelloFacebookSampleActivity.cs +++ b/Facebook/HelloFacebookSample/HelloFacebookSampleActivity.cs @@ -151,8 +151,8 @@ protected override void OnCreate (Bundle savedInstanceState) controlsContainer = (ViewGroup)FindViewById (Resource.Id.main_ui_container); - FragmentManager fm = SupportFragmentManager; - Fragment fragment = fm.FindFragmentById (Resource.Id.fragment_container); + Android.Support.V4.App.FragmentManager fm = SupportFragmentManager; + Android.Support.V4.App.Fragment fragment = fm.FindFragmentById (Resource.Id.fragment_container); if (fragment != null) { // If we're being re-created and have a fragment, we need to a) hide the main UI controls and // b) hook up its listeners again. @@ -354,7 +354,7 @@ private void ShowPickerFragment (PickerFragment fragment) toast.Show (); }); - FragmentManager fm = SupportFragmentManager; + Android.Support.V4.App.FragmentManager fm = SupportFragmentManager; fm.BeginTransaction () .Replace (Resource.Id.fragment_container, fragment) .AddToBackStack (null) @@ -386,7 +386,7 @@ private void SetFriendPickerListeners (FriendPickerFragment fragment) private void OnFriendPickerDone (FriendPickerFragment fragment) { - FragmentManager fm = SupportFragmentManager; + Android.Support.V4.App.FragmentManager fm = SupportFragmentManager; fm.PopBackStack (); String results = ""; @@ -407,7 +407,7 @@ private void OnFriendPickerDone (FriendPickerFragment fragment) private void OnPlacePickerDone (PlacePickerFragment fragment) { - FragmentManager fm = SupportFragmentManager; + Android.Support.V4.App.FragmentManager fm = SupportFragmentManager; fm.PopBackStack (); String result = ""; diff --git a/Facebook/HelloFacebookSample/packages.config b/Facebook/HelloFacebookSample/packages.config index a34d750a3..6ad86a3e7 100644 --- a/Facebook/HelloFacebookSample/packages.config +++ b/Facebook/HelloFacebookSample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Facebook/Xamarin.Facebook/Xamarin.Facebook.csproj b/Facebook/Xamarin.Facebook/Xamarin.Facebook.csproj index a9bb2a75a..dd96c901d 100644 --- a/Facebook/Xamarin.Facebook/Xamarin.Facebook.csproj +++ b/Facebook/Xamarin.Facebook/Xamarin.Facebook.csproj @@ -15,7 +15,7 @@ Transforms Xamarin.Facebook ../facebook-android-sdk-3.0.1/facebook/docs - v2.3 + v5.0 True @@ -43,7 +43,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -56,12 +56,6 @@ - - Package.nuspec - - - README.md - diff --git a/Facebook/Xamarin.Facebook/packages.config b/Facebook/Xamarin.Facebook/packages.config index a34d750a3..6ad86a3e7 100644 --- a/Facebook/Xamarin.Facebook/packages.config +++ b/Facebook/Xamarin.Facebook/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/FilePickerExample/FilePickerExample.csproj b/FilePickerExample/FilePickerExample.csproj index 274bcbbaf..b538f174d 100644 --- a/FilePickerExample/FilePickerExample.csproj +++ b/FilePickerExample/FilePickerExample.csproj @@ -13,7 +13,7 @@ true Resources\Resource.Designer.cs Off - v2.3 + v5.0 armeabi-v7a%3bx86 Properties\AndroidManifest.xml @@ -47,7 +47,7 @@ - packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -68,6 +68,7 @@ Designer + @@ -110,9 +111,6 @@ - - - - + diff --git a/LocalNotifications/Notifications.Android/packages.config b/LocalNotifications/Notifications.Android/packages.config old mode 100755 new mode 100644 index 76df95e75..a6db3b2d2 --- a/LocalNotifications/Notifications.Android/packages.config +++ b/LocalNotifications/Notifications.Android/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MapsAndLocationDemo_v3/SimpleMapDemo/SimpleMapDemo.csproj b/MapsAndLocationDemo_v3/SimpleMapDemo/SimpleMapDemo.csproj index 9a275dc9e..4743c6360 100644 --- a/MapsAndLocationDemo_v3/SimpleMapDemo/SimpleMapDemo.csproj +++ b/MapsAndLocationDemo_v3/SimpleMapDemo/SimpleMapDemo.csproj @@ -47,13 +47,13 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll diff --git a/MapsAndLocationDemo_v3/SimpleMapDemo/packages.config b/MapsAndLocationDemo_v3/SimpleMapDemo/packages.config index 22f8a6015..761435d48 100644 --- a/MapsAndLocationDemo_v3/SimpleMapDemo/packages.config +++ b/MapsAndLocationDemo_v3/SimpleMapDemo/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/SimpleMapDemo_Froyo.csproj b/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/SimpleMapDemo_Froyo.csproj index 4f1dfc8ba..cec4f864d 100644 --- a/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/SimpleMapDemo_Froyo.csproj +++ b/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/SimpleMapDemo_Froyo.csproj @@ -44,13 +44,13 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll diff --git a/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/packages.config b/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/packages.config index 22f8a6015..761435d48 100644 --- a/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/packages.config +++ b/MapsAndLocationDemo_v3/SimpleMapDemo_Froyo/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/MonoIO/MonoIO.csproj b/MonoIO/MonoIO.csproj index 41dfd627a..82d6c6a09 100644 --- a/MonoIO/MonoIO.csproj +++ b/MonoIO/MonoIO.csproj @@ -15,10 +15,9 @@ true Resources\Resource.Designer.cs armeabi - Properties\AndroidManifest.xml - v4.0.3 + v5.0 True @@ -30,7 +29,7 @@ 4 None True - armeabi,armeabi-v7a,x86 + armeabi;armeabi-v7a;x86 pdbonly @@ -41,6 +40,8 @@ 4 False armeabi,x86 + + True @@ -52,6 +53,8 @@ 4 True None + + pdbonly @@ -61,6 +64,8 @@ prompt 4 False + + @@ -70,11 +75,8 @@ - - packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/MonoIO/Properties/AndroidManifest.xml b/MonoIO/Properties/AndroidManifest.xml index b53c16d3e..e8e8763a9 100644 --- a/MonoIO/Properties/AndroidManifest.xml +++ b/MonoIO/Properties/AndroidManifest.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/MonoIO/Resources/layout/blocks_content.xml b/MonoIO/Resources/layout/blocks_content.xml index 01c002bbb..1c8feacca 100644 --- a/MonoIO/Resources/layout/blocks_content.xml +++ b/MonoIO/Resources/layout/blocks_content.xml @@ -1,22 +1,7 @@ - - + - + \ No newline at end of file diff --git a/MonoIO/packages.config b/MonoIO/packages.config index 6b1c134fb..ede6aea18 100644 --- a/MonoIO/packages.config +++ b/MonoIO/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/SlidingMenu/Mono.SlidingMenu/Mono.SlidingMenu.csproj b/SlidingMenu/Mono.SlidingMenu/Mono.SlidingMenu.csproj index 8e7510aa6..084e083e5 100644 --- a/SlidingMenu/Mono.SlidingMenu/Mono.SlidingMenu.csproj +++ b/SlidingMenu/Mono.SlidingMenu/Mono.SlidingMenu.csproj @@ -39,9 +39,6 @@ - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll - @@ -49,7 +46,6 @@ - diff --git a/SlidingMenu/Mono.SlidingMenu/packages.config b/SlidingMenu/Mono.SlidingMenu/packages.config deleted file mode 100644 index a34d750a3..000000000 --- a/SlidingMenu/Mono.SlidingMenu/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/SlidingMenu/SlidingMenuExample/Properties/AndroidManifest.xml b/SlidingMenu/SlidingMenuExample/Properties/AndroidManifest.xml index 659fbde4c..1926398fb 100644 --- a/SlidingMenu/SlidingMenuExample/Properties/AndroidManifest.xml +++ b/SlidingMenu/SlidingMenuExample/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/SlidingMenu/SlidingMenuExample/SlidingMenuExample.csproj b/SlidingMenu/SlidingMenuExample/SlidingMenuExample.csproj index f6ba5322b..36af76a33 100644 --- a/SlidingMenu/SlidingMenuExample/SlidingMenuExample.csproj +++ b/SlidingMenu/SlidingMenuExample/SlidingMenuExample.csproj @@ -15,7 +15,7 @@ True Resources\Resource.designer.cs SlidingMenuExample - v2.3 + v5.0 Properties\AndroidManifest.xml @@ -44,7 +44,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/SlidingMenu/SlidingMenuExample/packages.config b/SlidingMenu/SlidingMenuExample/packages.config index a34d750a3..6ad86a3e7 100644 --- a/SlidingMenu/SlidingMenuExample/packages.config +++ b/SlidingMenu/SlidingMenuExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Support4/Support4/Support4.csproj b/Support4/Support4/Support4.csproj index 7bac2f094..e7548a507 100644 --- a/Support4/Support4/Support4.csproj +++ b/Support4/Support4/Support4.csproj @@ -16,7 +16,7 @@ Resources\Resource.designer.cs Support4 Properties\AndroidManifest.xml - v4.0.3 + v5.0 True @@ -43,11 +43,8 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/Support4/Support4/packages.config b/Support4/Support4/packages.config index 7795016ef..6ad86a3e7 100644 --- a/Support4/Support4/packages.config +++ b/Support4/Support4/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/Supportv7/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenu.csproj b/Supportv7/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenu.csproj index 795961403..103ec67ec 100644 --- a/Supportv7/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenu.csproj +++ b/Supportv7/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenu.csproj @@ -43,10 +43,10 @@ - packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/Supportv7/ActionBarCompat-ListPopupMenu/packages.config b/Supportv7/ActionBarCompat-ListPopupMenu/packages.config index 1b6f7e988..c9cf6fe24 100644 --- a/Supportv7/ActionBarCompat-ListPopupMenu/packages.config +++ b/Supportv7/ActionBarCompat-ListPopupMenu/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj b/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj index 148dd945e..164a43332 100644 --- a/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj +++ b/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/Supportv7Toolbar.csproj @@ -43,10 +43,10 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config b/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config index 52e46a7c7..9a2417727 100644 --- a/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config +++ b/Supportv7/AppCompat/Toolbar/Supportv7Toolbar/packages.config @@ -1,5 +1,5 @@ - + - - + + \ No newline at end of file diff --git a/Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj b/Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj index 17fe89eeb..35f6165bb 100644 --- a/Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj +++ b/Supportv7/Pallete/Supportv7Pallete/Supportv7Pallete.csproj @@ -43,16 +43,16 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.Palette.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll - - - ..\packages\Xamarin.Android.Support.v7.CardView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + ..\packages\Xamarin.Android.Support.v7.Palette.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll diff --git a/Supportv7/Pallete/Supportv7Pallete/packages.config b/Supportv7/Pallete/Supportv7Pallete/packages.config index 5fb3e01d7..563e8d25f 100644 --- a/Supportv7/Pallete/Supportv7Pallete/packages.config +++ b/Supportv7/Pallete/Supportv7Pallete/packages.config @@ -1,7 +1,7 @@ - + - - - - + + + + \ No newline at end of file diff --git a/ViewPagerIndicator/ViewPagerIndicator/ViewPagerIndicator.csproj b/ViewPagerIndicator/ViewPagerIndicator/ViewPagerIndicator.csproj index d263159bc..22298c0e9 100644 --- a/ViewPagerIndicator/ViewPagerIndicator/ViewPagerIndicator.csproj +++ b/ViewPagerIndicator/ViewPagerIndicator/ViewPagerIndicator.csproj @@ -46,7 +46,7 @@ - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ViewPagerIndicator/ViewPagerIndicator/packages.config b/ViewPagerIndicator/ViewPagerIndicator/packages.config index ec6abfe39..ede6aea18 100644 --- a/ViewPagerIndicator/ViewPagerIndicator/packages.config +++ b/ViewPagerIndicator/ViewPagerIndicator/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/Properties/AndroidManifest.xml b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/Properties/AndroidManifest.xml index 438a7e5d8..41b67dedc 100644 --- a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/Properties/AndroidManifest.xml +++ b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/ViewPagerIndicator-Example.csproj b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/ViewPagerIndicator-Example.csproj index c71818de0..9c22b5098 100644 --- a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/ViewPagerIndicator-Example.csproj +++ b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/ViewPagerIndicator-Example.csproj @@ -15,9 +15,8 @@ true Resources\Resource.Designer.cs Off - v2.3 + v5.0 armeabi-v7a%3bx86 - Properties\AndroidManifest.xml @@ -39,6 +38,8 @@ prompt 4 False + + @@ -48,7 +49,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/packages.config b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/packages.config index a34d750a3..6ad86a3e7 100644 --- a/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/packages.config +++ b/ViewPagerIndicatorBinding/ViewPagerIndicator-Example/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ViewPagerIndicatorBinding/ViewPagerIndicator/ViewPagerIndicator.csproj b/ViewPagerIndicatorBinding/ViewPagerIndicator/ViewPagerIndicator.csproj index 35e65478e..30cecd7b0 100644 --- a/ViewPagerIndicatorBinding/ViewPagerIndicator/ViewPagerIndicator.csproj +++ b/ViewPagerIndicatorBinding/ViewPagerIndicator/ViewPagerIndicator.csproj @@ -12,7 +12,7 @@ ViewPagerIndicator ViewPagerIndicator 512 - v2.3 + v5.0 True @@ -38,7 +38,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/ViewPagerIndicatorBinding/ViewPagerIndicator/packages.config b/ViewPagerIndicatorBinding/ViewPagerIndicator/packages.config index a34d750a3..6ad86a3e7 100644 --- a/ViewPagerIndicatorBinding/ViewPagerIndicator/packages.config +++ b/ViewPagerIndicatorBinding/ViewPagerIndicator/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/android5.0/AppUsageStatistics/AppUsageStatistics.csproj b/android5.0/AppUsageStatistics/AppUsageStatistics.csproj index 604b64da8..bbc2a8075 100644 --- a/android5.0/AppUsageStatistics/AppUsageStatistics.csproj +++ b/android5.0/AppUsageStatistics/AppUsageStatistics.csproj @@ -43,13 +43,13 @@ - packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - packages\Xamarin.Android.Support.v7.RecyclerView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/android5.0/AppUsageStatistics/packages.config b/android5.0/AppUsageStatistics/packages.config index edd034af3..bcc6164d7 100644 --- a/android5.0/AppUsageStatistics/packages.config +++ b/android5.0/AppUsageStatistics/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/android5.0/CardViewSample/CardViewSample/CardViewSample.csproj b/android5.0/CardViewSample/CardViewSample/CardViewSample.csproj index a19ba10c0..b23db101e 100644 --- a/android5.0/CardViewSample/CardViewSample/CardViewSample.csproj +++ b/android5.0/CardViewSample/CardViewSample/CardViewSample.csproj @@ -16,6 +16,8 @@ CardViewSample v5.0 Properties\AndroidManifest.xml + 8.0.30703 + 2.0 true @@ -43,7 +45,7 @@ - ..\packages\Xamarin.Android.Support.v7.CardView.21.0.0.0-beta1\lib\MonoAndroid\Xamarin.Android.Support.v7.CardView.dll + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll diff --git a/android5.0/CardViewSample/CardViewSample/packages.config b/android5.0/CardViewSample/CardViewSample/packages.config index a6a954e06..71cf8aadf 100644 --- a/android5.0/CardViewSample/CardViewSample/packages.config +++ b/android5.0/CardViewSample/CardViewSample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/android5.0/Cheesesquare/Cheesesquare.csproj b/android5.0/Cheesesquare/Cheesesquare.csproj index 1d8c9151b..3877f5f87 100644 --- a/android5.0/Cheesesquare/Cheesesquare.csproj +++ b/android5.0/Cheesesquare/Cheesesquare.csproj @@ -13,7 +13,7 @@ Resource Resources\Resource.designer.cs True - True + False Cheesesquare v5.0 @@ -42,20 +42,20 @@ - - packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0-beta3\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - packages\Xamarin.Android.Support.v7.CardView.22.2.0.0-beta3\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - - - packages\Xamarin.Android.Support.Design.22.2.0.0-beta3\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll + packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - packages\Xamarin.Android.Support.v4.22.2.0.0-beta3\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0-beta3\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + + packages\Xamarin.Android.Support.Design.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll diff --git a/android5.0/Cheesesquare/MainActivity.cs b/android5.0/Cheesesquare/MainActivity.cs index fb19cbaa4..c0e3ec186 100644 --- a/android5.0/Cheesesquare/MainActivity.cs +++ b/android5.0/Cheesesquare/MainActivity.cs @@ -83,7 +83,7 @@ void setupViewPager (Android.Support.V4.View.ViewPager viewPager) void setupDrawerContent(NavigationView navigationView) { navigationView.NavigationItemSelected += (sender, e) => { - e.P0.SetChecked (true); + e.MenuItem.SetChecked (true); drawerLayout.CloseDrawers (); }; } diff --git a/android5.0/Cheesesquare/packages.config b/android5.0/Cheesesquare/packages.config index 1025e4007..6522212e2 100644 --- a/android5.0/Cheesesquare/packages.config +++ b/android5.0/Cheesesquare/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/android5.0/DirectorySelection/DirectorySelection.csproj b/android5.0/DirectorySelection/DirectorySelection.csproj index 99641ce52..1b4bce17b 100644 --- a/android5.0/DirectorySelection/DirectorySelection.csproj +++ b/android5.0/DirectorySelection/DirectorySelection.csproj @@ -43,10 +43,10 @@ - packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - packages\Xamarin.Android.Support.v7.RecyclerView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll @@ -61,8 +61,8 @@ - + diff --git a/android5.0/DirectorySelection/packages.config b/android5.0/DirectorySelection/packages.config index 6d0ed006c..d67e4b136 100644 --- a/android5.0/DirectorySelection/packages.config +++ b/android5.0/DirectorySelection/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/android5.0/ElevationDrag/ElevationDrag/ElevationDrag.csproj b/android5.0/ElevationDrag/ElevationDrag/ElevationDrag.csproj index 11cc8f736..2914b5f40 100644 --- a/android5.0/ElevationDrag/ElevationDrag/ElevationDrag.csproj +++ b/android5.0/ElevationDrag/ElevationDrag/ElevationDrag.csproj @@ -46,7 +46,7 @@ - ..\packages\Xamarin.Android.Support.v4.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/android5.0/ElevationDrag/ElevationDrag/packages.config b/android5.0/ElevationDrag/ElevationDrag/packages.config index e730f40fe..6ad86a3e7 100644 --- a/android5.0/ElevationDrag/ElevationDrag/packages.config +++ b/android5.0/ElevationDrag/ElevationDrag/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/android5.0/GoogleIO2014Master/GoogleIO2014Master/GoogleIO2014Master.csproj b/android5.0/GoogleIO2014Master/GoogleIO2014Master/GoogleIO2014Master.csproj index 5d417f1d8..469861662 100644 --- a/android5.0/GoogleIO2014Master/GoogleIO2014Master/GoogleIO2014Master.csproj +++ b/android5.0/GoogleIO2014Master/GoogleIO2014Master/GoogleIO2014Master.csproj @@ -44,17 +44,17 @@ - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.Palette.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll + ..\packages\Xamarin.Android.Support.v7.Palette.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll diff --git a/android5.0/GoogleIO2014Master/GoogleIO2014Master/packages.config b/android5.0/GoogleIO2014Master/GoogleIO2014Master/packages.config index ccafbb404..3bd0cb7e9 100644 --- a/android5.0/GoogleIO2014Master/GoogleIO2014Master/packages.config +++ b/android5.0/GoogleIO2014Master/GoogleIO2014Master/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/android5.0/JobScheduler/JobScheduler/JobScheduler.csproj b/android5.0/JobScheduler/JobScheduler/JobScheduler.csproj index 0c916fc56..276cd5b9e 100644 --- a/android5.0/JobScheduler/JobScheduler/JobScheduler.csproj +++ b/android5.0/JobScheduler/JobScheduler/JobScheduler.csproj @@ -30,7 +30,6 @@ None false False - true full @@ -47,12 +46,6 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll - @@ -64,7 +57,6 @@ - diff --git a/android5.0/JobScheduler/JobScheduler/packages.config b/android5.0/JobScheduler/JobScheduler/packages.config deleted file mode 100644 index c1fa85697..000000000 --- a/android5.0/JobScheduler/JobScheduler/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android5.0/KitchenSink/AndroidLSamples/AndroidLSamples.csproj b/android5.0/KitchenSink/AndroidLSamples/AndroidLSamples.csproj index 9b987f576..31605fb0e 100644 --- a/android5.0/KitchenSink/AndroidLSamples/AndroidLSamples.csproj +++ b/android5.0/KitchenSink/AndroidLSamples/AndroidLSamples.csproj @@ -43,16 +43,16 @@ - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - ..\packages\Xamarin.Android.Support.v7.Palette.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll + ..\packages\Xamarin.Android.Support.v7.Palette.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.Palette.dll - - ..\packages\Xamarin.Android.Support.v7.CardView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll diff --git a/android5.0/KitchenSink/AndroidLSamples/packages.config b/android5.0/KitchenSink/AndroidLSamples/packages.config index 970bbc5ea..e5e1f4d22 100644 --- a/android5.0/KitchenSink/AndroidLSamples/packages.config +++ b/android5.0/KitchenSink/AndroidLSamples/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/android5.0/MessagingService/MessagingService.csproj b/android5.0/MessagingService/MessagingService.csproj index d74bfebbc..cedaad82e 100644 --- a/android5.0/MessagingService/MessagingService.csproj +++ b/android5.0/MessagingService/MessagingService.csproj @@ -43,7 +43,7 @@ - packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/android5.0/MessagingService/packages.config b/android5.0/MessagingService/packages.config index b1c552e83..6ad86a3e7 100644 --- a/android5.0/MessagingService/packages.config +++ b/android5.0/MessagingService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/android5.0/NavigationDrawer/NavigationDrawer/NavigationDrawer.csproj b/android5.0/NavigationDrawer/NavigationDrawer/NavigationDrawer.csproj index cdd5bb3dc..9c9709c24 100644 --- a/android5.0/NavigationDrawer/NavigationDrawer/NavigationDrawer.csproj +++ b/android5.0/NavigationDrawer/NavigationDrawer/NavigationDrawer.csproj @@ -12,10 +12,12 @@ Resource Resources\Resource.designer.cs True - True + False NavigationDrawer v5.0 Properties\AndroidManifest.xml + 8.0.30703 + 2.0 true @@ -43,10 +45,10 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.0-rc1v2\lib\MonoAndroid10\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll diff --git a/android5.0/NavigationDrawer/NavigationDrawer/packages.config b/android5.0/NavigationDrawer/NavigationDrawer/packages.config index 4a7e5f426..72a30a4e1 100644 --- a/android5.0/NavigationDrawer/NavigationDrawer/packages.config +++ b/android5.0/NavigationDrawer/NavigationDrawer/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/android5.0/RecyclerViewSample/RecyclerViewSample/RecyclerViewSample.csproj b/android5.0/RecyclerViewSample/RecyclerViewSample/RecyclerViewSample.csproj index fbd18426c..68500038d 100644 --- a/android5.0/RecyclerViewSample/RecyclerViewSample/RecyclerViewSample.csproj +++ b/android5.0/RecyclerViewSample/RecyclerViewSample/RecyclerViewSample.csproj @@ -46,10 +46,10 @@ - ..\packages\Xamarin.Android.Support.v4.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll diff --git a/android5.0/RecyclerViewSample/RecyclerViewSample/packages.config b/android5.0/RecyclerViewSample/RecyclerViewSample/packages.config index eac583691..d67e4b136 100644 --- a/android5.0/RecyclerViewSample/RecyclerViewSample/packages.config +++ b/android5.0/RecyclerViewSample/RecyclerViewSample/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/android5.0/RecyclerViewer/RecyclerViewer/RecyclerViewer.csproj b/android5.0/RecyclerViewer/RecyclerViewer/RecyclerViewer.csproj index a7b039f9b..b84317f09 100644 --- a/android5.0/RecyclerViewer/RecyclerViewer/RecyclerViewer.csproj +++ b/android5.0/RecyclerViewer/RecyclerViewer/RecyclerViewer.csproj @@ -1,220 +1,111 @@ - - Debug - AnyCPU - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {C7F5D818-C203-47A2-AFB4-60078932730E} - Library - RecyclerViewer - Assets - Resources - Resource - Resources\Resource.designer.cs - True - False - RecyclerViewer - v5.0 - Properties\AndroidManifest.xml - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - false - - - full - true - bin\Release - prompt - 4 - false - false - - - - - - - - - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll - + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - - ..\packages\Xamarin.Android.Support.v7.CardView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - - - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android5.0/RecyclerViewer/RecyclerViewer/packages.config b/android5.0/RecyclerViewer/RecyclerViewer/packages.config index 5695a39d0..a8e059987 100644 --- a/android5.0/RecyclerViewer/RecyclerViewer/packages.config +++ b/android5.0/RecyclerViewer/RecyclerViewer/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/android5.0/ThemeSwitcher/ThemeSwitcher/ThemeSwitcher.csproj b/android5.0/ThemeSwitcher/ThemeSwitcher/ThemeSwitcher.csproj index 4724d5f9d..565972949 100644 --- a/android5.0/ThemeSwitcher/ThemeSwitcher/ThemeSwitcher.csproj +++ b/android5.0/ThemeSwitcher/ThemeSwitcher/ThemeSwitcher.csproj @@ -44,7 +44,7 @@ - ..\packages\Xamarin.Android.Support.v7.CardView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll diff --git a/android5.0/ThemeSwitcher/ThemeSwitcher/packages.config b/android5.0/ThemeSwitcher/ThemeSwitcher/packages.config index dfab081b7..71cf8aadf 100644 --- a/android5.0/ThemeSwitcher/ThemeSwitcher/packages.config +++ b/android5.0/ThemeSwitcher/ThemeSwitcher/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/android5.0/Topeka/Topeka/Topeka.csproj b/android5.0/Topeka/Topeka/Topeka.csproj index 3e1370a7c..8d2415218 100644 --- a/android5.0/Topeka/Topeka/Topeka.csproj +++ b/android5.0/Topeka/Topeka/Topeka.csproj @@ -65,14 +65,14 @@ ..\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll + + ..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\packages\Xamarin.Android.Support.v7.CardView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll diff --git a/android5.0/Topeka/Topeka/packages.config b/android5.0/Topeka/Topeka/packages.config index 2f86aa0bc..0b11b29e5 100644 --- a/android5.0/Topeka/Topeka/packages.config +++ b/android5.0/Topeka/Topeka/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/google-services/AdMobExample/AdMobExample/AdMobExample.csproj b/google-services/AdMobExample/AdMobExample/AdMobExample.csproj index c2184e85f..e1a405138 100644 --- a/google-services/AdMobExample/AdMobExample/AdMobExample.csproj +++ b/google-services/AdMobExample/AdMobExample/AdMobExample.csproj @@ -43,19 +43,16 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Ads.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll + ..\packages\Xamarin.GooglePlayServices.Ads.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/AdMobExample/AdMobExample/packages.config b/google-services/AdMobExample/AdMobExample/packages.config index 7315f98a2..18e010969 100644 --- a/google-services/AdMobExample/AdMobExample/packages.config +++ b/google-services/AdMobExample/AdMobExample/packages.config @@ -1,8 +1,7 @@  - - - - - + + + + \ No newline at end of file diff --git a/google-services/Analytics/Analytics/Analytics.csproj b/google-services/Analytics/Analytics/Analytics.csproj index 9dc4d2404..c8f1c5970 100644 --- a/google-services/Analytics/Analytics/Analytics.csproj +++ b/google-services/Analytics/Analytics/Analytics.csproj @@ -43,19 +43,16 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Analytics.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll + ..\packages\Xamarin.GooglePlayServices.Analytics.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Analytics/Analytics/packages.config b/google-services/Analytics/Analytics/packages.config index f51fd4870..ee95b200a 100644 --- a/google-services/Analytics/Analytics/packages.config +++ b/google-services/Analytics/Analytics/packages.config @@ -1,8 +1,7 @@  - - - - - + + + + \ No newline at end of file diff --git a/google-services/AppIndexing/AppIndexing/AppIndexing.csproj b/google-services/AppIndexing/AppIndexing/AppIndexing.csproj index c05884f15..c77c5b030 100644 --- a/google-services/AppIndexing/AppIndexing/AppIndexing.csproj +++ b/google-services/AppIndexing/AppIndexing/AppIndexing.csproj @@ -43,76 +43,16 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Ads.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll - - - ..\packages\Xamarin.GooglePlayServices.Analytics.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.AppIndexing.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppIndexing.dll - - - ..\packages\Xamarin.GooglePlayServices.AppInvite.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppInvite.dll - - - ..\packages\Xamarin.GooglePlayServices.AppState.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppState.dll - - - ..\packages\Xamarin.GooglePlayServices.Cast.25.0.0.0\lib\MonoAndroid42\Xamarin.GooglePlayServices.Cast.dll - - - ..\packages\Xamarin.GooglePlayServices.Drive.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Drive.dll - - - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - - - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - - - ..\packages\Xamarin.GooglePlayServices.Fitness.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll - - - ..\packages\Xamarin.GooglePlayServices.Games.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Games.dll - - - ..\packages\Xamarin.GooglePlayServices.Gcm.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll - - - ..\packages\Xamarin.GooglePlayServices.Identity.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Identity.dll - - - ..\packages\Xamarin.GooglePlayServices.Nearby.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Nearby.dll - - - ..\packages\Xamarin.GooglePlayServices.Panorama.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Panorama.dll - - - ..\packages\Xamarin.GooglePlayServices.Plus.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Plus.dll - - - ..\packages\Xamarin.GooglePlayServices.SafetyNet.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.SafetyNet.dll - - - ..\packages\Xamarin.GooglePlayServices.Wallet.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wallet.dll - - - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll - - - ..\packages\Xamarin.GooglePlayServices.25.0.0.0\lib\MonoAndroid41\GooglePlayServicesLib.dll + ..\packages\Xamarin.GooglePlayServices.AppIndexing.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppIndexing.dll @@ -140,10 +80,4 @@ - - - 25.0.0.0 - False - - \ No newline at end of file diff --git a/google-services/AppIndexing/AppIndexing/packages.config b/google-services/AppIndexing/AppIndexing/packages.config index 35b5dbc84..aea6bf17d 100644 --- a/google-services/AppIndexing/AppIndexing/packages.config +++ b/google-services/AppIndexing/AppIndexing/packages.config @@ -1,27 +1,7 @@  - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/google-services/AppInvite/AppInvite/AppInvite.csproj b/google-services/AppInvite/AppInvite/AppInvite.csproj index 6793e9065..427ce2891 100644 --- a/google-services/AppInvite/AppInvite/AppInvite.csproj +++ b/google-services/AppInvite/AppInvite/AppInvite.csproj @@ -43,22 +43,19 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.AppInvite.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppInvite.dll + ..\packages\Xamarin.GooglePlayServices.AppInvite.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppInvite.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll + ..\packages\Xamarin.Android.Support.Design.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll diff --git a/google-services/AppInvite/AppInvite/packages.config b/google-services/AppInvite/AppInvite/packages.config index d16e5c518..bf5dc2598 100644 --- a/google-services/AppInvite/AppInvite/packages.config +++ b/google-services/AppInvite/AppInvite/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/BasicHistoryApi.csproj b/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/BasicHistoryApi.csproj index 3d216b827..cdef5fe10 100644 --- a/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/BasicHistoryApi.csproj +++ b/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/BasicHistoryApi.csproj @@ -43,25 +43,22 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.GooglePlayServices.Fitness.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll + ..\packages\Xamarin.GooglePlayServices.Fitness.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/packages.config b/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/packages.config index dde675e3a..0e171a895 100644 --- a/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/packages.config +++ b/google-services/Fitness/BasicHistoryApi/BasicHistoryApi/packages.config @@ -1,10 +1,9 @@  - - - - - - - + + + + + + \ No newline at end of file diff --git a/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/BasicHistorySessions.csproj b/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/BasicHistorySessions.csproj index 648af8313..2c33e496f 100644 --- a/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/BasicHistorySessions.csproj +++ b/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/BasicHistorySessions.csproj @@ -43,22 +43,22 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.GooglePlayServices.Fitness.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll + ..\packages\Xamarin.GooglePlayServices.Fitness.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/packages.config b/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/packages.config index 1b9059a1c..0e171a895 100644 --- a/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/packages.config +++ b/google-services/Fitness/BasicHistorySessions/BasicHistorySessions/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/BasicRecordingApi.csproj b/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/BasicRecordingApi.csproj index 36d663658..cce5351b2 100644 --- a/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/BasicRecordingApi.csproj +++ b/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/BasicRecordingApi.csproj @@ -43,25 +43,22 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.GooglePlayServices.Fitness.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll + ..\packages\Xamarin.GooglePlayServices.Fitness.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/packages.config b/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/packages.config index 854feaf80..0e171a895 100644 --- a/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/packages.config +++ b/google-services/Fitness/BasicRecordingApi/BasicRecordingApi/packages.config @@ -1,10 +1,9 @@  - - - - - - - + + + + + + \ No newline at end of file diff --git a/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/BasicSensorsApi.csproj b/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/BasicSensorsApi.csproj index 7fd647dbc..a5a649c48 100644 --- a/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/BasicSensorsApi.csproj +++ b/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/BasicSensorsApi.csproj @@ -42,26 +42,23 @@ + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.GooglePlayServices.Fitness.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll - - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.GooglePlayServices.Fitness.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Fitness.dll diff --git a/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/packages.config b/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/packages.config index 854feaf80..0e171a895 100644 --- a/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/packages.config +++ b/google-services/Fitness/BasicSensorsApi/BasicSensorsApi/packages.config @@ -1,10 +1,9 @@  - - - - - - - + + + + + + \ No newline at end of file diff --git a/google-services/GCMSample/GCMSample/GCMSample.csproj b/google-services/GCMSample/GCMSample/GCMSample.csproj index d98024fab..2d5b83d7f 100644 --- a/google-services/GCMSample/GCMSample/GCMSample.csproj +++ b/google-services/GCMSample/GCMSample/GCMSample.csproj @@ -42,17 +42,17 @@ - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Gcm.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Gcm.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll diff --git a/google-services/GCMSample/GCMSample/packages.config b/google-services/GCMSample/GCMSample/packages.config index 4ffb28eb9..291e3eadf 100644 --- a/google-services/GCMSample/GCMSample/packages.config +++ b/google-services/GCMSample/GCMSample/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/google-services/Location/ActivityRecognition/ActivityRecognition/ActivityRecognition.csproj b/google-services/Location/ActivityRecognition/ActivityRecognition/ActivityRecognition.csproj index af7e4ef7d..c7fe88562 100644 --- a/google-services/Location/ActivityRecognition/ActivityRecognition/ActivityRecognition.csproj +++ b/google-services/Location/ActivityRecognition/ActivityRecognition/ActivityRecognition.csproj @@ -42,26 +42,20 @@ - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\packages\Xamarin.GooglePlayServices.Cast.25.0.0.0\lib\MonoAndroid42\Xamarin.GooglePlayServices.Cast.dll + + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll diff --git a/google-services/Location/ActivityRecognition/ActivityRecognition/packages.config b/google-services/Location/ActivityRecognition/ActivityRecognition/packages.config index df4977cbc..eec8f8dfb 100644 --- a/google-services/Location/ActivityRecognition/ActivityRecognition/packages.config +++ b/google-services/Location/ActivityRecognition/ActivityRecognition/packages.config @@ -1,11 +1,9 @@  - - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Location/BasicLocationSample/BasicLocationSample/BasicLocationSample.csproj b/google-services/Location/BasicLocationSample/BasicLocationSample/BasicLocationSample.csproj index b84947c32..b3fcd39dc 100644 --- a/google-services/Location/BasicLocationSample/BasicLocationSample/BasicLocationSample.csproj +++ b/google-services/Location/BasicLocationSample/BasicLocationSample/BasicLocationSample.csproj @@ -43,22 +43,19 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Location/BasicLocationSample/BasicLocationSample/packages.config b/google-services/Location/BasicLocationSample/BasicLocationSample/packages.config index fd2949aef..f9bf85edf 100644 --- a/google-services/Location/BasicLocationSample/BasicLocationSample/packages.config +++ b/google-services/Location/BasicLocationSample/BasicLocationSample/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Location/Geofencing/Geofencing/Geofencing.csproj b/google-services/Location/Geofencing/Geofencing/Geofencing.csproj index 4207cfc2d..b166094b1 100644 --- a/google-services/Location/Geofencing/Geofencing/Geofencing.csproj +++ b/google-services/Location/Geofencing/Geofencing/Geofencing.csproj @@ -42,23 +42,20 @@ + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll diff --git a/google-services/Location/Geofencing/Geofencing/packages.config b/google-services/Location/Geofencing/Geofencing/packages.config index fd2949aef..f9bf85edf 100644 --- a/google-services/Location/Geofencing/Geofencing/packages.config +++ b/google-services/Location/Geofencing/Geofencing/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Location/LocationAddress/LocationAddress/LocationAddress.csproj b/google-services/Location/LocationAddress/LocationAddress/LocationAddress.csproj index a7cef7d51..9209e128d 100644 --- a/google-services/Location/LocationAddress/LocationAddress/LocationAddress.csproj +++ b/google-services/Location/LocationAddress/LocationAddress/LocationAddress.csproj @@ -43,22 +43,19 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Location/LocationAddress/LocationAddress/packages.config b/google-services/Location/LocationAddress/LocationAddress/packages.config index fd2949aef..f9bf85edf 100644 --- a/google-services/Location/LocationAddress/LocationAddress/packages.config +++ b/google-services/Location/LocationAddress/LocationAddress/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Location/LocationSettings/LocationSettings/LocationSettings.csproj b/google-services/Location/LocationSettings/LocationSettings/LocationSettings.csproj index 4fb624435..57c3a01a5 100644 --- a/google-services/Location/LocationSettings/LocationSettings/LocationSettings.csproj +++ b/google-services/Location/LocationSettings/LocationSettings/LocationSettings.csproj @@ -42,20 +42,20 @@ + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll diff --git a/google-services/Location/LocationSettings/LocationSettings/packages.config b/google-services/Location/LocationSettings/LocationSettings/packages.config index 03db9110b..f9bf85edf 100644 --- a/google-services/Location/LocationSettings/LocationSettings/packages.config +++ b/google-services/Location/LocationSettings/LocationSettings/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Location/LocationUpdates/LocationUpdates/LocationUpdates.csproj b/google-services/Location/LocationUpdates/LocationUpdates/LocationUpdates.csproj index 86fe326e5..404b634eb 100644 --- a/google-services/Location/LocationUpdates/LocationUpdates/LocationUpdates.csproj +++ b/google-services/Location/LocationUpdates/LocationUpdates/LocationUpdates.csproj @@ -43,22 +43,19 @@ - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/google-services/Location/LocationUpdates/LocationUpdates/packages.config b/google-services/Location/LocationUpdates/LocationUpdates/packages.config index fd2949aef..f9bf85edf 100644 --- a/google-services/Location/LocationUpdates/LocationUpdates/packages.config +++ b/google-services/Location/LocationUpdates/LocationUpdates/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/ConnectionsQuickstart.csproj b/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/ConnectionsQuickstart.csproj index fcf454e59..9a28a7251 100644 --- a/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/ConnectionsQuickstart.csproj +++ b/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/ConnectionsQuickstart.csproj @@ -42,20 +42,17 @@ - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Nearby.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Nearby.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Nearby.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Nearby.dll diff --git a/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/packages.config b/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/packages.config index fa35a465b..ba2dd142a 100644 --- a/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/packages.config +++ b/google-services/Nearby/ConnectionsQuickstart/ConnectionsQuickstart/packages.config @@ -1,8 +1,7 @@  - - - - - + + + + \ No newline at end of file diff --git a/google-services/SigninQuickstart/SigninQuickstart/SigninQuickstart.csproj b/google-services/SigninQuickstart/SigninQuickstart/SigninQuickstart.csproj index 2ba1ada9b..4ae5e1dbc 100644 --- a/google-services/SigninQuickstart/SigninQuickstart/SigninQuickstart.csproj +++ b/google-services/SigninQuickstart/SigninQuickstart/SigninQuickstart.csproj @@ -42,17 +42,17 @@ - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Plus.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Plus.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Plus.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Plus.dll diff --git a/google-services/SigninQuickstart/SigninQuickstart/packages.config b/google-services/SigninQuickstart/SigninQuickstart/packages.config index c39a1c782..3f6f2c250 100644 --- a/google-services/SigninQuickstart/SigninQuickstart/packages.config +++ b/google-services/SigninQuickstart/SigninQuickstart/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/tv/TvLeanback/TvLeanback/DetailsActivity.cs b/tv/TvLeanback/TvLeanback/DetailsActivity.cs index 29156bb50..acc0803ad 100644 --- a/tv/TvLeanback/TvLeanback/DetailsActivity.cs +++ b/tv/TvLeanback/TvLeanback/DetailsActivity.cs @@ -8,6 +8,10 @@ namespace TvLeanback [Activity (Label = "DetailsActivity", Exported = true)] public class DetailsActivity : Activity { + public static string SHARED_ELEMENT_NAME = "hero"; + public static string MOVIE = "Movie"; + public static string NOTIFICATION_ID = "NotificationId"; + protected override void OnCreate (Bundle savedInstanceState) { base.OnCreate (savedInstanceState); diff --git a/tv/TvLeanback/TvLeanback/LeanbackDetailsFragment.cs b/tv/TvLeanback/TvLeanback/LeanbackDetailsFragment.cs index ca5a552bf..5bbd31785 100644 --- a/tv/TvLeanback/TvLeanback/LeanbackDetailsFragment.cs +++ b/tv/TvLeanback/TvLeanback/LeanbackDetailsFragment.cs @@ -5,6 +5,7 @@ using Android.OS; using Android.Util; using Android.Widget; +using Android.Support.V4.App; using Android.Support.V17.Leanback.App; using Android.Support.V17.Leanback.Widget; using Action = Android.Support.V17.Leanback.Widget.Action; @@ -16,7 +17,7 @@ namespace TvLeanback { - public class LeanbackDetailsFragment : Android.Support.V17.Leanback.App.DetailsFragment, IOnItemClickedListener + public class LeanbackDetailsFragment : Android.Support.V17.Leanback.App.DetailsFragment, IOnItemViewClickedListener { private static readonly string TAG = "DetailsFragment"; @@ -50,16 +51,20 @@ public override void OnCreate (Bundle savedInstanceState) selectedMovie = Utils.Deserialize(this.Activity.Intent.GetStringExtra (GetString(Resource.String.movie))) ; //TODO make this work Log.Debug (TAG, "DetailsActivity movie: " + selectedMovie.ToString ()); new DetailRowBuilderTask (this).Execute (selectedMovie); - OnItemClickedListener = this; + OnItemViewClickedListener = this; } - public void OnItemClicked (Java.Lang.Object item, Row row) + public void OnItemClicked (Presenter.ViewHolder itemViewHolder, Java.Lang.Object item, + RowPresenter.ViewHolder rowViewHolder, Row row) { if (item is Movie) { var movie = (Movie)item; var intent = new Intent (this.Activity, typeof(DetailsActivity)); - intent.PutExtra (GetString (Resource.String.movie), Utils.Serialize(movie)); - StartActivity (intent); + intent.PutExtra (GetString (Resource.String.movie), Utils.Serialize (movie)); + Bundle bundle = ActivityOptionsCompat.MakeSceneTransitionAnimation (Activity, + ((ImageCardView) itemViewHolder.View).MainImageView, + DetailsActivity.SHARED_ELEMENT_NAME).ToBundle (); + StartActivity (intent, bundle); } } @@ -141,7 +146,7 @@ protected override void OnPostExecute (Java.Lang.Object raw) } } } - HeaderItem header = new HeaderItem (0, subcategories [0], null); + HeaderItem header = new HeaderItem (0, subcategories [0]); adapter.Add (new ListRow (header, listRowAdapter)); owner.Adapter = adapter; } diff --git a/tv/TvLeanback/TvLeanback/MainFragment.cs b/tv/TvLeanback/TvLeanback/MainFragment.cs index eab6689a3..74d8ff89d 100644 --- a/tv/TvLeanback/TvLeanback/MainFragment.cs +++ b/tv/TvLeanback/TvLeanback/MainFragment.cs @@ -20,7 +20,7 @@ namespace TvLeanback { - public class MainFragment : BrowseFragment, LoaderManager.ILoaderCallbacks, View.IOnClickListener, IOnItemSelectedListener//>> + public class MainFragment : BrowseFragment, LoaderManager.ILoaderCallbacks, View.IOnClickListener, IOnItemViewSelectedListener//>> { private static readonly String TAG = "MainFragment"; @@ -81,8 +81,8 @@ private void SetupEventListeners () { SetOnSearchClickedListener (this);//new View.IOnClickListener(){ - SetOnItemSelectedListener (this); - ItemClicked += (object sender, ItemClickedEventArgs e) => { + OnItemViewSelectedListener = this; + ItemViewClicked += (object sender, ItemViewClickedEventArgs e) => { var item = e.Item; if (item is Movie) { Movie movie = (Movie)item; @@ -102,7 +102,8 @@ private void SetupEventListeners () }; } - public void OnItemSelected (Java.Lang.Object item, Row row) + public void OnItemSelected (Presenter.ViewHolder itemViewHolder, Java.Lang.Object item, + RowPresenter.ViewHolder rowViewHolder, Row row) { if (item is Movie) { mBackgroundURI = ((Movie)item).GetBackgroundImageURI (); @@ -144,12 +145,12 @@ public void OnLoadFinished (Android.Content.Loader loader, Java.Lang.Object raw) foreach (Movie current in list) { listRowAdapter.Add (current); } - var header = new HeaderItem (i, entry.Key, null); + var header = new HeaderItem (i, entry.Key); i++; mRowsAdapter.Add (new ListRow (header, listRowAdapter)); } - var gridHeader = new HeaderItem (i, Resources.GetString (Resource.String.preferences), null); + var gridHeader = new HeaderItem (i, Resources.GetString (Resource.String.preferences)); var gridPresenter = new GridItemPresenter (this); var gridRowAdapter = new ArrayObjectAdapter (gridPresenter); diff --git a/tv/TvLeanback/TvLeanback/SearchFragment.cs b/tv/TvLeanback/TvLeanback/SearchFragment.cs index ba3038313..495dcc6b6 100644 --- a/tv/TvLeanback/TvLeanback/SearchFragment.cs +++ b/tv/TvLeanback/TvLeanback/SearchFragment.cs @@ -13,7 +13,7 @@ namespace TvLeanback { - public class SearchFragment : Android.Support.V17.Leanback.App.SearchFragment, IOnItemClickedListener, + public class SearchFragment : Android.Support.V17.Leanback.App.SearchFragment, IOnItemViewClickedListener, Android.Support.V17.Leanback.App.SearchFragment.ISearchResultProvider { private static string TAG = "SearchFragment"; @@ -39,10 +39,11 @@ public override void OnCreate (Bundle savedInstanceState) mDelayedLoad = new SearchRunnable (this); mRowsAdapter = new ArrayObjectAdapter (new ListRowPresenter ()); SetSearchResultProvider (this); - SetOnItemClickedListener (this); + SetOnItemViewClickedListener (this); } - public void OnItemClicked (Java.Lang.Object item, Row row) + public void OnItemClicked (Presenter.ViewHolder itemViewHolder, Java.Lang.Object item, + RowPresenter.ViewHolder rowViewHolder, Row row) { if (item is Movie) { var movie = (Movie)item; @@ -90,7 +91,7 @@ protected void LoadRows (String query) } } } - HeaderItem header = new HeaderItem (0, Resources.GetString (Resource.String.search_results), (string)null); + HeaderItem header = new HeaderItem (0, Resources.GetString (Resource.String.search_results)); mRowsAdapter.Add (new ListRow (header, listRowAdapter)); } diff --git a/tv/TvLeanback/TvLeanback/TvLeanback.csproj b/tv/TvLeanback/TvLeanback/TvLeanback.csproj index aca746907..b77cabd0c 100644 --- a/tv/TvLeanback/TvLeanback/TvLeanback.csproj +++ b/tv/TvLeanback/TvLeanback/TvLeanback.csproj @@ -12,7 +12,7 @@ Resource Resources\Resource.designer.cs True - True + False TvLeanback v5.0 Properties\AndroidManifest.xml @@ -45,13 +45,13 @@ - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Support.v17.Leanback.21.0.3.0\lib\MonoAndroid42\Xamarin.Android.Support.v17.Leanback.dll + ..\packages\Xamarin.Android.Support.v17.Leanback.23.0.1.0-rc2\lib\MonoAndroid42\Xamarin.Android.Support.v17.Leanback.dll diff --git a/tv/TvLeanback/TvLeanback/VertivalGridFragment.cs b/tv/TvLeanback/TvLeanback/VertivalGridFragment.cs index 739073b60..60ca59910 100644 --- a/tv/TvLeanback/TvLeanback/VertivalGridFragment.cs +++ b/tv/TvLeanback/TvLeanback/VertivalGridFragment.cs @@ -10,7 +10,7 @@ namespace TvLeanback { - public class VertivalGridFragment : Android.Support.V17.Leanback.App.VerticalGridFragment, IOnItemClickedListener, IOnItemSelectedListener + public class VertivalGridFragment : Android.Support.V17.Leanback.App.VerticalGridFragment, IOnItemViewClickedListener, IOnItemViewSelectedListener { private static string TAG = "VerticalGridFragment"; @@ -45,12 +45,14 @@ private void SetupFragment() { } this.Adapter = mAdapter; - SetOnItemSelectedListener (this); - OnItemClickedListener = this; + OnItemViewClickedListener = this; - SetOnItemSelectedListener (this); + SetOnItemViewSelectedListener (this); } - public void OnItemClicked(Java.Lang.Object item, Row row){ + + public void OnItemClicked (Presenter.ViewHolder itemViewHolder, Java.Lang.Object item, + RowPresenter.ViewHolder rowViewHolder, Row row) + { if (item is Movie) { var movie = (Movie)item; var intent = new Intent (this.Activity, typeof(DetailsActivity)); @@ -58,7 +60,10 @@ public void OnItemClicked(Java.Lang.Object item, Row row){ StartActivity (intent); } } - public void OnItemSelected(Java.Lang.Object item, Row row){ + + public void OnItemSelected (Presenter.ViewHolder itemViewHolder, Java.Lang.Object item, + RowPresenter.ViewHolder rowViewHolder, Row row) + { //Do nothing } } diff --git a/tv/TvLeanback/TvLeanback/packages.config b/tv/TvLeanback/TvLeanback/packages.config index 814971fc4..ad03a2bea 100644 --- a/tv/TvLeanback/TvLeanback/packages.config +++ b/tv/TvLeanback/TvLeanback/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/tv/VisualGameController/VisualGameController/Resources/values/attrs.xml b/tv/VisualGameController/VisualGameController/Resources/values/attrs.xml index 9f091eb4b..00f9da546 100644 --- a/tv/VisualGameController/VisualGameController/Resources/values/attrs.xml +++ b/tv/VisualGameController/VisualGameController/Resources/values/attrs.xml @@ -32,6 +32,5 @@ - \ No newline at end of file diff --git a/tv/VisualGameController/VisualGameController/VisualGameController.csproj b/tv/VisualGameController/VisualGameController/VisualGameController.csproj index d2a2a2843..42e2d722b 100644 --- a/tv/VisualGameController/VisualGameController/VisualGameController.csproj +++ b/tv/VisualGameController/VisualGameController/VisualGameController.csproj @@ -45,14 +45,11 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.20.0.0.2\lib\MonoAndroid10\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll diff --git a/tv/VisualGameController/VisualGameController/packages.config b/tv/VisualGameController/VisualGameController/packages.config index 8cabcfeca..f68096947 100644 --- a/tv/VisualGameController/VisualGameController/packages.config +++ b/tv/VisualGameController/VisualGameController/packages.config @@ -1,6 +1,5 @@  - - - + + \ No newline at end of file diff --git a/wear/AgendaData/AgendaData/AgendaData.csproj b/wear/AgendaData/AgendaData/AgendaData.csproj index 8d9c5ba72..a7602c0d2 100644 --- a/wear/AgendaData/AgendaData/AgendaData.csproj +++ b/wear/AgendaData/AgendaData/AgendaData.csproj @@ -47,13 +47,13 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/AgendaData/AgendaData/packages.config b/wear/AgendaData/AgendaData/packages.config index 87f072458..9531cfae5 100644 --- a/wear/AgendaData/AgendaData/packages.config +++ b/wear/AgendaData/AgendaData/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/wear/AgendaData/Wearable/Wearable.csproj b/wear/AgendaData/Wearable/Wearable.csproj index 0ebbfbe1c..2351156e0 100644 --- a/wear/AgendaData/Wearable/Wearable.csproj +++ b/wear/AgendaData/Wearable/Wearable.csproj @@ -46,19 +46,19 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Wear.1.2.0-rc3\lib\MonoAndroid5\Xamarin.Android.Wearable.dll + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/AgendaData/Wearable/packages.config b/wear/AgendaData/Wearable/packages.config index 84eca16a6..dee68526d 100644 --- a/wear/AgendaData/Wearable/packages.config +++ b/wear/AgendaData/Wearable/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/wear/DataLayer/DataLayer/DataLayer.csproj b/wear/DataLayer/DataLayer/DataLayer.csproj index ef066653a..a29f6802c 100644 --- a/wear/DataLayer/DataLayer/DataLayer.csproj +++ b/wear/DataLayer/DataLayer/DataLayer.csproj @@ -46,13 +46,13 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/DataLayer/DataLayer/packages.config b/wear/DataLayer/DataLayer/packages.config index 87f072458..9531cfae5 100644 --- a/wear/DataLayer/DataLayer/packages.config +++ b/wear/DataLayer/DataLayer/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/wear/DataLayer/Wearable/Wearable.csproj b/wear/DataLayer/Wearable/Wearable.csproj index 5ad304579..cb441b12b 100644 --- a/wear/DataLayer/Wearable/Wearable.csproj +++ b/wear/DataLayer/Wearable/Wearable.csproj @@ -44,20 +44,20 @@ - - ..\packages\Xamarin.Android.Wear.1.2.0-rc3\lib\MonoAndroid5\Xamarin.Android.Wearable.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/DataLayer/Wearable/packages.config b/wear/DataLayer/Wearable/packages.config index 84eca16a6..dee68526d 100644 --- a/wear/DataLayer/Wearable/packages.config +++ b/wear/DataLayer/Wearable/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/wear/DelayedConfirmation/DelayedConfirmationApp/DelayedConfirmationApp.csproj b/wear/DelayedConfirmation/DelayedConfirmationApp/DelayedConfirmationApp.csproj index cd637d19d..00803c65c 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationApp/DelayedConfirmationApp.csproj +++ b/wear/DelayedConfirmation/DelayedConfirmationApp/DelayedConfirmationApp.csproj @@ -16,7 +16,7 @@ DelayedConfirmation Properties\AndroidManifest.xml false - v4.4.87 + v5.0 true @@ -46,10 +46,13 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\packages\Xamarin.Android.Wear.1.0.0-preview3\lib\MonoAndroid10\Xamarin.Android.Wearable.dll + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/DelayedConfirmation/DelayedConfirmationApp/packages.config b/wear/DelayedConfirmation/DelayedConfirmationApp/packages.config index 6dbc012e1..9531cfae5 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationApp/packages.config +++ b/wear/DelayedConfirmation/DelayedConfirmationApp/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/wear/DelayedConfirmation/DelayedConfirmationWear/DelayedConfirmationWear.csproj b/wear/DelayedConfirmation/DelayedConfirmationWear/DelayedConfirmationWear.csproj index a51982134..43d689427 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationWear/DelayedConfirmationWear.csproj +++ b/wear/DelayedConfirmation/DelayedConfirmationWear/DelayedConfirmationWear.csproj @@ -14,7 +14,7 @@ True False Wearable - v4.4.87 + v5.0 Properties\AndroidManifest.xml false @@ -46,10 +46,19 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + + + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Wear.1.0.0-preview3\lib\MonoAndroid10\Xamarin.Android.Wearable.dll + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll diff --git a/wear/DelayedConfirmation/DelayedConfirmationWear/MainActivity.cs b/wear/DelayedConfirmation/DelayedConfirmationWear/MainActivity.cs index cfd0597da..3e376bcb2 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationWear/MainActivity.cs +++ b/wear/DelayedConfirmation/DelayedConfirmationWear/MainActivity.cs @@ -2,18 +2,21 @@ using Android.App; using Android.Content; -using Android.Gms; -using Android.Gms.Common; -using Android.Gms.Common.Apis; -using Android.Gms.Wearable; -using Android.Support.Wearable.View; using Android.OS; using Android.Runtime; -using Android.Support.V4.App; using Android.Views; using Android.Util; using Android.Widget; +using Android.Support.V4.App; + +using Android.Gms; +using Android.Gms.Common; +using Android.Gms.Common.Apis; +using Android.Gms.Wearable; + +using Android.Support.Wearable.Views; + namespace DelayedConfirmation { [Activity (Label = "Wearable", MainLauncher = true, Icon = "@drawable/ic_launcher")] diff --git a/wear/DelayedConfirmation/DelayedConfirmationWear/Properties/AndroidManifest.xml b/wear/DelayedConfirmation/DelayedConfirmationWear/Properties/AndroidManifest.xml index 202c7419e..1c11fd656 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationWear/Properties/AndroidManifest.xml +++ b/wear/DelayedConfirmation/DelayedConfirmationWear/Properties/AndroidManifest.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/wear/DelayedConfirmation/DelayedConfirmationWear/packages.config b/wear/DelayedConfirmation/DelayedConfirmationWear/packages.config index 5856f915f..dee68526d 100644 --- a/wear/DelayedConfirmation/DelayedConfirmationWear/packages.config +++ b/wear/DelayedConfirmation/DelayedConfirmationWear/packages.config @@ -1,5 +1,8 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/wear/ElizaChat/ElizaChat/ElizaChat.csproj b/wear/ElizaChat/ElizaChat/ElizaChat.csproj index d00a53ef8..4821f6450 100644 --- a/wear/ElizaChat/ElizaChat/ElizaChat.csproj +++ b/wear/ElizaChat/ElizaChat/ElizaChat.csproj @@ -15,7 +15,7 @@ False ElizaChat Properties\AndroidManifest.xml - v4.4.87 + v5.0 true @@ -45,10 +45,13 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.2\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Wear.1.0.0-preview4\lib\MonoAndroid10\Xamarin.Android.Wearable.dll + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll diff --git a/wear/ElizaChat/ElizaChat/Properties/AndroidManifest.xml b/wear/ElizaChat/ElizaChat/Properties/AndroidManifest.xml index 302901d0e..21d4e8dad 100644 --- a/wear/ElizaChat/ElizaChat/Properties/AndroidManifest.xml +++ b/wear/ElizaChat/ElizaChat/Properties/AndroidManifest.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/wear/ElizaChat/ElizaChat/packages.config b/wear/ElizaChat/ElizaChat/packages.config index ade9d995f..c9e71717d 100644 --- a/wear/ElizaChat/ElizaChat/packages.config +++ b/wear/ElizaChat/ElizaChat/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/wear/FindMyPhoneSample/Application/Application.csproj b/wear/FindMyPhoneSample/Application/Application.csproj index 18eae3f65..e7030c737 100644 --- a/wear/FindMyPhoneSample/Application/Application.csproj +++ b/wear/FindMyPhoneSample/Application/Application.csproj @@ -14,7 +14,7 @@ True False Application - v4.4.87 + v5.0 Properties\AndroidManifest.xml @@ -44,20 +44,14 @@ - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v7.AppCompat.dll - - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - ..\packages\Xamarin.Android.Wear.1.1.0.2\lib\MonoAndroid44\Xamarin.Android.Wearable.dll + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/FindMyPhoneSample/Application/packages.config b/wear/FindMyPhoneSample/Application/packages.config index 411dd335f..bac4d65ae 100644 --- a/wear/FindMyPhoneSample/Application/packages.config +++ b/wear/FindMyPhoneSample/Application/packages.config @@ -1,8 +1,6 @@  - - - - - + + + \ No newline at end of file diff --git a/wear/FindMyPhoneSample/Wearable/DisconnectListenerService.cs b/wear/FindMyPhoneSample/Wearable/DisconnectListenerService.cs index a454dd90e..e41f5e368 100644 --- a/wear/FindMyPhoneSample/Wearable/DisconnectListenerService.cs +++ b/wear/FindMyPhoneSample/Wearable/DisconnectListenerService.cs @@ -1,6 +1,7 @@ using System; using Android.App; using Android.Gms.Wearable; + namespace FindMyPhoneSample { [Service] diff --git a/wear/FindMyPhoneSample/Wearable/Wearable.csproj b/wear/FindMyPhoneSample/Wearable/Wearable.csproj index 6f09cb8ed..86aee0860 100644 --- a/wear/FindMyPhoneSample/Wearable/Wearable.csproj +++ b/wear/FindMyPhoneSample/Wearable/Wearable.csproj @@ -15,7 +15,7 @@ False FindMyPhoneSample Properties\AndroidManifest.xml - v4.4.87 + v5.0 false @@ -46,14 +46,14 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll - - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - ..\packages\Xamarin.Android.Wear.1.0.0-preview7\lib\MonoAndroid10\Xamarin.Android.Wearable.dll + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/FindMyPhoneSample/Wearable/packages.config b/wear/FindMyPhoneSample/Wearable/packages.config index 6fa5e3d23..9531cfae5 100644 --- a/wear/FindMyPhoneSample/Wearable/packages.config +++ b/wear/FindMyPhoneSample/Wearable/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/wear/FlashlightSample/FlashlightSample/FlashlightSample.csproj b/wear/FlashlightSample/FlashlightSample/FlashlightSample.csproj index ee4693171..ac33a2024 100644 --- a/wear/FlashlightSample/FlashlightSample/FlashlightSample.csproj +++ b/wear/FlashlightSample/FlashlightSample/FlashlightSample.csproj @@ -15,7 +15,7 @@ False FlashlightSample Properties\AndroidManifest.xml - v4.4.87 + v5.0 false @@ -46,8 +46,8 @@ - - ..\packages\Xamarin.Android.Support.v13.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v13.dll + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/wear/FlashlightSample/FlashlightSample/MainActivity.cs b/wear/FlashlightSample/FlashlightSample/MainActivity.cs index 18be132cd..049a25fc3 100644 --- a/wear/FlashlightSample/FlashlightSample/MainActivity.cs +++ b/wear/FlashlightSample/FlashlightSample/MainActivity.cs @@ -7,14 +7,14 @@ using Android.Views; using Android.Widget; using Android.OS; -using Android.Support.V13.App; using Android.Support.V4.View; - +using Android.Support.V4.App; +using Fragment = Android.Support.V4.App.Fragment; namespace FlashlightSample { [Activity (Label = "FlashlightSample", MainLauncher = true, Icon = "@drawable/ic_launcher")] - public class MainActivity : Activity + public class MainActivity : FragmentActivity { private ViewPager view_pager; public PartyLightFragment party_fragment; @@ -27,7 +27,7 @@ protected override void OnCreate (Bundle bundle) view_pager = (FindViewById (Resource.Id.pager)); //make the first page the white light fragment - LightFragmentAdapter adapter = new LightFragmentAdapter (FragmentManager); + LightFragmentAdapter adapter = new LightFragmentAdapter (SupportFragmentManager); adapter.AddFragment (new WhiteLightFragment ()); //make the second page the party light fragment @@ -45,7 +45,8 @@ public class LightFragmentAdapter : FragmentPagerAdapter private List fragments; - public LightFragmentAdapter(FragmentManager fm) : base(fm) + public LightFragmentAdapter (Android.Support.V4.App.FragmentManager fm) + : base(fm) { fragments = new List (); } @@ -98,14 +99,16 @@ public void StopCycling() } } - public class MyOnPageListener : Java.Lang.Object,ViewPager.IOnPageChangeListener + public class MyOnPageListener : Java.Lang.Object, ViewPager.IOnPageChangeListener { MainActivity a; - public MyOnPageListener(MainActivity activity) + + public MyOnPageListener (MainActivity activity) { a = activity; } - public void OnPageSelected(int position) + + public void OnPageSelected (int position) { if (position == 1) { a.party_fragment.StartCycling (); @@ -114,11 +117,11 @@ public void OnPageSelected(int position) } } - public void OnPageScrolled(int position, float positionOffset, int positionOffsetPixels) + public void OnPageScrolled (int position, float positionOffset, int positionOffsetPixels) { } - public void OnPageScrollStateChanged(int state) + public void OnPageScrollStateChanged (int state) { } } diff --git a/wear/FlashlightSample/FlashlightSample/packages.config b/wear/FlashlightSample/FlashlightSample/packages.config index 6c157c70a..91bdba9c6 100644 --- a/wear/FlashlightSample/FlashlightSample/packages.config +++ b/wear/FlashlightSample/FlashlightSample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/wear/Geofencing/Geofencing/Geofencing.csproj b/wear/Geofencing/Geofencing/Geofencing.csproj index 9f0997eb5..620d15a20 100644 --- a/wear/Geofencing/Geofencing/Geofencing.csproj +++ b/wear/Geofencing/Geofencing/Geofencing.csproj @@ -45,19 +45,19 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Maps.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll + ..\packages\Xamarin.GooglePlayServices.Maps.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll - ..\packages\Xamarin.GooglePlayServices.Location.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + ..\packages\Xamarin.GooglePlayServices.Location.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Location.dll + + + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/Geofencing/Geofencing/MainActivity.cs b/wear/Geofencing/Geofencing/MainActivity.cs index 9724fd0e0..4cf99a202 100644 --- a/wear/Geofencing/Geofencing/MainActivity.cs +++ b/wear/Geofencing/Geofencing/MainActivity.cs @@ -7,10 +7,11 @@ using Android.Widget; using Android.OS; using System.Collections.Generic; -using Android.Gms.Location; using Android.Util; -using Android.Gms.Common.Apis; + using Android.Gms.Common; +using Android.Gms.Common.Apis; +using Android.Gms.Location; namespace Geofencing { diff --git a/wear/Geofencing/Geofencing/packages.config b/wear/Geofencing/Geofencing/packages.config index bfb4f9f2a..a8a19d756 100644 --- a/wear/Geofencing/Geofencing/packages.config +++ b/wear/Geofencing/Geofencing/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/wear/Geofencing/Wearable/Wearable.csproj b/wear/Geofencing/Wearable/Wearable.csproj index 5ff01a037..88d638f22 100644 --- a/wear/Geofencing/Wearable/Wearable.csproj +++ b/wear/Geofencing/Wearable/Wearable.csproj @@ -44,20 +44,20 @@ - - ..\packages\Xamarin.Android.Wear.1.2.0-rc3\lib\MonoAndroid5\Xamarin.Android.Wearable.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll diff --git a/wear/Geofencing/Wearable/packages.config b/wear/Geofencing/Wearable/packages.config index 84eca16a6..dee68526d 100644 --- a/wear/Geofencing/Wearable/packages.config +++ b/wear/Geofencing/Wearable/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/wear/GridViewPager/GridViewPager/GridViewPagerSample.csproj b/wear/GridViewPager/GridViewPager/GridViewPagerSample.csproj index d7e5bcba3..effcf8bb0 100644 --- a/wear/GridViewPager/GridViewPager/GridViewPagerSample.csproj +++ b/wear/GridViewPager/GridViewPager/GridViewPagerSample.csproj @@ -45,13 +45,13 @@ - ..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.0.0-rc1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Wear.1.1.0.2\lib\MonoAndroid44\Xamarin.Android.Wearable.dll + ..\packages\Xamarin.Android.Wear.1.3.0.0-rc2\lib\MonoAndroid50\Xamarin.Android.Wearable.dll diff --git a/wear/GridViewPager/GridViewPager/packages.config b/wear/GridViewPager/GridViewPager/packages.config index b6d220a3b..b0f7854cf 100644 --- a/wear/GridViewPager/GridViewPager/packages.config +++ b/wear/GridViewPager/GridViewPager/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/wear/JumpingJack/JumpingJack/CounterFragment.cs b/wear/JumpingJack/JumpingJack/CounterFragment.cs index 46bcdbbc5..9f2311504 100644 --- a/wear/JumpingJack/JumpingJack/CounterFragment.cs +++ b/wear/JumpingJack/JumpingJack/CounterFragment.cs @@ -18,7 +18,7 @@ namespace JumpingJack { - public class MyRunnable : Java.Lang.Object,IRunnable + public class MyRunnable : Java.Lang.Object, IRunnable { CounterFragment cf; public MyRunnable(CounterFragment counterFragment) @@ -32,6 +32,7 @@ public void Run() cf.up = !cf.up; } } + public class MyTimertask : TimerTask { CounterFragment cf; @@ -45,7 +46,7 @@ public override void Run () } } - public class CounterFragment : Fragment + public class CounterFragment : Android.Support.V4.App.Fragment { const int ANIMATION_INTERVAL_MS = 500; diff --git a/wear/JumpingJack/JumpingJack/JumpingJack.csproj b/wear/JumpingJack/JumpingJack/JumpingJack.csproj index 65045b4c8..cc97d9c7c 100644 --- a/wear/JumpingJack/JumpingJack/JumpingJack.csproj +++ b/wear/JumpingJack/JumpingJack/JumpingJack.csproj @@ -15,7 +15,7 @@ False JumpingJack Properties\AndroidManifest.xml - v4.4.87 + v5.0 true @@ -44,8 +44,8 @@ - - ..\Components\xamandroidsupportv13-18-20.0.0\lib\android\Xamarin.Android.Support.v13.dll + + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -61,14 +61,9 @@ + - - - 20.0.0 - False - - diff --git a/wear/JumpingJack/JumpingJack/MainActivity.cs b/wear/JumpingJack/JumpingJack/MainActivity.cs index 82c6159ff..f5742eedd 100644 --- a/wear/JumpingJack/JumpingJack/MainActivity.cs +++ b/wear/JumpingJack/JumpingJack/MainActivity.cs @@ -12,6 +12,7 @@ using Java.Util; using Java.Lang; +using Android.Support.V4.App; namespace JumpingJack { @@ -72,8 +73,9 @@ public void Run() activity.Finish (); } } + [Activity (Label = "JumpingJack", MainLauncher = true, Icon = "@drawable/ic_launcher")] - public class MainActivity : Activity,ISensorEventListener + public class MainActivity : FragmentActivity, ISensorEventListener { public const string TAG = "JJMainActivity"; @@ -121,7 +123,7 @@ private void SetUpViews() pager = (ViewPager)FindViewById (Resource.Id.pager); first_indicator = (ImageView)FindViewById (Resource.Id.indicator_0); second_indicator = (ImageView)FindViewById (Resource.Id.indicator_1); - PagerAdapter adapter = new PagerAdapter (FragmentManager); + PagerAdapter adapter = new PagerAdapter (SupportFragmentManager); counter_page = new CounterFragment (); setting_page = new SettingsFragment (this); adapter.AddFragment (counter_page); diff --git a/wear/JumpingJack/JumpingJack/PagerAdapter.cs b/wear/JumpingJack/JumpingJack/PagerAdapter.cs index af88e16bc..64b7d6a6a 100644 --- a/wear/JumpingJack/JumpingJack/PagerAdapter.cs +++ b/wear/JumpingJack/JumpingJack/PagerAdapter.cs @@ -1,16 +1,18 @@ using System; using System.Collections.Generic; -using Android.App; -using Android.Support.V13.App; -using Java.Util; +using Android.App; +using Android.Support.V4.App; +using Fragment = Android.Support.V4.App.Fragment; namespace JumpingJack { public class PagerAdapter : FragmentPagerAdapter { List fragments = null; - public PagerAdapter (FragmentManager fm) : base(fm) + + public PagerAdapter (Android.Support.V4.App.FragmentManager fm) + : base(fm) { fragments = new List (); } @@ -26,7 +28,7 @@ public override int Count { } } - public void AddFragment(Fragment fragment) + public void AddFragment (Fragment fragment) { fragments.Add (fragment); NotifyDataSetChanged (); diff --git a/wear/JumpingJack/JumpingJack/Properties/AndroidManifest.xml b/wear/JumpingJack/JumpingJack/Properties/AndroidManifest.xml index 5dbefa495..2fde99ba7 100644 --- a/wear/JumpingJack/JumpingJack/Properties/AndroidManifest.xml +++ b/wear/JumpingJack/JumpingJack/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/wear/JumpingJack/JumpingJack/SettingsFragment.cs b/wear/JumpingJack/JumpingJack/SettingsFragment.cs index 1ecc54c86..a1df22658 100644 --- a/wear/JumpingJack/JumpingJack/SettingsFragment.cs +++ b/wear/JumpingJack/JumpingJack/SettingsFragment.cs @@ -14,7 +14,7 @@ namespace JumpingJack { - public class SettingsFragment : Fragment + public class SettingsFragment : Android.Support.V4.App.Fragment { private Button button; private MainActivity main_activity; diff --git a/wear/JumpingJack/JumpingJack/packages.config b/wear/JumpingJack/JumpingJack/packages.config new file mode 100644 index 000000000..91bdba9c6 --- /dev/null +++ b/wear/JumpingJack/JumpingJack/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/wear/Quiz/Quiz/Quiz.csproj b/wear/Quiz/Quiz/Quiz.csproj index f23dc7237..bd172c537 100644 --- a/wear/Quiz/Quiz/Quiz.csproj +++ b/wear/Quiz/Quiz/Quiz.csproj @@ -46,13 +46,13 @@ - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/Quiz/Quiz/packages.config b/wear/Quiz/Quiz/packages.config index 87f072458..9531cfae5 100644 --- a/wear/Quiz/Quiz/packages.config +++ b/wear/Quiz/Quiz/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/wear/Quiz/Wearable/Wearable.csproj b/wear/Quiz/Wearable/Wearable.csproj index 04b94ce16..b1d9282b3 100644 --- a/wear/Quiz/Wearable/Wearable.csproj +++ b/wear/Quiz/Wearable/Wearable.csproj @@ -44,20 +44,14 @@ - - ..\packages\Xamarin.Android.Wear.1.2.0-rc3\lib\MonoAndroid5\Xamarin.Android.Wearable.dll - - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.0.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.GooglePlayServices.Base.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll + ..\packages\Xamarin.GooglePlayServices.Base.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll - ..\packages\Xamarin.GooglePlayServices.Wearable.25.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.GooglePlayServices.Wearable.26.0.0.0-rc3\lib\MonoAndroid41\Xamarin.GooglePlayServices.Wearable.dll diff --git a/wear/Quiz/Wearable/packages.config b/wear/Quiz/Wearable/packages.config index 84eca16a6..9531cfae5 100644 --- a/wear/Quiz/Wearable/packages.config +++ b/wear/Quiz/Wearable/packages.config @@ -1,8 +1,6 @@  - - - - - + + + \ No newline at end of file diff --git a/wear/RecipeAssistant/RecipeAssistant/RecipeAssistant.csproj b/wear/RecipeAssistant/RecipeAssistant/RecipeAssistant.csproj index 5d8ca6498..3bb8f84c6 100644 --- a/wear/RecipeAssistant/RecipeAssistant/RecipeAssistant.csproj +++ b/wear/RecipeAssistant/RecipeAssistant/RecipeAssistant.csproj @@ -45,7 +45,7 @@ - ..\packages\Xamarin.Android.Support.v4.20.0.0.3\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.23.0.1.0-rc2\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll diff --git a/wear/RecipeAssistant/RecipeAssistant/packages.config b/wear/RecipeAssistant/RecipeAssistant/packages.config index 4a87d846c..f474a4806 100644 --- a/wear/RecipeAssistant/RecipeAssistant/packages.config +++ b/wear/RecipeAssistant/RecipeAssistant/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/wear/SkeletonWear/SkeletonWear/GridExampleActivity.cs b/wear/SkeletonWear/SkeletonWear/GridExampleActivity.cs index 80346a9e4..01b4632f0 100644 --- a/wear/SkeletonWear/SkeletonWear/GridExampleActivity.cs +++ b/wear/SkeletonWear/SkeletonWear/GridExampleActivity.cs @@ -10,6 +10,8 @@ using Android.Views; using Android.Widget; using Android.Graphics; +using Android.Graphics.Drawables; + using Android.Support.Wearable.Views; namespace SkeletonWear @@ -37,7 +39,7 @@ internal class MainAdapter : FragmentGridPagerAdapter /*Java generics do not exist in bytecode, so the Java project's Hashmap * would be Hashmap. Using C#'s Dictionary provides the same functionality with trivial changes to use. */ - Dictionary mBackgrounds = new Dictionary (); + Dictionary mBackgrounds = new Dictionary (); GridExampleActivity owner; public MainAdapter (FragmentManager fm, GridExampleActivity owner) : base (fm) @@ -61,26 +63,26 @@ public override Fragment GetFragment (int row, int col) return MainFragment.NewInstance (row, col); } - public override ImageReference GetBackground (int row, int col) + public override Android.Graphics.Drawables.Drawable GetBackgroundForPage (int row, int column) { - var pt = new Point (row, col); - ImageReference imgRef = null; - if(mBackgrounds.ContainsKey(pt)) - imgRef = mBackgrounds [pt]; - if (imgRef == null) { + Point pt = new Point (column, row); + Drawable drawable = mBackgrounds [pt]; + if (drawable == null) { var bm = Bitmap.CreateBitmap (200, 200, Bitmap.Config.Argb8888); var c = new Canvas (bm); var p = new Paint (); + // Clear previous image. c.DrawRect (0, 0, 200, 200, p); p.AntiAlias = true; p.SetTypeface (Typeface.Default); p.TextSize = 64; p.Color = Color.LightGray; - c.DrawText (col + "-" + row, 20, 100, p); - imgRef = ImageReference.ForBitmap (bm); - mBackgrounds.Add (pt, imgRef); + p.TextAlign = Paint.Align.Center; + c.DrawText (column+ "-" + row, 100, 100, p); + drawable = new BitmapDrawable (owner.Resources, bm); + mBackgrounds.Add (pt, drawable); } - return imgRef; + return drawable; } } diff --git a/wear/SkeletonWear/SkeletonWear/Properties/AndroidManifest.xml b/wear/SkeletonWear/SkeletonWear/Properties/AndroidManifest.xml index 056c9372b..5341e71d4 100644 --- a/wear/SkeletonWear/SkeletonWear/Properties/AndroidManifest.xml +++ b/wear/SkeletonWear/SkeletonWear/Properties/AndroidManifest.xml @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/wear/SkeletonWear/SkeletonWear/Resources/layout/main_activity.xml b/wear/SkeletonWear/SkeletonWear/Resources/layout/main_activity.xml index 7b92da27c..5ab4ef8ef 100644 --- a/wear/SkeletonWear/SkeletonWear/Resources/layout/main_activity.xml +++ b/wear/SkeletonWear/SkeletonWear/Resources/layout/main_activity.xml @@ -1,10 +1,7 @@ - - - - - - + android:textColor="#006600" />