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.

Sign up for GitHub

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

Jump to bottom

[net9.0] Bring latest main fixes to net9.0 #20652

Merged
merged 16 commits into from Feb 16, 2024
Merged

[net9.0] Bring latest main fixes to net9.0 #20652

merged 16 commits into from Feb 16, 2024
+3,281 −213

Conversation

rmarinho
Copy link
Member

Description of Change

Bring latest fixes for ci and tests to net9.0

PureWeen and others added 13 commits February 13, 2024 18:28
@PureWeen
Add SR2 to issue template (#20564)
d749dc7
@rmarinho
[testing] Ignore flacky tests on iOS17 (#20581)
63bffb3 
* [tests] Ignore more keyboard tests

* [tests] Ignore Issue18751Test as image comparison fails

* Use Ignore attribute
@Redth
Added text and link to suggest attaching binlog (#20599)
1e3f24d 
* Added text and link to suggest attaching binlog

* Remove extra / unintended line
@jsuarezruiz @mattleibow @tj-devel709
[iOS] Fix gestures in Label Spans (#15544)
b2f64f2 
* Squashed commit of the following:

commit 694fba9
Merge: b388f57 1f21047
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Mon Dec 4 12:03:39 2023 +0100

    Merge branch 'main' into fix-4734-ios

commit b388f57
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Nov 30 08:59:24 2023 +0100

    Updated tests

commit 89353df
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Nov 29 17:29:14 2023 +0100

    Fix merge issue

commit 99db35e
Merge: fdb7113 4a31ee1
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Tue Nov 28 13:50:36 2023 +0100

    Merge branch 'main' into fix-4734-ios

commit fdb7113
Merge: ad27d6e f6956cb
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Nov 3 09:08:01 2023 +0100

    Merge branch 'main' into fix-4734-ios

commit ad27d6e
Merge: c87a842 783db24
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 25 14:07:27 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit c87a842
Merge: a507d1e e25d331
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Oct 20 13:34:23 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit a507d1e
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 18 17:13:11 2023 +0200

    Updated test

commit aa0f949
Merge: b12077e 3bd8421
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 18 13:25:01 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit b12077e
Merge: 8e45456 0f764ac
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 18 08:40:46 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 8e45456
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Oct 6 11:47:49 2023 +0200

    Fix the test

commit 08176dc
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Oct 5 12:30:35 2023 +0200

    Updated test

commit e7ed571
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 4 14:20:15 2023 +0200

    Updated test

commit 93e8095
Merge: 1145f10 a05a5a7
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Oct 4 13:52:29 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 1145f10
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Sep 29 11:46:28 2023 +0200

    Update src/Controls/tests/UITests/Tests/Issues/Issue3525.cs

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

commit 6f272d4
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Sep 28 16:23:00 2023 +0200

    Changes in tests

commit 7c8d533
Merge: b69cc28 9895399
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Sep 27 10:51:18 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit b69cc28
Author: Shane Neuville <shneuvil@microsoft.com>
Date:   Sun Sep 17 10:41:12 2023 -0500

    - add span tests back

commit 3f4b36b
Merge: c21fe9a fdbeb81
Author: Shane Neuville (HE/HIM) <shneuvil@microsoft.com>
Date:   Sun Sep 17 10:34:32 2023 -0500

    Merge remote-tracking branch 'origin/main' into fix-4734-ios

commit c21fe9a
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Sep 13 15:55:22 2023 +0200

    Fix build errors

commit 0669553
Merge: fdf5296 aff9b34
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Tue Sep 12 13:02:14 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit fdf5296
Merge: ee2cd4e ace9fe5
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Aug 18 09:02:59 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit ee2cd4e
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 17 12:23:35 2023 +0200

    Remove unnecessary event in iOS MauiLabel

commit cd8098f
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 17 12:13:20 2023 +0200

    Changes in test

commit 797872d
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 17 12:12:46 2023 +0200

    Fix build error

commit 5c7ff39
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 17 11:53:06 2023 +0200

    Added UI Test

commit deaf66d
Merge: b68a52d 34b481d
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 17 09:57:08 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit b68a52d
Merge: 4854977 e6a4334
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Aug 3 15:44:30 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 4854977
Merge: 74a8d7a f241014
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Tue Jul 25 12:00:27 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 74a8d7a
Merge: b62d39d 443d3a0
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Tue Jul 18 11:49:35 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit b62d39d
Merge: 05b0495 b9f64e1
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Tue Jul 11 12:42:20 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 05b0495
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Jul 6 12:16:43 2023 +0200

    Fix the build

commit b717d17
Merge: b1543a3 700944b
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Jul 5 09:12:33 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit b1543a3
Merge: d55348b db60162
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Jun 30 09:41:55 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit d55348b
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Fri Jun 23 19:34:48 2023 +0200

    Fix broken tests

commit f48ca85
Merge: a725311 3622625
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Thu Jun 22 11:56:09 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit a725311
Merge: 3d4326c b7afc3b
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed Jun 14 12:00:53 2023 +0200

    Merge branch 'main' into fix-4734-ios

commit 3d4326c
Merge: e99fa67 233fa2f
Author: Matthew Leibowitz <mattleibow@live.com>
Date:   Thu May 18 19:53:40 2023 +0800

    Merge remote-tracking branch 'origin/main' into fix-4734-ios

commit e99fa67
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed May 10 10:11:43 2023 +0200

    More changes

commit 9c45894
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed May 10 10:11:35 2023 +0200

    More changes

commit a0747e4
Author: Javier Suárez <javiersuarezruiz@hotmail.com>
Date:   Wed May 10 10:01:00 2023 +0200

    Fix span gestures on iOS

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

* Removed duplicated test

* I think the span gestures look pretty good now

* Fix edge case with new line

* remove comment

* make RecalculateSpanPositions internal

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: tj-devel709 <tj.devel709@gmail.com>
@StephaneDelcroix
[XC] split warnings on ',' and ';' (#20578)
4a2d418 
- fixes #20568
@mandel-macaque
[CI] Fix template to get it back to work with the megapipeline. (#20587)
8769393 
* [CI] Fix template to get it back to work with the megapipeline.

The template has a parameter that allows to know the checkout location,
that allow use to reuse it in the megapiepline. The new step was added
ignoring that fact.

* Add checkout dir as requeste in the pr.
@tj-devel709
[iOS] Adjust Keyboard Scrolling for Sticky Headers and Fix Bottom Con…
ee32869 
…tent Inset (#20562)

* got sticky header working

* add correct contentinset

* Add UITests

* remove comment
@mattleibow
Add the multi-project template (#20365)
37be10a
@PureWeen
Only run delete if files exist (#20617)
118319c 
* Only run delete if folders exist

* - fix
@mattleibow
Add animated GIF support for Image (#19411)
e15cf82
@Foda @jsuarezruiz
(Windows) ImageButton contents now explicitly stretches (#17159)
7dff6eb 
* ImageButton contents now explicitly stretches to prevent odd resizing aliasing

* Add stuff for image regression testing

* Add snapshot image and fix element names

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
@rmarinho
[ci] Remove Agent.OSVersion from demands (#20641)
d65a52a
@rmarinho
Merge branch 'main' into main-net9
ac94038
@rmarinho rmarinho requested a review from a team as a code owner February 16, 2024 16:22
@rmarinho rmarinho changed the title [net.90] Bring latest main fixes onet9.0 [net.90] Bring latest main fixes to net9.0 Feb 16, 2024
@rmarinho rmarinho changed the title [net.90] Bring latest main fixes to net9.0 [net.9] Bring latest main fixes to net9.0 Feb 16, 2024
@rmarinho rmarinho changed the title [net.9] Bring latest main fixes to net9.0 [net9.0] Bring latest main fixes to net9.0 Feb 16, 2024
@rmarinho rmarinho merged commit cd1e685 into net9.0 Feb 16, 2024
37 of 48 checks passed
@rmarinho rmarinho deleted the main-net9 branch February 16, 2024 20:11
@github-actions github-actions bot locked and limited conversation to collaborators Mar 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jfversluis jfversluis Awaiting requested review from jfversluis jfversluis is a code owner automatically assigned from dotnet/dotnet-maui-reviewers

@mattleibow mattleibow Awaiting requested review from mattleibow mattleibow is a code owner automatically assigned from dotnet/dotnet-maui-reviewers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@rmarinho @PureWeen @Redth @jsuarezruiz @StephaneDelcroix @mandel-macaque @tj-devel709 @mattleibow @Foda