diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index efd6fbe9b113..edb70cab2421 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22531.1", + "version": "1.0.0-prerelease.22569.1", "commands": [ "xharness" ] diff --git a/.github/workflows/dotnet-autoformat-pr.yml b/.github/workflows/dotnet-autoformat-pr.yml index 8333354d0072..f5625114c39a 100644 --- a/.github/workflows/dotnet-autoformat-pr.yml +++ b/.github/workflows/dotnet-autoformat-pr.yml @@ -12,6 +12,7 @@ jobs: steps: - name: 'Autoformat' - uses: rolfbjarne/autoformat@v0.1 + uses: rolfbjarne/autoformat@v0.2 with: - projects: "Microsoft.Maui.sln" \ No newline at end of file + projects: "Microsoft.Maui.sln" + onlyFilesModifiedInPullRequest: true diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily.yml index eb1806e80ebf..746572d877d4 100644 --- a/.github/workflows/dotnet-format-daily.yml +++ b/.github/workflows/dotnet-format-daily.yml @@ -18,7 +18,7 @@ jobs: ref: ${{ github.head_ref }} - name: Run dotnet format - run: dotnet format whitespace ./src --folder --exclude Templates/src + run: dotnet format whitespace ./src --folder --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs - name: Commit files if: steps.format.outputs.has-changes == 'true' diff --git a/.nuspec/Microsoft.Maui.Controls.targets b/.nuspec/Microsoft.Maui.Controls.targets index dc1e84f73a81..afbfa45a65e3 100644 --- a/.nuspec/Microsoft.Maui.Controls.targets +++ b/.nuspec/Microsoft.Maui.Controls.targets @@ -11,7 +11,6 @@ true false - True diff --git a/Directory.Build.props b/Directory.Build.props index 0543ceb45135..cccc263c3431 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -150,7 +150,7 @@ - + diff --git a/Directory.Build.targets b/Directory.Build.targets index b09a7de6ec0b..70e0848283db 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -70,7 +70,7 @@ - + - 1.1.5 - 10.0.22621.1 + 1.2.221116.1 + 10.0.22621.755 1.0.4 7.0.0 @@ -61,9 +61,9 @@ <_HarfBuzzSharpVersion>2.8.2.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483 7.0.100-preview.5.22226.1 - 1.0.0-prerelease.22531.1 - 1.0.0-prerelease.22531.1 - 1.0.0-prerelease.22531.1 + 1.0.0-prerelease.22569.1 + 1.0.0-prerelease.22569.1 + 1.0.0-prerelease.22569.1 0.9.0 0.5.13 1.2.0 diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 4b6b6e87ac68..fb1127f7cb4a 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -324,13 +324,16 @@ Task("dotnet-pack-docs") CleanDirectories(destDir); // Get the docs for .NET MAUI - foreach (var nupkg in GetFiles("./artifacts/Microsoft.Maui.*.Ref.*.nupkg")) + foreach (var nupkg in GetFiles("./artifacts/Microsoft.Maui.*.Ref.any.*.nupkg")) { var d = $"{tempDir}/{nupkg.GetFilename()}"; + Unzip(nupkg, d); DeleteFiles($"{d}/**/*.pri"); DeleteFiles($"{d}/**/*.aar"); - CopyDirectory($"{d}/ref", $"{destDir}"); + DeleteFiles($"{d}/**/*.DesignTools.*"); + CopyFiles($"{d}/ref/**/net?.?/**/*.dll", $"{destDir}"); + CopyFiles($"{d}/ref/**/net?.?/**/*.xml", $"{destDir}"); } // Get the docs for libraries separately distributed as NuGets @@ -343,7 +346,8 @@ Task("dotnet-pack-docs") DeleteFiles($"{d}/**/*.pri"); DeleteFiles($"{d}/**/*.aar"); DeleteFiles($"{d}/**/*.pdb"); - CopyDirectory($"{d}/lib", $"{destDir}"); + CopyFiles($"{d}/lib/**/{{net,netstandard}}?.?/**/*.dll", $"{destDir}"); + CopyFiles($"{d}/lib/**/{{net,netstandard}}?.?/**/*.xml", $"{destDir}"); } } diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml index 9617544c0932..603f06e892d1 100644 --- a/eng/pipelines/common/device-tests-steps.yml +++ b/eng/pipelines/common/device-tests-steps.yml @@ -4,6 +4,7 @@ parameters: device: '' # the xharness device to use cakeArgs: '' # additional cake args provisionatorChannel: 'latest' + agentPoolAccessToken: '' steps: - template: provision.yml @@ -42,3 +43,8 @@ steps: condition: always() inputs: artifactName: $(System.PhaseName) + + # This must always be placed as the last step in the job + - template: agent-rebooter/mac.v1.yml@yaml-templates + parameters: + AgentPoolAccessToken: ${{ parameters.agentPoolAccessToken }} diff --git a/eng/pipelines/common/device-tests.yml b/eng/pipelines/common/device-tests.yml index 560c218028a8..886b0abd38cf 100644 --- a/eng/pipelines/common/device-tests.yml +++ b/eng/pipelines/common/device-tests.yml @@ -4,6 +4,7 @@ parameters: androidApiLevels: [ 33 ] iosVersions: [ 'latest' ] provisionatorChannel: 'latest' + agentPoolAccessToken: '' projects: - name: name desc: Human Description @@ -38,6 +39,7 @@ stages: path: ${{ project.android }} device: android-emulator-32_${{ api }} provisionatorChannel: ${{ parameters.provisionatorChannel }} + agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }} - stage: ios_device_tests displayName: iOS Device Tests @@ -64,3 +66,4 @@ stages: ${{ if ne(version, 'latest') }}: device: ios-simulator-64_${{ version }} provisionatorChannel: ${{ parameters.provisionatorChannel }} + agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }} diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index a85b87b0715d..e7febf96d06b 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -1,6 +1,4 @@ variables: -- name: Codeql.Enabled - value: true - name: BuildVersion value: $[counter('buildversion-counter', 5000)] - name: NUGET_VERSION @@ -55,6 +53,11 @@ variables: value: Maui - name: POWERSHELL_VERSION value: 7.1.3 +- name: Codeql.Enabled + value: $[and( + eq(variables['Build.SourceBranch'], 'refs/heads/main'), + eq(variables['Build.DefinitionName'], 'MAUI') + )] - ${{ if ne(variables['Build.DefinitionName'], 'MAUI-private') }}: - name: PrivateBuild value: false diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml index ceba5bbe20dd..efff785379ce 100644 --- a/eng/pipelines/device-tests.yml +++ b/eng/pipelines/device-tests.yml @@ -44,6 +44,8 @@ pr: variables: - template: /eng/pipelines/common/variables.yml + - name: AgentPoolAccessToken + value: $(botdeploy--azdo--token--register--xamarin-public--untrusted) parameters: - name: provisionatorChannel @@ -75,13 +77,14 @@ resources: name: xamarin/yaml-templates endpoint: xamarin ref: refs/heads/main - + stages: - template: common/device-tests.yml parameters: androidPool: ${{ parameters.androidPool }} iosPool: ${{ parameters.iosPool }} + agentPoolAccessToken: $(AgentPoolAccessToken) ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}: androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23 ] # androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # fix the issue of getting the test results off @@ -95,18 +98,18 @@ stages: projects: - name: essentials desc: Essentials - androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable + androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable android: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj ios: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj - name: core desc: Core - androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable + androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj - name: controls desc: Controls - androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable + androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -116,4 +119,4 @@ stages: android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj - + diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index d2b75a129807..b7f2662be1fd 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -126,13 +126,13 @@ resources: stages: - - stage: build_net6 + - stage: build_net displayName: Build .NET MAUI dependsOn: [] jobs: - ${{ each BuildPlatform in parameters.BuildPlatforms }}: - ${{ each BuildConfiguration in parameters.BuildConfigurations }}: - - job: build_net6_${{ BuildPlatform.name }}_${{ BuildConfiguration }} + - job: build_net_${{ BuildPlatform.name }}_${{ BuildConfiguration }} workspace: clean: all displayName: ${{ BuildPlatform.name }} (${{ BuildConfiguration }}) @@ -209,7 +209,7 @@ stages: jobs: - ${{ each BuildPlatform in parameters.BuildPlatforms }}: - ${{ each BuildConfiguration in parameters.BuildConfigurations }}: - - job: build_net6_${{ BuildPlatform.name }}_${{ BuildConfiguration }} + - job: build_net_${{ BuildPlatform.name }}_${{ BuildConfiguration }} workspace: clean: all displayName: ${{ BuildPlatform.name }} (${{ BuildConfiguration }}) diff --git a/eng/provisioning/provisioning.csx b/eng/provisioning/provisioning.csx index 1e4b50e9f719..5f7a5db6cea3 100644 --- a/eng/provisioning/provisioning.csx +++ b/eng/provisioning/provisioning.csx @@ -88,7 +88,8 @@ if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS)) // AndroidVirtualDevice.NEXUS_5X) .SdkManagerPackage ("build-tools;33.0.0"); } -else{ +else +{ var androidSDK = AndroidSdk(); foreach(var sdk in ANDROID_API_SDKS.Split(',')) 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/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj index 2c6e0241b393..d17209e6c520 100644 --- a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj index 2a0f6d508ab4..0e1fee4adbf5 100644 --- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj index ac10586cfceb..f5f4e803a5ba 100644 --- a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj @@ -18,7 +18,7 @@ - + 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/Core/src/iOS/Renderers/FrameRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs index b64de4c1548b..edc2f9b6f357 100644 --- a/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs +++ b/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs @@ -133,7 +133,10 @@ public virtual void SetupLayer() public override void LayoutSubviews() { if (_previousSize != Bounds.Size) + { SetNeedsDisplay(); + this.UpdateBackgroundLayer(); + } base.LayoutSubviews(); } 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/Foldable/src/TwoPaneView.cs b/src/Controls/Foldable/src/TwoPaneView.cs index b5d0dfb52375..ecd35d114895 100644 --- a/src/Controls/Foldable/src/TwoPaneView.cs +++ b/src/Controls/Foldable/src/TwoPaneView.cs @@ -142,6 +142,7 @@ public double MinWideModeWidth /// /// Gets the calculated width (in wide mode) or height (in tall mode) of pane 1, or sets the GridLength value of pane 1. /// + [System.ComponentModel.TypeConverter(typeof(GridLengthTypeConverter))] public GridLength Pane1Length { get { return (GridLength)GetValue(Pane1LengthProperty); } @@ -151,6 +152,7 @@ public GridLength Pane1Length /// /// Gets the calculated width (in wide mode) or height (in tall mode) of pane 2, or sets the GridLength value of pane 2. /// + [System.ComponentModel.TypeConverter(typeof(GridLengthTypeConverter))] public GridLength Pane2Length { get { return (GridLength)GetValue(Pane2LengthProperty); } 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/Compatibility/FramePage.xaml b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml index df4b3db49236..c671d3c19803 100644 --- a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml +++ b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml @@ -16,6 +16,21 @@