diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38284.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38284.cs index e7513cb59eba..5fd45f65b0c9 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38284.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38284.cs @@ -1,10 +1,9 @@ using System; - using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Maps; -using Microsoft.Maui.Maps; using Microsoft.Maui.Devices.Sensors; +using Microsoft.Maui.Maps; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { diff --git a/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs index 25043e633ffd..d107e627539d 100644 --- a/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs +++ b/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs @@ -11,8 +11,8 @@ using AndroidX.AppCompat.Widget; using Microsoft.Maui.Controls.Platform; using Color = Microsoft.Maui.Graphics.Color; -using Size = Microsoft.Maui.Graphics.Size; using SearchView = AndroidX.AppCompat.Widget.SearchView; +using Size = Microsoft.Maui.Graphics.Size; namespace Microsoft.Maui.Controls.Compatibility.Platform.Android { diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs index 942dcf6521d5..445520ea53c7 100644 --- a/src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs +++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs @@ -1,16 +1,16 @@ #nullable enable +using System; +using Microsoft.Maui.Controls.Compatibility; using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using Microsoft.Maui.Graphics.Win2D; +using Microsoft.Maui.Hosting; +using Microsoft.Maui.LifecycleEvents; using BoxRenderer = Microsoft.Maui.Controls.Compatibility.Platform.UWP.BoxViewBorderRenderer; using CellRenderer = Microsoft.Maui.Controls.Compatibility.Platform.UWP.TextCellRenderer; +using DefaultRenderer = Microsoft.Maui.Controls.Compatibility.Platform.UWP.DefaultRenderer; +using ImageLoaderSourceHandler = Microsoft.Maui.Controls.Compatibility.Platform.UWP.UriImageSourceHandler; using ResourcesProvider = Microsoft.Maui.Controls.Compatibility.Platform.UWP.WindowsResourcesProvider; using StreamImagesourceHandler = Microsoft.Maui.Controls.Compatibility.Platform.UWP.StreamImageSourceHandler; -using ImageLoaderSourceHandler = Microsoft.Maui.Controls.Compatibility.Platform.UWP.UriImageSourceHandler; -using DefaultRenderer = Microsoft.Maui.Controls.Compatibility.Platform.UWP.DefaultRenderer; -using Microsoft.Maui.LifecycleEvents; -using Microsoft.Maui.Controls.Compatibility; -using System; -using Microsoft.Maui.Hosting; namespace Microsoft.Maui.Controls.Compatibility.Hosting { diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs b/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs index 13ec0f44c146..7458b4405dae 100644 --- a/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs +++ b/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using PlatformView = Microsoft.UI.Xaml.FrameworkElement; using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using Microsoft.Maui.Graphics; +using PlatformView = Microsoft.UI.Xaml.FrameworkElement; namespace Microsoft.Maui.Controls.Compatibility { diff --git a/src/Compatibility/Core/src/Windows/AccessKeyHelper.cs b/src/Compatibility/Core/src/Windows/AccessKeyHelper.cs index 6163c0a393c5..92547367d548 100644 --- a/src/Compatibility/Core/src/Windows/AccessKeyHelper.cs +++ b/src/Compatibility/Core/src/Windows/AccessKeyHelper.cs @@ -1,7 +1,7 @@ +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using VisualElementSpecifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.VisualElement; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs b/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs index 9ee893f7b399..af6f0b5e5172 100644 --- a/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs @@ -1,7 +1,7 @@ using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/BoxViewBorderRenderer.cs b/src/Compatibility/Core/src/Windows/BoxViewBorderRenderer.cs index e8ff5a404388..08a2ca9d7323 100644 --- a/src/Compatibility/Core/src/Windows/BoxViewBorderRenderer.cs +++ b/src/Compatibility/Core/src/Windows/BoxViewBorderRenderer.cs @@ -1,10 +1,10 @@ using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; -using WShape = Microsoft.UI.Xaml.Shapes.Shape; -using Microsoft.Maui.Controls.Platform; using WBorder = Microsoft.UI.Xaml.Controls.Border; +using WShape = Microsoft.UI.Xaml.Shapes.Shape; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ButtonRenderer.cs b/src/Compatibility/Core/src/Windows/ButtonRenderer.cs index 1354e2953d6d..1ad41f2efd50 100644 --- a/src/Compatibility/Core/src/Windows/ButtonRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ButtonRenderer.cs @@ -1,16 +1,16 @@ +using System; using System.ComponentModel; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media.Imaging; using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Controls.Internals; +using Microsoft.UI.Xaml.Media.Imaging; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImage = Microsoft.UI.Xaml.Controls.Image; using WStretch = Microsoft.UI.Xaml.Media.Stretch; using WThickness = Microsoft.UI.Xaml.Thickness; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; -using System; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CarouselPageRenderer.cs b/src/Compatibility/Core/src/Windows/CarouselPageRenderer.cs index a9b1b0586960..8b3090ddd8a3 100644 --- a/src/Compatibility/Core/src/Windows/CarouselPageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/CarouselPageRenderer.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Specialized; using System.ComponentModel; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.Internals; using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CellControl.cs b/src/Compatibility/Core/src/Windows/CellControl.cs index 3e8253f1628d..54a5d5a864c6 100644 --- a/src/Compatibility/Core/src/Windows/CellControl.cs +++ b/src/Compatibility/Core/src/Windows/CellControl.cs @@ -2,7 +2,10 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; -using Windows.UI.Input; +using Microsoft.Maui.Controls.Handlers.Compatibility; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; @@ -10,14 +13,11 @@ using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Animation; -using Microsoft.Maui.Controls.Internals; +using Windows.UI.Input; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Handlers.Compatibility; -using Microsoft.Maui.Controls.Platform; -using WMenuFlyout = Microsoft.UI.Xaml.Controls.MenuFlyout; using WFlyoutBase = Microsoft.UI.Xaml.Controls.Primitives.FlyoutBase; +using WMenuFlyout = Microsoft.UI.Xaml.Controls.MenuFlyout; +using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CheckBoxRenderer.cs b/src/Compatibility/Core/src/Windows/CheckBoxRenderer.cs index 41df44e104be..3c7a7b026bf5 100644 --- a/src/Compatibility/Core/src/Windows/CheckBoxRenderer.cs +++ b/src/Compatibility/Core/src/Windows/CheckBoxRenderer.cs @@ -1,8 +1,8 @@ using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CollectionView/CollectionViewRenderer.cs b/src/Compatibility/Core/src/Windows/CollectionView/CollectionViewRenderer.cs index d13d1dd8d135..09fee605a00e 100644 --- a/src/Compatibility/Core/src/Windows/CollectionView/CollectionViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/CollectionView/CollectionViewRenderer.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; -using Windows.Foundation; +using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Data; -using Microsoft.Maui.Controls.Internals; +using Windows.Foundation; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CollectionView/ItemContentControl.cs b/src/Compatibility/Core/src/Windows/CollectionView/ItemContentControl.cs index 7985061f586e..8f631109c378 100644 --- a/src/Compatibility/Core/src/Windows/CollectionView/ItemContentControl.cs +++ b/src/Compatibility/Core/src/Windows/CollectionView/ItemContentControl.cs @@ -1,11 +1,11 @@ using System; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.Internals; -using WThickness = Microsoft.UI.Xaml.Thickness; using WSize = Windows.Foundation.Size; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using WThickness = Microsoft.UI.Xaml.Thickness; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/Windows/CollectionView/ItemsViewRenderer.cs index 7e55c5140549..c36be5cb7483 100644 --- a/src/Compatibility/Core/src/Windows/CollectionView/ItemsViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/CollectionView/ItemsViewRenderer.cs @@ -2,17 +2,17 @@ using System.Collections.Specialized; using System.ComponentModel; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Data; -using Microsoft.Maui.Controls.Internals; using UwpApp = Microsoft.UI.Xaml.Application; using UwpDataTemplate = Microsoft.UI.Xaml.DataTemplate; using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility; using WRect = Windows.Foundation.Rect; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; using WVisibility = Microsoft.UI.Xaml.Visibility; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs b/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs index b2766bc3db20..dcec99e74879 100644 --- a/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs +++ b/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs @@ -1,16 +1,16 @@ using System; using System.ComponentModel; using System.Linq; -using Windows.UI.Text; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Documents; using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.Internals; +using Windows.UI.Text; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/EditorRenderer.cs b/src/Compatibility/Core/src/Windows/EditorRenderer.cs index 1f31a2e07085..4c203788a1cf 100644 --- a/src/Compatibility/Core/src/Windows/EditorRenderer.cs +++ b/src/Compatibility/Core/src/Windows/EditorRenderer.cs @@ -1,14 +1,14 @@ using System; using System.ComponentModel; -using Windows.UI.Text; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; -using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.InputView; using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Windows.UI.Text; +using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.InputView; +using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/EntryCellTextBox.cs b/src/Compatibility/Core/src/Windows/EntryCellTextBox.cs index 34b593b2ba7a..a80218f0a5ba 100644 --- a/src/Compatibility/Core/src/Windows/EntryCellTextBox.cs +++ b/src/Compatibility/Core/src/Windows/EntryCellTextBox.cs @@ -1,7 +1,7 @@ -using Windows.System; +using System; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using System; +using Windows.System; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/EntryRenderer.cs b/src/Compatibility/Core/src/Windows/EntryRenderer.cs index fed472a6d5d9..42ecc9180776 100644 --- a/src/Compatibility/Core/src/Windows/EntryRenderer.cs +++ b/src/Compatibility/Core/src/Windows/EntryRenderer.cs @@ -1,16 +1,16 @@ using System; using System.ComponentModel; -using Windows.System; -using Windows.UI.Text; +using Microsoft.Extensions.Logging; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; -using WBrush = Microsoft.UI.Xaml.Media.Brush; +using Windows.System; +using Windows.UI.Text; using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.InputView; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; +using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/Extensions/ClipExtensions.cs b/src/Compatibility/Core/src/Windows/Extensions/ClipExtensions.cs index 2c5ed22aacf0..2b418ed26ed8 100644 --- a/src/Compatibility/Core/src/Windows/Extensions/ClipExtensions.cs +++ b/src/Compatibility/Core/src/Windows/Extensions/ClipExtensions.cs @@ -1,12 +1,12 @@ #pragma warning disable CS8305 +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.Shapes; using Microsoft.UI.Composition; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Hosting; -using Microsoft.Maui.Controls.Shapes; using WRectangleGeometry = Microsoft.UI.Xaml.Media.RectangleGeometry; -using Microsoft.Maui.Controls.Platform; #if UWP_18362 using WVector2 = System.Numerics.Vector2; diff --git a/src/Compatibility/Core/src/Windows/Extensions/ImageExtensions.cs b/src/Compatibility/Core/src/Windows/Extensions/ImageExtensions.cs index 6d8629fa5a54..f24f20c9da8c 100644 --- a/src/Compatibility/Core/src/Windows/Extensions/ImageExtensions.cs +++ b/src/Compatibility/Core/src/Windows/Extensions/ImageExtensions.cs @@ -1,18 +1,18 @@ using System; -using Microsoft.Graphics.Canvas.UI.Xaml; -using Microsoft.UI.Xaml.Media.Imaging; using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Windows.Foundation; +using Microsoft.Extensions.Logging; +using Microsoft.Graphics.Canvas.UI.Xaml; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.Internals; +using Microsoft.UI.Xaml.Media.Imaging; +using Windows.Foundation; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; -using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FileImageSourceHandler.cs b/src/Compatibility/Core/src/Windows/FileImageSourceHandler.cs index 67812728c302..e00b23e82293 100644 --- a/src/Compatibility/Core/src/Windows/FileImageSourceHandler.cs +++ b/src/Compatibility/Core/src/Windows/FileImageSourceHandler.cs @@ -1,11 +1,11 @@ using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using IOPath = System.IO.Path; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FlyoutPageControl.cs b/src/Compatibility/Core/src/Windows/FlyoutPageControl.cs index 42e39b514247..fe245f4175c7 100644 --- a/src/Compatibility/Core/src/Windows/FlyoutPageControl.cs +++ b/src/Compatibility/Core/src/Windows/FlyoutPageControl.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; using WVisibility = Microsoft.UI.Xaml.Visibility; diff --git a/src/Compatibility/Core/src/Windows/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/Windows/FlyoutPageRenderer.cs index 1b7774ac38d5..fe1539cf88c6 100644 --- a/src/Compatibility/Core/src/Windows/FlyoutPageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/FlyoutPageRenderer.cs @@ -1,17 +1,17 @@ using System; using System.ComponentModel; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Devices; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Automation.Peers; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; using WVisibility = Microsoft.UI.Xaml.Visibility; -using Microsoft.Maui.Devices; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FormsCancelButton.cs b/src/Compatibility/Core/src/Windows/FormsCancelButton.cs index bf140faeaf83..fa1662240e57 100644 --- a/src/Compatibility/Core/src/Windows/FormsCancelButton.cs +++ b/src/Compatibility/Core/src/Windows/FormsCancelButton.cs @@ -1,7 +1,7 @@ using System; using Microsoft.UI.Xaml.Controls; -using WBrush = Microsoft.UI.Xaml.Media.Brush; using WBorder = Microsoft.UI.Xaml.Controls.Border; +using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FormsComboBox.cs b/src/Compatibility/Core/src/Windows/FormsComboBox.cs index ead13ba1bc4f..8f7a51e36847 100644 --- a/src/Compatibility/Core/src/Windows/FormsComboBox.cs +++ b/src/Compatibility/Core/src/Windows/FormsComboBox.cs @@ -1,7 +1,7 @@ using System; +using Microsoft.Maui.Devices; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; -using Microsoft.Maui.Devices; using WVisualState = Microsoft.UI.Xaml.VisualState; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/FormsCommandBar.cs b/src/Compatibility/Core/src/Windows/FormsCommandBar.cs index 5beb59c17fb4..df3ae96e3e58 100644 --- a/src/Compatibility/Core/src/Windows/FormsCommandBar.cs +++ b/src/Compatibility/Core/src/Windows/FormsCommandBar.cs @@ -1,9 +1,9 @@ using System; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Media; +using Windows.Foundation.Collections; using WVisibility = Microsoft.UI.Xaml.Visibility; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/FormsFlyout.xaml.cs b/src/Compatibility/Core/src/Windows/FormsFlyout.xaml.cs index 7c8550afe983..f5a113fc7bbb 100644 --- a/src/Compatibility/Core/src/Windows/FormsFlyout.xaml.cs +++ b/src/Compatibility/Core/src/Windows/FormsFlyout.xaml.cs @@ -1,8 +1,8 @@ using System; using System.Linq; +using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.Internals; using WVisibility = Microsoft.UI.Xaml.Visibility; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/FormsPivot.cs b/src/Compatibility/Core/src/Windows/FormsPivot.cs index 6193e10623e6..d7a91183df8d 100644 --- a/src/Compatibility/Core/src/Windows/FormsPivot.cs +++ b/src/Compatibility/Core/src/Windows/FormsPivot.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/FormsPresenter.cs b/src/Compatibility/Core/src/Windows/FormsPresenter.cs index cb5315a89167..23ed6646383f 100644 --- a/src/Compatibility/Core/src/Windows/FormsPresenter.cs +++ b/src/Compatibility/Core/src/Windows/FormsPresenter.cs @@ -1,7 +1,7 @@ using System; -using Microsoft.UI.Xaml; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; +using Microsoft.UI.Xaml; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FormsTextBox.cs b/src/Compatibility/Core/src/Windows/FormsTextBox.cs index 9b1c2798f08a..e70201fec87f 100644 --- a/src/Compatibility/Core/src/Windows/FormsTextBox.cs +++ b/src/Compatibility/Core/src/Windows/FormsTextBox.cs @@ -1,17 +1,17 @@ using System; using System.Linq; +using System.Text; using System.Threading; using System.Threading.Tasks; -using Windows.System; -using Windows.UI.Core; +using Microsoft.Maui.Devices; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Devices; +using Windows.System; +using Windows.UI.Core; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WVisualStateManager = Microsoft.UI.Xaml.VisualStateManager; -using System.Text; -using Microsoft.Maui.Graphics; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FrameRenderer.cs b/src/Compatibility/Core/src/Windows/FrameRenderer.cs index 23734d4776c3..3eab53873e04 100644 --- a/src/Compatibility/Core/src/Windows/FrameRenderer.cs +++ b/src/Compatibility/Core/src/Windows/FrameRenderer.cs @@ -1,11 +1,11 @@ +using System; using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.Platform; using WBorder = Microsoft.UI.Xaml.Controls.Border; -using System; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/FrameworkElementExtensions.cs b/src/Compatibility/Core/src/Windows/FrameworkElementExtensions.cs index 38b5406bc90f..8a49258a0241 100644 --- a/src/Compatibility/Core/src/Windows/FrameworkElementExtensions.cs +++ b/src/Compatibility/Core/src/Windows/FrameworkElementExtensions.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.Internals; using WBinding = Microsoft.UI.Xaml.Data.Binding; -using WBrush = Microsoft.UI.Xaml.Media.Brush; using WBindingExpression = Microsoft.UI.Xaml.Data.BindingExpression; +using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/HandlerToRendererShim.cs b/src/Compatibility/Core/src/Windows/HandlerToRendererShim.cs index 3870d43ef66f..61821e5f7c32 100644 --- a/src/Compatibility/Core/src/Windows/HandlerToRendererShim.cs +++ b/src/Compatibility/Core/src/Windows/HandlerToRendererShim.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel; -using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Compatibility.Platform.UWP; -using Microsoft.UI.Xaml; -using Microsoft.Maui.Graphics; +using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; +using Microsoft.UI.Xaml; namespace Microsoft.Maui.Controls.Compatibility { diff --git a/src/Compatibility/Core/src/Windows/ImageButtonRenderer.cs b/src/Compatibility/Core/src/Windows/ImageButtonRenderer.cs index 4fbe3456378f..51aad0073a6d 100644 --- a/src/Compatibility/Core/src/Windows/ImageButtonRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ImageButtonRenderer.cs @@ -1,17 +1,17 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Media; +using Microsoft.Extensions.Logging; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; +using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImage = Microsoft.UI.Xaml.Controls.Image; using WStretch = Microsoft.UI.Xaml.Media.Stretch; using WThickness = Microsoft.UI.Xaml.Thickness; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ImageRenderer.cs b/src/Compatibility/Core/src/Windows/ImageRenderer.cs index 0226af3b4031..d6ec732881e1 100644 --- a/src/Compatibility/Core/src/Windows/ImageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ImageRenderer.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -using Microsoft.UI.Xaml; +using Microsoft.Extensions.Logging; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; +using Microsoft.UI.Xaml; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/IndicatorViewRenderer.cs b/src/Compatibility/Core/src/Windows/IndicatorViewRenderer.cs index 7f53219e6630..52610e43a02c 100644 --- a/src/Compatibility/Core/src/Windows/IndicatorViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/IndicatorViewRenderer.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Markup; @@ -8,7 +9,6 @@ using WEllipse = Microsoft.UI.Xaml.Shapes.Ellipse; using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle; using WShape = Microsoft.UI.Xaml.Shapes.Shape; -using Microsoft.Maui.Controls.Platform; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/KeyboardExtensions.cs b/src/Compatibility/Core/src/Windows/KeyboardExtensions.cs index ad2d13dddd87..c57b36a3e31f 100644 --- a/src/Compatibility/Core/src/Windows/KeyboardExtensions.cs +++ b/src/Compatibility/Core/src/Windows/KeyboardExtensions.cs @@ -1,7 +1,7 @@ using System; -using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Controls.Internals; using Microsoft.Extensions.Logging; +using Microsoft.Maui.Controls.Internals; +using Microsoft.UI.Xaml.Input; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/LabelRenderer.cs b/src/Compatibility/Core/src/Windows/LabelRenderer.cs index 538cba221c77..ed5d49c48af6 100644 --- a/src/Compatibility/Core/src/Windows/LabelRenderer.cs +++ b/src/Compatibility/Core/src/Windows/LabelRenderer.cs @@ -3,18 +3,18 @@ using System.ComponentModel; using System.Text.RegularExpressions; using System.Xml.Linq; +using Microsoft.Maui.Controls.Compatibility.Platform.UAP; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Graphics; using Microsoft.UI.Text; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; using Windows.UI.Text; -using Microsoft.Maui.Controls.Platform; -using Microsoft.Maui.Controls.Compatibility.Platform.UAP; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Label; using WRect = Windows.Foundation.Rect; using WThickness = Microsoft.UI.Xaml.Thickness; -using Microsoft.Maui.Graphics; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/LayoutRenderer.cs b/src/Compatibility/Core/src/Windows/LayoutRenderer.cs index 88451629b674..399d29286aea 100644 --- a/src/Compatibility/Core/src/Windows/LayoutRenderer.cs +++ b/src/Compatibility/Core/src/Windows/LayoutRenderer.cs @@ -1,12 +1,12 @@ using System.ComponentModel; -using Windows.UI; +using Microsoft.Maui.Controls.Platform; +using Microsoft.UI; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Media; +using Windows.UI; using WRect = Windows.Foundation.Rect; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; -using Microsoft.UI; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ListViewRenderer.cs b/src/Compatibility/Core/src/Windows/ListViewRenderer.cs index 8b5662d9dc62..fd57e2757fd6 100644 --- a/src/Compatibility/Core/src/Windows/ListViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ListViewRenderer.cs @@ -1,29 +1,29 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Windows.Foundation; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Devices; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Devices; -using WListView = Microsoft.UI.Xaml.Controls.ListView; -using WBinding = Microsoft.UI.Xaml.Data.Binding; -using WApp = Microsoft.UI.Xaml.Application; -using WRect = Windows.Foundation.Rect; -using Microsoft.Maui.Controls.Internals; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Windows.Foundation; using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.ListView; -using System.Collections.ObjectModel; -using Microsoft.Maui.Controls.Platform; using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility; +using WApp = Microsoft.UI.Xaml.Application; +using WBinding = Microsoft.UI.Xaml.Data.Binding; +using WListView = Microsoft.UI.Xaml.Controls.ListView; +using WRect = Windows.Foundation.Rect; using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/MasterBackgroundConverter.cs b/src/Compatibility/Core/src/Windows/MasterBackgroundConverter.cs index 4be2b83c36bf..5779cb45fc46 100644 --- a/src/Compatibility/Core/src/Windows/MasterBackgroundConverter.cs +++ b/src/Compatibility/Core/src/Windows/MasterBackgroundConverter.cs @@ -1,9 +1,9 @@ using System; -using Windows.UI; using Microsoft.UI; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; +using Windows.UI; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/NativeBindingExtensions.cs b/src/Compatibility/Core/src/Windows/NativeBindingExtensions.cs index 8c1a8d60fb0c..00de36ce7264 100644 --- a/src/Compatibility/Core/src/Windows/NativeBindingExtensions.cs +++ b/src/Compatibility/Core/src/Windows/NativeBindingExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using Microsoft.UI.Xaml; using Microsoft.Maui.Controls.Internals; +using Microsoft.UI.Xaml; using static System.String; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/NativeBindingService.cs b/src/Compatibility/Core/src/Windows/NativeBindingService.cs index ad2bd98941e7..794e91db2e33 100644 --- a/src/Compatibility/Core/src/Windows/NativeBindingService.cs +++ b/src/Compatibility/Core/src/Windows/NativeBindingService.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Reflection; -using Microsoft.UI.Xaml; using Microsoft.Maui.Controls.Xaml.Internals; +using Microsoft.UI.Xaml; [assembly: Microsoft.Maui.Controls.Dependency(typeof(Microsoft.Maui.Controls.Compatibility.Platform.UWP.NativeBindingService))] diff --git a/src/Compatibility/Core/src/Windows/NativeEventWrapper.cs b/src/Compatibility/Core/src/Windows/NativeEventWrapper.cs index d09e3a9cfd22..8c49cd00da43 100644 --- a/src/Compatibility/Core/src/Windows/NativeEventWrapper.cs +++ b/src/Compatibility/Core/src/Windows/NativeEventWrapper.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.Extensions.Logging; +using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml; using WinRT; -using Microsoft.Maui.Controls.Internals; -using Microsoft.Extensions.Logging; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/NativeValueConverterService.cs b/src/Compatibility/Core/src/Windows/NativeValueConverterService.cs index 1e04eab771a6..035e1b2b3742 100644 --- a/src/Compatibility/Core/src/Windows/NativeValueConverterService.cs +++ b/src/Compatibility/Core/src/Windows/NativeValueConverterService.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -using Microsoft.UI.Xaml; using Microsoft.Maui.Controls.Xaml.Internals; +using Microsoft.UI.Xaml; [assembly: Microsoft.Maui.Controls.Dependency(typeof(Microsoft.Maui.Controls.Compatibility.Platform.UWP.NativeValueConverterService))] diff --git a/src/Compatibility/Core/src/Windows/NativeViewWrapperRenderer.cs b/src/Compatibility/Core/src/Windows/NativeViewWrapperRenderer.cs index 7d75da534847..d4621f23b4f0 100644 --- a/src/Compatibility/Core/src/Windows/NativeViewWrapperRenderer.cs +++ b/src/Compatibility/Core/src/Windows/NativeViewWrapperRenderer.cs @@ -1,6 +1,6 @@ -using Microsoft.UI.Xaml; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Platform; +using Microsoft.UI.Xaml; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/NavigationPageRenderer.cs b/src/Compatibility/Core/src/Windows/NavigationPageRenderer.cs index dd0af6b56038..017835ab299e 100644 --- a/src/Compatibility/Core/src/Windows/NavigationPageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/NavigationPageRenderer.cs @@ -3,20 +3,20 @@ using System.Collections.Specialized; using System.ComponentModel; using System.Threading.Tasks; -using Windows.Devices.Input; -using Windows.UI.Input; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media.Animation; +using Windows.Devices.Input; using Windows.UI.Core; -using Microsoft.UI.Xaml.Data; -using Microsoft.Maui.Controls.Internals; +using Windows.UI.Input; using static Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Page; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/PageControl.cs b/src/Compatibility/Core/src/Windows/PageControl.cs index 0946936c7cc5..0250ab3a79a3 100644 --- a/src/Compatibility/Core/src/Windows/PageControl.cs +++ b/src/Compatibility/Core/src/Windows/PageControl.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; using WVisibility = Microsoft.UI.Xaml.Visibility; diff --git a/src/Compatibility/Core/src/Windows/PageRenderer.cs b/src/Compatibility/Core/src/Windows/PageRenderer.cs index 7e51203a0a48..ea783ab81be6 100644 --- a/src/Compatibility/Core/src/Windows/PageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/PageRenderer.cs @@ -1,11 +1,11 @@ +using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using Windows.UI.ViewManagement; +using Microsoft.Maui.Controls.Platform; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; -using System; -using Microsoft.Maui.Controls.Platform; +using Windows.UI.ViewManagement; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/PickerRenderer.cs b/src/Compatibility/Core/src/Windows/PickerRenderer.cs index 446413b0667e..3b60785dcc1e 100644 --- a/src/Compatibility/Core/src/Windows/PickerRenderer.cs +++ b/src/Compatibility/Core/src/Windows/PickerRenderer.cs @@ -1,14 +1,14 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -using Windows.UI.Core; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Controls.Internals; +using Windows.UI.Core; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/Platform.cs b/src/Compatibility/Core/src/Windows/Platform.cs index f80eea2f8b0f..444b3926be5a 100644 --- a/src/Compatibility/Core/src/Windows/Platform.cs +++ b/src/Compatibility/Core/src/Windows/Platform.cs @@ -2,18 +2,18 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Windows.Foundation.Metadata; using Windows.UI.Core; -using Microsoft.Maui.Controls.Internals; using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties; using WFlowDirection = Microsoft.UI.Xaml.FlowDirection; using WImage = Microsoft.UI.Xaml.Controls.Image; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; using WVisibility = Microsoft.UI.Xaml.Visibility; -using Microsoft.Extensions.Logging; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs b/src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs index 54efb30a4c0a..583fa7421d35 100644 --- a/src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs @@ -1,9 +1,9 @@ using System.ComponentModel; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.Maui.Controls.Internals; -using Microsoft.Maui.Graphics; using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls.Primitives; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs b/src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs index 289e1bbd2e12..8582d7d059c3 100644 --- a/src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs +++ b/src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs @@ -1,11 +1,11 @@ using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Input; +using static Microsoft.Maui.Controls.Compatibility.Platform.UWP.ViewToRendererConverter; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WThickness = Microsoft.UI.Xaml.Thickness; -using static Microsoft.Maui.Controls.Compatibility.Platform.UWP.ViewToRendererConverter; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs b/src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs index 05023d1c98bb..19bf077ca593 100644 --- a/src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs @@ -1,15 +1,15 @@ using System; using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Graphics; +using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media; using Windows.Foundation; using Windows.UI.Core; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.RefreshView; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs b/src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs index 6fb295b83b77..6cbb2ce3f497 100644 --- a/src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs @@ -1,12 +1,12 @@ using System; using System.ComponentModel; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using WRect = Windows.Foundation.Rect; using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using WRect = Windows.Foundation.Rect; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/SearchBarRenderer.cs b/src/Compatibility/Core/src/Windows/SearchBarRenderer.cs index 4e07b428f7f0..85eb26b0343c 100644 --- a/src/Compatibility/Core/src/Windows/SearchBarRenderer.cs +++ b/src/Compatibility/Core/src/Windows/SearchBarRenderer.cs @@ -1,13 +1,13 @@ using System.ComponentModel; -using Windows.UI.Text; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; -using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.SearchBar; using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Windows.UI.Text; +using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.SearchBar; +using WBrush = Microsoft.UI.Xaml.Media.Brush; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/SliderRenderer.cs b/src/Compatibility/Core/src/Windows/SliderRenderer.cs index 00f6204ffaf2..404f3520a08d 100644 --- a/src/Compatibility/Core/src/Windows/SliderRenderer.cs +++ b/src/Compatibility/Core/src/Windows/SliderRenderer.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls.Primitives; @@ -7,7 +8,6 @@ using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/StepperControl.cs b/src/Compatibility/Core/src/Windows/StepperControl.cs index 20c8c67dcb23..18d294052608 100644 --- a/src/Compatibility/Core/src/Windows/StepperControl.cs +++ b/src/Compatibility/Core/src/Windows/StepperControl.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using WVisualStateManager = Microsoft.UI.Xaml.VisualStateManager; -using WVisualStateGroup = Microsoft.UI.Xaml.VisualStateGroup; using WVisualState = Microsoft.UI.Xaml.VisualState; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using WVisualStateGroup = Microsoft.UI.Xaml.VisualStateGroup; +using WVisualStateManager = Microsoft.UI.Xaml.VisualStateManager; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs b/src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs index 5de9fadb35bd..b150f3c12e74 100644 --- a/src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs @@ -1,15 +1,15 @@ using System; -using System.Linq; -using System.ComponentModel; using System.Collections.Generic; using System.Collections.Specialized; +using System.ComponentModel; +using System.Linq; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using WSwipeBehaviorOnInvoked = Microsoft.UI.Xaml.Controls.SwipeBehaviorOnInvoked; using WSwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl; -using WSwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems; using WSwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem; +using WSwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems; using WSwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/SwitchRenderer.cs b/src/Compatibility/Core/src/Windows/SwitchRenderer.cs index c6c879e9a73f..1d9da0bd4a1f 100644 --- a/src/Compatibility/Core/src/Windows/SwitchRenderer.cs +++ b/src/Compatibility/Core/src/Windows/SwitchRenderer.cs @@ -1,17 +1,17 @@ using System.ComponentModel; using System.Linq; +using Microsoft.Maui.Controls.Platform; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; using Microsoft.UI.Xaml.Shapes; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WColor = Windows.UI.Color; -using WGrid = Microsoft.UI.Xaml.Controls.Grid; using WEllipse = Microsoft.UI.Xaml.Shapes.Ellipse; +using WGrid = Microsoft.UI.Xaml.Controls.Grid; using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; using WVisualStateManager = Microsoft.UI.Xaml.VisualStateManager; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs index 59c6f9c4b7ad..d30c60259747 100644 --- a/src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs +++ b/src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs @@ -1,30 +1,30 @@ using System; -using System.Linq; using System.Collections.Specialized; using System.ComponentModel; +using System.Linq; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; -using Microsoft.Maui.Controls.Internals; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using PageSpecifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Page; +using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.TabbedPage; +using VisualElementSpecifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.VisualElement; using WBrush = Microsoft.UI.Xaml.Media.Brush; using WGrid = Microsoft.UI.Xaml.Controls.Grid; -using WTextAlignment = Microsoft.UI.Xaml.TextAlignment; using WHorizontalAlignment = Microsoft.UI.Xaml.HorizontalAlignment; -using WVisibility = Microsoft.UI.Xaml.Visibility; -using WStackPanel = Microsoft.UI.Xaml.Controls.StackPanel; using WImage = Microsoft.UI.Xaml.Controls.Image; +using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; +using WStackPanel = Microsoft.UI.Xaml.Controls.StackPanel; +using WTextAlignment = Microsoft.UI.Xaml.TextAlignment; using WTextBlock = Microsoft.UI.Xaml.Controls.TextBlock; -using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.TabbedPage; -using VisualElementSpecifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.VisualElement; -using PageSpecifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Page; -using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; +using WVisibility = Microsoft.UI.Xaml.Visibility; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/TableViewRenderer.cs b/src/Compatibility/Core/src/Windows/TableViewRenderer.cs index 667434a8f791..d8ebea5993ca 100644 --- a/src/Compatibility/Core/src/Windows/TableViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/TableViewRenderer.cs @@ -1,10 +1,10 @@ using System; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; using WItemsControl = Microsoft.UI.Xaml.Controls.ItemsControl; using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/TextCellRenderer.cs b/src/Compatibility/Core/src/Windows/TextCellRenderer.cs index 331a00eb545b..270066274036 100644 --- a/src/Compatibility/Core/src/Windows/TextCellRenderer.cs +++ b/src/Compatibility/Core/src/Windows/TextCellRenderer.cs @@ -1,10 +1,10 @@ using System; using System.Windows.Input; -using WDataTemplate = Microsoft.UI.Xaml.DataTemplate; -using WApplication = Microsoft.UI.Xaml.Application; +using Microsoft.Maui.Controls.Handlers.Compatibility; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Platform.Compatibility; -using Microsoft.Maui.Controls.Handlers.Compatibility; +using WApplication = Microsoft.UI.Xaml.Application; +using WDataTemplate = Microsoft.UI.Xaml.DataTemplate; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs b/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs index a1280fcd69a7..d853d127d0ec 100644 --- a/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs +++ b/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs @@ -1,14 +1,14 @@ using System; using System.ComponentModel; using System.Linq; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Media; using WBrush = Microsoft.UI.Xaml.Media.Brush; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs b/src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs index 0f006b2b9812..a27c6a632e9a 100644 --- a/src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs +++ b/src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs @@ -1,8 +1,8 @@ using System; +using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; +using Microsoft.Maui.Devices; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.Devices; -using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; using WBorder = Microsoft.UI.Xaml.Controls.Border; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs b/src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs index abcd4d3a2252..22dd13b2ad42 100644 --- a/src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs +++ b/src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs @@ -2,12 +2,12 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Windows.Storage.Streams; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media.Imaging; +using Microsoft.Extensions.Logging; using Microsoft.Maui.Controls.Internals; using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media.Imaging; +using Windows.Storage.Streams; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ViewRenderer.cs b/src/Compatibility/Core/src/Windows/ViewRenderer.cs index 61c4ea28a357..c0804a0d84ab 100644 --- a/src/Compatibility/Core/src/Windows/ViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/ViewRenderer.cs @@ -1,7 +1,7 @@ +using System; +using Microsoft.Maui.Controls.Platform; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; -using Microsoft.Maui.Controls.Platform; -using System; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs b/src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs index c66f83b0d062..a9b079768cf2 100644 --- a/src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs +++ b/src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs @@ -1,9 +1,9 @@ using System; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using WRect = Windows.Foundation.Rect; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/VisualElementRenderer.cs b/src/Compatibility/Core/src/Windows/VisualElementRenderer.cs index 4d554e73d5e3..ae5de36e3553 100644 --- a/src/Compatibility/Core/src/Windows/VisualElementRenderer.cs +++ b/src/Compatibility/Core/src/Windows/VisualElementRenderer.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; -using Microsoft.Maui.Controls.Internals; using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.VisualElement; using WRect = Windows.Foundation.Rect; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls.Platform; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/Windows/VisualElementTracker.cs b/src/Compatibility/Core/src/Windows/VisualElementTracker.cs index d02726e2c36c..59da8736fdc4 100644 --- a/src/Compatibility/Core/src/Windows/VisualElementTracker.cs +++ b/src/Compatibility/Core/src/Windows/VisualElementTracker.cs @@ -5,19 +5,19 @@ using System.ComponentModel; using System.Linq; using System.Threading.Tasks; -using Windows.ApplicationModel.DataTransfer; -using Windows.Graphics.Imaging; -using Windows.Storage.Streams; +using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Graphics; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Hosting; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; -using Microsoft.Maui.Controls.Internals; +using Windows.ApplicationModel.DataTransfer; +using Windows.Graphics.Imaging; +using Windows.Storage.Streams; using WCompositeTransform = Microsoft.UI.Xaml.Media.CompositeTransform; using WScaleTransform = Microsoft.UI.Xaml.Media.ScaleTransform; -using Microsoft.Maui.Graphics; using WVisibility = Microsoft.UI.Xaml.Visibility; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP diff --git a/src/Compatibility/Core/src/Windows/WebViewRenderer.cs b/src/Compatibility/Core/src/Windows/WebViewRenderer.cs index 486302dff0c1..ff23bdfd056f 100644 --- a/src/Compatibility/Core/src/Windows/WebViewRenderer.cs +++ b/src/Compatibility/Core/src/Windows/WebViewRenderer.cs @@ -1,19 +1,19 @@ #pragma warning disable CA1416 // Validate platform compatibility using System; +using System.Collections.Generic; using System.ComponentModel; -using Windows.UI.Core; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Microsoft.Maui.Controls.Internals; -using static System.String; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific; -using System.Threading.Tasks; -using System.Net; -using Windows.Web.Http; -using System.Collections.Generic; -using System.Linq; using Microsoft.UI.Xaml.Controls; +using Windows.UI.Core; +using Windows.Web.Http; +using static System.String; using WWebView = Microsoft.UI.Xaml.Controls.WebView2; -using Microsoft.Maui.Controls.Platform; -using Microsoft.Extensions.Logging; namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { diff --git a/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs b/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs index 193e644a9fb5..12b0ec93061d 100644 --- a/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs +++ b/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs @@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS [SupportedOSPlatform("ios11.0")] internal class DragAndDropDelegate : NSObject, IUIDragInteractionDelegate, IUIDropInteractionDelegate { -#region UIDragInteractionDelegate + #region UIDragInteractionDelegate [Export("dragInteraction:session:willEndWithOperation:")] @@ -39,7 +39,7 @@ public UIDragItem[] GetItemsForBeginningSession(UIDragInteraction interaction, I return new UIDragItem[0]; } -#endregion + #endregion [Export("dropInteraction:canHandleSession:")] [Preserve(Conditional = true)] diff --git a/src/Compatibility/Maps/src/Android/MapRenderer.cs b/src/Compatibility/Maps/src/Android/MapRenderer.cs index c13a8d26905f..fe526759bf13 100644 --- a/src/Compatibility/Maps/src/Android/MapRenderer.cs +++ b/src/Compatibility/Maps/src/Android/MapRenderer.cs @@ -25,10 +25,10 @@ using APolygon = Android.Gms.Maps.Model.Polygon; using APolyline = Android.Gms.Maps.Model.Polyline; using Circle = Microsoft.Maui.Controls.Maps.Circle; +using IList = System.Collections.IList; using Math = System.Math; using Polygon = Microsoft.Maui.Controls.Maps.Polygon; using Polyline = Microsoft.Maui.Controls.Maps.Polyline; -using IList = System.Collections.IList; namespace Microsoft.Maui.Controls.Compatibility.Maps.Android { diff --git a/src/Controls/samples/Controls.Sample/Controls/Rate/Rate.cs b/src/Controls/samples/Controls.Sample/Controls/Rate/Rate.cs index 938e7c972fa8..eb289be18680 100644 --- a/src/Controls/samples/Controls.Sample/Controls/Rate/Rate.cs +++ b/src/Controls/samples/Controls.Sample/Controls/Rate/Rate.cs @@ -1,9 +1,9 @@ using System; +using System.Runtime.CompilerServices; +using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Shapes; using Microsoft.Maui.Graphics; -using System.Runtime.CompilerServices; -using Microsoft.Maui; namespace Maui.Controls.Sample.Controls { diff --git a/src/Controls/samples/Controls.Sample/Pages/AppShell.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/AppShell.xaml.cs index 4f106de6d20f..a6604b6bc7e1 100644 --- a/src/Controls/samples/Controls.Sample/Pages/AppShell.xaml.cs +++ b/src/Controls/samples/Controls.Sample/Pages/AppShell.xaml.cs @@ -1,9 +1,9 @@ -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Controls; +using System; using System.Collections.Generic; -using System; -using Maui.Controls.Sample.Pages.ShellGalleries; using System.Linq; +using Maui.Controls.Sample.Pages.ShellGalleries; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Graphics; namespace Maui.Controls.Sample.Pages { diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs index be3d02732fdd..0dbd4e6cd19d 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs @@ -1,12 +1,12 @@ using System; -using Microsoft.Maui.Controls; -using Microsoft.Maui.Maps; -using Microsoft.Maui.Controls.Maps; -using System.Windows.Input; using System.Collections; using System.Collections.ObjectModel; -using System.Linq; using System.ComponentModel; +using System.Linq; +using System.Windows.Input; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Maps; +using Microsoft.Maui.Maps; using Position = Microsoft.Maui.Devices.Sensors.Location; namespace Maui.Controls.Sample.Pages.MapsGalleries diff --git a/src/Controls/samples/Controls.Sample/Pages/Others/TwoPaneViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Others/TwoPaneViewPage.xaml.cs index b057b7d402db..84b5b06b909b 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Others/TwoPaneViewPage.xaml.cs +++ b/src/Controls/samples/Controls.Sample/Pages/Others/TwoPaneViewPage.xaml.cs @@ -1,8 +1,8 @@ namespace Maui.Controls.Sample.Pages { using Microsoft.Maui; - using Microsoft.Maui.Foldable; using Microsoft.Maui.Controls.Foldable; + using Microsoft.Maui.Foldable; /// /// Sample demonstrating the use of TwoPaneView control and diff --git a/src/Controls/samples/Controls.Sample/ViewModels/ScrollViewOptionsModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/ScrollViewOptionsModel.cs index 51477d5c9323..e32007f7f1d8 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/ScrollViewOptionsModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/ScrollViewOptionsModel.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using Maui.Controls.Sample.Models; -using Maui.Controls.Sample.ViewModels.Base; using Maui.Controls.Sample.Pages.ScrollViewPages; +using Maui.Controls.Sample.ViewModels.Base; +using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; -using Microsoft.Maui; namespace Maui.Controls.Sample.ViewModels { diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs index a1f924b7a404..8e3628e7cd9a 100644 --- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs +++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs @@ -1,20 +1,20 @@ -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Automation.Peers; -using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties; -using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem; -using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement; -using WWindow = Microsoft.UI.Xaml.Window; -using Microsoft.Maui; -using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform; +using System; +using System.Collections.Generic; using System.Threading.Tasks; -using System; using Microsoft.Extensions.DependencyInjection; -using System.Collections.Generic; -using WAppBarButton = Microsoft.UI.Xaml.Controls.AppBarButton; -using Xunit; +using Microsoft.Maui; +using Microsoft.Maui.Controls; using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Platform; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; +using Xunit; +using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties; +using WAppBarButton = Microsoft.UI.Xaml.Controls.AppBarButton; +using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement; +using WNavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem; +using WWindow = Microsoft.UI.Xaml.Window; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs index 9eef876ba639..d1d1830cc11d 100644 --- a/src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs +++ b/src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs @@ -1,10 +1,10 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; +using AndroidX.AppCompat.Widget; +using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; -using Xunit; using Microsoft.Maui.Handlers; -using Microsoft.Maui.Controls; -using AndroidX.AppCompat.Widget; -using System; +using Xunit; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.Windows.cs index e018a2c71cb6..4bb311e94a9c 100644 --- a/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.Windows.cs @@ -1,10 +1,10 @@ -using System.Threading.Tasks; +using System.Linq; +using System.Threading.Tasks; using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform; +using Microsoft.Maui.DeviceTests.Stubs; using Microsoft.Maui.Handlers; +using Microsoft.Maui.Platform; using Xunit; -using System.Linq; -using Microsoft.Maui.DeviceTests.Stubs; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.cs b/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.cs index b80e9ab01aae..9e07c74b7824 100644 --- a/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/ContextFlyout/ContextFlyoutTests.cs @@ -2,16 +2,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; -using Microsoft.Extensions.DependencyInjection; using Xunit; -using Microsoft.Maui.Hosting; -using Microsoft.Maui.Handlers; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.DeviceTests.Stubs; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Windows.cs index 5f5a3019086e..fa4d6b0eedd8 100644 --- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.Windows.cs @@ -3,19 +3,19 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.UI.Xaml.Controls; using Xunit; -using WPanel = Microsoft.UI.Xaml.Controls.Panel; using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement; +using WPanel = Microsoft.UI.Xaml.Controls.Panel; using WWindow = Microsoft.UI.Xaml.Window; -using Microsoft.Maui.Hosting; -using Microsoft.Maui.Handlers; -using Microsoft.UI.Xaml.Controls; -using Microsoft.Maui.DeviceTests.Stubs; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs index a42c70c15704..5a3acd6cc475 100644 --- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs +++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs @@ -36,7 +36,7 @@ await InvokeOnMainThreadAsync(() => // so on iOS we just return the shadow that was hard coded into the renderer var expectedShadow = new Shadow() { Radius = 5, Opacity = 0.8f, Offset = new Point(0, 0), Brush = Brush.Black }; - if(platformView.Element is IView element) + if (platformView.Element is IView element) { var platformShadow = element.Shadow; await AssertionExtensions.Wait(() => platformShadow != null); @@ -45,7 +45,7 @@ await InvokeOnMainThreadAsync(() => Assert.Equal(platformShadow.Opacity, expectedShadow.Opacity); Assert.Equal(platformShadow.Offset, expectedShadow.Offset); } - })); + })); } } } \ No newline at end of file diff --git a/src/Controls/tests/DeviceTests/Elements/Image/ImageTests.cs b/src/Controls/tests/DeviceTests/Elements/Image/ImageTests.cs index ff00b3beeead..34109c05d40e 100644 --- a/src/Controls/tests/DeviceTests/Elements/Image/ImageTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/Image/ImageTests.cs @@ -3,11 +3,11 @@ using System.Threading.Tasks; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers.Compatibility; +using Microsoft.Maui.Graphics; using Microsoft.Maui.Handlers; using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; using Xunit; -using Microsoft.Maui.Graphics; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.Android.cs index 66910896e4df..d68e66934773 100644 --- a/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.Android.cs +++ b/src/Controls/tests/DeviceTests/Elements/ListView/ListViewTests.Android.cs @@ -3,12 +3,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Maui.Platform; +using Android.Views; using Microsoft.Maui.Controls; -using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Controls.Handlers.Compatibility; +using Microsoft.Maui.Controls.Platform; +using Microsoft.Maui.Platform; using Xunit; -using Android.Views; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs index 9904e75d1d9d..19f602dff9c5 100644 --- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs @@ -3,18 +3,18 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; -using Microsoft.Extensions.DependencyInjection; using Xunit; -using WPanel = Microsoft.UI.Xaml.Controls.Panel; +using WAppBarButton = Microsoft.UI.Xaml.Controls.AppBarButton; using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement; +using WPanel = Microsoft.UI.Xaml.Controls.Panel; using WWindow = Microsoft.UI.Xaml.Window; -using Microsoft.Maui.Hosting; -using Microsoft.Maui.Handlers; -using WAppBarButton = Microsoft.UI.Xaml.Controls.AppBarButton; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Android.cs index 54cf309250f3..d7a24e0fe2f1 100644 --- a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Android.cs +++ b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Android.cs @@ -1,11 +1,11 @@ -using System.Collections.Generic; -using System; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; using Microsoft.Maui.Handlers; -using Xunit; using Microsoft.Maui.Platform; +using Xunit; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs index 8cd903f9b5d2..97cfbda607ed 100644 --- a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.Windows.cs @@ -1,12 +1,12 @@ -using System.Collections.Generic; -using System; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; using Microsoft.Maui.Handlers; -using Xunit; -using Microsoft.UI.Xaml.Controls; using Microsoft.Maui.Platform; +using Microsoft.UI.Xaml.Controls; +using Xunit; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.iOS.cs index 68d99790030a..4be49a2c3ffa 100644 --- a/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.iOS.cs +++ b/src/Controls/tests/DeviceTests/Elements/Picker/PickerTests.iOS.cs @@ -1,11 +1,11 @@ -using System.Collections.Generic; -using System; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; using Microsoft.Maui.Handlers; -using Xunit; using Microsoft.Maui.Platform; +using Xunit; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs index 70f9a87f1d57..fb47d65c0b0b 100644 --- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs +++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.Android.cs @@ -5,20 +5,20 @@ using System.Threading.Tasks; using Android.Views; using AndroidX.AppCompat.Widget; +using AndroidX.CoordinatorLayout.Widget; +using AndroidX.Core.View; using AndroidX.DrawerLayout.Widget; using Google.Android.Material.AppBar; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers.Compatibility; +using Microsoft.Maui.Controls.Platform; using Microsoft.Maui.Controls.Platform.Compatibility; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Handlers; using Microsoft.Maui.Platform; -using Microsoft.Maui.Controls.Platform; using Xunit; -using AView = Android.Views.View; -using AndroidX.CoordinatorLayout.Widget; -using AndroidX.Core.View; using static Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutTemplatedContentRenderer; -using Microsoft.Maui.DeviceTests.Stubs; -using Microsoft.Maui.Handlers; +using AView = Android.Views.View; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Windows.cs index a0072446dbc5..9d218215a3f0 100644 --- a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Windows.cs @@ -2,18 +2,18 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; -using Microsoft.Extensions.DependencyInjection; using Xunit; using WFrameworkElement = Microsoft.UI.Xaml.FrameworkElement; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; -using Microsoft.Maui.Hosting; -using Microsoft.Maui.Handlers; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.DeviceTests.Stubs; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs index db17e331feb4..56ad089dd78c 100644 --- a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs @@ -2,17 +2,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui; using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Handlers; +using Microsoft.Maui.Controls.Handlers.Compatibility; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Handlers; +using Microsoft.Maui.Hosting; using Microsoft.Maui.Platform; -using Microsoft.Extensions.DependencyInjection; using Xunit; -using Microsoft.Maui.Hosting; -using Microsoft.Maui.Handlers; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.DeviceTests.Stubs; -using Microsoft.Maui.Controls.Handlers.Compatibility; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs index 96b9f96401d2..7b05e206fb95 100644 --- a/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs @@ -1,13 +1,13 @@ -using System.Threading.Tasks; +using System; +using System.Linq; +using System.Threading.Tasks; using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform; +using Microsoft.Maui.DeviceTests.Stubs; +using Microsoft.Maui.Graphics.Win2D; using Microsoft.Maui.Handlers; -using WPanel = Microsoft.UI.Xaml.Controls.Panel; +using Microsoft.Maui.Platform; using Xunit; -using System.Linq; -using Microsoft.Maui.Graphics.Win2D; -using System; -using Microsoft.Maui.DeviceTests.Stubs; +using WPanel = Microsoft.UI.Xaml.Controls.Panel; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Windows.cs b/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Windows.cs index f5f359e172c6..afd4e94cc836 100644 --- a/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Windows.cs +++ b/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Windows.cs @@ -1,9 +1,9 @@ using System; +using Microsoft.Maui.Handlers; using Microsoft.Maui.Platform; +using Microsoft.UI.Xaml; using WPanel = Microsoft.UI.Xaml.Controls.Panel; using WWindow = Microsoft.UI.Xaml.Window; -using Microsoft.Maui.Handlers; -using Microsoft.UI.Xaml; namespace Microsoft.Maui.DeviceTests.Stubs { diff --git a/src/Controls/tests/Xaml.UnitTests/WarnOnObsolete.xaml.cs b/src/Controls/tests/Xaml.UnitTests/WarnOnObsolete.xaml.cs index 71cc919f38bc..10a37a1a6cd5 100644 --- a/src/Controls/tests/Xaml.UnitTests/WarnOnObsolete.xaml.cs +++ b/src/Controls/tests/Xaml.UnitTests/WarnOnObsolete.xaml.cs @@ -1,10 +1,8 @@ using System; - using Microsoft.Maui.ApplicationModel; +using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.Core.UnitTests; using Microsoft.Maui.Devices; -using Microsoft.Maui.Controls; - using NUnit.Framework; namespace Microsoft.Maui.Controls.Xaml.UnitTests diff --git a/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.Windows.cs index 8cca2c630d00..670f89c2604a 100644 --- a/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.Windows.cs +++ b/src/Core/tests/DeviceTests/Handlers/Layout/LayoutHandlerTests.Windows.cs @@ -1,9 +1,9 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Xunit; -using System.Collections.Generic; -using System.Linq; using LayoutPanel = Microsoft.Maui.Platform.LayoutPanel; namespace Microsoft.Maui.DeviceTests.Handlers.Layout diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs index d56d30902cd1..9f5f1785acb5 100644 --- a/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs +++ b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs @@ -1,5 +1,5 @@ -using System.Threading.Tasks; using System.Threading; +using System.Threading.Tasks; namespace Microsoft.Maui.DeviceTests { diff --git a/src/Graphics/samples/GraphicsTester.Android/MainActivity.cs b/src/Graphics/samples/GraphicsTester.Android/MainActivity.cs index 70f28e2475b0..f9d94db23064 100644 --- a/src/Graphics/samples/GraphicsTester.Android/MainActivity.cs +++ b/src/Graphics/samples/GraphicsTester.Android/MainActivity.cs @@ -1,8 +1,8 @@ -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Android; using Android.App; -using Android.Widget; using Android.OS; +using Android.Widget; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Android; using Microsoft.Maui.Graphics.Platform; namespace GraphicsTester.Android diff --git a/src/Graphics/samples/GraphicsTester.Android/MainView.cs b/src/Graphics/samples/GraphicsTester.Android/MainView.cs index a360bd74227e..f31d67bbb847 100644 --- a/src/Graphics/samples/GraphicsTester.Android/MainView.cs +++ b/src/Graphics/samples/GraphicsTester.Android/MainView.cs @@ -1,11 +1,11 @@ using System; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Android; -using Android.Runtime; using Android.Content; +using Android.Runtime; using Android.Views; using Android.Widget; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Android; using Microsoft.Maui.Graphics.Platform; namespace GraphicsTester.Android diff --git a/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterTableViewSource.cs b/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterTableViewSource.cs index 9bb906db8617..1fd84bdedbad 100644 --- a/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterTableViewSource.cs +++ b/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterTableViewSource.cs @@ -1,7 +1,7 @@ using System; -using Microsoft.Maui.Graphics; using Foundation; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; using UIKit; namespace GraphicsTester.iOS diff --git a/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterView.cs b/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterView.cs index d4b65fa37d0b..01993d26eb2e 100644 --- a/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterView.cs +++ b/src/Graphics/samples/GraphicsTester.MacCatalyst/TesterView.cs @@ -1,9 +1,9 @@ using System; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Platform; using CoreGraphics; using Foundation; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Platform; using UIKit; namespace GraphicsTester.iOS diff --git a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawImages.cs b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawImages.cs index 2887f80337ae..b2ab856089bf 100644 --- a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawImages.cs +++ b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawImages.cs @@ -1,8 +1,8 @@ -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Platform; using System; using System.IO; using System.Reflection; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Platform; namespace GraphicsTester.Scenarios { diff --git a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawPathsScaled.cs b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawPathsScaled.cs index 20b57d7404c5..fce7a7860122 100644 --- a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawPathsScaled.cs +++ b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/DrawPathsScaled.cs @@ -1,7 +1,7 @@ -using Microsoft.Maui.Graphics; -using System; +using System; using System.Collections.Generic; using System.Text; +using Microsoft.Maui.Graphics; namespace GraphicsTester.Scenarios { diff --git a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ImageFills.cs b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ImageFills.cs index 296d003fee63..f507aa293ad1 100644 --- a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ImageFills.cs +++ b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ImageFills.cs @@ -1,6 +1,6 @@ +using System.Reflection; using Microsoft.Maui.Graphics; using Microsoft.Maui.Graphics.Platform; -using System.Reflection; namespace GraphicsTester.Scenarios { diff --git a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ScaleCanvas.cs b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ScaleCanvas.cs index 1ca4838e976e..60aef17783b6 100644 --- a/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ScaleCanvas.cs +++ b/src/Graphics/samples/GraphicsTester.Portable/Scenarios/ScaleCanvas.cs @@ -1,7 +1,7 @@ -using Microsoft.Maui.Graphics; -using System; +using System; using System.Collections.Generic; using System.Text; +using Microsoft.Maui.Graphics; namespace GraphicsTester.Scenarios { diff --git a/src/Graphics/samples/GraphicsTester.Skia.Console/Program.cs b/src/Graphics/samples/GraphicsTester.Skia.Console/Program.cs index 3d728f3c08cb..52a80f56d8aa 100644 --- a/src/Graphics/samples/GraphicsTester.Skia.Console/Program.cs +++ b/src/Graphics/samples/GraphicsTester.Skia.Console/Program.cs @@ -1,9 +1,9 @@ using System; +using System.IO; +using System.Linq; +using GraphicsTester.Scenarios; using Microsoft.Maui.Graphics; using Microsoft.Maui.Graphics.Skia; -using GraphicsTester.Scenarios; -using System.Linq; -using System.IO; namespace GraphicsTester.Skia.ConsoleApp { diff --git a/src/Graphics/samples/GraphicsTester.Skia.Gtk/MainWindow.cs b/src/Graphics/samples/GraphicsTester.Skia.Gtk/MainWindow.cs index 3feb0d00e0ce..f7981eab836e 100644 --- a/src/Graphics/samples/GraphicsTester.Skia.Gtk/MainWindow.cs +++ b/src/Graphics/samples/GraphicsTester.Skia.Gtk/MainWindow.cs @@ -1,11 +1,11 @@ // This is free and unencumbered software released into the public domain. // Happy coding!!! - GtkSharp Team -using Gtk; using System; using System.Collections.Generic; using System.IO; using GraphicsTester.Scenarios; +using Gtk; using Microsoft.Maui.Graphics; using Microsoft.Maui.Graphics.Skia; diff --git a/src/Graphics/samples/GraphicsTester.Skia.Tizen/Main.cs b/src/Graphics/samples/GraphicsTester.Skia.Tizen/Main.cs index 3efc044eaf5e..8dc6d3fc313a 100644 --- a/src/Graphics/samples/GraphicsTester.Skia.Tizen/Main.cs +++ b/src/Graphics/samples/GraphicsTester.Skia.Tizen/Main.cs @@ -1,10 +1,10 @@ using System; +using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics.Skia.Views; using Tizen.Applications; using Tizen.NUI; using Tizen.NUI.BaseComponents; using Tizen.NUI.Components; -using GraphicsTester.Scenarios; -using Microsoft.Maui.Graphics.Skia.Views; namespace GraphicsTester.Skia.Tizen { diff --git a/src/Graphics/samples/GraphicsTester.Skia.Windows/MainWindow.xaml.cs b/src/Graphics/samples/GraphicsTester.Skia.Windows/MainWindow.xaml.cs index e0ba957e341b..5636f3bd2d69 100644 --- a/src/Graphics/samples/GraphicsTester.Skia.Windows/MainWindow.xaml.cs +++ b/src/Graphics/samples/GraphicsTester.Skia.Windows/MainWindow.xaml.cs @@ -1,7 +1,7 @@ -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Skia; using System.Windows; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Skia; namespace GraphicsTester.WPF.Skia { diff --git a/src/Graphics/samples/GraphicsTester.WinUI.Desktop/App.xaml.cs b/src/Graphics/samples/GraphicsTester.WinUI.Desktop/App.xaml.cs index 2423de355207..aa7971ae3f25 100644 --- a/src/Graphics/samples/GraphicsTester.WinUI.Desktop/App.xaml.cs +++ b/src/Graphics/samples/GraphicsTester.WinUI.Desktop/App.xaml.cs @@ -1,4 +1,9 @@ -using Microsoft.UI.Xaml; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Data; @@ -6,11 +11,6 @@ using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; using Microsoft.UI.Xaml.Shapes; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel; using Windows.ApplicationModel.Activation; using Windows.Foundation; diff --git a/src/Graphics/samples/GraphicsTester.iOS/TesterTableViewSource.cs b/src/Graphics/samples/GraphicsTester.iOS/TesterTableViewSource.cs index 9bb906db8617..1fd84bdedbad 100644 --- a/src/Graphics/samples/GraphicsTester.iOS/TesterTableViewSource.cs +++ b/src/Graphics/samples/GraphicsTester.iOS/TesterTableViewSource.cs @@ -1,7 +1,7 @@ using System; -using Microsoft.Maui.Graphics; using Foundation; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; using UIKit; namespace GraphicsTester.iOS diff --git a/src/Graphics/samples/GraphicsTester.iOS/TesterView.cs b/src/Graphics/samples/GraphicsTester.iOS/TesterView.cs index d4b65fa37d0b..01993d26eb2e 100644 --- a/src/Graphics/samples/GraphicsTester.iOS/TesterView.cs +++ b/src/Graphics/samples/GraphicsTester.iOS/TesterView.cs @@ -1,9 +1,9 @@ using System; -using Microsoft.Maui.Graphics; -using Microsoft.Maui.Graphics.Platform; using CoreGraphics; using Foundation; using GraphicsTester.Scenarios; +using Microsoft.Maui.Graphics; +using Microsoft.Maui.Graphics.Platform; using UIKit; namespace GraphicsTester.iOS diff --git a/src/Graphics/src/Graphics.Skia.GtkSharp/GtkSkiaDirectRenderer.cs b/src/Graphics/src/Graphics.Skia.GtkSharp/GtkSkiaDirectRenderer.cs index 531785202f6b..d2d22b886b9d 100644 --- a/src/Graphics/src/Graphics.Skia.GtkSharp/GtkSkiaDirectRenderer.cs +++ b/src/Graphics/src/Graphics.Skia.GtkSharp/GtkSkiaDirectRenderer.cs @@ -1,5 +1,5 @@ -using SkiaSharp; using System; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia.GtkSharp/ISkiaGraphicsRenderer.cs b/src/Graphics/src/Graphics.Skia.GtkSharp/ISkiaGraphicsRenderer.cs index 5b5cb69df864..7e6eec2bfe58 100644 --- a/src/Graphics/src/Graphics.Skia.GtkSharp/ISkiaGraphicsRenderer.cs +++ b/src/Graphics/src/Graphics.Skia.GtkSharp/ISkiaGraphicsRenderer.cs @@ -1,5 +1,5 @@ -using SkiaSharp; using System; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia.WPF/ISkiaGraphicsRenderer.cs b/src/Graphics/src/Graphics.Skia.WPF/ISkiaGraphicsRenderer.cs index 55e84f6acd47..0f83895de3e7 100644 --- a/src/Graphics/src/Graphics.Skia.WPF/ISkiaGraphicsRenderer.cs +++ b/src/Graphics/src/Graphics.Skia.WPF/ISkiaGraphicsRenderer.cs @@ -1,5 +1,5 @@ -using SkiaSharp; using System; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia.WPF/WDSkiaDirectRenderer.cs b/src/Graphics/src/Graphics.Skia.WPF/WDSkiaDirectRenderer.cs index 533410292396..c9f6a396bbc5 100644 --- a/src/Graphics/src/Graphics.Skia.WPF/WDSkiaDirectRenderer.cs +++ b/src/Graphics/src/Graphics.Skia.WPF/WDSkiaDirectRenderer.cs @@ -1,5 +1,5 @@ -using SkiaSharp; using System; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia/FontExtensions.cs b/src/Graphics/src/Graphics.Skia/FontExtensions.cs index a242ce4ffaeb..cacd1d5decc0 100644 --- a/src/Graphics/src/Graphics.Skia/FontExtensions.cs +++ b/src/Graphics/src/Graphics.Skia/FontExtensions.cs @@ -1,7 +1,7 @@ -using SkiaSharp; -using System; +using System; using System.Collections.Generic; using System.Text; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvasStateService.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvasStateService.cs index 32d9d8099300..0d6b285a7bab 100644 --- a/src/Graphics/src/Graphics.Skia/SkiaCanvasStateService.cs +++ b/src/Graphics/src/Graphics.Skia/SkiaCanvasStateService.cs @@ -1,5 +1,5 @@ -using SkiaSharp; -using System; +using System; +using SkiaSharp; namespace Microsoft.Maui.Graphics.Skia { diff --git a/src/Graphics/src/Graphics.Skia/Views/SkiaGraphicsView.Android.cs b/src/Graphics/src/Graphics.Skia/Views/SkiaGraphicsView.Android.cs index a61beaf7e1ea..2a95506a2aa5 100644 --- a/src/Graphics/src/Graphics.Skia/Views/SkiaGraphicsView.Android.cs +++ b/src/Graphics/src/Graphics.Skia/Views/SkiaGraphicsView.Android.cs @@ -1,8 +1,8 @@ -using Microsoft.Maui.Graphics.Android; -using Microsoft.Maui.Graphics.Skia; using Android.App; using Android.Content; using Android.Util; +using Microsoft.Maui.Graphics.Android; +using Microsoft.Maui.Graphics.Skia; using SkiaSharp.Views.Android; namespace Microsoft.Maui.Graphics.Skia.Views diff --git a/src/Graphics/src/Text.Markdig/MarkdownAttributedTextReader.cs b/src/Graphics/src/Text.Markdig/MarkdownAttributedTextReader.cs index 4a2f6ab8149f..e00b3a6804f2 100644 --- a/src/Graphics/src/Text.Markdig/MarkdownAttributedTextReader.cs +++ b/src/Graphics/src/Text.Markdig/MarkdownAttributedTextReader.cs @@ -1,5 +1,5 @@ -using Microsoft.Maui.Graphics.Text.Renderer; using Markdig; +using Microsoft.Maui.Graphics.Text.Renderer; namespace Microsoft.Maui.Graphics.Text { diff --git a/src/Graphics/src/Text.Markdig/Renderer/AttributedTextRenderer.cs b/src/Graphics/src/Text.Markdig/Renderer/AttributedTextRenderer.cs index 4bfb41b0bf11..ef2b0d10441e 100644 --- a/src/Graphics/src/Text.Markdig/Renderer/AttributedTextRenderer.cs +++ b/src/Graphics/src/Text.Markdig/Renderer/AttributedTextRenderer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Microsoft.Maui.Graphics.Text; using System.IO; using Markdig.Renderers; +using Microsoft.Maui.Graphics.Text; namespace Microsoft.Maui.Graphics.Text.Renderer { diff --git a/src/Graphics/src/Text.Markdig/Renderer/EmphasisInlineRenderer.cs b/src/Graphics/src/Text.Markdig/Renderer/EmphasisInlineRenderer.cs index 78b08fe20fc0..0030f6e43ac8 100644 --- a/src/Graphics/src/Text.Markdig/Renderer/EmphasisInlineRenderer.cs +++ b/src/Graphics/src/Text.Markdig/Renderer/EmphasisInlineRenderer.cs @@ -1,5 +1,5 @@ -using Microsoft.Maui.Graphics.Text; using Markdig.Syntax.Inlines; +using Microsoft.Maui.Graphics.Text; namespace Microsoft.Maui.Graphics.Text.Renderer { diff --git a/src/Graphics/src/Text.Markdig/Renderer/HtmlInlineRenderer.cs b/src/Graphics/src/Text.Markdig/Renderer/HtmlInlineRenderer.cs index 2cdec2f54880..f94ef888ceef 100644 --- a/src/Graphics/src/Text.Markdig/Renderer/HtmlInlineRenderer.cs +++ b/src/Graphics/src/Text.Markdig/Renderer/HtmlInlineRenderer.cs @@ -1,7 +1,7 @@ +using System; using System.Collections.Generic; -using Microsoft.Maui.Graphics.Text; using Markdig.Syntax.Inlines; -using System; +using Microsoft.Maui.Graphics.Text; namespace Microsoft.Maui.Graphics.Text.Renderer { diff --git a/src/Graphics/src/Text.Markdig/Renderer/ListRenderer.cs b/src/Graphics/src/Text.Markdig/Renderer/ListRenderer.cs index 1aa2a071b176..50b3bdf768c8 100644 --- a/src/Graphics/src/Text.Markdig/Renderer/ListRenderer.cs +++ b/src/Graphics/src/Text.Markdig/Renderer/ListRenderer.cs @@ -1,5 +1,5 @@ -using Microsoft.Maui.Graphics.Text; using Markdig.Syntax; +using Microsoft.Maui.Graphics.Text; namespace Microsoft.Maui.Graphics.Text.Renderer { diff --git a/src/Graphics/tests/Graphics.Tests/ColorTypeConverterTests.cs b/src/Graphics/tests/Graphics.Tests/ColorTypeConverterTests.cs index 8c4528d57c4c..c5d0d9a8b023 100644 --- a/src/Graphics/tests/Graphics.Tests/ColorTypeConverterTests.cs +++ b/src/Graphics/tests/Graphics.Tests/ColorTypeConverterTests.cs @@ -1,9 +1,9 @@ -using Microsoft.Maui.Graphics.Converters; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Maui.Graphics.Converters; using Xunit; namespace Microsoft.Maui.Graphics.Tests diff --git a/src/Graphics/tests/Graphics.Tests/PointTypeConverterTests.cs b/src/Graphics/tests/Graphics.Tests/PointTypeConverterTests.cs index 913f05c5df5d..ca019e972e58 100644 --- a/src/Graphics/tests/Graphics.Tests/PointTypeConverterTests.cs +++ b/src/Graphics/tests/Graphics.Tests/PointTypeConverterTests.cs @@ -1,9 +1,9 @@ -using Microsoft.Maui.Graphics.Converters; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Maui.Graphics.Converters; using Xunit; namespace Microsoft.Maui.Graphics.Tests diff --git a/src/Graphics/tests/Graphics.Tests/RectTypeConverterTests.cs b/src/Graphics/tests/Graphics.Tests/RectTypeConverterTests.cs index 301d2e46fa08..67028388680f 100644 --- a/src/Graphics/tests/Graphics.Tests/RectTypeConverterTests.cs +++ b/src/Graphics/tests/Graphics.Tests/RectTypeConverterTests.cs @@ -1,9 +1,9 @@ -using Microsoft.Maui.Graphics.Converters; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Maui.Graphics.Converters; using Xunit; namespace Microsoft.Maui.Graphics.Tests diff --git a/src/Graphics/tests/Graphics.Tests/SizeTypeConverterTests.cs b/src/Graphics/tests/Graphics.Tests/SizeTypeConverterTests.cs index 60880d7b0744..ae6d502ab3cb 100644 --- a/src/Graphics/tests/Graphics.Tests/SizeTypeConverterTests.cs +++ b/src/Graphics/tests/Graphics.Tests/SizeTypeConverterTests.cs @@ -1,9 +1,9 @@ -using Microsoft.Maui.Graphics.Converters; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Maui.Graphics.Converters; using Xunit; namespace Microsoft.Maui.Graphics.Tests diff --git a/src/TestUtils/src/DeviceTests/UINSWindow.iOS.cs b/src/TestUtils/src/DeviceTests/UINSWindow.iOS.cs index 5dc12eef3d65..b21022573959 100644 --- a/src/TestUtils/src/DeviceTests/UINSWindow.iOS.cs +++ b/src/TestUtils/src/DeviceTests/UINSWindow.iOS.cs @@ -1,9 +1,9 @@ -using Foundation; +using System; +using System.Runtime.InteropServices; using CoreGraphics; +using Foundation; using Microsoft.Maui.Graphics; using ObjCRuntime; -using System; -using System.Runtime.InteropServices; using UIKit; namespace Microsoft.Maui.DeviceTests;