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

Merge v2_develop in to v2_release #3718

Merged
merged 178 commits into from
Sep 3, 2024
Merged

Merge v2_develop in to v2_release #3718

merged 178 commits into from
Sep 3, 2024

Conversation

tig
Copy link
Collaborator

@tig tig commented Sep 2, 2024

No description provided.

tig and others added 30 commits August 1, 2024 06:08
…work in some edge cases.

This will require re-visiting the design at a deep level and fixing some long-standing but ignored issues such as how OnEnter/OnLeave don't follow proper cancelation design. Also, there's a need for keeping track of the old focus state of a tree of subviews when that tree loses focus; FocusDireciton is a hack that causes tons of confusion.
* Add a native AOT project.

* Fixes Text.Json to work with native AOT.

* Fix silent errors on unit tests when testing the Red color which has a length of 3.

* Allowing test custom configuration without the config.json file match the unit tests configurations.

* Fix unit test if tested alone.

* Add native project into solution.

* Fix merge errors.

* Setting ConfigurationManager.ThrowOnJsonErrors as true to throw any serialization issue when published file runs.

* Remove unnecessary using's.

* Added unit test to ensure all serialization is properly configured.

* Fix warnings.

* Remove ThrowOnJsonErrors.

* Fix warnings.

---------

Co-authored-by: Tig <tig@users.noreply.github.com>
* Fixed rendering issue

* Removed dead code

* Removed dead code
* Moving ShortcutDelimiter from MenuBar to Key.

* Rename to ShortcutKey and change type to Key.

* Improving add and remove menu items dynamically.

* Code cleanup.

* Fix status bar shortcuts issues.

* Fix build error.

* Change HotKey type to Key.

* Change HotKey.setter to private.

* Fix warnings.

* Fix some bugs.

* Rename ShortcutDelimiter to Separator.

* Add Separator property into the Configuration Manager.

* Change XML doc for Separator.

* Replace KeyEvent with Key.

* Add unit test preventing the Key.Separator is never Null ('\0).
Progess on thinking through new design, but not working yet.
tig and others added 24 commits August 29, 2024 16:08
Partially Adresses #2491. Refactors how `Focus` works
* Initial commit.

* More fixes

* Fixed AdvanceFocus issue with nested subviews. E.g. Wizard->WizardStep->_contentView->subview

* Fixed DatePicker tests

* Fixed DatePicker tests
…or-picker-values

Fixes #3695 - Add event handlers for Accept in ColorPicker text fields
Fixes #3702. Manipulating Adornment doesn't always cause LayoutSubviews.
Fixes #3715 - `Pos.Has (Type, out Pos)` -> `Pos.Has<T> (out Pos)`
* Remove custom navigation in FileDialog and change Ok/Cancel to use AddButton

* Fix most tests

* Update drawing tests to use contents asserts instead

* Update positioning to be less absolute

* TableView to not swallow cursors if no selection change manifests

* Make SetSelection cleverer about how it decides selection changed

* Refactor TableView key handling/Tab to be simpler and faster

* Tests for TableView selection moving out

* Add test for TableView selection change swallow cursor

* Fix formatting

* Fix split container height when buttons have shadows

* Fix alignment of buttons and input boxes
@tig tig marked this pull request as ready for review September 2, 2024 22:40
@tig tig requested a review from BDisp September 2, 2024 23:12
Copy link
Collaborator

@BDisp BDisp left a comment

Choose a reason for hiding this comment

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

Seems you are not passing the correct development branches. Should be v2_release for v2 and v1_release for v1. Maybe in the settings?

System.InvalidOperationException: Gitversion could not determine which branch to treat as the development branch (default is 'develop') nor release-able branch (default is 'main' or 'master'), either locally or remotely. Ensure the local clone and checkout match the requirements or considering using 'GitVersion Dynamic Repositories'

@tig
Copy link
Collaborator Author

tig commented Sep 3, 2024

Seems you are not passing the correct development branches. Should be v2_release for v2 and v1_release for v1. Maybe in the settings?

System.InvalidOperationException: Gitversion could not determine which branch to treat as the development branch (default is 'develop') nor release-able branch (default is 'main' or 'master'), either locally or remotely. Ensure the local clone and checkout match the requirements or considering using 'GitVersion Dynamic Repositories'

That error is occurring because the action is running from my brach.

@tig tig merged commit 9b87f52 into v2_release Sep 3, 2024
11 of 12 checks passed
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.

6 participants