[net8.0] Merge main into net8

.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"
       ]

.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"
+        projects: "Microsoft.Maui.sln"
+        onlyFilesModifiedInPullRequest: true

.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'

.nuspec/Microsoft.Maui.Controls.targets

@@ -11,7 +11,6 @@
 		<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'==''">true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
 		<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'=='false'"></SkipMicrosoftUIXamlCheckTargetPlatformVersion>
 		<AndroidUseDefaultAotProfile Condition="'$(AndroidEnableProfiledAot)' == 'true' and '$(AndroidUseDefaultAotProfile)' == ''">false</AndroidUseDefaultAotProfile>
-		<AndroidLinkResources Condition=" '$(AndroidLinkResources)' == '' And '$(Configuration)' == 'Release' ">True</AndroidLinkResources>
 	</PropertyGroup>
 
 	<ItemGroup>

Directory.Build.props

@@ -150,7 +150,7 @@
   <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props" />
   <Import Condition="'$(SampleProject)' != 'True' and '$(CI)' == 'true'" Project="$(MSBuildThisFileDirectory)eng\SourceLink.Build.props" />
   <ItemGroup Condition="'$(MSBuildVersion)' != '' AND '$(MSBuildVersion)' &lt; '16.7.0'  ">
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.3.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.4.0" PrivateAssets="all" />
   </ItemGroup>
   <PropertyGroup>
     <!-- We don't need to be warned that we are using a preview .NET -->

Directory.Build.targets

@@ -70,7 +70,7 @@
 
   <!-- Until we get a new enough dotnet -->
   <ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.24" TargetingPackVersion="10.0.19041.24" />
+    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.27" TargetingPackVersion="10.0.19041.27" />
   </ItemGroup>
 
   <!--

README.md

@@ -19,6 +19,7 @@
 
 ## Current News
 
+* November 8, 2022 - [Announcing .NET MAUI for .NET 7 General Availability](https://devblogs.microsoft.com/dotnet/dotnet-maui-dotnet-7/)
 * May 23, 2022 - [Introducing .NET MAUI – One Codebase, Many Platforms](https://devblogs.microsoft.com/dotnet/introducing-dotnet-maui-one-codebase-many-platforms/)
 * May 10, 2022 - [.NET MAUI Release Candidate 3](https://devblogs.microsoft.com/dotnet/dotnet-maui-rc-3/)
 * April 26, 2022 - [.NET MAUI Release Candidate 2](https://devblogs.microsoft.com/dotnet/dotnet-maui-rc-2/)

eng/AndroidX.targets

@@ -46,7 +46,7 @@
     />
     <PackageReference
         Update="Xamarin.Build.Download"
-        Version="0.11.3"
+        Version="0.11.4"
     />
     <PackageReference
         Update="Xamarin.Google.Android.Material"

eng/Version.Details.xml

@@ -83,17 +83,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22531.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22569.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>9832d3f69cb3a3ba9b6196b7210cb3949f4af6c1</Sha>
+      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22531.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22569.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>9832d3f69cb3a3ba9b6196b7210cb3949f4af6c1</Sha>
+      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22531.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22569.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>9832d3f69cb3a3ba9b6196b7210cb3949f4af6c1</Sha>
+      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>

eng/Versions.props

@@ -23,8 +23,8 @@
     <MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>8.0.0-alpha.1.22510.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
-    <MicrosoftWindowsAppSDKPackageVersion>1.1.5</MicrosoftWindowsAppSDKPackageVersion>
-    <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.1</MicrosoftWindowsSDKBuildToolsPackageVersion>
+    <MicrosoftWindowsAppSDKPackageVersion>1.2.221116.1</MicrosoftWindowsAppSDKPackageVersion>
+    <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.755</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.4</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
     <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.0</MicrosoftAspNetCoreAuthorizationPackageVersion>
@@ -61,9 +61,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

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}");
             }
         }
 

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 }}

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 }}

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

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
-          
+

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 }})

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(','))

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
 {

src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="3.2.9" />
+    <PackageReference Include="Xamarin.UITest" Version="4.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
 

src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="3.2.9" />
+    <PackageReference Include="Xamarin.UITest" Version="4.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
 

src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
-    <PackageReference Include="Xamarin.UITest" Version="3.2.9" />
+    <PackageReference Include="Xamarin.UITest" Version="4.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
 

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
 {

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
 {

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
 {

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

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
 {