Skip to content

Conversation

@RebeccaAnne
Copy link
Contributor

@RebeccaAnne RebeccaAnne commented Sep 14, 2021

Related Issue

Fixes #6309

Description

@jonwis converted our Object Model to C++/WinRT. This PR merges that change back into the UWP object model, and adds testing and bug fixes.

How Verified

  • Ran existing UWP tests
  • Updated UWP object model tests to be more robust and ensure they tested full round trip through the object model code (Construct object model in code, serialize to json, deserialize back to object model from json, serialize to json)
  • Smoke testing on the scenario cards
    • Found an issue in fallback this way that wasn't caught by the tests and added a new fallback test to cover it.
Microsoft Reviewers: Open in CodeFlow

Copy link
Member

@paulcam206 paulcam206 left a comment

Choose a reason for hiding this comment

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

this looks so nice! appreciate all of the hard work it took to get this done :)

@RebeccaAnne RebeccaAnne merged commit 61677f2 into main Sep 21, 2021
@RebeccaAnne RebeccaAnne deleted the rebecch/mergejonwiswinrt branch September 21, 2021 16:04
vivekkozhisseri pushed a commit to BigThinkcode/AdaptiveCards that referenced this pull request Sep 30, 2021
* Toggle input in c++/winrt! (microsoft#6303)

* Toggle input in c++/winrt!

* PR Feedback

* Fix return value

* Merge Jonwis' object model conversion into UWP (microsoft#6322)

* Merge u/jonwis/winui3 from fork

* Copy object model changes from winappsdk to uwp

* Delete winappsdk directory

* Rename WinUI3 to Uwp - everything builds

* Testing, bug fixes, and cleanup

* Fix propert_opt setter

* Version and package changes

* Remove nuget source from nuget config

* version changes

* Update package pushing readme

Co-authored-by: Jon Wiswall <[email protected]>
Co-authored-by: almedina-ms <[email protected]>

* [Designer] Make everything accessible at high zoom levels (microsoft#6320)

* [Designer] Make small-x-dimension scenario basically work

Fixes microsoft#6263

* Tabs feedback

* Fix drag/drop and random scrolling

* Per triage, Xamarin is deprecated, so no need to hold on to this old unsupported code (microsoft#6255)

* [Shared] Add `password` `Input.Text` support (microsoft#6377)

* [Shared] Add `password` `Input.Text` support

Fixes microsoft#6340

* PR feedback

* [iOS] removed custom background color to return to system default (microsoft#6378)

* [iOS] Updated Radio Buttons / Check Boxes Contrast Ratio (microsoft#6372)

Co-authored-by: Paul Campbell <[email protected]>

* Set wrapping to true for accessibility fix (microsoft#6324)

Co-authored-by: Paul Campbell <[email protected]>

* Fix link traversal (microsoft#6317)

Co-authored-by: Paul Campbell <[email protected]>

* [iOS] Updated vertical content alignment, height and toggle Visibility (microsoft#6329)

* [iOS] Fixed microsoft#6219

* [iOS] adding padding support to toggle visibility

* [Padding] Update

* [iOS] work in progress

* mostly done need to refactor and update padding management code

* [iOS] refactored

* [iOS] added padding test

* refactored the padding configuration in FactSet to Padding Handler

* [iOS] Updated VerticalContentAlignment and Height

* Reverts samples card changes

* [iOS] code clean-up

* [iOS] CR update

* [iOS] CR update

* Add implementation and tests (microsoft#6406)

Co-authored-by: Paul Campbell <[email protected]>

* [UWP] Fix risky cast in `GenerateElementProjection()` (microsoft#6412)

* [UWP] Fix risky cast in `GenerateElementProjection()`

Fixes microsoft#6394

* Fix PR feedback

* Fix style behaviour (microsoft#6419)

Co-authored-by: Paul Campbell <[email protected]>

* [JS] Add Password support to Input.Text (microsoft#6407)

* Add Password to style list

* Fix comparator

* Change property implementation to contain version info in new enum value

Co-authored-by: Paul Campbell <[email protected]>

* [iOS] Password Masking (microsoft#6411)

* [iOS] Password implementation

* [iOS] Updated unit tests and added sample json

* Update Input.Text.PasswordStyle.json

Co-authored-by: almedina-ms <[email protected]>

* [iOS] Table Horizontal Alignment Update (microsoft#6401)

* [iOS] Fixed microsoft#6219

* [iOS] adding padding support to toggle visibility

* [Padding] Update

* [iOS] work in progress

* mostly done need to refactor and update padding management code

* [iOS] refactored

* [iOS] added padding test

* refactored the padding configuration in FactSet to Padding Handler

* [iOS] Updated VerticalContentAlignment and Height

* Reverts samples card changes

* [iOS] code clean-up

* [iOS] Table Update

* [iOS] Updated Table with better Horizontal Alignment

Co-authored-by: Paul Campbell <[email protected]>

* [iOS/Android/UWP/Shared] Fix handling of orphaned table child elements (microsoft#6408)

* [Shared] Fix parsing of `TableRow` and `TableCell` outside of `Table`

Fixes microsoft#6393

* SWIG updates

* Fix up Android rendering

* Fix up iOS

* Fix up UWP

Co-authored-by: Paul Campbell <[email protected]>

* Enabling blank issues for internal team use (microsoft#6445)

Co-authored-by: RebeccaAnne <[email protected]>
Co-authored-by: Jon Wiswall <[email protected]>
Co-authored-by: almedina-ms <[email protected]>
Co-authored-by: Paul Campbell <[email protected]>
Co-authored-by: Joseph Woo <[email protected]>
Co-authored-by: Paul Campbell <[email protected]>
Co-authored-by: Jonathan Miller <[email protected]>
michaelfarnsworth pushed a commit to michaelfarnsworth/AdaptiveCards that referenced this pull request Nov 10, 2022
* Merge u/jonwis/winui3 from fork

* Copy object model changes from winappsdk to uwp

* Delete winappsdk directory

* Rename WinUI3 to Uwp - everything builds

* Testing, bug fixes, and cleanup

* Fix propert_opt setter

* Version and package changes

* Remove nuget source from nuget config

* version changes

* Update package pushing readme

Co-authored-by: Jon Wiswall <[email protected]>
Co-authored-by: almedina-ms <[email protected]>
rankush pushed a commit to rankush/AdaptiveCards that referenced this pull request May 8, 2024
* Merge u/jonwis/winui3 from fork

* Copy object model changes from winappsdk to uwp

* Delete winappsdk directory

* Rename WinUI3 to Uwp - everything builds

* Testing, bug fixes, and cleanup

* Fix propert_opt setter

* Version and package changes

* Remove nuget source from nuget config

* version changes

* Update package pushing readme

Co-authored-by: Jon Wiswall <[email protected]>
Co-authored-by: almedina-ms <[email protected]>
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.

Fold Jonwis cppwinrt conversion back into UWP

6 participants