Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[net9.0] Fix deprecated API usage for embedded fonts on iOS/Catalyst 18.0+ #25055

Closed
wants to merge 603 commits into from

Conversation

PureWeen
Copy link
Member

@PureWeen PureWeen commented Oct 2, 2024

Description of Change

#25025

Redth and others added 30 commits June 27, 2024 11:59
### Description of Change

- Removed System.Text.Json usage in Resizetizer which was causing
exceptions in our build task
- Updated to newer Android/MaciOS Workloads
- Fix for resolving our OrderedDictionary implementation as the new
built in BCL one was conflicting
- Removed previously added `MSBuildSDKsPath=;` in our build which caused
sdk resolver issues now
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Bump Appium version to 2.11

* Update CarouselViewUITests.UpdateCurrentItem.cs

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Bump Appium version to 2.11

* Update CarouselViewUITests.UpdateCurrentItem.cs

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Obsolete Frame for NET9

* - tizen fixes

* - tizen

* - fix deprecation errors

* - fix a few more frame areas

* - ignore tests not running on catalyst

* - remove a few more frames

* - few more test fixes

* - fix

* Update Issue15330.cs
# Conflicts:
#	src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Controls/tests/TestCases.HostApp/Issues/Issue23029.xaml
#	src/Controls/tests/TestCases.HostApp/Issues/Issue23029.xaml.cs
* Simplify Development.md (#23142)

* Simplify Development.md

* Update .github/DEVELOPMENT.md

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

* Update .github/DEVELOPMENT.md

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

* Update .github/DEVELOPMENT.md

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

* Update .github/DEVELOPMENT.md

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

* Update DEVELOPMENT.md

* - modify and move advanced tips to different file

* Update DEVELOPMENT.md

* Update .github/DEVELOPMENT.md

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

* Update docs/DevelopmentTips.md

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

* Update docs/DevelopmentTips.md

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

* - updates based on review

---------

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* Wire RefreshView up to our xplat layout workflow (#23169) (#23218)

* Use better layout/measure path with refreshview

* - fix naming

* - set RefreshView content to maui compatible container

* - add test

* - fix null operator

* Update Issue23029.xaml.cs

* - fix content panel so it removes previous content

* - add additional check

* Remove adding to FutureAccessList as the app is running with runFullTrust capability (#23047)

* Call base.OnResume if Existing NavigationFragment Early (#23187)

* VSCode no longer uses MAUI to launch (#23222)

* [Android] Fix flyout behaviour switching exception (#22453)

* Fix flyout behaviour switching exception

* Tests added

* Flyout test page added

* Flyoutpage test fixes

* Flyout toggle test added

* Remove duplicate ] characters

* Flyout test pages added

* Check for platforms

* Fix title

* - fix tests

---------

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

* Renamed the project because macOS uses .app (#23223)

* Renamed the project because macOS uses .app

* And the folder

* merge first

* ns

* Move tests to new location (#23251)

* Split SingleProject targets (#23269)

* Split SingleProject targets

* Update Microsoft.Maui.Controls.SingleProject.Before.targets

* Update bug-report.yml with 8.0.61 (#23273)

* Null terminate Page on TabbedRenderer (#23290)

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* [Windows] Improve performance in accessibility extensions (#22698)

* AccessibilityExtensions: Add missing braces

* AccessibilityExtensions: Enable nullability and improve performance

* Update shipped & unshipped API

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>

* [Android] Avoid double event subscribes in gesture manager (#23242)

* [Android] Avoid double event subscribes in gesture manager

* Fix typo in test text

* Bump Microsoft.Web.WebView2 from 1.0.2151.40 to 1.0.2592.51 (#23209)

* [tests] test a lot more things in `MemoryTests.cs` (#23324)

* [tests] test a lot more things in `MemoryTests.cs`

This expands the tests to cover more controls and areas.

* Add test cases for more controls:

  * `Ellipse`
  * `Grid`
  * `Path`
  * `Line`
  * `Path`
  * `RadioButton`
  * `Rectangle`
  * `RoundRectangle`

* Expand tests for a couple controls:

    * `Border` has a `StrokeShape`
    * Any `TemplatedView` gets a `ControlTemplate`

* Re-enable `ListView` for Android

This should work now after merging:

* dotnet/android#8900
* #23120

* Add a complicated test case for `BindableLayout`

Similar to the case at:

* #23199

* Skip `ListView` on API 23

* Bump Appium version to 2.11 (#23337)

* Bump Appium version to 2.11

* Update CarouselViewUITests.UpdateCurrentItem.cs

* Update appium-install.ps1

* Update CarouselViewUITests.UpdateCurrentItem.cs

* Simplify `NavigationRootManager.Connect` on the Windows platform. (#23345)

* Simplify `NavigationRootManager.Connect` on the Windows platform.

* Use ternary operator syntax

* Removed extra tabs

* Moved `_disconnected = false;` to `if (_disconnected)`

* Bump Appium Drivers (#23349)

* Fix Merge

---------

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Thomas Muller <imuller@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
Co-authored-by: Jonathan Dick <jodick@microsoft.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Takym (たかやま) <15681312+Takym@users.noreply.github.com>
### Description of Change

A non-squashed version.
…#23116)

* split generated code into multiple files

* removed collect and added tests

* removed unnecessary hashing function

* extracted binding id calculation into separate variable

* added filepath sanitizing

* Disable MAUI analyzers in server sample project

* Revert "Disable MAUI analyzers in server sample project"

This reverts commit 5c535d0.

* Use ImplementationSourceOutput instead of SourceOutput for less frequent code generation while editing

---------

Co-authored-by: Simon Rozsival <simon@rozsival.com>
### Description of Change

Add ```RegisteredForRemoteNotifications``` and
```ReceivedRemoteNotification``` to ```MauiUIApplicationDelegate``` as
virtual methods to allow override. Add corresponding lifecycle events.

### Issues Fixed

Fixes [#23451](#23451)
### Description of Change

Bring changes from p6 release branch back into net9.0
# Conflicts:
#	Microsoft.Maui-dev.sln
#	Microsoft.Maui-vscode.sln
#	Microsoft.Maui.sln
#	eng/Versions.props
#	eng/pipelines/common/ui-tests-steps.yml
#	eng/pipelines/common/ui-tests.yml
#	src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs
#	src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs
#	src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
### Description of Change

Update net9 with the latest preview6
* Update to preview7 versions

* Move branding to preview 7

* Use newer macios bits

* Update Versions.props
try again

Try again

nativeaot

only build iOS for nativeaot

Add category
* Update dependencies from https://github.com/dotnet/aspnetcore build 20240710.6

Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebAssembly , Microsoft.AspNetCore.Components.WebAssembly.Server , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.Metadata , Microsoft.JSInterop
 From Version 9.0.0-preview.7.24359.10 -> To Version 9.0.0-preview.7.24360.6

* Update dependencies from https://github.com/dotnet/aspnetcore build 20240710.7

Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebAssembly , Microsoft.AspNetCore.Components.WebAssembly.Server , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.Metadata , Microsoft.JSInterop
 From Version 9.0.0-preview.7.24359.10 -> To Version 9.0.0-preview.7.24360.7

---------

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

Bring latest changes from main to net9.0 branch
### Description of Change

Update net9.0 with needed changes to deploy
dotnet-maestro bot and others added 7 commits October 2, 2024 14:18
* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24480.1+azdo.10308467

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.134 -> To Version 35.0.0-rc.2.143

* darc update-dependencies --id 240434

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
* [testing] Enable test again

* [testing] Enable CollectionViewHandler2 on UITests

* Try new changes

* try new fix

* [iOS] Dont call InitialUpdatePosition on attach, wait for LayoutSubViews

* Try update when navigating back

* Try this

* Add missing usings

* Try this

* Fix more stuff

* Fix test on mac

* Try again

* Ignore tests on windows and android

* Use the ItemsView position on compare

* Try this

* Fix

* Cleanup

* Fix test naming

* Cleanup

* try skip android install on public bots

* Update device-tests-steps.yml

* Use our bots
### Description of Change

Bring some changes from rc2 release branch to net9.0
@PureWeen PureWeen requested a review from a team as a code owner October 2, 2024 16:56
@PureWeen
Copy link
Member Author

PureWeen commented Oct 3, 2024

/rebase

* [housekeeping] Update & Consolidate Appium + driver versions (#24817)

* Update appium + driver versions

Updating to latest

* Move appium versions to eng/Versions.props

* Fix ps1 get-location

* Check if appium is completely missing too

No need to attempt to uninstall appium if it's not installed

* - bump versions

* - fix script

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* Try iOS18 device

* See if this works

* Try xs

---------

Co-authored-by: Jonathan Dick <jodick@microsoft.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
@PureWeen
Copy link
Member Author

PureWeen commented Oct 3, 2024

/rebase

@github-actions github-actions bot force-pushed the backport/pr-25025-to-net9.0 branch from a61dfb6 to 94423fa Compare October 3, 2024 22:09
@jsuarezruiz
Copy link
Contributor

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

Copy link
Contributor

@jsuarezruiz jsuarezruiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The device test CanLoadEmbeddedFont is failing on iOS:

`Assert.Equal() Failure: Strings differ\n           ↓ (pos 0)\nExpected: "Dokdo"\nActual:   ".AppleSystemUIFont"\n           ↑ (pos 0)`

 at Microsoft.Maui.DeviceTests.FontManagerTests.<CanLoadEmbeddedFont>b__1_0() in /_/src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs:line 41
   at Microsoft.Maui.Dispatching.DispatcherExtensions.<>c__DisplayClass1_0.<DispatchAsync>b__0() in /_/src/Core/src/Dispatching/DispatcherExtensions.cs:line 48
   at Microsoft.Maui.Dispatching.DispatcherExtensions.<>c__DisplayClass0_0`1[[System.Boolean, System.Private.CoreLib, Version=9.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].<DispatchAsync>b__0() in /_/src/Core/src/Dispatching/DispatcherExtensions.cs:line 27
--- End of stack trace from previous location ---
   at Microsoft.Maui.DeviceTests.FontManagerTests.CanLoadEmbeddedFont() in /_/src/Core/tests/DeviceTests/Services/FontManagerTests.iOS.cs:line 31
--- End of stack trace from previous location ---

@PureWeen PureWeen changed the base branch from net9.0 to main October 17, 2024 19:24
@PureWeen PureWeen requested a review from a team as a code owner October 17, 2024 19:24
@rmarinho rmarinho closed this Nov 18, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Dec 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.