From ea2d1c8481123b68a86626f7c1c4432f475e8063 Mon Sep 17 00:00:00 2001 From: Kent Green Date: Tue, 1 Dec 2020 14:59:19 -0800 Subject: [PATCH] version retargeting --- .../FormsGallery.Android.csproj | 382 +++++++++++++----- .../FormsGallery.Android/packages.config | 134 +++--- .../FormsGallery.iOS/FormsGallery.iOS.csproj | 6 +- FormsGallery/FormsGallery.iOS/Info.plist | 2 +- 4 files changed, 368 insertions(+), 156 deletions(-) diff --git a/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj b/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj index 1fa10d1..4414fa8 100644 --- a/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj +++ b/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj @@ -1,6 +1,7 @@  + Debug @@ -17,7 +18,7 @@ true Resources\Resource.Designer.cs Properties\AndroidManifest.xml - v9.0 + v11.0 1G false @@ -53,9 +54,7 @@ - - ..\..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll - + ..\..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll @@ -65,93 +64,84 @@ ..\..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll - - ..\..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll - ..\..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll + + ..\..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll + ..\..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll ..\..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll - - ..\..\packages\Xamarin.Android.Support.Collections.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Collections.dll + + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - ..\..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll - - - ..\..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll - - - ..\..\packages\Xamarin.Android.Support.Interpolator.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll - - - ..\..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll - - - ..\..\packages\Xamarin.Android.Support.Print.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Print.dll - - - ..\..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll - - - ..\..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll - - - ..\..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Compat.dll + + ..\..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll ..\..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll - - ..\..\packages\Xamarin.Android.Support.CustomView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll + + ..\..\packages\Xamarin.Android.Support.Collections.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Collections.dll + + + ..\..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Compat.dll ..\..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll - - ..\..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll - - - ..\..\packages\Xamarin.Android.Support.Loader.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Loader.dll + + ..\..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll ..\..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll + + ..\..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll + + + ..\..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll + + + ..\..\packages\Xamarin.Android.Support.CustomView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll + + + ..\..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Design.dll + + + ..\..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll + + + ..\..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll + + + ..\..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll + + + ..\..\packages\Xamarin.Android.Support.Interpolator.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll + + + ..\..\packages\Xamarin.Android.Support.Loader.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Loader.dll + + + ..\..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll + + ..\..\packages\Xamarin.Android.Support.Print.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Print.dll + ..\..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll ..\..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll - - ..\..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll - - - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll - - - ..\..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll - - - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll - - - ..\..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.Transition.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Transition.dll @@ -161,48 +151,182 @@ ..\..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll - - ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Design.dll + + ..\..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll - - ..\..\packages\Xamarin.GooglePlayServices.Basement.71.1620.4\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll + + ..\..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll - - ..\..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.4\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll + + ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll - - ..\..\packages\Xamarin.GooglePlayServices.Base.71.1610.4\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll + + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll - - ..\..\packages\Xamarin.GooglePlayServices.Maps.71.1610.4\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll + + ..\..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll + + + ..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll + + + ..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.1\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll + + + ..\..\packages\Xamarin.AndroidX.Annotation.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll + + + ..\..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll + + + ..\..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll + + + ..\..\packages\Xamarin.AndroidX.CardView.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.CardView.dll + + + ..\..\packages\Xamarin.AndroidX.Collection.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Collection.dll + + + ..\..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll + + + ..\..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.1\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll + + + ..\..\packages\Xamarin.AndroidX.Interpolator.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll + + + ..\..\packages\Xamarin.AndroidX.Lifecycle.Common.2.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll + + + ..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll + + + ..\..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll + + + ..\..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll + + + ..\..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll + + + ..\..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll + + + ..\..\packages\Xamarin.AndroidX.Print.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Print.dll + + + ..\..\packages\Xamarin.AndroidX.SavedState.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll + + + ..\..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll + + + ..\..\packages\Xamarin.AndroidX.Core.1.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Core.dll + + + ..\..\packages\Xamarin.AndroidX.Activity.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Activity.dll + + + ..\..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll + + + ..\..\packages\Xamarin.AndroidX.CustomView.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll + + + ..\..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll + + + ..\..\packages\Xamarin.AndroidX.DrawerLayout.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll + + + ..\..\packages\Xamarin.AndroidX.Loader.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Loader.dll + + + ..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll + + + ..\..\packages\Xamarin.AndroidX.Media.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Media.dll + + + ..\..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll + + + ..\..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll + + + ..\..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll + + + ..\..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll + + + ..\..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll + + + ..\..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll + + + ..\..\packages\Xamarin.AndroidX.ViewPager.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll + + + ..\..\packages\Xamarin.AndroidX.Fragment.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll + + + ..\..\packages\Xamarin.AndroidX.AppCompat.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll + + + ..\..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll + + + ..\..\packages\Xamarin.AndroidX.Browser.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Browser.dll + + + ..\..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll + + + ..\..\packages\Xamarin.AndroidX.Transition.1.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Transition.dll + + + ..\..\packages\Xamarin.Google.Android.Material.1.0.0.1\lib\monoandroid90\Xamarin.Google.Android.Material.dll - - ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid90\FormsViewGroup.dll + ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid10.0\FormsViewGroup.dll - ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid90\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll - ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid90\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll - ..\..\packages\Xamarin.Forms.Maps.4.8.0.1451\lib\MonoAndroid90\Xamarin.Forms.Maps.Android.dll + ..\..\packages\Xamarin.Forms.Maps.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Maps.Android.dll - ..\..\packages\Xamarin.Forms.Maps.4.8.0.1451\lib\MonoAndroid90\Xamarin.Forms.Maps.dll + ..\..\packages\Xamarin.Forms.Maps.4.8.0.1687\lib\MonoAndroid10.0\Xamarin.Forms.Maps.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Base.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Maps.117.0.0\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll @@ -244,49 +368,91 @@ - - + - - - - - - - - - + + - + + - - + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FormsGallery/FormsGallery.Android/packages.config b/FormsGallery/FormsGallery.Android/packages.config index d9139a0..f5151cd 100644 --- a/FormsGallery/FormsGallery.Android/packages.config +++ b/FormsGallery/FormsGallery.Android/packages.config @@ -1,49 +1,91 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj b/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj index ed9f340..8e655c1 100644 --- a/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj +++ b/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj @@ -22,7 +22,7 @@ prompt 4 false - x86_64 + i386, x86_64 None true NSUrlSessionHandler @@ -52,6 +52,7 @@ true Entitlements.plist NSUrlSessionHandler + SdkOnly none @@ -64,6 +65,7 @@ iPhone Developer Entitlements.plist NSUrlSessionHandler + SdkOnly none @@ -78,6 +80,7 @@ iPhone Distribution Entitlements.plist NSUrlSessionHandler + SdkOnly none @@ -91,6 +94,7 @@ iPhone Distribution Entitlements.plist NSUrlSessionHandler + SdkOnly diff --git a/FormsGallery/FormsGallery.iOS/Info.plist b/FormsGallery/FormsGallery.iOS/Info.plist index e09fa88..590af99 100755 --- a/FormsGallery/FormsGallery.iOS/Info.plist +++ b/FormsGallery/FormsGallery.iOS/Info.plist @@ -21,7 +21,7 @@ UIInterfaceOrientationLandscapeRight MinimumOSVersion - 8.0 + 9.0 CFBundleDisplayName FormsGallery CFBundleIdentifier