Skip to content

Commit

Permalink
[net8.0] Merge main into net8 (#11693)
Browse files Browse the repository at this point in the history
* Update Entry.cs (#11250)

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* Revert "[android] bring back `$(AndroidLinkResources)` by default" (#11096)

This reverts commit b73147e.

Fixes: dotnet/sdk#28880

* Remove dead XML Doc link (#11233)

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* [net7.0] Update dependencies from xamarin/xamarin-macios (#11220)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1463

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1463

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2018

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1463

* Bump Xcode to 14.1.0

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2020

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2021

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2022

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1467

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>

* restore unittests for native views binding (#11341)

* Bump Microsoft.WindowsAppSDK from 1.1.5 to 1.2.221109.1 (#11280)

* Bump Microsoft.WindowsAppSDK from 1.1.5 to 1.2.221109.1

Bumps [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) from 1.1.5 to 1.2.221109.1.
- [Release notes](https://github.com/microsoft/windowsappsdk/releases)
- [Commits](https://github.com/microsoft/windowsappsdk/commits)

---
updated-dependencies:
- dependency-name: Microsoft.WindowsAppSDK
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Directory.Build.targets

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Bump Microsoft.CodeAnalysis.CSharp from 4.2.0 to 4.4.0 (#11365)

Bumps [Microsoft.CodeAnalysis.CSharp](https://github.com/dotnet/roslyn) from 4.2.0 to 4.4.0.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](dotnet/roslyn@v4.2.0...Visual-Studio-2019-Version-16.0-Preview-4.4)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Xamarin.Build.Download from 0.11.3 to 0.11.4 (#11367)

Bumps [Xamarin.Build.Download](https://github.com/xamarin/XamarinComponents) from 0.11.3 to 0.11.4.
- [Release notes](https://github.com/xamarin/XamarinComponents/releases)
- [Commits](https://github.com/xamarin/XamarinComponents/commits)

---
updated-dependencies:
- dependency-name: Xamarin.Build.Download
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Microsoft.Net.Compilers.Toolset from 4.3.1 to 4.4.0 (#11366)

Bumps [Microsoft.Net.Compilers.Toolset](https://github.com/dotnet/roslyn) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits/Visual-Studio-2019-Version-16.0-Preview-4.4)

---
updated-dependencies:
- dependency-name: Microsoft.Net.Compilers.Toolset
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Set window soft input via window mapper (#11356)

* Set window soft input via window mapper

* - disconnect handlers

* - add additional logging info

* - fix handler typing

* - fix formatting

* Update Microsoft.Windows.SDK.BuildTools (#11396)

* Update Versions.props

* Not needed anymore!

* Revert "Not needed anymore!"

This reverts commit 1e22ff2.

* Bump Xamarin.UITest from 3.2.9 to 4.0.0 (#11407)

Bumps Xamarin.UITest from 3.2.9 to 4.0.0.

---
updated-dependencies:
- dependency-name: Xamarin.UITest
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/xharness build 20221108.1 (#11342)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.22531.1 -> To Version 1.0.0-prerelease.22558.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [main] Update dependencies from xamarin/xamarin-macios (#11338)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221114.10

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1468

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.iOS.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.tvOS.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.macOS.Sdk
 From Version 13.0.2022 -> To Version 13.0.2024

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>

* Add NeedsExactMeasure check for Editor on Android (#10876)

* Add NeedsExactMeasure check for Editor on Android
Fixes #8232
Fixes #7627

* Add public API stuff

* Update Essentials Barometer API Docs (#11378)

* Update Essentials Barometer API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials AppActions API Docs (#11373)

* Fix Essentials AppActions API Docs

* Update AppActions.netstandard.tvos.watchos.macos.tizen.cs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials Accelerometer API Docs (#11370)

* External file to inline

* Final touches

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Remove unnecessary MeasureOverride from RefreshView; (#11357)

* Remove unnecessary MeasureOverride from RefreshView;
Fixes #5772

* Fix missing api thing

* Don't set editor action to handled (#11386)

* Don't set editor action to handled

* - Add tests

* - remove for tizen

* Update Essentials Battery API Docs (#11380)

* Update Essentials Battery API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials AppInfo API Docs (#11374)

* Update Essentials AppInfo API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials Browser API Docs (#11394)

* Update Essentials Browser API Docs

* Apply suggestions from code review

All the URI!

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* [iOS] Fix issue clearing MapElements in Map (#11471) Fixes #11296

* Fix issue clearing MapElements in iOS Map

* Fix XAML formatting

* Update Essentials Contacts API Docs (#11417)

* Update Essentials Contacts API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials Connectivity API Docs (#11415)

* Update Essentials Connectivity API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials Clipboard Docs (#11395)

* Update Essentials Clipboard Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Fix window page changed event subscriptions (#11483)

* Fix the ordering registration for tests (#11484)

* Fix the ordering registration for tests

* - fix the timing on some tests

* CodeQL only on main/non-public builds (#11273)

* CodeQL only on main/non-public builds

* Update eng/pipelines/common/variables.yml

Co-authored-by: Rui Marinho <me@ruimarinho.net>

* Update dependencies from https://github.com/dotnet/xharness build 20221119.1 (#11524)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.22558.1 -> To Version 1.0.0-prerelease.22569.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Ensure that UIScrollView ContentSize is set (#11175)

* Ensure that UIScrollView ContentSize is set;
Fixes #9209; also fixes #11017.

* Use EnsureHandlerCreated in tests

* Make unbounded arrange method public; move UIScrollView ContentSize test to Controls;
Write new ContentSize test in Core;

* Fix public api stuff

* Fix iOS/macOS Images not cropped inside of a Frame #6580 (#11352)

* Enable Frame to clip children content on ios by default

* use tryget properly

* fix formatting

* Reverting bool check since it is nullable

* use the correct bindable property

* use an extension method to share code for frame

* changing the extension method to internal

Co-authored-by: TJ Lambert <tjlambert@microsoft.com>

* [Build] Clean up provisioning script (#11523)

* [Build] Clean up provisioning script

* Fix openjdk only on Mac

* [Housekeeping] Remove calls to Console.WriteLine to decrease app size (#11437) Fixes #11405

* Remove calls to Console.WriteLine to decrease app size

* Update src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

* Clean up the files in the xml-docs artifacts (#11257)

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake

* Add BlazorWebView, enable Graphics docs gen

* Filter DesignTools assembly

* Include BlazorWebView

* Remove BlazorWebView

* [foldable] add TypeConverter to Pane1Length/Pane2Length properties (#11269)

fixes #11240

* [Tizen] Add handing Label.TextType (#11389)

* Add .NET 7 announcement (#11539)

* [Tizen] Add Shell FlyoutBackDrop (#11390)

* Bump Microsoft.WindowsAppSDK from 1.2.221109.1 to 1.2.221116.1 (#11469)

Bumps [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) from 1.2.221109.1 to 1.2.221116.1.
- [Release notes](https://github.com/microsoft/windowsappsdk/releases)
- [Commits](https://github.com/microsoft/windowsappsdk/commits)

---
updated-dependencies:
- dependency-name: Microsoft.WindowsAppSDK
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow transparent modal pages on iOS (#11107) Fixes #8526 Fixes #11040

* Update Essentials DeviceInfo API Docs (#11431)

* Update Essentials DeviceInfo API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Update Essentials DeviceDisplay API Docs (#11429)

* Update Essentials DeviceDisplay API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

* Possible fix for issue #10960 (#11361)

* Possible fix for issue #10960

* Update src/Controls/src/Core/Shell/Shell.cs

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* Bump Microsoft.Bcl.AsyncInterfaces from 6.0.0 to 7.0.0 (#11193)

* Bump Microsoft.Bcl.AsyncInterfaces from 6.0.0 to 7.0.0

Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

---
updated-dependencies:
- dependency-name: Microsoft.Bcl.AsyncInterfaces
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump System.Text.Json

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>

* Reboot on-prem agent after job completion (#11359)

* Reboot on-prem Mac agent at the end of a test run

* Use agent-rebooter template capable of targeting the xamarin org

* Simplify agent-rebooter condition to only include the agent pool check

* Diagnostics: Show agent agentPool parameter setting

* Powershell block step

* Diagnostics: Single line echo statement

* Test: Simplify output to not include parameter setting

* Pass through the agent pool name rather than the pool object

* Show agent pool at the beginning of the job

* Remove agentPoolName parameter and condition

The agent-rebooter template will only take action when the agent is in an on-prem pool. It will not attempt to reboot an agent in a hosted pool

* Try placing group Xamarin-Secrets after the variables template

* Xamarin-Secrets is already included in the variables template

* Directly use the Xamarin public pool access token keyvault value

* Capture the agent pool access token in a variable

* Move AgentPoolAccessToken definition into device-tests

* Updated rebooter template eliminates need for organization and project parameters

* Temporarily remove all steps except the rebooter

* Restore the original steps

* Focus testing on the rebooter

* Restore all steps

* Comment noting that the rebooter template must always be the last step in the job

* Agent-rebooter capability was released to production and so target in yaml-templates main

* Trim trailing whitespace

* [main] Update dependencies from xamarin/xamarin-macios (#11553)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.iOS.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.tvOS.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.macOS.Sdk
 From Version 13.0.2024 -> To Version 13.0.2029

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Dotnet format Microsoft.Maui.sln (#11110)

* Notify Button ImageSource changes correctly (#11146)

* Fix the issue

* Added Device Tests

* [Android] Fix Stepper IsEnabled property changes (#11053)

* Added sample to validate the issue

* Fix droid Stepper IsEnabled property

* Added Device Test

* [main] Update dependencies from xamarin/xamarin-macios (#11563)

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2030

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2032

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2031

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Bump autoformatting action to v0.2. (#11580)

This new and shiny version is able to just autoformat files already modified
in a PR, so enable that mode.

* Fix ObjectDisposedException on Android resizing images (#11577)

* [Android] Fix crash using Page IsBusy property (#9783)

* Fix IsBusy crash on Android

* Added Device Test

* Align Shapes Fill property behavior with Xamarin.Forms (#10328)

* Align Shapes Fill property behavior with Xamarin.Forms

* Added device tests

* Fix brushes in Frame (#7925)

* Fix Managing Layout Children (#11581)

* Avoid propagate Map tap event tapping a Pin on iOS (#11582) Fixes #11532

* Exclude incompatible files from daily dotnet format workflow (#11590)

Some C# files use '#if' to include/exclude code and that does not work well with the dotnet format command.

* Only include MauiXaml/Css when $(UseMaui)=true (#11638)

* Add appropriate versioning attributes (#11589)

* Add a condition to skip the AutoImport.props (#11665)

Adding '$(_MauiSkipSdkAutoImport)' != 'true' so that the imports can be skipped

* [Build] Update yaml for net8 (#11609)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>
Co-authored-by: Stephane Delcroix <stephane@delcroix.org>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
Co-authored-by: Jonathan Dick <jondick@gmail.com>
Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
Co-authored-by: TJ Lambert <tjlambert@microsoft.com>
Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
Co-authored-by: Craig Dunn <craig.dunn@microsoft.com>
Co-authored-by: Jay Cho <chojoong@gmail.com>
Co-authored-by: Richard Garside <code@nogginbox.co.uk>
Co-authored-by: Mike Bond <mjbond-msft@outlook.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Rachel Kang <rachelkang@microsoft.com>
  • Loading branch information
1 parent cba2b90 commit 16f4c7f
Show file tree
Hide file tree
Showing 314 changed files with 3,390 additions and 4,398 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22531.1",
"version": "1.0.0-prerelease.22569.1",
"commands": [
"xharness"
]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/dotnet-autoformat-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion .nuspec/Microsoft.Maui.Controls.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion eng/AndroidX.targets
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
/>
<PackageReference
Update="Xamarin.Build.Download"
Version="0.11.3"
Version="0.11.4"
/>
<PackageReference
Update="Xamarin.Google.Android.Material"
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 7 additions & 3 deletions eng/cake/dotnet.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}");
}
}
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/common/device-tests-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
device: '' # the xharness device to use
cakeArgs: '' # additional cake args
provisionatorChannel: 'latest'
agentPoolAccessToken: ''

steps:
- template: provision.yml
Expand Down Expand Up @@ -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 }}
3 changes: 3 additions & 0 deletions eng/pipelines/common/device-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
androidApiLevels: [ 33 ]
iosVersions: [ 'latest' ]
provisionatorChannel: 'latest'
agentPoolAccessToken: ''
projects:
- name: name
desc: Human Description
Expand Down Expand Up @@ -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
Expand All @@ -64,3 +66,4 @@ stages:
${{ if ne(version, 'latest') }}:
device: ios-simulator-64_${{ version }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}
agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
7 changes: 5 additions & 2 deletions eng/pipelines/common/variables.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
variables:
- name: Codeql.Enabled
value: true
- name: BuildVersion
value: $[counter('buildversion-counter', 5000)]
- name: NUGET_VERSION
Expand Down Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions eng/pipelines/device-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

6 changes: 3 additions & 3 deletions eng/pipelines/handlers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
Expand Down Expand Up @@ -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 }})
Expand Down
3 changes: 2 additions & 1 deletion eng/provisioning/provisioning.csx
Original file line number Diff line number Diff line change
Expand Up @@ -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(','))
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
12 changes: 6 additions & 6 deletions src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Windows/AccessKeyHelper.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Loading

0 comments on commit 16f4c7f

Please sign in to comment.