From 3bc36731b4f9331808e1851b4077f35cdef772a9 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 1 Sep 2020 19:21:20 +0100 Subject: [PATCH] [Build] Remove VS2017 and old XCODE support, move Flex to core project (#11972) * [Pages] Remove pages * [Pages] Remove PagesGallery update sln * [Build] Remove 2017 * [Build] Cleanup cake VS2017 * [Build] Remove Xamarin.Build.TypeRedirector * [Build] Remove references to Use2017 * Update Xamarin.Forms.nuspec * Update Xamarin.Forms.Platform.UAP.csproj * [Android]remove Monodroid90 * Update build.cake * Update Environment.Build.props * [Android] Remove extra manifest * [Android]Fix Android tests project * [Android] Remove __ANDROID_29__ checks * - remove a few more Android 9 references * - updates formsviewgroup 10.0 * Update FormsAppCompatActivity.cs * [iOS,macOS] Remove __XCODE11__ * [Core] Move Flex to core project * Update Embedding.iOS.csproj Co-authored-by: Shane Neuville --- .nuspec/Xamarin.Forms.AppLinks.nuspec | 8 --- .nuspec/Xamarin.Forms.DualScreen.nuspec | 8 --- .nuspec/Xamarin.Forms.Maps.nuspec | 9 --- .nuspec/Xamarin.Forms.Visual.Material.nuspec | 12 +--- .nuspec/Xamarin.Forms.nuspec | 57 ++----------------- .nuspec/Xamarin.Forms.targets | 36 +----------- ControlGallery.Build.props | 1 - .../Embedding.Droid/Android10.Build.targets | 12 ---- .../Embedding.Droid/Directory.Build.targets | 11 +++- .../Embedding.Droid/Embedding.Droid.csproj | 3 - .../Properties/AndroidManifest28.xml | 5 -- .../Embedding.iOS/Embedding.iOS.csproj | 5 +- Environment.Build.props | 10 +--- ...Forms.Platform.Android (Forwarders).csproj | 11 ---- ...rin.Forms.Platform.iOS (Forwarders).csproj | 8 +-- Xamarin.Flex/Xamarin.Flex.projitems | 14 ----- Xamarin.Flex/Xamarin.Flex.shproj | 11 ---- .../Android10.Build.targets | 10 ---- .../CustomRenderers.cs | 8 --- .../Directory.Build.targets | 12 +++- .../DrawableExtensions.cs | 24 -------- .../Issue7249SwitchRenderer.cs | 8 --- ...2019.Build.targets => Nuget.Build.targets} | 2 +- .../Nuget2017.Build.targets | 7 --- .../Properties/AndroidManifest28.xml | 23 -------- .../StaggeredCollectionViewRenderer.cs | 5 -- ...amarin.Forms.ControlGallery.Android.csproj | 10 +--- .../_50787CustomRenderer.cs | 4 -- .../AppDelegate.cs | 2 - .../PerformanceTrackerRenderer.cs | 4 -- .../Xamarin.Forms.ControlGallery.iOS.csproj | 1 - {Xamarin.Flex => Xamarin.Forms.Core}/Flex.cs | 0 Xamarin.Forms.Core/Xamarin.Forms.Core.csproj | 1 - .../Xamarin.Forms.DualScreen.csproj | 12 ---- Xamarin.Forms.Maps.Android/MapRenderer.cs | 4 -- .../Xamarin.Forms.Maps.Android.csproj | 7 --- .../Xamarin.Forms.Maps.iOS.csproj | 8 +-- .../MaterialActivityIndicatorRenderer.cs | 6 -- .../MaterialButtonRenderer.cs | 9 --- .../MaterialCheckBoxRenderer.cs | 11 +--- .../MaterialContextThemeWrapper.cs | 6 -- .../MaterialFormsEditTextBase.cs | 5 -- .../MaterialFormsEditTextManager.cs | 4 -- .../MaterialFormsTextInputLayoutBase.cs | 6 -- .../MaterialFrameRenderer.cs | 7 --- .../MaterialProgressBarRenderer.cs | 6 -- .../MaterialSliderRenderer.cs | 6 -- .../MaterialStepperRenderer.cs | 7 --- .../Xamarin.Forms.Material.Android.csproj | 11 ---- .../Xamarin.Forms.Material.iOS.csproj | 5 +- ...rin.Forms.Platform.Android.AppLinks.csproj | 7 --- ...rms.Platform.Android.FormsViewGroup.csproj | 2 +- .../AssertionExtensions.cs | 5 -- .../EmbeddingTests.cs | 2 +- .../PlatformTestFixture.cs | 5 -- .../ShellTests.cs | 11 +--- .../TestActivity.cs | 6 -- .../ToolbarExtensionsTests.cs | 2 +- ...in.Forms.Platform.Android.UnitTests.csproj | 6 +- .../AppCompat/ButtonRenderer.cs | 4 -- .../AppCompat/CarouselPageRenderer.cs | 9 +-- .../AppCompat/CheckBoxDesignerRenderer.cs | 9 --- .../AppCompat/CheckBoxRendererBase.cs | 10 +--- .../AppCompat/FormsAppCompatActivity.cs | 18 ------ .../AppCompat/FormsFragmentPagerAdapter.cs | 8 --- .../AppCompat/FormsViewPager.cs | 5 -- .../AppCompat/FragmentContainer.cs | 18 +----- .../AppCompat/IManageFragments.cs | 4 -- .../AppCompat/ImageButtonRenderer.cs | 5 -- .../AppCompat/MasterDetailContainer.cs | 6 -- .../AppCompat/MasterDetailPageRenderer.cs | 5 -- .../AppCompat/NavigationPageRenderer.cs | 12 ---- .../AppCompat/PageExtensions.cs | 4 -- .../AppCompat/RadioButtonRenderer.cs | 6 -- .../AppCompat/SwitchRenderer.cs | 5 -- .../AppCompat/TabbedPageRenderer.cs | 11 ---- .../ButtonLayoutManager.cs | 8 --- Xamarin.Forms.Platform.Android/CellAdapter.cs | 8 +-- .../Cells/BaseCellView.cs | 12 ---- .../Cells/EntryCellView.cs | 4 -- .../CollectionView/AdapterNotifier.cs | 7 +-- .../CarouselSpacingItemDecoration.cs | 6 -- .../CollectionView/CarouselViewRenderer.cs | 5 -- .../CollectionView/CenterSnapHelper.cs | 7 +-- .../CollectionView/DataChangeObserver.cs | 6 -- .../CollectionView/EdgeSnapHelper.cs | 5 -- .../CollectionView/EmptyViewAdapter.cs | 6 -- .../CollectionView/EndSingleSnapHelper.cs | 5 -- .../CollectionView/EndSnapHelper.cs | 5 -- .../GridLayoutSpanSizeLookup.cs | 7 +-- .../GroupableItemsViewAdapter.cs | 5 -- .../CollectionView/ItemsSourceFactory.cs | 7 --- .../CollectionView/ItemsViewAdapter.cs | 5 -- .../CollectionView/ItemsViewRenderer.cs | 7 --- .../CollectionView/NongreedySnapHelper.cs | 8 +-- .../PositionalSmoothScroller.cs | 5 -- .../RecyclerViewScrollListener.cs | 8 +-- .../CollectionView/ScrollHelper.cs | 6 -- .../SelectableItemsViewAdapter.cs | 5 -- .../CollectionView/SelectableViewHolder.cs | 6 -- .../CollectionView/SimpleViewHolder.cs | 5 -- .../CollectionView/SingleSnapHelper.cs | 5 -- .../CollectionView/SnapManager.cs | 5 -- .../CollectionView/SpacingItemDecoration.cs | 6 -- .../CollectionView/StartSingleSnapHelper.cs | 5 -- .../CollectionView/StartSnapHelper.cs | 5 -- .../StructuredItemsViewAdapter.cs | 5 -- .../ColorExtensions.cs | 5 -- .../ContextExtensions.cs | 6 -- .../Extensions/AccessibilityExtensions.cs | 5 -- .../Extensions/DrawableExtensions.cs | 22 ------- .../Extensions/FragmentManagerExtensions.cs | 6 -- .../Extensions/RecyclerExtensions.cs | 7 +-- .../Extensions/ToolbarExtensions.cs | 4 -- .../FastRenderers/ButtonRenderer.cs | 5 -- .../FastRenderers/FrameRenderer.cs | 6 -- .../FastRenderers/ImageElementManager.cs | 4 -- .../FastRenderers/ImageRenderer.cs | 4 -- .../FastRenderers/LabelRenderer.cs | 5 -- Xamarin.Forms.Platform.Android/Forms.cs | 4 -- .../GestureManager.cs | 4 -- .../IButtonLayoutRenderer.cs | 4 -- Xamarin.Forms.Platform.Android/Platform.cs | 6 -- .../PopupManager.cs | 5 -- .../Renderers/AHorizontalScrollView.cs | 4 -- .../Renderers/BottomNavigationViewUtils.cs | 8 --- .../Renderers/CarouselPageAdapter.cs | 4 -- .../Renderers/CarouselPageRenderer.cs | 5 -- .../Renderers/EntryRenderer.cs | 4 -- .../Renderers/FormsEditText.cs | 5 -- ...llBottomNavigationViewAppearanceTracker.cs | 7 +-- .../Renderers/IShellContext.cs | 6 -- .../Renderers/IShellItemRenderer.cs | 7 +-- .../Renderers/IShellObservableFragment.cs | 6 +- .../IShellTabLayoutAppearanceTracker.cs | 4 -- .../IShellToolbarAppearanceTracker.cs | 5 -- .../Renderers/ListViewRenderer.cs | 4 -- .../Renderers/MasterDetailRenderer.cs | 6 -- .../Renderers/PageRenderer.cs | 8 --- .../Renderers/RefreshViewRenderer.cs | 7 --- .../Renderers/ScrollViewRenderer.cs | 4 -- .../ShellBottomNavViewAppearanceTracker.cs | 7 --- .../Renderers/ShellContentFragment.cs | 8 --- .../Renderers/ShellFlyoutRecyclerAdapter.cs | 5 -- .../Renderers/ShellFlyoutRenderer.cs | 6 -- .../ShellFlyoutTemplatedContentRenderer.cs | 6 -- .../Renderers/ShellFragmentPagerAdapter.cs | 11 +--- .../Renderers/ShellItemRenderer.cs | 8 --- .../Renderers/ShellItemRendererBase.cs | 7 +-- .../Renderers/ShellRenderer.cs | 11 ---- .../Renderers/ShellSearchView.cs | 5 -- .../Renderers/ShellSectionRenderer.cs | 12 ---- .../ShellTabLayoutAppearanceTracker.cs | 4 -- .../ShellToolbarAppearanceTracker.cs | 4 -- .../Renderers/ShellToolbarTracker.cs | 11 ---- .../Renderers/SwipeViewRenderer.cs | 7 --- .../Renderers/TableViewRenderer.cs | 4 -- .../ResourceManager.cs | 4 -- .../ViewExtensions.cs | 5 -- .../VisualElementRenderer.cs | 4 -- .../Xamarin.Forms.Platform.Android.csproj | 19 ------- .../Renderers/ListViewRenderer.cs | 2 - .../Xamarin.Forms.Platform.macOS.csproj | 10 ---- .../Xamarin.Forms.Platform.UAP.csproj | 1 - ...amarin.Forms.Platform.iOS.UnitTests.csproj | 10 ---- .../Extensions/ColorExtensions.cs | 39 +++++-------- .../Extensions/Extensions.cs | 2 - Xamarin.Forms.Platform.iOS/Forms.cs | 6 +- Xamarin.Forms.Platform.iOS/ModalWrapper.cs | 11 ++-- Xamarin.Forms.Platform.iOS/Platform.cs | 3 +- .../Renderers/ActivityIndicatorRenderer.cs | 2 - .../Renderers/FrameRenderer.cs | 2 - .../Renderers/ListViewRenderer.cs | 2 - .../Renderers/NavigationRenderer.cs | 13 ----- .../Renderers/PageRenderer.cs | 2 - .../Renderers/RadioButtonRenderer.cs | 2 - .../Renderers/SearchBarRenderer.cs | 2 - .../Renderers/TableViewRenderer.cs | 2 - Xamarin.Forms.Platform.iOS/ViewRenderer.cs | 2 - .../Xamarin.Forms.Platform.iOS.csproj | 16 +----- Xamarin.Forms.sln | 7 --- azure-pipelines.yml | 48 ---------------- build.cake | 56 ++++++------------ build/steps/build-android.yml | 21 ++----- build/steps/build-osx.yml | 44 +++----------- 185 files changed, 108 insertions(+), 1377 deletions(-) delete mode 100644 EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets delete mode 100644 EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest28.xml delete mode 100644 Xamarin.Flex/Xamarin.Flex.projitems delete mode 100644 Xamarin.Flex/Xamarin.Flex.shproj delete mode 100644 Xamarin.Forms.ControlGallery.Android/Android10.Build.targets rename Xamarin.Forms.ControlGallery.Android/{Nuget2019.Build.targets => Nuget.Build.targets} (90%) delete mode 100644 Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets delete mode 100644 Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest28.xml rename {Xamarin.Flex => Xamarin.Forms.Core}/Flex.cs (100%) diff --git a/.nuspec/Xamarin.Forms.AppLinks.nuspec b/.nuspec/Xamarin.Forms.AppLinks.nuspec index d3933ca99..c3ffa0068 100644 --- a/.nuspec/Xamarin.Forms.AppLinks.nuspec +++ b/.nuspec/Xamarin.Forms.AppLinks.nuspec @@ -14,10 +14,6 @@ Add support for deep linking and indexing app content using Xamarin.Forms on the Android Platform © Microsoft Corporation. All rights reserved. - - - - @@ -27,9 +23,6 @@ - - - @@ -38,7 +31,6 @@ - diff --git a/.nuspec/Xamarin.Forms.DualScreen.nuspec b/.nuspec/Xamarin.Forms.DualScreen.nuspec index 5883436d1..6391725e8 100644 --- a/.nuspec/Xamarin.Forms.DualScreen.nuspec +++ b/.nuspec/Xamarin.Forms.DualScreen.nuspec @@ -17,9 +17,6 @@ - - - @@ -37,11 +34,6 @@ - - - - - diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/.nuspec/Xamarin.Forms.Maps.nuspec index 337fa0a90..c9a99c44d 100644 --- a/.nuspec/Xamarin.Forms.Maps.nuspec +++ b/.nuspec/Xamarin.Forms.Maps.nuspec @@ -27,11 +27,6 @@ - - - - - @@ -46,10 +41,6 @@ - - - - diff --git a/.nuspec/Xamarin.Forms.Visual.Material.nuspec b/.nuspec/Xamarin.Forms.Visual.Material.nuspec index 5e919ea11..b39124eb9 100644 --- a/.nuspec/Xamarin.Forms.Visual.Material.nuspec +++ b/.nuspec/Xamarin.Forms.Visual.Material.nuspec @@ -20,10 +20,7 @@ - - - - + @@ -49,12 +46,7 @@ - - - - - - + diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec index 8e03afdfd..5722215f1 100644 --- a/.nuspec/Xamarin.Forms.nuspec +++ b/.nuspec/Xamarin.Forms.nuspec @@ -20,13 +20,6 @@ - - - - - - - @@ -64,13 +57,6 @@ - - - - - - - @@ -179,8 +165,6 @@ - - @@ -197,21 +181,6 @@ - - - - - - - - - - - - - - - @@ -228,22 +197,9 @@ - - - - - - - - - - - - - - - - + + + @@ -297,12 +253,7 @@ - - - - - - + diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets index b523a1e21..1f989d71f 100644 --- a/.nuspec/Xamarin.Forms.targets +++ b/.nuspec/Xamarin.Forms.targets @@ -182,47 +182,13 @@ - 9.0 + 10.0 $(TargetFrameworkVersion.TrimStart('vV')) - - - - - IncludeCorrectXIOSReference; - $(CoreCompileDependsOn); - - - IncludeCorrectXIOSReference; - $(PrepareForBuildDependsOn); - - - - - - - $(FrameworkSDKRoot.Contains('/Versions/5')) - true - false - Xamarin.Forms.Platform.iOS.dll - Xamarin.Forms.Platform.macOS.dll - - - - $(MSBuildThisFileDirectory)\XCODE11\$(FrameworkDll) - - - - - $(MSBuildThisFileDirectory)\XCODE10\$(FrameworkDll) - - - - diff --git a/ControlGallery.Build.props b/ControlGallery.Build.props index dcfd7795d..bbe4bd069 100644 --- a/ControlGallery.Build.props +++ b/ControlGallery.Build.props @@ -1,7 +1,6 @@ 7.3 - 7.3 $(CGLangVersion) diff --git a/EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets deleted file mode 100644 index 70191ec72..000000000 --- a/EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - 1.0.0.1 - - - - - - - - \ No newline at end of file diff --git a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets index f693d4103..4803776e3 100644 --- a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets +++ b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets @@ -1,3 +1,12 @@ - + + + 1.0.0.1 + + + + + + + \ No newline at end of file diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj index de3ad9651..21c7b5b49 100644 --- a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj +++ b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj @@ -16,12 +16,10 @@ True Resources\Resource.Designer.cs Off - v9.0 v10.0 $(AndroidTargetFrameworkVersion) Properties\AndroidManifest30.xml Properties\AndroidManifest.xml - Properties\AndroidManifest28.xml @@ -90,7 +88,6 @@ - diff --git a/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest28.xml b/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest28.xml deleted file mode 100644 index afbb0497d..000000000 --- a/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest28.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj index 0e0867bcb..5dcf1ee87 100644 --- a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj +++ b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj @@ -10,7 +10,6 @@ Embedding.iOS Resources Embedding.iOS - __XCODE11__;$(DefineConstants); true @@ -88,7 +87,7 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core - + {8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4} Xamarin.Forms.Material.iOS false @@ -112,4 +111,4 @@ - \ No newline at end of file + diff --git a/Environment.Build.props b/Environment.Build.props index e9e365abe..30cd17933 100644 --- a/Environment.Build.props +++ b/Environment.Build.props @@ -29,20 +29,12 @@ - $(FrameworkSDKRoot.Contains('/Versions/5')) - true - false - - - - 7.3 7.3 - MonoAndroid90; - MonoAndroid90;MonoAndroid10.0; + MonoAndroid10.0; diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj index f262bfc34..b9c911337 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj @@ -10,10 +10,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -31,11 +27,4 @@ - - - - - - - diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj index e461a74d6..8a1ee1ac4 100644 --- a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj @@ -62,10 +62,4 @@ - - - - - - - + \ No newline at end of file diff --git a/Xamarin.Flex/Xamarin.Flex.projitems b/Xamarin.Flex/Xamarin.Flex.projitems deleted file mode 100644 index 9e13e7076..000000000 --- a/Xamarin.Flex/Xamarin.Flex.projitems +++ /dev/null @@ -1,14 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {A6703C7D-D362-452A-A7A5-73771194D38C} - - - Xamarin.Flex - - - - - \ No newline at end of file diff --git a/Xamarin.Flex/Xamarin.Flex.shproj b/Xamarin.Flex/Xamarin.Flex.shproj deleted file mode 100644 index 657a1bd93..000000000 --- a/Xamarin.Flex/Xamarin.Flex.shproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {A6703C7D-D362-452A-A7A5-73771194D38C} - - - - - - - \ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/Android10.Build.targets b/Xamarin.Forms.ControlGallery.Android/Android10.Build.targets deleted file mode 100644 index 5cc90f956..000000000 --- a/Xamarin.Forms.ControlGallery.Android/Android10.Build.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs index ff27eadc8..901c3d6ac 100644 --- a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs +++ b/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs @@ -3,7 +3,6 @@ using Android.Widget; using Android.App; using System.Collections.Generic; using Android.Views; -using System.Collections; using System.ComponentModel; using System.Linq; using Xamarin.Forms.Controls; @@ -17,21 +16,14 @@ using Android.Runtime; using Android.Util; using AButton = Android.Widget.Button; using AView = Android.Views.View; -using AViewGroup = Android.Views.ViewGroup; using Android.OS; using System.Reflection; using Android.Text; using Android.Text.Method; using Xamarin.Forms.Controls.Issues; -#if __ANDROID_29__ using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction; using NestedScrollView = global::AndroidX.Core.Widget.NestedScrollView; -#else -using FragmentTransaction = Android.Support.V4.App.FragmentTransaction; -using NestedScrollView = global::Android.Support.V4.Widget.NestedScrollView; -#endif using AMenuItemCompat = global::Android.Support.V4.View.MenuItemCompat; -using Android.Support.V4.Content; using IOPath = System.IO.Path; [assembly: ExportRenderer(typeof(Issue5461.ScrollbarFadingEnabledFalseScrollView), typeof(ScrollbarFadingEnabledFalseScrollViewRenderer))] diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets index ec466d057..2f46f5d3a 100644 --- a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets +++ b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets @@ -1,6 +1,12 @@ - - - + + + + + + + + + diff --git a/Xamarin.Forms.ControlGallery.Android/DrawableExtensions.cs b/Xamarin.Forms.ControlGallery.Android/DrawableExtensions.cs index b5986ec05..24a55aea0 100644 --- a/Xamarin.Forms.ControlGallery.Android/DrawableExtensions.cs +++ b/Xamarin.Forms.ControlGallery.Android/DrawableExtensions.cs @@ -2,11 +2,7 @@ using ADrawable = Android.Graphics.Drawables.Drawable; using AColorFilter = Android.Graphics.ColorFilter; using AColor = Android.Graphics.Color; -#if __ANDROID_29__ using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat; -#else -using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat; -#endif using Android.Graphics; namespace Xamarin.Forms.Platform.Android @@ -21,7 +17,6 @@ namespace Xamarin.Forms.Platform.Android internal static class DrawableExtensions { -#if __ANDROID_29__ public static BlendMode GetFilterMode(FilterMode mode) { switch (mode) @@ -37,14 +32,6 @@ namespace Xamarin.Forms.Platform.Android throw new Exception("Invalid Mode"); } -#else - [Obsolete] - static PorterDuff.Mode GetFilterMode(FilterMode mode) - { - return GetFilterModePre29(mode); - } -#endif - [Obsolete] static PorterDuff.Mode GetFilterModePre29(FilterMode mode) { @@ -102,23 +89,12 @@ namespace Xamarin.Forms.Platform.Android public static void SetColorFilter(this ADrawable drawable, AColor color, FilterMode mode) { -#if __ANDROID_29__ if((int)global::Android.OS.Build.VERSION.SdkInt >= 29) drawable.SetColorFilter(new BlendModeColorFilter(color, GetFilterMode(mode))); else #pragma warning disable CS0612 // Type or member is obsolete #pragma warning disable CS0618 // Type or member is obsolete drawable.SetColorFilter(color, GetFilterModePre29(mode)); -#pragma warning restore CS0618 // Type or member is obsolete -#pragma warning restore CS0612 // Type or member is obsolete -#else -#pragma warning disable CS0612 // Type or member is obsolete -#pragma warning disable CS0618 // Type or member is obsolete - drawable.SetColorFilter(color, GetFilterMode(mode)); -#pragma warning restore CS0618 // Type or member is obsolete -#pragma warning restore CS0612 // Type or member is obsolete -#endif } - } } diff --git a/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs b/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs index 88aaed531..b241b88e1 100644 --- a/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs +++ b/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs @@ -55,19 +55,11 @@ namespace Xamarin.Forms.ControlGallery.Android if (Control.Checked) { -#if __ANDROID_29__ Control.TrackDrawable.SetColorFilter(new BlendModeColorFilter(_view.SwitchOffColor.ToAndroid(), BlendMode.SrcAtop)); -#else - Control.TrackDrawable.SetColorFilter(_view.SwitchOnColor.ToAndroid(), PorterDuff.Mode.SrcAtop); -#endif } else { -#if __ANDROID_29__ Control.TrackDrawable.SetColorFilter(new BlendModeColorFilter(_view.SwitchOffColor.ToAndroid(), BlendMode.SrcAtop)); -#else - Control.TrackDrawable.SetColorFilter(_view.SwitchOffColor.ToAndroid(), PorterDuff.Mode.SrcAtop); -#endif } } } diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets similarity index 90% rename from Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets rename to Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets index 9f0451812..c67ed2981 100644 --- a/Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets +++ b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets @@ -4,7 +4,7 @@ 0.10.0 - + 1.0.0 diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets deleted file mode 100644 index d5c7b72ce..000000000 --- a/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0.4.11 - - - \ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest28.xml b/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest28.xml deleted file mode 100644 index b06e28bf9..000000000 --- a/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest28.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs b/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs index 58d193450..1fd74003a 100644 --- a/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs +++ b/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs @@ -1,11 +1,6 @@ using System; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Xamarin.Forms; using Xamarin.Forms.ControlGallery.Android; using Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries.AlternateLayoutGalleries; diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index 69d5e9bb6..05ea3b45e 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -17,12 +17,10 @@ true Resources\Resource.Designer.cs Off - v9.0 v10.0 $(AndroidTargetFrameworkVersion) Properties\AndroidManifest30.xml Properties\AndroidManifest.xml - Properties\AndroidManifest28.xml ..\ true @@ -69,10 +67,9 @@ SdkOnly True true - d8 - r8 - false - true + d8 + r8 + false Full @@ -248,7 +245,6 @@ - diff --git a/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs b/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs index 376d4971e..8cbcc8672 100644 --- a/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs +++ b/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs @@ -3,11 +3,7 @@ using Android.Content; using Xamarin.Forms; using Xamarin.Forms.ControlGallery.Android; using Xamarin.Forms.Platform.Android.AppCompat; -#if __ANDROID_29__ using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction; -#else -using FragmentTransaction = Android.Support.V4.App.FragmentTransaction; -#endif [assembly: ExportRenderer(typeof(NavigationPage), typeof(_50787CustomRenderer))] namespace Xamarin.Forms.ControlGallery.Android { diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs index bbffd8cd0..b40647fce 100644 --- a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs +++ b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs @@ -154,9 +154,7 @@ namespace Xamarin.Forms.ControlGallery.iOS Forms.SetFlags("SwipeView_Experimental", "MediaElement_Experimental"); Forms.Init(); FormsMaps.Init(); -#if __XCODE11__ FormsMaterial.Init(); -#endif Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) => { diff --git a/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs b/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs index 0d3fba6c2..dbc8b5e3a 100644 --- a/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs +++ b/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs @@ -34,9 +34,7 @@ using Xamarin.Forms.Platform.iOS; [assembly: ExportRenderer(typeof(TableView), typeof(PerformanceTrackingTableView))] [assembly: ExportRenderer(typeof(TimePicker), typeof(PerformanceTrackingTimePicker))] [assembly: ExportRenderer(typeof(WebView), typeof(PerformanceTrackingWebView))] -#if __XCODE11__ [assembly: ExportRenderer(typeof(Entry), typeof(PerformanceTrackingMaterialEntry), new[] { typeof(VisualMarker.MaterialVisual) })] -#endif [assembly: ExportRenderer(typeof(Frame), typeof(PerformanceTrackingFrame))] @@ -580,7 +578,6 @@ namespace Xamarin.Forms.ControlGallery.iOS } } -#if __XCODE11__ public class PerformanceTrackingMaterialEntry : Material.iOS.MaterialEntryRenderer, IDrawnObservable { readonly SubviewWatcher _watcher; @@ -629,7 +626,6 @@ namespace Xamarin.Forms.ControlGallery.iOS base.Dispose(disposing); } } -#endif public class PerformanceTrackingImage : ImageRenderer, IDrawnObservable { diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj index da9463507..4aca2b35c 100644 --- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj +++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj @@ -14,7 +14,6 @@ XamarinFormsControlGalleryiOS ..\ true - __XCODE11__;$(DefineConstants); --nolinkaway --optimize=experimental-xforms-product-type diff --git a/Xamarin.Flex/Flex.cs b/Xamarin.Forms.Core/Flex.cs similarity index 100% rename from Xamarin.Flex/Flex.cs rename to Xamarin.Forms.Core/Flex.cs diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj index 4be554b20..d2d7374a7 100644 --- a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj +++ b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj @@ -26,7 +26,6 @@ high - diff --git a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj index 285c32c77..a39670618 100644 --- a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj +++ b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj @@ -19,10 +19,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -63,12 +59,4 @@ - - - - - - - - diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms.Maps.Android/MapRenderer.cs index 307b3ecb7..a87cf9902 100644 --- a/Xamarin.Forms.Maps.Android/MapRenderer.cs +++ b/Xamarin.Forms.Maps.Android/MapRenderer.cs @@ -11,11 +11,7 @@ using Android.Content.PM; using Android.Gms.Maps; using Android.Gms.Maps.Model; using Android.OS; -#if __ANDROID_29__ using AndroidX.Core.Content; -#else -using Android.Support.V4.Content; -#endif using Java.Lang; using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.Android; diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj index 2627ef855..cf8ed5954 100644 --- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj +++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj @@ -9,10 +9,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -34,7 +30,4 @@ - - - diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj index 2edd079c0..17448795f 100644 --- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj +++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj @@ -70,10 +70,4 @@ - - - - - - - + \ No newline at end of file diff --git a/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs index b63e2e199..f4a3f28c4 100644 --- a/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs @@ -1,16 +1,10 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif using Android.Views; using Android.Widget; -using Xamarin.Forms; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Material.Android; using Xamarin.Forms.Platform.Android; using AProgressBar = Android.Widget.ProgressBar; using AView = Android.Views.View; diff --git a/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs index 5188da7a1..3f952bef3 100644 --- a/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs @@ -1,25 +1,16 @@ using System; using System.ComponentModel; -using System.Threading.Tasks; using Android.Content; using Android.Content.Res; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.AppCompat.Widget; using MButton = Google.Android.Material.Button.MaterialButton; -#else -using Android.Support.V4.View; -using Android.Support.V7.Widget; -using MButton = Android.Support.Design.Button.MaterialButton; -#endif using Android.Util; using Android.Views; -using Xamarin.Forms; using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Material.Android; using Xamarin.Forms.Platform.Android; using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; using AColor = Android.Graphics.Color; diff --git a/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs b/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs index 62c98ced5..ddc74635d 100644 --- a/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs @@ -1,16 +1,7 @@ -using System; -using Android.Content; +using Android.Content; using Android.Content.Res; using Xamarin.Forms.Platform.Android; -using AColor = Android.Graphics.Color; -#if __ANDROID_29__ -using AColorUtils = AndroidX.Core.Graphics.ColorUtils; -#else -using AColorUtils = Android.Support.V4.Graphics.ColorUtils; -#endif using AAttribute = Android.Resource.Attribute; -using Android.Graphics.Drawables; -using Android.Graphics; namespace Xamarin.Forms.Material.Android { diff --git a/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs b/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs index 17bd846b0..2b4d83950 100644 --- a/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs +++ b/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs @@ -1,12 +1,6 @@  using Android.Content; using Android.Views; -using Xamarin.Forms.Platform.Android; -#if __ANDROID_29__ -using AndroidAppCompat = AndroidX.AppCompat.Content.Res.AppCompatResources; -#else -using AndroidAppCompat = Android.Support.V7.Content.Res.AppCompatResources; -#endif namespace Xamarin.Forms.Material.Android { diff --git a/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs b/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs index 9f2b2aac5..f6b1e5555 100644 --- a/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs +++ b/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs @@ -1,12 +1,7 @@ using System; using Android.Content; -using Android.Graphics; using Android.Views; -#if __ANDROID_29__ using Google.Android.Material.TextField; -#else -using Android.Support.Design.Widget; -#endif using Android.Runtime; using Android.Util; using Xamarin.Forms.Platform.Android; diff --git a/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs b/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs index 0eb318f14..45c732c0e 100644 --- a/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs +++ b/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs @@ -1,11 +1,7 @@  using System; using Android.Content; -#if __ANDROID_29__ using Google.Android.Material.TextField; -#else -using Android.Support.Design.Widget; -#endif using Xamarin.Forms.Platform.Android; namespace Xamarin.Forms.Material.Android diff --git a/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs b/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs index c989a27aa..8eeb9c244 100644 --- a/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs +++ b/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs @@ -3,14 +3,8 @@ using System; using Android.Content; using Android.Runtime; using Android.Util; -#if __ANDROID_29__ using AndroidX.Core.View; using Google.Android.Material.TextField; -#else -using Android.Support.V4.View; -using Android.Support.Design.Widget; -using Xamarin.Forms.Platform.Android.AppCompat; -#endif using Android.Content.Res; using AView = Android.Views.View; using Xamarin.Forms.Platform.Android; diff --git a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs index 2a4af8286..e2f545d67 100644 --- a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs @@ -2,17 +2,10 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; using MaterialCardView = Google.Android.Material.Card.MaterialCardView; -#else -using Android.Support.V4.View; -using MaterialCardView = Android.Support.Design.Card.MaterialCardView; -#endif using Android.Views; -using Xamarin.Forms; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Material.Android; using AView = Android.Views.View; using Xamarin.Forms.Platform.Android; using Android.Graphics.Drawables; diff --git a/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs b/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs index 73033275e..927b2b97e 100644 --- a/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs @@ -2,15 +2,9 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif using Android.Views; -using Xamarin.Forms; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Material.Android; using AProgressBar = Android.Widget.ProgressBar; using AView = Android.Views.View; using Xamarin.Forms.Platform.Android; diff --git a/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs b/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs index bbaf0a4d9..08741c90a 100644 --- a/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs @@ -1,16 +1,10 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif using Android.Views; using Android.Widget; -using Xamarin.Forms; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Material.Android; using AView = Android.Views.View; using Xamarin.Forms.Platform.Android; diff --git a/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs b/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs index 2ac44170b..a6be418e8 100644 --- a/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs @@ -3,16 +3,9 @@ using System.ComponentModel; using Android.Content; using Android.Views; using Android.Widget; -using Xamarin.Forms; -using Xamarin.Forms.Material.Android; using Xamarin.Forms.Platform.Android; using AButton = Android.Widget.Button; -#if __ANDROID_29__ using MButton = Google.Android.Material.Button.MaterialButton; -#else -using MButton = Android.Support.Design.Button.MaterialButton; -#endif - namespace Xamarin.Forms.Material.Android { diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj index d0c0a974c..7d893e7e1 100644 --- a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj +++ b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj @@ -11,10 +11,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -22,10 +18,6 @@ - - - - @@ -34,7 +26,4 @@ - - - diff --git a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj index d3f6361d8..a18ad2722 100644 --- a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj +++ b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj @@ -102,7 +102,4 @@ - - - - + \ No newline at end of file diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj index afbe9383c..9c12bb84a 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj +++ b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj @@ -12,10 +12,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -36,7 +32,4 @@ 1.0.0.1 - - - diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj b/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj index cd7174c83..1e77aeee6 100644 --- a/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj +++ b/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj @@ -15,7 +15,7 @@ FormsViewGroup FormsViewGroup 512 - v9.0 + v10.0 true diff --git a/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs b/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs index 3c7f13519..55de502d5 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs @@ -5,11 +5,6 @@ using System; using NUnit.Framework; using System.IO; -#if __ANDROID_29__ -#else -using Android.Support.V7.Widget; -#endif - namespace Xamarin.Forms.Platform.Android.UnitTests { internal static class AssertionExtensions diff --git a/Xamarin.Forms.Platform.Android.UnitTests/EmbeddingTests.cs b/Xamarin.Forms.Platform.Android.UnitTests/EmbeddingTests.cs index 3d47b6808..a7c9cde1c 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/EmbeddingTests.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/EmbeddingTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Android.Support.V4.App; +using AndroidX.Fragment.App; using NUnit.Framework; namespace Xamarin.Forms.Platform.Android.UnitTests diff --git a/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs b/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs index 1e78aed00..95303ee06 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs @@ -11,13 +11,8 @@ using ASearchView = Android.Widget.SearchView; using System.Collections.Generic; using NUnit.Framework; using System.Threading.Tasks; - -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; using AndroidX.CardView.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android.UnitTests { diff --git a/Xamarin.Forms.Platform.Android.UnitTests/ShellTests.cs b/Xamarin.Forms.Platform.Android.UnitTests/ShellTests.cs index ac4258101..29fe818ea 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/ShellTests.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/ShellTests.cs @@ -1,22 +1,13 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; using Android.Content; -using Android.Support.Design.Widget; using Android.Views; -using Android.Widget; using NUnit.Framework; using Xamarin.Forms; using Xamarin.Forms.CustomAttributes; using Xamarin.Forms.Platform.Android.UnitTests; +using Google.Android.Material.BottomNavigation; -#if __ANDROID_29__ -using AndroidX.AppCompat.App; -using AToolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -#endif [assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))] namespace Xamarin.Forms.Platform.Android.UnitTests diff --git a/Xamarin.Forms.Platform.Android.UnitTests/TestActivity.cs b/Xamarin.Forms.Platform.Android.UnitTests/TestActivity.cs index 70b1c5d92..28f9ce155 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/TestActivity.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/TestActivity.cs @@ -8,14 +8,8 @@ using Android.Views; using Xamarin.Forms; using Xamarin.Forms.Platform.Android.UnitTests; using System.Threading; - -#if __ANDROID_29__ using AndroidX.AppCompat.App; using AToolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -using Android.Support.V7.App; -using AToolbar = Android.Support.V7.Widget.Toolbar; -#endif [assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))] namespace Xamarin.Forms.Platform.Android.UnitTests diff --git a/Xamarin.Forms.Platform.Android.UnitTests/ToolbarExtensionsTests.cs b/Xamarin.Forms.Platform.Android.UnitTests/ToolbarExtensionsTests.cs index bc5d6d6bc..f99788704 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/ToolbarExtensionsTests.cs +++ b/Xamarin.Forms.Platform.Android.UnitTests/ToolbarExtensionsTests.cs @@ -17,7 +17,7 @@ using NUnit.Framework; using Xamarin.Forms; using Xamarin.Forms.CustomAttributes; using Xamarin.Forms.Platform.Android.UnitTests; -using AToolBar = Android.Support.V7.Widget.Toolbar; +using AToolBar = AndroidX.AppCompat.Widget.Toolbar; using AView = Android.Views.View; [assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))] diff --git a/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj b/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj index 11cb0cbe6..616e51595 100644 --- a/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj +++ b/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj @@ -16,7 +16,7 @@ True Resources\Resource.designer.cs Off - v9.0 + v10.0 true @@ -74,7 +74,9 @@ 3.12.0 - + + 28.0.0.3 + diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs index e0d7fbfbe..02b46a476 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs @@ -2,11 +2,7 @@ using System; using System.ComponentModel; using Android.Content; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Util; using Android.Views; using Xamarin.Forms.Platform.Android.FastRenderers; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs index e38341c4b..4dd6331f8 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs @@ -3,19 +3,12 @@ using System.Collections.Specialized; using System.ComponentModel; using Android.Content; using Android.Views; - -#if __ANDROID_29__ using AndroidX.Fragment.App; using AndroidX.ViewPager.Widget; -using AndroidX.Core.View; -#else -using Android.Support.V4.App; -using Android.Support.V4.View; -#endif namespace Xamarin.Forms.Platform.Android.AppCompat { - + public class CarouselPageRenderer : VisualElementRenderer, ViewPager.IOnPageChangeListener, IManageFragments { bool _disposed; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs index 616357fe5..09bffacd3 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs @@ -1,22 +1,13 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.Core.Widget; -#else -using Android.Support.V7.Widget; -using Android.Support.V4.Widget; -#endif using AView = Android.Views.View; using Android.Views; using Xamarin.Forms.Internals; using AColor = Android.Graphics.Color; -using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; -using Android.Graphics.Drawables; using Android.Graphics; using Xamarin.Forms.Platform.Android.FastRenderers; -using Android.OS; using Android.Widget; using Android.Content.Res; using AAttribute = Android.Resource.Attribute; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs b/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs index 41c46db4d..22a2104d4 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs @@ -1,11 +1,7 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; using Android.Views; using Xamarin.Forms.Internals; @@ -14,11 +10,7 @@ using Android.Graphics; using Xamarin.Forms.Platform.Android.FastRenderers; using Android.Widget; using Android.Content.Res; -#if __ANDROID_29__ using AndroidX.Core.Widget; -#else -using Android.Support.V4.Widget; -#endif using AAttribute = Android.Resource.Attribute; namespace Xamarin.Forms.Platform.Android @@ -240,7 +232,7 @@ namespace Xamarin.Forms.Platform.Android var mode = PorterDuff.Mode.SrcIn; - + CompoundButtonCompat.SetButtonTintList(Control, GetColorStateList()); CompoundButtonCompat.SetButtonTintMode(Control, mode); } diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index ecc98e1cc..26420841e 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -7,13 +7,8 @@ using Android.Content; using Android.Content.Res; using Android.OS; using Android.Runtime; -#if __ANDROID_29__ using AndroidX.AppCompat.App; using AToolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -using Android.Support.V7.App; -using AToolbar = Android.Support.V7.Widget.Toolbar; -#endif using Android.Views; using Xamarin.Forms.Platform.Android.AppCompat; using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; @@ -21,7 +16,6 @@ using Xamarin.Forms.PlatformConfiguration.AndroidSpecific.AppCompat; using AColor = Android.Graphics.Color; using ARelativeLayout = Android.Widget.RelativeLayout; using Xamarin.Forms.Internals; -using System.Runtime.CompilerServices; namespace Xamarin.Forms.Platform.Android { @@ -231,7 +225,6 @@ namespace Xamarin.Forms.Platform.Android Profile.FramePartition("SetSupportActionBar"); AToolbar bar = null; -#if __ANDROID_29__ if (ToolbarResource == 0) { ToolbarResource = Resource.Layout.Toolbar; @@ -241,7 +234,6 @@ namespace Xamarin.Forms.Platform.Android { TabLayoutResource = Resource.Layout.Tabbar; } -#endif if (ToolbarResource != 0) { @@ -249,7 +241,6 @@ namespace Xamarin.Forms.Platform.Android { bar = LayoutInflater.Inflate(ToolbarResource, null).JavaCast(); } -#if __ANDROID_29__ catch (global::Android.Views.InflateException ie) { if ((ie.Cause is Java.Lang.ClassNotFoundException || ie.Cause.Cause is Java.Lang.ClassNotFoundException) && @@ -268,19 +259,10 @@ namespace Xamarin.Forms.Platform.Android } else throw; -#else - catch - { - throw; -#endif } if (bar == null) -#if __ANDROID_29__ - throw new InvalidOperationException("ToolbarResource must be set to a Android.Support.V7.Widget.Toolbar"); -#else throw new InvalidOperationException("ToolbarResource must be set to a androidx.appcompat.widget.Toolbar"); -#endif } else { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs index 107c7d524..cab2fb821 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs @@ -1,10 +1,6 @@ using System.Collections.Generic; using Android.OS; -#if __ANDROID_29__ using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif using Java.Lang; using Xamarin.Forms.Internals; using FragmentTransit = Android.App.FragmentTransit; @@ -18,11 +14,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat List _fragments; bool _disposed; -#if __ANDROID_29__ public FormsFragmentPagerAdapter(MultiPage page, FragmentManager fragmentManager) : base(fragmentManager, FragmentStatePagerAdapter.BehaviorResumeOnlyCurrentFragment) -#else - public FormsFragmentPagerAdapter(MultiPage page, FragmentManager fragmentManager) : base(fragmentManager) -#endif { _page = page; _fragmentManager = fragmentManager; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs index 58dd95b8b..e3c94d090 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs @@ -1,12 +1,7 @@ using System; using Android.Content; using Android.Runtime; -#if __ANDROID_29__ -using AndroidX.Core.View; using AndroidX.ViewPager.Widget; -#else -using Android.Support.V4.View; -#endif using Android.Util; using Android.Views; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs b/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs index dcfde2451..93a298e5e 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs @@ -5,12 +5,7 @@ using Android.Runtime; using Android.Views; using Xamarin.Forms.PlatformConfiguration.AndroidSpecific.AppCompat; using AView = Android.Views.View; - -#if __ANDROID_29__ using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif namespace Xamarin.Forms.Platform.Android.AppCompat { @@ -21,10 +16,8 @@ namespace Xamarin.Forms.Platform.Android.AppCompat Action _onCreateCallback; PageContainer _pageContainer; IVisualElementRenderer _visualElementRenderer; - -#if __ANDROID_29__ bool _isVisible = false; -#endif + public FragmentContainer() { } @@ -117,9 +110,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat public override void OnPause() { -#if __ANDROID_29__ _isVisible = false; -#endif bool shouldSendEvent = Application.Current.OnThisPlatform().GetSendDisappearingEventOnPause(); if (shouldSendEvent) @@ -130,10 +121,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat public override void OnResume() { - -#if __ANDROID_29__ _isVisible = true; -#endif bool shouldSendEvent = Application.Current.OnThisPlatform().GetSendAppearingEventOnResume(); if (shouldSendEvent) @@ -151,11 +139,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat if(!(currentPage == null || currentPage == PageController)) return; -#if __ANDROID_29__ if (isAppearing && _isVisible) -#else - if (isAppearing && UserVisibleHint) -#endif PageController?.SendAppearing(); else if(!isAppearing) PageController?.SendDisappearing(); diff --git a/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs b/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs index a9e2b56ce..5d734f4d2 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs @@ -1,8 +1,4 @@ -#if __ANDROID_29__ using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif namespace Xamarin.Forms.Platform.Android.AppCompat { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs index 8c6dca429..d22f68a1e 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs @@ -1,11 +1,7 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; using Android.Views; using Xamarin.Forms.Internals; @@ -14,7 +10,6 @@ using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; using Android.Graphics.Drawables; using Android.Graphics; using Xamarin.Forms.Platform.Android.FastRenderers; -using Android.OS; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs index 2f7eecd01..c173c6bf2 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs @@ -1,14 +1,8 @@ using Android.App; using Android.Content; -#if __ANDROID_29__ using Fragment = AndroidX.Fragment.App.Fragment; using FragmentManager = AndroidX.Fragment.App.FragmentManager; using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction; -#else -using Fragment = Android.Support.V4.App.Fragment; -using FragmentManager = Android.Support.V4.App.FragmentManager; -using FragmentTransaction = Android.Support.V4.App.FragmentTransaction; -#endif namespace Xamarin.Forms.Platform.Android.AppCompat { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs index dbdf2ca3b..9094269a7 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs @@ -2,14 +2,9 @@ using System; using System.ComponentModel; using System.Threading.Tasks; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.Widget; using AndroidX.Fragment.App; using AndroidX.DrawerLayout.Widget; -#else -using Android.Support.V4.Widget; -using Android.Support.V4.App; -#endif using Android.Views; using AView = Android.Views.View; using Android.OS; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs index abce8c870..a97d55a27 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs @@ -10,8 +10,6 @@ using Android.Content.Res; using Android.Graphics; using Android.Graphics.Drawables; using Android.Runtime; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using Fragment = AndroidX.Fragment.App.Fragment; using FragmentManager = AndroidX.Fragment.App.FragmentManager; using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction; @@ -20,16 +18,6 @@ using ActionBarDrawerToggle = AndroidX.AppCompat.App.ActionBarDrawerToggle; using AndroidX.AppCompat.Graphics.Drawable; using AndroidX.DrawerLayout.Widget; using AndroidX.AppCompat.App; -#else -using Android.Support.V4.Widget; -using Fragment = Android.Support.V4.App.Fragment; -using FragmentManager = Android.Support.V4.App.FragmentManager; -using FragmentTransaction = Android.Support.V4.App.FragmentTransaction; -using AToolbar = Android.Support.V7.Widget.Toolbar; -using ActionBarDrawerToggle = Android.Support.V7.App.ActionBarDrawerToggle; -using Android.Support.V7.Graphics.Drawable; -using Android.Support.V7.App; -#endif using Android.Util; using Android.Views; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs b/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs index 8b1335889..1d2b9e4c6 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs @@ -4,11 +4,7 @@ using Android.App; using Android.Content; using Android.OS; using Android.Views; -#if __ANDROID_29__ using Fragment = AndroidX.Fragment.App.Fragment; -#else -using Fragment = global::Android.Support.V4.App.Fragment; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/AppCompat/RadioButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/RadioButtonRenderer.cs index 62a38a3f1..9c01634c2 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/RadioButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/RadioButtonRenderer.cs @@ -2,13 +2,8 @@ using System; using System.ComponentModel; using Android.Content; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -using Android.Support.V4.View; -#endif using Android.Util; using Android.Views; using Xamarin.Forms.Internals; @@ -16,7 +11,6 @@ using Xamarin.Forms.Platform.Android.FastRenderers; using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; using AColor = Android.Graphics.Color; using AView = Android.Views.View; -using Android.Graphics.Drawables; using Android.Widget; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs index ebe30d278..2b88da6a1 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs @@ -1,13 +1,8 @@ using System; using System.ComponentModel; using Android.Content; -using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Widget; using Xamarin.Forms.Platform.Android.FastRenderers; diff --git a/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs index 6de4cfa8b..b8c5bf389 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs @@ -5,30 +5,19 @@ using Android.Content; using Android.Content.Res; using Android.Graphics; using Android.Graphics.Drawables; -using Android.OS; using Android.Runtime; -#if __ANDROID_29__ using AndroidX.Fragment.App; -using AndroidX.Core.View; using AndroidX.ViewPager.Widget; using Google.Android.Material.BottomNavigation; using Google.Android.Material.BottomSheet; using Google.Android.Material.Tabs; using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat; -#else -using Android.Support.V4.App; -using Android.Support.Design.Widget; -using Android.Support.V4.View; -using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat; -#endif using AWidget = Android.Widget; using Android.Views; using Xamarin.Forms.Internals; using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; using AView = Android.Views.View; -using AMenu = Android.Views.Menu; using AColor = Android.Graphics.Color; -using System.Threading.Tasks; using System.Collections.Generic; namespace Xamarin.Forms.Platform.Android.AppCompat diff --git a/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs b/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs index 61a83db4e..90a113fb4 100644 --- a/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs +++ b/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs @@ -1,17 +1,9 @@ using System; using System.ComponentModel; using Android.Content; -using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.Core.Widget; -using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.View; -using Android.Support.V4.Widget; -using Android.Support.V7.Widget; -#endif using Xamarin.Forms.Internals; using ARect = Android.Graphics.Rect; using AView = Android.Views.View; diff --git a/Xamarin.Forms.Platform.Android/CellAdapter.cs b/Xamarin.Forms.Platform.Android/CellAdapter.cs index 0f945cf1a..1ccffca46 100644 --- a/Xamarin.Forms.Platform.Android/CellAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CellAdapter.cs @@ -1,21 +1,15 @@ using System; using System.Collections.Specialized; using System.ComponentModel; -using Android.App; using Android.Content; using Android.Util; using Android.Views; using Android.Widget; using AView = Android.Views.View; using AListView = Android.Widget.ListView; -using Android.Graphics.Drawables; -#if __ANDROID_29__ using AActionMode = global::AndroidX.AppCompat.View.ActionMode; using AndroidX.AppCompat.App; -#else -using AActionMode = global::Android.Support.V7.View.ActionMode; -using Android.Support.V7.App; -#endif + namespace Xamarin.Forms.Platform.Android { public abstract class CellAdapter : BaseAdapter, AdapterView.IOnItemLongClickListener, ActionMode.ICallback, AdapterView.IOnItemClickListener, AActionMode.ICallback diff --git a/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs b/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs index 1f5f39eb5..294e7d058 100644 --- a/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs +++ b/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs @@ -1,22 +1,10 @@ -using System.IO; -using System.Threading.Tasks; using Android.Content; -using Android.Graphics; using Android.Text; using Android.Views; using Android.Widget; using AView = Android.Views.View; -using AColor = Android.Graphics.Color; -using AColorDraw = Android.Graphics.Drawables.ColorDrawable; using Xamarin.Forms.Internals; -#if __ANDROID_29__ using AndroidX.Core.Widget; -using AndroidX.Core.Content; -#else -using Android.Support.V4.Widget; -using Android.Support.V4.Content; -#endif -using Android.OS; using System; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs b/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs index 4cdfc0621..bfa5af25b 100644 --- a/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs +++ b/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs @@ -1,10 +1,6 @@ using System; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Text; using Android.Views; using Android.Views.InputMethods; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs b/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs index b0d456085..e81d48967 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif +using AndroidX.RecyclerView.Widget; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs b/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs index b20e6143e..e491116aa 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs @@ -1,11 +1,5 @@ using System; -using Android.Graphics; -#if __ANDROID_29__ using AndroidX.RecyclerView.Widget; -using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif using ARect = Android.Graphics.Rect; using AView = Android.Views.View; using FormsCarouselView = Xamarin.Forms.CarouselView; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs index ad0599f12..226ca7624 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs @@ -3,13 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Views; -using Java.Interop; using FormsCarouselView = Xamarin.Forms.CarouselView; using Xamarin.Forms.Platform.Android.CollectionView; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs index d4d80e194..1e9ef0d5c 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif +using AndroidX.RecyclerView.Widget; using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs b/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs index 00af39e25..a264ebb38 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs @@ -1,12 +1,6 @@ using System; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using static AndroidX.RecyclerView.Widget.RecyclerView; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -using static Android.Support.V7.Widget.RecyclerView; -#endif using Object = Java.Lang.Object; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs index b74a16b85..e50e0ef01 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; using ALayoutDirection = Android.Views.LayoutDirection; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs index eb72ac982..6916130b4 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs @@ -1,12 +1,6 @@ using System; using Android.Content; -using Android.Content.Res; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Views; using Object = Java.Lang.Object; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs index a1685685b..22b8d5f8e 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs index 816134219..ba017f144 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs b/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs index 912ac4133..5209b666b 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif +using AndroidX.RecyclerView.Widget; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs index 4fff906fa..c6251c3a1 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs @@ -1,11 +1,6 @@ using System; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Views; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs b/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs index d837c7675..4771f8498 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs @@ -1,14 +1,7 @@ using System.Collections; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.IO; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs index 890626ee4..ef85333e6 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs @@ -1,11 +1,6 @@ using System; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Widget; using Object = Java.Lang.Object; using ViewGroup = Android.Views.ViewGroup; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs index b5edaa204..48c112c83 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs @@ -1,15 +1,8 @@ using System; using System.ComponentModel; using Android.Content; -using Android.Graphics; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; using AViewCompat = AndroidX.Core.View.ViewCompat; -#else -using Android.Support.V7.Widget; -using AViewCompat = Android.Support.V4.View.ViewCompat; -#endif using Android.Views; using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.Android.CollectionView; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs index 3fb2ee483..52f49c281 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs @@ -1,10 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using System; -using Android.Support.V7.Widget; -#endif +using AndroidX.RecyclerView.Widget; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs b/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs index 14d6424f2..e7895ed25 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs @@ -1,10 +1,5 @@ using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs b/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs index 98bc302ff..80743a6ff 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs @@ -1,10 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif -using AView = Android.Views.View; +using AndroidX.RecyclerView.Widget; namespace Xamarin.Forms.Platform.Android.CollectionView { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs index 6e0af7a44..707c93758 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs @@ -1,12 +1,6 @@ using System; -using Android.Graphics; using ARect = Android.Graphics.Rect; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs index 5d706618a..5d725f2c8 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs @@ -1,12 +1,7 @@ using System; using System.Collections.Generic; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Object = Java.Lang.Object; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs b/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs index e5b1d9bc2..a0ef15615 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs @@ -1,14 +1,8 @@ using System; using System.Linq; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.Core.Content; -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V4.Content; -using Android.Support.V7.Widget; -#endif using Android.Util; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs b/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs index 3a527f4d1..452d021a8 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs @@ -1,11 +1,6 @@ using System; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Views; using Android.Widget; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs index 32b448b91..9fabcc92d 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; using ALayoutDirection = Android.Views.LayoutDirection; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs b/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs index 3cd48b215..e3d7a8b36 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs @@ -1,10 +1,5 @@ using System; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs b/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs index 05dbb38ca..051cffbcd 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs @@ -1,11 +1,5 @@ using System; -using Android.Graphics; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; using ARect = Android.Graphics.Rect; diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs index d8213aa6e..4e34d6d26 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs b/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs index c0ba90e7f..341eed20f 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs index aaa172473..35c7a46e2 100644 --- a/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs @@ -1,12 +1,7 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using ViewGroup = Android.Views.ViewGroup; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/ColorExtensions.cs b/Xamarin.Forms.Platform.Android/ColorExtensions.cs index 5c91200bc..0655d5897 100644 --- a/Xamarin.Forms.Platform.Android/ColorExtensions.cs +++ b/Xamarin.Forms.Platform.Android/ColorExtensions.cs @@ -2,12 +2,7 @@ using System; using System.ComponentModel; using Android.Content; using Android.Content.Res; -#if __ANDROID_29__ using AndroidX.Core.Content; -#else -using Android.Support.V4.Content; -#endif - using AColor = Android.Graphics.Color; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/ContextExtensions.cs b/Xamarin.Forms.Platform.Android/ContextExtensions.cs index 18821cd3f..0d239b86b 100644 --- a/Xamarin.Forms.Platform.Android/ContextExtensions.cs +++ b/Xamarin.Forms.Platform.Android/ContextExtensions.cs @@ -6,15 +6,9 @@ using Android.Views.InputMethods; using AApplicationInfoFlags = Android.Content.PM.ApplicationInfoFlags; using AActivity = Android.App.Activity; -#if __ANDROID_29__ using AndroidX.Fragment.App; using AndroidX.AppCompat.App; using AFragmentManager = AndroidX.Fragment.App.FragmentManager; -#else -using AFragmentManager = Android.Support.V4.App.FragmentManager; -using Android.Support.V4.App; -using Android.Support.V7.App; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs index 61bf5b5a1..32c362511 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs @@ -1,12 +1,7 @@ using System; using Android.Views; -#if __ANDROID_29__ using AMenuItemCompat = AndroidX.Core.View.MenuItemCompat; using AToolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -using AMenuItemCompat = global::Android.Support.V4.View.MenuItemCompat; -using AToolbar = Android.Support.V7.Widget.Toolbar; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs index db1f36fcd..f71c64001 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs @@ -2,11 +2,7 @@ using ADrawable = Android.Graphics.Drawables.Drawable; using AColorFilter = Android.Graphics.ColorFilter; using AColor = Android.Graphics.Color; -#if __ANDROID_29__ using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat; -#else -using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat; -#endif using Android.Graphics; namespace Xamarin.Forms.Platform.Android @@ -21,8 +17,6 @@ namespace Xamarin.Forms.Platform.Android internal static class DrawableExtensions { - -#if __ANDROID_29__ public static BlendMode GetFilterMode(FilterMode mode) { switch (mode) @@ -40,14 +34,6 @@ namespace Xamarin.Forms.Platform.Android throw new Exception("Invalid Mode"); } -#else - [Obsolete] - static PorterDuff.Mode GetFilterMode(FilterMode mode) - { - return GetFilterModePre29(mode); - } -#endif - [Obsolete] static PorterDuff.Mode GetFilterModePre29(FilterMode mode) { @@ -107,7 +93,6 @@ namespace Xamarin.Forms.Platform.Android public static void SetColorFilter(this ADrawable drawable, AColor color, FilterMode mode) { -#if __ANDROID_29__ if(Forms.Is29OrNewer) drawable.SetColorFilter(new BlendModeColorFilter(color, GetFilterMode(mode))); else @@ -116,13 +101,6 @@ namespace Xamarin.Forms.Platform.Android drawable.SetColorFilter(color, GetFilterModePre29(mode)); #pragma warning restore CS0618 // Type or member is obsolete #pragma warning restore CS0612 // Type or member is obsolete -#else -#pragma warning disable CS0612 // Type or member is obsolete -#pragma warning disable CS0618 // Type or member is obsolete - drawable.SetColorFilter(color, GetFilterMode(mode)); -#pragma warning restore CS0618 // Type or member is obsolete -#pragma warning restore CS0612 // Type or member is obsolete -#endif } } diff --git a/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs index 3b190dae1..34ecf4b97 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs @@ -1,11 +1,5 @@ -#if __ANDROID_29__ using AndroidX.Fragment.App; -#else -using FragmentTransaction = Android.Support.V4.App.FragmentTransaction; -using Fragment = Android.Support.V4.App.Fragment; -using FragmentManager = Android.Support.V4.App.FragmentManager; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Extensions/RecyclerExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/RecyclerExtensions.cs index 4b72c2242..6ef9f9fb0 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/RecyclerExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/RecyclerExtensions.cs @@ -1,9 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; -using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif +using AndroidX.RecyclerView.Widget; using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Extensions/ToolbarExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/ToolbarExtensions.cs index 33a068b3a..4fb68d726 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/ToolbarExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/ToolbarExtensions.cs @@ -1,10 +1,6 @@ using System.ComponentModel; using Android.Views; -#if __ANDROID_29__ using AToolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -using AToolbar = Android.Support.V7.Widget.Toolbar; -#endif using ATextView = global::Android.Widget.TextView; using Android.Content; using Android.Graphics; diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs index f2338470b..8baa45537 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs @@ -2,13 +2,8 @@ using System; using System.ComponentModel; using Android.Content; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.View; -using Android.Support.V7.Widget; -#endif using Android.Util; using Android.Views; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs index 5af5f330d..e228e03a0 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs @@ -3,14 +3,8 @@ using System.ComponentModel; using Android.Content; using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.CardView.Widget; -using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.View; -using Android.Support.V7.Widget; -#endif using Android.Views; using AColor = Android.Graphics.Color; using AView = Android.Views.View; diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs index 2cf790c23..cb0731390 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs @@ -5,11 +5,7 @@ using AScaleType = Android.Widget.ImageView.ScaleType; using ARect = Android.Graphics.Rect; using System; using Xamarin.Forms.Internals; -#if __ANDROID_29__ using AViewCompat = AndroidX.Core.View.ViewCompat; -#else -using AViewCompat = Android.Support.V4.View.ViewCompat; -#endif namespace Xamarin.Forms.Platform.Android.FastRenderers { diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs index 1eb701b8c..4487cfe11 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs @@ -7,11 +7,7 @@ using AImageView = Android.Widget.ImageView; using AView = Android.Views.View; using Android.Views; using Xamarin.Forms.Internals; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif namespace Xamarin.Forms.Platform.Android.FastRenderers { diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs index a68771466..4d97745e0 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs @@ -3,15 +3,10 @@ using System.ComponentModel; using Android.Content; using Android.Content.Res; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif using Android.Text; using Android.Util; using Android.Views; -using Android.Widget; using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android.FastRenderers diff --git a/Xamarin.Forms.Platform.Android/Forms.cs b/Xamarin.Forms.Platform.Android/Forms.cs index db4e72648..9bb1d4de0 100644 --- a/Xamarin.Forms.Platform.Android/Forms.cs +++ b/Xamarin.Forms.Platform.Android/Forms.cs @@ -22,11 +22,7 @@ using Resource = Android.Resource; using Trace = System.Diagnostics.Trace; using System.ComponentModel; using AColor = Android.Graphics.Color; -#if __ANDROID_29__ using AndroidX.Core.Content; -#else -using Android.Support.V4.Content; -#endif namespace Xamarin.Forms { diff --git a/Xamarin.Forms.Platform.Android/GestureManager.cs b/Xamarin.Forms.Platform.Android/GestureManager.cs index 42fc3a252..241b48ad8 100644 --- a/Xamarin.Forms.Platform.Android/GestureManager.cs +++ b/Xamarin.Forms.Platform.Android/GestureManager.cs @@ -4,11 +4,7 @@ using System.Collections.Specialized; using System.ComponentModel; using System.Linq; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif using Android.Views; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs b/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs index f814f7ce9..acbf90957 100644 --- a/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs +++ b/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs @@ -1,9 +1,5 @@ using System; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Platform.cs b/Xamarin.Forms.Platform.Android/Platform.cs index a836f8652..00a5b7a71 100644 --- a/Xamarin.Forms.Platform.Android/Platform.cs +++ b/Xamarin.Forms.Platform.Android/Platform.cs @@ -10,14 +10,8 @@ using Android.Content.Res; using Android.Graphics; using Android.Graphics.Drawables; using Android.OS; -#if __ANDROID_29__ -using AndroidX.Fragment.App; using FragmentManager = AndroidX.Fragment.App.FragmentManager; using AndroidX.Legacy.App; -#else -using Android.Support.V4.App; -using FragmentManager = Android.Support.V4.App.FragmentManager; -#endif using Android.Util; using Android.Views; using Android.Widget; diff --git a/Xamarin.Forms.Platform.Android/PopupManager.cs b/Xamarin.Forms.Platform.Android/PopupManager.cs index 0b8232981..c0f04f03a 100644 --- a/Xamarin.Forms.Platform.Android/PopupManager.cs +++ b/Xamarin.Forms.Platform.Android/PopupManager.cs @@ -7,13 +7,8 @@ using Android.Text; using Android.Views; using Android.Widget; using Xamarin.Forms.Internals; -#if __ANDROID_29__ using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog; using AppCompatActivity = AndroidX.AppCompat.App.AppCompatActivity; -#else -using AppCompatAlertDialog = global::Android.Support.V7.App.AlertDialog; -using AppCompatActivity =global::Android.Support.V7.App.AppCompatActivity; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs b/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs index 859090ac4..9a32d377d 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs @@ -1,9 +1,5 @@ using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Graphics; using Android.Views; using Android.Widget; diff --git a/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs b/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs index 2c95e7dac..7b9246b22 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs @@ -12,17 +12,9 @@ using Typeface = Android.Graphics.Typeface; using TypefaceStyle = Android.Graphics.TypefaceStyle; using Android.Graphics.Drawables; using System.Threading.Tasks; -using Android.Content.Res; - -#if __ANDROID_29__ using Google.Android.Material.BottomNavigation; using Google.Android.Material.BottomSheet; using ALabelVisibilityMode = Google.Android.Material.BottomNavigation.LabelVisibilityMode; -#else -using ALabelVisibilityMode = Android.Support.Design.BottomNavigation.LabelVisibilityMode; -using Android.Support.Design.Widget; -using Android.Support.Design.Internal; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs index 9a1df8433..d34e1ba7d 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs @@ -2,12 +2,8 @@ using System; using System.Collections.Specialized; using System.Linq; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.ViewPager.Widget; -#else -using Android.Support.V4.View; -#endif using Android.Views; using Xamarin.Forms.Internals; using Object = Java.Lang.Object; diff --git a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs index 125b3d67d..5b0effa7d 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs @@ -1,12 +1,7 @@ using System; using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ -using AndroidX.Core.View; using AndroidX.ViewPager.Widget; -#else -using Android.Support.V4.View; -#endif using Android.Views; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs index 47680b67e..1d08018fd 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs @@ -3,11 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using Android.Content; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.Core.Content; -#else -using Android.Support.V4.Content; -#endif using Android.Text; using Android.Text.Method; using Android.Util; diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs b/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs index 67c4041a7..463ba3b09 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs @@ -1,14 +1,9 @@ using System; using Android.Content; -using Android.Graphics; using Android.Views; using Android.Widget; using System.ComponentModel; -#if __ANDROID_29__ using AndroidX.Core.Graphics.Drawable; -#else -using Android.Support.V4.Graphics.Drawable; -#endif using ARect = Android.Graphics.Rect; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs index 033ab5818..271e7a281 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs @@ -1,12 +1,7 @@  using System; -#if __ANDROID_29__ -using AndroidX.Core.Content; using Google.Android.Material.BottomNavigation; -#else -using Android.Support.Design.Widget; -using Toolbar = Android.Support.V7.Widget.Toolbar; -#endif + namespace Xamarin.Forms.Platform.Android { public interface IShellBottomNavViewAppearanceTracker : IDisposable diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs index 4cc7799a7..54a61dcf2 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs @@ -1,12 +1,6 @@ using Android.Content; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.DrawerLayout.Widget; using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.Widget; -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs index 462a2b50a..4a62d416f 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs @@ -1,10 +1,5 @@ -#if __ANDROID_29__ -using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif +using AndroidX.Fragment.App; using System; -using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs index 8177b4f5e..4f99ccfc6 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs @@ -1,8 +1,4 @@ -#if __ANDROID_29__ -using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif +using AndroidX.Fragment.App; using System; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs index 4ac1538bf..72776ae52 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs @@ -1,9 +1,5 @@ using System; -#if __ANDROID_29__ using Google.Android.Material.Tabs; -#else -using Android.Support.Design.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs index ea66d25e5..125a47be0 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs @@ -1,10 +1,5 @@ using System; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.Design.Widget; -using Toolbar = Android.Support.V7.Widget.Toolbar; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs index 307693797..9b22ea916 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs @@ -1,11 +1,7 @@ using System.ComponentModel; using Android.Content; -#if __ANDROID_29__ using AndroidX.Core.Widget; using AndroidX.SwipeRefreshLayout.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Views; using AListView = Android.Widget.ListView; using AView = Android.Views.View; diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs index 5fd0496f7..4c01b3f9e 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs @@ -1,14 +1,8 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -using Android.App; using Android.Content; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.DrawerLayout.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Views; using AView = Android.Views.View; using Android.OS; diff --git a/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs index 0137545a7..0b85785d8 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs @@ -2,15 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using Android.Content; -using Android.Content.Res; -using Android.OS; -#if __ANDROID_29__ using AndroidX.Core.Content; -using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.Content; -using Android.Support.V7.Widget; -#endif using Android.Views; using Android.Views.Accessibility; using AColor = Android.Graphics.Color; diff --git a/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs index 38d83e3da..e8b9ca94c 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs @@ -2,17 +2,10 @@ using System.ComponentModel; using Android.Content; using Android.OS; -#if __ANDROID_29__ using AndroidX.Core.View; using AndroidX.Core.Widget; using AndroidX.RecyclerView.Widget; using AndroidX.SwipeRefreshLayout.Widget; -using AndroidX.AppCompat.Widget; -#else -using Android.Support.V4.Widget; -using Android.Support.V4.View; -using Android.Support.V7.Widget; -#endif using Android.Views; using Android.Widget; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs index f6d0721d9..05ccf70d7 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs @@ -4,11 +4,7 @@ using System.Threading.Tasks; using Android.Animation; using Android.Content; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Views; using Android.Widget; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs index c77d08c21..8e0ab2cd0 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs @@ -1,13 +1,6 @@ using Android.Content.Res; using Android.Graphics.Drawables; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using Google.Android.Material.BottomNavigation; -#else -using Android.Support.Design.Internal; -using Android.Support.Design.Widget; -using Android.Support.V4.Widget; -#endif using System; using AColor = Android.Graphics.Color; using R = Android.Resource; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs index da1916c50..3bacb8d34 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs @@ -1,17 +1,9 @@ using Android.OS; using Android.Runtime; -#if __ANDROID_29__ using AndroidX.Fragment.App; -using AndroidX.Core.Widget; using AndroidX.AppCompat.Widget; using AndroidX.CoordinatorLayout.Widget; using Google.Android.Material.AppBar; -#else -using Android.Support.V4.App; -using Android.Support.Design.Widget; -using Android.Support.V7.Widget; -using Android.Support.V4.Widget; -#endif using Android.Views; using Android.Views.Animations; using System; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs index ac555ff46..2964f4bd6 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs @@ -1,10 +1,5 @@ using Android.Runtime; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; -#else -using Android.Support.V7.Widget; -#endif using Android.Views; using Android.Widget; using System; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs index 9fd920cc6..e884fa42f 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs @@ -1,10 +1,5 @@ using Android.Content; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.DrawerLayout.Widget; -#else -using Android.Support.V4.Widget; -#endif using Android.Util; using Android.Views; using System; @@ -12,7 +7,6 @@ using System.ComponentModel; using Xamarin.Forms.Internals; using AView = Android.Views.View; using LP = Android.Views.ViewGroup.LayoutParams; -using AColor = Android.Graphics.Color; using Android.Graphics; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs index bb90b4185..43bf4977f 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs @@ -1,13 +1,7 @@ using Android.Content; using Android.Graphics.Drawables; -#if __ANDROID_29__ -using AndroidX.AppCompat.Widget; using AndroidX.RecyclerView.Widget; using Google.Android.Material.AppBar; -#else -using Android.Support.V7.Widget; -using Android.Support.Design.Widget; -#endif using Android.Util; using Android.Views; using Android.Widget; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs index 8b3e06c11..2144198be 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs @@ -1,10 +1,5 @@ -using Android.Database; -using Android.OS; -#if __ANDROID_29__ +using Android.OS; using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif using Java.Lang; using System.Collections.Specialized; using Xamarin.Forms.Platform.Android.AppCompat; @@ -17,11 +12,7 @@ namespace Xamarin.Forms.Platform.Android ShellSection _shellSection; IShellSectionController SectionController => (IShellSectionController)_shellSection; -#if __ANDROID_29__ public ShellFragmentPagerAdapter(ShellSection shellSection, FragmentManager fragmentManager) : base(fragmentManager, FragmentStatePagerAdapter.BehaviorResumeOnlyCurrentFragment) -#else - public ShellFragmentPagerAdapter(ShellSection shellSection, FragmentManager fragmentManager) : base(fragmentManager) -#endif { _shellSection = shellSection; SectionController.ItemsCollectionChanged += OnItemsCollectionChanged; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs index 188f2d78b..8c70848f3 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs @@ -1,27 +1,19 @@ using Android.Content; using Android.Graphics.Drawables; using Android.OS; -#if __ANDROID_29__ using Google.Android.Material.BottomNavigation; using Google.Android.Material.BottomSheet; -#else -using Android.Support.Design.Widget; -#endif using Android.Views; using Android.Widget; using System; using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; -using System.Threading.Tasks; using AColor = Android.Graphics.Color; using AView = Android.Views.View; -using ColorStateList = Android.Content.Res.ColorStateList; using IMenu = Android.Views.IMenu; using LP = Android.Views.ViewGroup.LayoutParams; using Orientation = Android.Widget.Orientation; -using Typeface = Android.Graphics.Typeface; -using TypefaceStyle = Android.Graphics.TypefaceStyle; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs index c802e3288..d85a5bf46 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs @@ -1,9 +1,4 @@ -using Android.OS; -#if __ANDROID_29__ -using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif +using AndroidX.Fragment.App; using Android.Views; using System; using System.Collections.Generic; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs index 2695f76a1..a493de0ae 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs @@ -1,24 +1,13 @@ using Android.Content; using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.Fragment.App; -#else -using Android.Support.V4.App; -#endif -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.DrawerLayout.Widget; using Toolbar = AndroidX.AppCompat.Widget.Toolbar; -#else -using Android.Support.V4.Widget; -using Toolbar = Android.Support.V7.Widget.Toolbar; -#endif using Android.Views; using Android.Widget; using System; using System.ComponentModel; -using System.Threading.Tasks; using Xamarin.Forms.Internals; using AColor = Android.Graphics.Color; using ARect = Android.Graphics.Rect; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs index e2ad3c887..e5ba800e0 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs @@ -1,14 +1,9 @@ using Android.Content; using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; using ASupportDrawable = AndroidX.AppCompat.Graphics.Drawable; using AndroidX.CardView.Widget; -#else -using Android.Support.V7.Widget; -using ASupportDrawable = Android.Support.V7.Graphics.Drawable; -#endif using Android.Text; using Android.Views; using Android.Views.InputMethods; diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs index 61ac5d439..ebcc2de44 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs @@ -1,21 +1,10 @@ using Android.OS; using Android.Runtime; - -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.Fragment.App; using AndroidX.CoordinatorLayout.Widget; using AndroidX.ViewPager.Widget; using Google.Android.Material.Tabs; using AndroidX.AppCompat.Widget; -using AndroidX.Core.View; -#else -using Android.Support.V4.Widget; -using Fragment = Android.Support.V4.App.Fragment; -using Toolbar = Android.Support.V7.Widget.Toolbar; -using Android.Support.V4.View; -using Android.Support.Design.Widget; -#endif using Android.Views; using System; using System.Collections.Specialized; @@ -23,7 +12,6 @@ using System.ComponentModel; using System.Linq; using Xamarin.Forms.Platform.Android.AppCompat; using AView = Android.Views.View; -using LP = Android.Views.ViewGroup.LayoutParams; namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs index 99d5cb292..4d19916c8 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs @@ -1,9 +1,5 @@ using Android.Graphics.Drawables; -#if __ANDROID_29__ using Google.Android.Material.Tabs; -#else -using Android.Support.Design.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs index 137fbebe5..9cbde3887 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs @@ -1,9 +1,5 @@ using Android.Graphics.Drawables; -#if __ANDROID_29__ using AndroidX.AppCompat.Widget; -#else -using Android.Support.V7.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs index 0ea8b6dab..5b02007dc 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs @@ -1,8 +1,6 @@ using Android.Content; using Android.Graphics; using Android.Graphics.Drawables; -#if __ANDROID_29__ -using AndroidX.Core.Widget; using AndroidX.AppCompat.Graphics.Drawable; using AndroidX.DrawerLayout.Widget; using Google.Android.Material.AppBar; @@ -10,15 +8,6 @@ using AndroidX.AppCompat.Widget; using Toolbar = AndroidX.AppCompat.Widget.Toolbar; using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat; using ActionBarDrawerToggle = AndroidX.AppCompat.App.ActionBarDrawerToggle; -#else -using Android.Support.V4.Widget; -using Android.Support.V7.Widget; -using Toolbar = Android.Support.V7.Widget.Toolbar; -using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat; -using Android.Support.V7.Graphics.Drawable; -using Android.Support.Design.Widget; -using ActionBarDrawerToggle = Android.Support.V7.App.ActionBarDrawerToggle; -#endif using Android.Views; using System; using System.Collections.Specialized; diff --git a/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs index 601ba8ab9..7427585fd 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs @@ -4,15 +4,8 @@ using System.Collections.Generic; using System.ComponentModel; using Android.Content; using Android.Graphics.Drawables; -#if __ANDROID_29__ -using AndroidX.Core.Widget; -using AndroidX.RecyclerView.Widget; using AndroidX.AppCompat.Widget; using AButton = AndroidX.AppCompat.Widget.AppCompatButton; -#else -using Android.Support.V7.Widget; -using AButton = Android.Support.V7.Widget.AppCompatButton; -#endif using Android.Views; using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.Android.AppCompat; diff --git a/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs index 5bd41a971..878c4c88e 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs @@ -4,11 +4,7 @@ using Android.Views; using AView = Android.Views.View; using AListView = Android.Widget.ListView; using System.ComponentModel; -#if __ANDROID_29__ using AndroidX.Core.Widget; -#else -using Android.Support.V4.Widget; -#endif namespace Xamarin.Forms.Platform.Android { diff --git a/Xamarin.Forms.Platform.Android/ResourceManager.cs b/Xamarin.Forms.Platform.Android/ResourceManager.cs index c6037561c..a7cccaddd 100644 --- a/Xamarin.Forms.Platform.Android/ResourceManager.cs +++ b/Xamarin.Forms.Platform.Android/ResourceManager.cs @@ -10,11 +10,7 @@ using Android.Graphics; using Android.Graphics.Drawables; using Xamarin.Forms.Internals; using IOPath = System.IO.Path; -#if __ANDROID_29__ using AndroidAppCompat = AndroidX.AppCompat.Content.Res.AppCompatResources; -#else -using AndroidAppCompat = Android.Support.V7.Content.Res.AppCompatResources; -#endif using System.ComponentModel; namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/ViewExtensions.cs b/Xamarin.Forms.Platform.Android/ViewExtensions.cs index c9a86fab4..a857f82e9 100644 --- a/Xamarin.Forms.Platform.Android/ViewExtensions.cs +++ b/Xamarin.Forms.Platform.Android/ViewExtensions.cs @@ -1,17 +1,12 @@ using Android.Content; using Android.Graphics.Drawables; using Android.OS; -#if __ANDROID_29__ using AndroidX.Core.Content; -#else -using Android.Support.V4.Content; -#endif using Android.Util; using Android.Views; using ARect = Android.Graphics.Rect; using AView = Android.Views.View; using AColor = Android.Graphics.Color; -using Android.Graphics; using System.Collections.Generic; using System.Linq; diff --git a/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs b/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs index eb22838ee..b67091026 100644 --- a/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs @@ -9,11 +9,7 @@ using Xamarin.Forms.Platform.Android.FastRenderers; using Android.Runtime; using Android.Content.Res; using Android.Graphics; -#if __ANDROID_29__ using AndroidX.Core.View; -#else -using Android.Support.V4.View; -#endif namespace Xamarin.Forms.Platform.Android diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index 54af8b7f5..e87944cfc 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -11,10 +11,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - @@ -35,12 +31,6 @@ - - - - - - @@ -59,21 +49,12 @@ - - - - - - - - - diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs index 7e01bd8d5..ff0bc5cc7 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs @@ -492,12 +492,10 @@ namespace Xamarin.Forms.Platform.MacOS (Source as ListViewDataSource)?.OnRowClicked(); } -#if __XCODE11__ public override bool ValidateProposedFirstResponder(NSResponder responder, NSEvent forEvent) { return true; } -#endif } } diff --git a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj index 3af795c3c..d47581ef7 100644 --- a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj +++ b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj @@ -66,13 +66,6 @@ - - __XCODE10__;$(DefineConstants); - $(OutputPath)\2017 - - - __XCODE11__;$(DefineConstants); - @@ -322,9 +315,6 @@ - - - diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj index 0f88c1337..f3b2af4f2 100644 --- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj +++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj @@ -5,7 +5,6 @@ true Debug AnyCPU - true AnyCPU diff --git a/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj b/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj index 615616900..833596a53 100644 --- a/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj +++ b/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj @@ -30,13 +30,6 @@ prompt 4 - - $(DefineConstants);__XCODE10__ - $(OutputPath)\2017 - - - $(DefineConstants);__XCODE11__ - @@ -90,8 +83,5 @@ 3.12.0 - - - diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs index 68296a6d2..715c5f3dd 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs @@ -23,10 +23,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.LabelColor; -#endif + return UIColor.Black; } } @@ -35,10 +34,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.PlaceholderTextColor; -#endif + return SeventyPercentGrey; } } @@ -47,10 +45,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SecondaryLabelColor; -#endif + return new Color(.32, .4, .57).ToUIColor(); } } @@ -59,10 +56,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemBackgroundColor; -#endif + return UIColor.White; } } @@ -71,10 +67,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SeparatorColor; -#endif + return UIColor.Gray; } } @@ -83,10 +78,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.OpaqueSeparatorColor; -#endif + return UIColor.Black; } } @@ -95,10 +89,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemGroupedBackgroundColor; -#endif + return new UIColor(247f / 255f, 247f / 255f, 247f / 255f, 1); } } @@ -107,10 +100,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemBlueColor; -#endif + return Color.FromRgba(50, 79, 133, 255).ToUIColor(); } } @@ -119,10 +111,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemRedColor; -#endif + return UIColor.FromRGBA(255, 0, 0, 255); } } @@ -131,10 +122,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemGrayColor; -#endif + return UIColor.Gray; } } @@ -143,11 +133,10 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsiOS13OrNewer) return UIColor.SystemGray2Color; -#endif return UIColor.LightGray; + } } @@ -215,10 +204,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsMojaveOrNewer) return NSColor.SecondaryLabelColor; -#endif + return new Color(.32, .4, .57).ToNSColor(); } } @@ -227,10 +215,9 @@ namespace Xamarin.Forms.Platform.MacOS { get { -#if __XCODE11__ if (Forms.IsMojaveOrNewer) return NSColor.SystemGrayColor; -#endif + return Color.LightGray.ToNSColor(); } } diff --git a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs index f955d1fc1..b43c98c0b 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs @@ -84,10 +84,8 @@ namespace Xamarin.Forms.Platform.iOS return UIModalPresentationStyle.FormSheet; case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.FullScreen: return UIModalPresentationStyle.FullScreen; -#if __XCODE11__ case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.Automatic: return UIModalPresentationStyle.Automatic; -#endif case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.OverFullScreen: return UIModalPresentationStyle.OverFullScreen; case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.PageSheet: diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs index 7fa3ed5fc..afd33781c 100644 --- a/Xamarin.Forms.Platform.iOS/Forms.cs +++ b/Xamarin.Forms.Platform.iOS/Forms.cs @@ -312,7 +312,7 @@ namespace Xamarin.Forms public Color GetNamedColor(string name) { -#if __XCODE11__ && __IOS__ +#if __IOS__ UIColor resultColor = null; // If not iOS 13, but 11+ we can only get the named colors @@ -713,7 +713,6 @@ namespace Xamarin.Forms #if __IOS__ || __TVOS__ if (!IsiOS13OrNewer) return OSAppTheme.Unspecified; -#if __XCODE11__ var uiStyle = GetCurrentUIViewController()?.TraitCollection?.UserInterfaceStyle ?? UITraitCollection.CurrentTraitCollection.UserInterfaceStyle; @@ -726,9 +725,6 @@ namespace Xamarin.Forms default: return OSAppTheme.Unspecified; }; -#else - return OSAppTheme.Unspecified; -#endif #else return AppearanceIsDark(NSApplication.SharedApplication.EffectiveAppearance) ? OSAppTheme.Dark : OSAppTheme.Light; #endif diff --git a/Xamarin.Forms.Platform.iOS/ModalWrapper.cs b/Xamarin.Forms.Platform.iOS/ModalWrapper.cs index 45c8e2013..001682c5b 100644 --- a/Xamarin.Forms.Platform.iOS/ModalWrapper.cs +++ b/Xamarin.Forms.Platform.iOS/ModalWrapper.cs @@ -21,13 +21,10 @@ namespace Xamarin.Forms.Platform.iOS if (elementConfiguration?.On()?.ModalPresentationStyle() is PlatformConfiguration.iOSSpecific.UIModalPresentationStyle style) { var result = style.ToNativeModalPresentationStyle(); -#if __XCODE11__ if (!Forms.IsiOS13OrNewer && result == UIKit.UIModalPresentationStyle.Automatic) { result = UIKit.UIModalPresentationStyle.FullScreen; } -#endif - ModalPresentationStyle = result; } @@ -37,23 +34,23 @@ namespace Xamarin.Forms.Platform.iOS AddChildViewController(modal.ViewController); modal.ViewController.DidMoveToParentViewController(this); -#if __XCODE11__ + if (Forms.IsiOS13OrNewer) PresentationController.Delegate = this; -#endif + ((Page)modal.Element).PropertyChanged += OnModalPagePropertyChanged; if (Forms.IsiOS13OrNewer) PresentationController.Delegate = this; } -#if __XCODE11__ + [Export("presentationControllerDidDismiss:")] [Internals.Preserve(Conditional = true)] public async void DidDismiss(UIPresentationController presentationController) { await Application.Current.NavigationProxy.PopModalAsync(false); } -#endif + public override void DismissViewController(bool animated, Action completionHandler) { if (PresentedViewController == null) diff --git a/Xamarin.Forms.Platform.iOS/Platform.cs b/Xamarin.Forms.Platform.iOS/Platform.cs index afe38d47f..166161234 100644 --- a/Xamarin.Forms.Platform.iOS/Platform.cs +++ b/Xamarin.Forms.Platform.iOS/Platform.cs @@ -178,10 +178,9 @@ namespace Xamarin.Forms.Platform.iOS // While the above IsiOS13OrNewer will always be false if __XCODE11__ is true // the UIModalPresentationStyle.Automatic is the only Xcode 11 API // for readability I decided to only take this part out -#if __XCODE11__ if (presentationStyle == UIKit.UIModalPresentationStyle.Automatic) shouldFire = false; -#endif + if (presentationStyle == UIKit.UIModalPresentationStyle.FullScreen) shouldFire = false; // This is mainly for backwards compatibility } diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs index 1beecfaee..db7a6841a 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs @@ -46,11 +46,9 @@ namespace Xamarin.Forms.Platform.iOS { if (Control == null) { -#if __XCODE11__ if(Forms.IsiOS13OrNewer) SetNativeControl(new UIActivityIndicatorViewDelegate(RectangleF.Empty, e.NewElement) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Medium }); else -#endif SetNativeControl(new UIActivityIndicatorViewDelegate(RectangleF.Empty, e.NewElement) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray }); } diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs index e3fdae2fd..d7ff33e52 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs @@ -55,11 +55,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the control adheres to changes in UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) SetupLayer(); -#endif } public virtual void SetupLayer() diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs index 1cbe1f5ca..79c528a50 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs @@ -351,11 +351,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the cells adhere to changes UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) ReloadData(); -#endif } NSIndexPath[] GetPaths(int section, int index, int count) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs index cedff483e..b77714747 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs @@ -352,11 +352,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the control adheres to changes in UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) UpdateBackgroundColor(); -#endif } ParentingViewController CreateViewControllerForPage(Page page) @@ -494,7 +492,6 @@ namespace Xamarin.Forms.Platform.iOS if (_defaultNavBarShadowImage == null) _defaultNavBarShadowImage = NavigationBar.ShadowImage; -#if __XCODE11__ if (Forms.IsiOS13OrNewer) { if (shouldHide) @@ -511,7 +508,6 @@ namespace Xamarin.Forms.Platform.iOS } } else -#endif { if (shouldHide) NavigationBar.ShadowImage = new UIImage(); @@ -658,7 +654,6 @@ namespace Xamarin.Forms.Platform.iOS { var barBackgroundColor = NavPage.BarBackgroundColor; -#if __XCODE11__ if (Forms.IsiOS13OrNewer) { var navigationBarAppearance = NavigationBar.StandardAppearance; @@ -686,7 +681,6 @@ namespace Xamarin.Forms.Platform.iOS NavigationBar.ScrollEdgeAppearance = navigationBarAppearance; } else -#endif { // Set navigation bar background color NavigationBar.BarTintColor = barBackgroundColor == Color.Default @@ -724,7 +718,6 @@ namespace Xamarin.Forms.Platform.iOS }; } -#if __XCODE11__ if (Forms.IsiOS13OrNewer) { NavigationBar.CompactAppearance.TitleTextAttributes = titleTextAttributes; @@ -737,7 +730,6 @@ namespace Xamarin.Forms.Platform.iOS NavigationBar.ScrollEdgeAppearance.LargeTitleTextAttributes = largeTitleTextAttributes; } else -#endif { NavigationBar.TitleTextAttributes = titleTextAttributes; @@ -762,14 +754,12 @@ namespace Xamarin.Forms.Platform.iOS if (statusBarColorMode == StatusBarTextColorMode.DoNotAdjust || barTextColor.Luminosity <= 0.5) { -#if __XCODE11__ // Use dark text color for status bar if (Forms.IsiOS13OrNewer) { UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.DarkContent; } else -#endif { UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.Default; } @@ -1174,8 +1164,6 @@ namespace Xamarin.Forms.Platform.iOS if (!_navigation.TryGetTarget(out NavigationRenderer navigationRenderer)) return; -#if __XCODE11__ - // We will use UINavigationBar.Appareance to infer settings that // were already set to navigation bar in older versions of // iOS. @@ -1215,7 +1203,6 @@ namespace Xamarin.Forms.Platform.iOS navBar.CompactAppearance.SetBackIndicatorImage(backIndicatorImage, backIndicatorTransitionMaskImage); navBar.StandardAppearance.SetBackIndicatorImage(backIndicatorImage, backIndicatorTransitionMaskImage); navBar.ScrollEdgeAppearance.SetBackIndicatorImage(backIndicatorImage, backIndicatorTransitionMaskImage); -#endif } UIImage GetEmptyBackIndicatorImage() diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs index 22994b141..4735ae262 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs @@ -360,10 +360,8 @@ namespace Xamarin.Forms.Platform.iOS { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ if (Forms.IsiOS13OrNewer && previousTraitCollection.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) Application.Current?.TriggerThemeChanged(new AppThemeChangedEventArgs(Application.Current.RequestedTheme)); -#endif } bool ShouldUseSafeArea() diff --git a/Xamarin.Forms.Platform.iOS/Renderers/RadioButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/RadioButtonRenderer.cs index 6ddd1390e..05dc8622d 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/RadioButtonRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/RadioButtonRenderer.cs @@ -143,11 +143,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the control adheres to changes in UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) _radioButtonLayer.SetNeedsDisplay(); -#endif } void SetRadioBoxLayer(CALayer layer) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs index 8d40d2407..df35b7f9d 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs @@ -190,11 +190,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the control adheres to changes in UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) UpdateTextColor(); -#endif } void OnCancelClicked(object sender, EventArgs args) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs index 290bf5902..a929d41ac 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs @@ -130,11 +130,9 @@ namespace Xamarin.Forms.Platform.iOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the cells adhere to changes UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) Control.ReloadData(); -#endif } void SetSource() diff --git a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs index 3ddc90715..29ee09f2b 100644 --- a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs @@ -252,11 +252,9 @@ namespace Xamarin.Forms.Platform.MacOS public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection) { base.TraitCollectionDidChange(previousTraitCollection); -#if __XCODE11__ // Make sure the control adheres to changes in UI theme if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle) Control?.SetNeedsDisplay(); -#endif } internal override void SendVisualElementInitialized(VisualElement element, NativeView nativeView) diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj index 5d67c0e06..a19e3727c 100644 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj +++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj @@ -39,13 +39,6 @@ - - $(DefineConstants);__XCODE10__ - $(OutputPath)\2017 - - - $(DefineConstants);__XCODE11__ - @@ -334,11 +327,4 @@ Xamarin.Forms.Core - - - - - - - - + \ No newline at end of file diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln index 830997a05..140d380ec 100644 --- a/Xamarin.Forms.sln +++ b/Xamarin.Forms.sln @@ -124,10 +124,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.ControlGaller EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform", "Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{D31A6537-ED9C-4EBD-B231-A8D4FE44126A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Flex", "Xamarin.Flex", "{CA1DF598-3650-4A7B-A065-492C26009295}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Flex", "Xamarin.Flex\Xamarin.Flex.shproj", "{A6703C7D-D362-452A-A7A5-73771194D38C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Design", "Xamarin.Forms.Core.Design\Xamarin.Forms.Core.Design.csproj", "{98637471-8E5C-4DDE-89CA-2EAA664FB0EF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Design", "Xamarin.Forms.Xaml.Design\Xamarin.Forms.Xaml.Design.csproj", "{65BC4888-CC59-428A-9B75-540CF1C09480}" @@ -160,12 +156,10 @@ Global Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13 - Xamarin.Flex\Xamarin.Flex.projitems*{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}*SharedItemsImports = 5 Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4 Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4 Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4 Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4 - Xamarin.Flex\Xamarin.Flex.projitems*{a6703c7d-d362-452a-a7a5-73771194d38c}*SharedItemsImports = 13 Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 5 Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13 Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4 @@ -1538,7 +1532,6 @@ Global {411B960D-6D30-4079-83B2-ABB9987D2EDF} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} {8C7F0087-4031-4297-A651-6ED55F7B88BA} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8} {D31A6537-ED9C-4EBD-B231-A8D4FE44126A} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} - {A6703C7D-D362-452A-A7A5-73771194D38C} = {CA1DF598-3650-4A7B-A065-492C26009295} {98637471-8E5C-4DDE-89CA-2EAA664FB0EF} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} {65BC4888-CC59-428A-9B75-540CF1C09480} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF} {39B3457F-01D8-43D0-8E84-D8C4F73CF48E} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aeddff2c6..af7df37f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,12 +7,6 @@ variables: value: Xamarin.Forms.sln - name: BuildVersion value: $[counter('nuget-counter', 126)] -- name: BuildVersion42 - value: $[counter('xf-nuget-counter', 992000)] -- name: BuildVersion43 - value: $[counter('xf-nuget-counter', 992000)] -- name: BuildVersion44 - value: $[counter('xf-nuget-counter', 992000)] - name: NUGET_VERSION value: 5.6.0 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE @@ -155,24 +149,10 @@ stages: vmPool: $[coalesce(variables.macAndroid2019VmPool, 'Azure Pipelines')] vmImage: $[coalesce(variables.macAndroid2019VmImage, 'macOS-10.15')] provisionatorPath : 'build/provisioning/provisioning.csx' - buildForVS2017: false buildConfiguration: $(DefaultBuildConfiguration) ${{ if ne(variables['MSBuildArguments_cg_android'], '') }}: MSBuildArguments_cg_android: $(MSBuildArguments_cg_android) - - stage: android_2017 - displayName: Build Android 2017 - condition: and(succeeded(), eq(variables['System.TeamProject'], 'devdiv')) - dependsOn: windows - jobs: - - template: build/steps/build-android.yml - parameters: - vmPool: $[coalesce(variables.macAndroid2017VmPool, 'Azure Pipelines')] - vmImage: 'macOS-10.14' - provisionatorPath : 'build/provisioning/provisioning.csx' - buildForVS2017: true - buildConfiguration: $(DefaultBuildConfiguration) - - stage: build_osx displayName: Build OSX ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: @@ -196,34 +176,6 @@ stages: buildConfiguration: $(DefaultBuildConfiguration) iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12' iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision' - buildForVS2017: 'false' - steps: - - template: build/steps/build-osx.yml - - - stage: build_osx_2017 - displayName: Build OSX 2017 - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - dependsOn: windows - ${{ if eq(variables['System.TeamProject'], 'public') }}: - dependsOn: [] - jobs: - - job: osx - workspace: - clean: all - displayName: OSX Phase 2017 - pool: - name: $(osx2017VmPool) - vmImage: 'macOS-10.14' - demands: - - sh - - Xamarin.iOS - variables: - provisionator.osxPath : 'build/provisioning/provisioning.csx' - buildConfiguration: $(DefaultBuildConfiguration) - slnPath: $(SolutionFile) - iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12' - iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision' - buildForVS2017: 'true' steps: - template: build/steps/build-osx.yml diff --git a/build.cake b/build.cake index 76ce71375..b629e6e44 100644 --- a/build.cake +++ b/build.cake @@ -62,7 +62,6 @@ var packageVersion = Argument("packageVersion", ""); var releaseChannelArg = Argument("CHANNEL", "Stable"); releaseChannelArg = EnvironmentVariable("CHANNEL") ?? releaseChannelArg; var teamProject = Argument("TeamProject", ""); -bool buildForVS2017 = Convert.ToBoolean(Argument("buildForVS2017", "false")); bool isHostedAgent = agentName.StartsWith("Azure Pipelines") || agentName.StartsWith("Hosted Agent"); string defaultUnitTestWhere = ""; @@ -110,18 +109,12 @@ string MSBuildArgumentsENV = EnvironmentVariable("MSBuildArguments", ""); string MSBuildArgumentsARGS = Argument("MSBuildArguments", ""); string MSBuildArguments; -if(buildForVS2017) - MSBuildArguments = String.Empty; -else - MSBuildArguments = $"{MSBuildArgumentsENV} {MSBuildArgumentsARGS}"; +MSBuildArguments = $"{MSBuildArgumentsENV} {MSBuildArgumentsARGS}"; Information("MSBuildArguments: {0}", MSBuildArguments); string androidSdks = EnvironmentVariable("ANDROID_API_SDKS", "platform-tools,platforms;android-28,platforms;android-29,build-tools;29.0.3,platforms;android-30"); -if(buildForVS2017) - androidSdks = "platforms;android-28,platforms;android-29,build-tools;29.0.3"; - Information("ANDROID_API_SDKS: {0}", androidSdks); string[] androidSdkManagerInstalls = androidSdks.Split(','); @@ -164,7 +157,6 @@ Information ("ANDROID_RENDERERS: {0}", ANDROID_RENDERERS); Information ("configuration: {0}", configuration); Information ("ANDROID_HOME: {0}", ANDROID_HOME); Information ("Team Project: {0}", teamProject); -Information ("buildForVS2017: {0}", buildForVS2017); Information ("Agent.Name: {0}", agentName); Information ("isCIBuild: {0}", isCIBuild); Information ("artifactStagingDirectory: {0}", artifactStagingDirectory); @@ -187,17 +179,7 @@ string monoPatchVersion = ""; string monoMajorVersion = ""; string monoVersion = ""; -if(buildForVS2017) -{ - // VS2017 - monoMajorVersion = "5.18.1"; - monoPatchVersion = ""; - androidSDK_macos = "https://aka.ms/xamarin-android-commercial-d15-9-macos"; - iOSSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode10.2/9c8d8e0a50e68d9abc8cd48fcd47a669e981fcc9/53/package/xamarin.ios-12.4.0.64.pkg"; - macSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode10.2/9c8d8e0a50e68d9abc8cd48fcd47a669e981fcc9/53/package/xamarin.mac-5.4.0.64.pkg"; - -} -else if(releaseChannel == ReleaseChannel.Stable) +if(releaseChannel == ReleaseChannel.Stable) { if(IsXcodeVersionOver("11.4")) { @@ -235,18 +217,16 @@ string iOSSDK_windows = ""; string monoSDK_windows = ""; string macSDK_windows = ""; -if(!buildForVS2017) -{ - androidSDK_macos = EnvironmentVariable("ANDROID_SDK_MAC", androidSDK_macos); - iOSSDK_macos = EnvironmentVariable("IOS_SDK_MAC", iOSSDK_macos); - monoSDK_macos = EnvironmentVariable("MONO_SDK_MAC", monoSDK_macos); - macSDK_macos = EnvironmentVariable("MAC_SDK_MAC", macSDK_macos); - androidSDK_windows = EnvironmentVariable("ANDROID_SDK_WINDOWS", ""); - iOSSDK_windows = EnvironmentVariable("IOS_SDK_WINDOWS", ""); - monoSDK_windows = EnvironmentVariable("MONO_SDK_WINDOWS", ""); - macSDK_windows = EnvironmentVariable("MAC_SDK_WINDOWS", ""); -} +androidSDK_macos = EnvironmentVariable("ANDROID_SDK_MAC", androidSDK_macos); +iOSSDK_macos = EnvironmentVariable("IOS_SDK_MAC", iOSSDK_macos); +monoSDK_macos = EnvironmentVariable("MONO_SDK_MAC", monoSDK_macos); +macSDK_macos = EnvironmentVariable("MAC_SDK_MAC", macSDK_macos); + +androidSDK_windows = EnvironmentVariable("ANDROID_SDK_WINDOWS", ""); +iOSSDK_windows = EnvironmentVariable("IOS_SDK_WINDOWS", ""); +monoSDK_windows = EnvironmentVariable("MONO_SDK_WINDOWS", ""); +macSDK_windows = EnvironmentVariable("MAC_SDK_WINDOWS", ""); string androidSDK = IsRunningOnWindows() ? androidSDK_windows : androidSDK_macos; string monoSDK = IsRunningOnWindows() ? monoSDK_windows : monoSDK_macos; @@ -833,16 +813,14 @@ Task("BuildForNuget") binaryLogger.FileName = $"{artifactStagingDirectory}/ios-{configuration}-csproj.binlog"; MSBuild("./Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj", msbuildSettings - .WithTarget("rebuild") - .WithProperty("USE2017", "true")); + .WithTarget("rebuild")); msbuildSettings = GetMSBuildSettings(); msbuildSettings.BinaryLogger = binaryLogger; binaryLogger.FileName = $"{artifactStagingDirectory}/macos-{configuration}-csproj.binlog"; MSBuild("./Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.MacOS.csproj", msbuildSettings - .WithTarget("rebuild") - .WithProperty("USE2017", "true")); + .WithTarget("rebuild")); } catch(Exception) @@ -881,7 +859,7 @@ Task("Android100") MSBuild("Xamarin.Forms.sln", GetMSBuildSettings() .WithRestore() - .WithProperty("AndroidTargetFrameworks", "MonoAndroid90;MonoAndroid10.0")); + .WithProperty("AndroidTargetFrameworks", "MonoAndroid10.0")); }); Task("VSMAC") @@ -908,7 +886,7 @@ Task("cg-android") }; buildSettings.BinaryLogger = binaryLogger; - binaryLogger.FileName = $"{artifactStagingDirectory}/android-{ANDROID_RENDERERS}_{buildForVS2017}.binlog"; + binaryLogger.FileName = $"{artifactStagingDirectory}/android-{ANDROID_RENDERERS}.binlog"; } else { @@ -942,7 +920,7 @@ Task("cg-ios") }; buildSettings.BinaryLogger = binaryLogger; - binaryLogger.FileName = $"{artifactStagingDirectory}/ios-cg-2017_{buildForVS2017}.binlog"; + binaryLogger.FileName = $"{artifactStagingDirectory}/ios-cg.binlog"; } else { @@ -978,7 +956,7 @@ Task("cg-ios-build-tests") { var binaryLogger = new MSBuildBinaryLogSettings { Enabled = true, - FileName = $"{artifactStagingDirectory}/ios-uitests-2017_{buildForVS2017}.binlog" + FileName = $"{artifactStagingDirectory}/ios-uitests.binlog" }; buildSettings.BinaryLogger = binaryLogger; diff --git a/build/steps/build-android.yml b/build/steps/build-android.yml index 8c9a855ef..fef9bbdc1 100644 --- a/build/steps/build-android.yml +++ b/build/steps/build-android.yml @@ -31,30 +31,27 @@ jobs: android_legacy: renderers: 'LEGACY' outputfolder: 'legacyRenderers' - buildForVS2017: ${{ parameters.buildForVS2017 }} android_preAppCompat: renderers: 'PREAPPCOMPAT' outputfolder: 'preAppCompat' - buildForVS2017: ${{ parameters.buildForVS2017 }} android_newRenderers: renderers: 'FAST' outputfolder: 'newRenderers' - buildForVS2017: ${{ parameters.buildForVS2017 }} steps: - checkout: self clean: true - task: Bash@3 displayName: 'Cake Provision' - condition: or(eq(variables['provisioningCake'], 'true'), eq(variables['buildForVS2017'], 'true')) + condition: eq(variables['provisioningCake'], 'true') inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target provision --TeamProject="$(System.TeamProject)" --buildForVS2017=$(buildForVS2017) + arguments: --target provision --TeamProject="$(System.TeamProject)" - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provisionator' - condition: and(eq(variables['provisioning'], 'true'), eq(variables['buildForVS2017'], 'false')) + condition: eq(variables['provisioning'], 'true') inputs: provisioning_script: ${{ parameters.provisionatorPath }} provisioning_extra_args: ${{ parameters.provisionator.extraArguments }} @@ -110,7 +107,7 @@ jobs: inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --buildForVS2017=$(buildForVS2017) --BUILD_CONFIGURATION=${{ parameters.buildConfiguration }} --MSBuildArguments='${{ variables.MSBuildArguments_cg_android }}' + arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --BUILD_CONFIGURATION=${{ parameters.buildConfiguration }} --MSBuildArguments='${{ variables.MSBuildArguments_cg_android }}' - task: CopyFiles@2 displayName: 'Copy $(renderers)' @@ -123,22 +120,12 @@ jobs: - task: CopyFiles@2 displayName: 'Copy Android apk $(renderers) for UITest' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: | Xamarin.Forms.ControlGallery.Android/$(outputfolder)/$(ApkName) TargetFolder: '$(build.artifactstagingdirectory)/androidApp' CleanTargetFolder: true - - task: CopyFiles@2 - displayName: 'Copy Android apk $(renderers) for UITest 2017' - condition: eq(variables['buildForVS2017'], 'true') - inputs: - Contents: | - Xamarin.Forms.ControlGallery.Android/$(outputfolder)/$(ApkName) - TargetFolder: '$(build.artifactstagingdirectory)/androidApp_2017' - CleanTargetFolder: true - - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: AndroidApps' condition: always() diff --git a/build/steps/build-osx.yml b/build/steps/build-osx.yml index 3964b92e8..36ec5106c 100644 --- a/build/steps/build-osx.yml +++ b/build/steps/build-osx.yml @@ -4,13 +4,13 @@ steps: - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provision Xcode' - condition: and(ne(variables['REQUIRED_XCODE'], ''), eq(variables['buildForVS2017'], 'false')) + condition: ne(variables['REQUIRED_XCODE'], '') inputs: provisioning_script: 'build/provisioning/xcode.csx' - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provisionator' - condition: and(eq(variables['provisioning'], 'true'), eq(variables['buildForVS2017'], 'false')) + condition: eq(variables['provisioning'], 'true') inputs: provisioning_script: $(provisionator.osxPath) provisioning_extra_args: $(provisionator.extraArguments) --v @@ -19,15 +19,15 @@ steps: echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/" echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx" displayName: 'Setup SDK Paths' - condition: and(ne(variables['osx2019VmPool'], 'Azure Pipelines'), eq(variables['buildForVS2017'], 'false')) + condition: ne(variables['osx2019VmPool'], 'Azure Pipelines') - task: Bash@3 displayName: 'Cake Provision' - condition: or(eq(variables['provisioningCake'], 'true'), eq(variables['buildForVS2017'], 'true')) + condition: eq(variables['provisioningCake'], 'true') inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target provision --TeamProject="$(System.TeamProject)" --buildForVS2017=$(buildForVS2017) + arguments: --target provision --TeamProject="$(System.TeamProject)" - task: UseDotNet@2 displayName: 'Install .net core $(DOTNET_VERSION)' @@ -80,18 +80,17 @@ steps: inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target cg-ios --buildForVS2017=$(buildForVS2017) --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}' + arguments: --target cg-ios --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}' - task: Bash@3 displayName: 'Build iOS Tests' inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target cg-ios-build-tests --buildForVS2017=$(buildForVS2017) --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}' + arguments: --target cg-ios-build-tests -BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}' - task: CopyFiles@2 displayName: 'Copy iOS Files for UITest' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: | **/XamarinFormsControlGalleryiOS.ipa @@ -106,7 +105,6 @@ steps: - task: CopyFiles@2 displayName: 'Copy iOS dSYM' - condition: eq(variables['buildForVS2017'], 'false') inputs: SourceFolder: Xamarin.Forms.ControlGallery.iOS/bin/iPhone/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app.dSYM/ TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhone/XamarinFormsControlGalleryiOS.app.dSYM/' @@ -115,23 +113,14 @@ steps: - task: CopyFiles@2 displayName: 'Copy iOS App' - condition: eq(variables['buildForVS2017'], 'false') inputs: SourceFolder: Xamarin.Forms.ControlGallery.iOS/bin/iPhoneSimulator/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app/ TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhoneSimulator/XamarinFormsControlGalleryiOS.app/' CleanTargetFolder: false flattenFolders: false - - task: MSBuild@1 - displayName: 'Build Android Tests' - inputs: - solution: 'Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj' - configuration: $(buildConfiguration) - msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/android-uitests-2017_$(buildForVS2017).binlog - - task: CopyFiles@2 displayName: 'Copy test-cloud.exe' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: '**/Xamarin.UITest.*/tools/test-cloud.exe' TargetFolder: '$(build.artifactstagingdirectory)/testcloud' @@ -141,7 +130,6 @@ steps: - task: CopyFiles@2 displayName: 'Copy iOS Files for UITest' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: | **/XamarinFormsControlGalleryiOS.ipa @@ -156,7 +144,6 @@ steps: - task: CopyFiles@2 displayName: 'Copy iOS dSYM' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: | **/*.dSYM/**/*.* @@ -164,25 +151,8 @@ steps: CleanTargetFolder: false flattenFolders: false - - task: CopyFiles@2 - displayName: 'Copy iOS Files for UITest 2017' - condition: eq(variables['buildForVS2017'], 'true') - inputs: - Contents: | - **/$(IpaName) - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/nunit.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/NUnit3.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Plugin.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Xamarin.* - - TargetFolder: '$(build.artifactstagingdirectory)/ios_2017' - CleanTargetFolder: true - flattenFolders: true - - task: CopyFiles@2 displayName: 'Copy Android Files for UITest' - condition: eq(variables['buildForVS2017'], 'false') inputs: Contents: | Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*