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

User/shalinijoshi19/1.2.4 #3561

Closed
wants to merge 17 commits into from
Closed

Conversation

shalinijoshi19
Copy link
Member

@shalinijoshi19 shalinijoshi19 commented Nov 1, 2019

Description

Cherry-pick changes for v1.2.4

How Verified

TBD

Microsoft Reviewers: Open in CodeFlow

@shalinijoshi19
Copy link
Member Author

@paulcam206, this is missing your UWP cpp/winrt changes (can you mark your PR with the 1.2.4 label if we dont have a github issue tracking this?) , @nesalang this is also missing your threading changes from yesterday; could you CP them over and push back onto this branch? Also @paulcam206 FYI that i'd run into some merge conflicts CP'ing your changes over and needed to pull in the entire XAMLBuilder refactor.. Can you double check things are looking ok there as you CP the remaining change over? Thanks!

@paulcam206
Copy link
Member

@paulcam206, this is missing your UWP cpp/winrt changes (can you mark your PR with the 1.2.4 label if we dont have a github issue tracking this?) ,

I already had the 1.2.4 label on the PR... I just filed #3562 (with the label) to track in case we need an issue to reference.

Also @paulcam206 FYI that i'd run into some merge conflicts CP'ing your changes over and needed to pull in the entire XAMLBuilder refactor.. Can you double check things are looking ok there as you CP the remaining change over? Thanks!

Yep -- will do once I get my change in :)

jwoo-msft and others added 6 commits November 1, 2019 11:45
* made parse context not static; need to fix the internal id being null when showcard is parsed

* adding missing file

* add parse context for property parsing

* work in progress

* fixes concurrency issue during parsing

* minor fix

* updated PR per CR comments
* addressed the review comments

* review comments fixes
@jwoo-msft
Copy link
Member

jwoo-msft commented Nov 1, 2019

/azp run

…p from… (#3526)

* Added Custom Parsing and allowed signal to be passed to host app from custom action in SelectAction

* updated with CR fixes

* fixed for CR comments

* addresssing CR comments
@azure-pipelines
Copy link

No pipelines are associated with this pull request.

jwoo-msft and others added 5 commits November 1, 2019 14:05
…ility (#3514)

* [iOS][Sample App]Updated custom image renderer to handle toggle visiblity

* toggle visibilty delegate will call action delegate to notify view frame
changes
#3498)

* [iOS] allows default text renderers to be used in their custom versions of renderer

* adding missing files

* fixed project file removal by tools (xcode, git, and etc)

* CR comments feedback reflection

* CR comments fix
@almedina-ms
Copy link
Contributor

I just tested .NET and it works correctly

Copy link
Member

@jwoo-msft jwoo-msft left a comment

Choose a reason for hiding this comment

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

:shipit:

@jwoo-msft
Copy link
Member

.Net merging seems to be correct for concurrency & outdated warning messages issues.
ios is verified.

@paulcam206
Copy link
Member

superceded by #3565

@paulcam206 paulcam206 closed this Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants