Skip to content

[X] revert #5611#17733

Merged
samhouts merged 2 commits intonet8.0from
fix_17461
Oct 20, 2023
Merged

[X] revert #5611#17733
samhouts merged 2 commits intonet8.0from
fix_17461

Conversation

@StephaneDelcroix
Copy link
Copy Markdown
Contributor

@StephaneDelcroix StephaneDelcroix commented Sep 29, 2023 •
edited
Loading

Description of Change

As reported in #17461, OnPlatform simplification cause some issues

Issues Fixed

@StephaneDelcroix StephaneDelcroix requested a review from a team as a code owner September 29, 2023 10:12
@jsuarezruiz jsuarezruiz added the area-xaml XAML, CSS, Triggers, Behaviors label Sep 29, 2023
@samhouts samhouts added this to the .NET 8 GA milestone Sep 29, 2023
samhouts
samhouts previously approved these changes Sep 29, 2023
View reviewed changes
@samhouts samhouts enabled auto-merge (squash) September 29, 2023 15:13
rmarinho
rmarinho previously requested changes Oct 3, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@rmarinho rmarinho left a comment

Choose a reason for hiding this comment

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

Seems is failing these tests for net6 ?!

OnPlatformAreSimplified("net6.0-android")

https://dev.azure.com/xamarin/public/_build/results?buildId=98082&view=ms.vss-test-web.build-test-results-tab&runId=2155529&resultId=101010&paneView=debug

@hartez hartez removed their request for review October 3, 2023 18:38
@samhouts samhouts added the s/pr-needs-author-input PR needs an update from the author label Oct 5, 2023
@ghost
Copy link
Copy Markdown

ghost commented Oct 5, 2023

Hi @StephaneDelcroix. We have added the "s/pr-needs-author-input" label to this issue, which indicates that we have an open question/action for you before we can take further action. This PRwill be closed automatically in 14 days if we do not hear back from you by then - please feel free to re-open it if you come back to this PR after that time.

PureWeen
PureWeen previously requested changes Oct 9, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@PureWeen PureWeen left a comment

Choose a reason for hiding this comment

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

Currently this PR is targeting main (SR1) with a GA milestone.
Can you please update the Milestone to SR1 or update the targeted branch to net8.0.

@StephaneDelcroix StephaneDelcroix requested a review from a team as a code owner October 17, 2023 10:41
@StephaneDelcroix StephaneDelcroix removed the s/pr-needs-author-input PR needs an update from the author label Oct 17, 2023
@StephaneDelcroix StephaneDelcroix changed the base branch from main to net8.0 October 17, 2023 12:29
@StephaneDelcroix StephaneDelcroix dismissed stale reviews from PureWeen and rmarinho October 17, 2023 12:33

fixed

@Eilon Eilon removed the request for review from a team October 17, 2023 16:32
@PureWeen
Copy link
Copy Markdown
Member

PureWeen commented Oct 19, 2023

/rebase

@StephaneDelcroix @PureWeen
[X] revert #5611
33482cf 
As reported in #17461, OnPlatform simplification cause some issues
- while used as a Resource (#17461, unable to unit test for now)
- doesn't type convert. On nodes shouldn't be replaced by the Value, but
  an element node (<On Platform="..." Value="Red" /> should generate
<Color x:Key="foo">Red</Color>. right now it only generated "Red"

- fixes #17461
@StephaneDelcroix @PureWeen
disable failing test
b0516db
@samhouts samhouts merged commit ab33293 into net8.0 Oct 20, 2023
@samhouts samhouts deleted the fix_17461 branch October 20, 2023 23:10
@PureWeen
Copy link
Copy Markdown
Member

PureWeen commented Oct 23, 2023

/backport to release/8.0.1xx-rc2.1

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 23, 2023

Started backporting to release/8.0.1xx-rc2.1: https://github.com/dotnet/maui/actions/runs/6615459756

@github-actions github-actions bot mentioned this pull request Oct 23, 2023
Merged
@github-actions github-actions bot locked and limited conversation to collaborators Dec 6, 2023
@samhouts samhouts added the fixed-in-8.0.0-rc.2.9511 Look for this fix in 8.0.0-rc.2.9511 label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@PureWeen PureWeen PureWeen left review comments

@rachelkang rachelkang Awaiting requested review from rachelkang rachelkang was automatically assigned from dotnet/dotnet-maui-reviewers

@rmarinho rmarinho Awaiting requested review from rmarinho

+1 more reviewer

@samhouts samhouts samhouts approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-xaml XAML, CSS, Triggers, Behaviors fixed-in-8.0.0-rc.2.9511 Look for this fix in 8.0.0-rc.2.9511

Projects

None yet

Milestone

.NET 8 GA

5 participants

@StephaneDelcroix @PureWeen @rmarinho @samhouts @jsuarezruiz