Merge feature/token-experiment to master and make default style to use 2.5 by licanhua · Pull Request #3887 · microsoft/microsoft-ui-xaml

licanhua · 2021-01-05T01:30:26Z

make default style to use 2.5
merge feature/token-experiment to master

This files have merge conflicts and I expect the owner will double check the new styles
dev/Expander/Expander_themeresources.xaml
dev/InfoBar/InfoBar.xaml
dev/InfoBar/InfoBar_themeresources.xaml
dev/ProgressBar/ProgressBar_themeresources.xaml

…, and adding visual states test page (#3514) * add visual states test page * add visual states test page * Add new colors, update Button* brushes * Tweaked CSV, added accent button * Fix bad merge * Added elevation border brushes * Temporarily disable failing tests so other work can be unblocked.

* Move build to windevbuildagents (#3511) * Remove infobar from innerloop when it isn't explicitly included. (#3512) * Remove infobar from innerloop when it isn't explicitly included. * Update InnerLoopAreas.props Remove feature area from InnerLoopAreas * add condition * revert innerloop solution file * revert innerloop solution file * Update script to add API test projects and add empty dependency list in FeatureArea.props file (#3474) * Update new control script to add API test project * Update script to add dependencies, clean up script * * Rename FindElementOfTypeInSubtree -> FindVisualChildByType (#3438) * FindVisualChildByName() now an extension method * internal code cleanup * IsSelectionRequried -> IsSelectionRequired (#3404) * IsSelectionRequried -> IsSelectionRequired * TreeViewListAutomationPeer::IsSelectionRequired() always returns false. * Update the test infra to account for the test app having a different name when built from the inner loop solution. (#3359) * Feature/expander (#3492) Adding expander control (#3492). Co-authored-by: Keith Mahoney <[email protected]> Co-authored-by: Stephen L Peters <[email protected]> Co-authored-by: Marcel Wagner <[email protected]> Co-authored-by: Felix-Dev <[email protected]> Co-authored-by: Tony Xia <[email protected]> Co-authored-by: EJ <[email protected]>

* Move build to windevbuildagents (#3511) * Remove infobar from innerloop when it isn't explicitly included. (#3512) * Remove infobar from innerloop when it isn't explicitly included. * Update InnerLoopAreas.props Remove feature area from InnerLoopAreas * add condition * revert innerloop solution file * revert innerloop solution file * Update script to add API test projects and add empty dependency list in FeatureArea.props file (#3474) * Update new control script to add API test project * Update script to add dependencies, clean up script * * Rename FindElementOfTypeInSubtree -> FindVisualChildByType (#3438) * FindVisualChildByName() now an extension method * internal code cleanup * IsSelectionRequried -> IsSelectionRequired (#3404) * IsSelectionRequried -> IsSelectionRequired * TreeViewListAutomationPeer::IsSelectionRequired() always returns false. * Update the test infra to account for the test app having a different name when built from the inner loop solution. (#3359) * Feature/expander (#3492) Adding expander control (#3492). * Initial check-in for colors/brushes, preliminary button brush updates, and adding visual states test page (#3514) * add visual states test page * add visual states test page * Add new colors, update Button* brushes * Tweaked CSV, added accent button * Fix bad merge * Added elevation border brushes * Temporarily disable failing tests so other work can be unblocked. * NavView: Fix CornerRadius for overflow menu and NavViewItem children flyout menu (#3082) * Fix corner radius for the overflow menu and the children flyout menu. * Add two interaction tests. * Small comment improvements. * Small comment improvement. * Move top NavigationView specific overflow button tests from CommonTests to TopModeTests. * Now close opened flyout in API test before finishing. * Rename FindElementOfTypeInParentTree -> FindVisualParentByType * Add missing resource files to LocConfig (#3567) * Cache IsFullScreenMode and invalidate the value only when SizeChanged is raised (#3569) * Fix issue with ProgressRing not acting correctly when moving backwards (#3565) * Add workaround for awkward progress ring behavior. * Update progresring backwards behavior * move pager resources under strings/en-us folder (#3593) * make footer menu items public (#3519) * update progress ring idl (#3599) * TabView: Fix newly-added items not respecting TabWidthMode [compact] when using an ItemsSource collection (#3118) * Fix the following issues when populating the TabView via its ItemsSource API: * crash when clearing the ItemsSource * TabWidthMode [compact] being ignored in XAML Markup and for newly-added items * small comment improvement * Added two API tests and modified existing test. * Unrelated code which was commented out is run again. * Add API test. * Simplified API test. * Merge API tests. * Add API contract checks for corner radius. * Ensure that listview selected index is not outside of the item range. * Update TabView.cpp Co-authored-by: Ranjesh <[email protected]> * Switch to using ThemeResource for icon in InfoBar (#3603) * Allow winui to detect if it's in CBS package (#3520) * build cbs * Revert "build cbs" This reverts commit 24b6812. * cbs: * Update dev/dll/SharedHelpers.cpp Co-authored-by: Jevan Saks <[email protected]> * Update dev/dll/XamlControlsResources.cpp Co-authored-by: Jevan Saks <[email protected]> * remove check for old platform and add assert * make pipeline build cbs resources.pri and manifest * Update dev/dll/XamlControlsResources.cpp * Update dev/dll/XamlControlsResources.cpp * fail fast * Update dev/dll/XamlControlsResources.cpp * fix package name when generate CBSManifest Co-authored-by: Jevan Saks <[email protected]> * Doc/roadmap updates (#3618) * Updating ordering * Updating feature roadmap * More updates to feature roadmap, roadmap graphic * Update bug_report.md (#3622) * Fix readme to mention Preview 3 instead of P2 (#3621) * Update NavigationView pane scrolling behavior (#3602) * Add initial layout updating, add test page * Add first interaction tests * Fix behavior, add scrolling behavior * CR feedback * Add hacky workaround for weird sizing behavior * Update layout, add separator * Fix updating behavior * Remove hacky workaround, fix test * Add fault tolerance to tests * Update verification files * Change Preview 2 to Preview 3 (#3626) * Update preview_upgrade_instructions.md (#3636) * TeachingTip: Fix background for light-dismissable tip (#3440) * Add missing visual state setters. * Extend API test. * update loc strings (#3650) * File Pipeline build break: Update Nuget from 5.2 to 5.8 (#3664) * Fixing an issue where we needed a FileWrites to avoid file deletion. (#3661) * Remove explicit sizes of InfoBar (#3653) * Remove explicit sizes of InfoBar * Set minheight for centering * Switch to lightweight styling resources * Update CommandBarFlyout closing animation to include button moving (#3594) * Update more-button animation behavior * Fix background issue * CR feedback * update intellisense file (#3651) * Update AcrylicBrushes and add new AcrylicBrushes (#3498) * Add new brushes, update CommandbarFlyout and NavigationView to use new brushes * Update brushes * Update brush references * Update project file * Update navigationview resources * Hacky workaround XAML compiler bug * Add check * Add comment * Fix typo * Add ImageIcon (#3629) * Add ImageIcon * Respond to feedback and use an svg image with an MIT license. * Fix broken test * Platform check the IsLoaded check which was introduced in RS5 * Fix Innerloop Solution (#3697) * Add ImageIcon * Respond to feedback and use an svg image with an MIT license. * Fix broken test * Platform check the IsLoaded check which was introduced in RS5 * Add preprocessor declaration around imageIconSource code in MakeIconElementFrom * Update InfoBarPanel API names (#3704) * Update API names * Remove grid.columns * Adding PipsPager (#3592) * PipsControl initial structure * PipsControl update file structure * Add boilerplate code * Add styles and update logic * Remove Grid inside the PipsControl * some layout fixes * Update common styles * Fix nav buttons visibility logic * Update themeresources and fix infinite scrolling * Clean up the code * Remove InneLoopAreasProps from PR * Add automation * Update resources file * Fix button visibility for automation * Fix navigaiton buttons disappearing bug * Update .idl file and add style as properties * Add handlers for button visibility changes * Add style handlers and update accessibility * Add basic test with flipview * Fix update of max number of pages * Fix maxdisplayedpages onchange handler and address small PR issues * remove commented code * Update Naming * Fix naming and fix pointer hover event * Update Tests and leave some comments * Update naming and tests * Fix sv change size and override virtual methods * Address PR comments * Address PR issues * Fix button not showing up on initial launch * Clean up the code * Update API tests * Partially Update Tests * Fix spacing * Update Strings * Attempt to fix tests * Attempt to fix tests * Fall back to manual scroll if fresh API is not available * Move API check to SharedHelpers * Fix naming Co-authored-by: Ranjesh Jaganathan <[email protected]> * fix tests * ImageIcon test fix Co-authored-by: Keith Mahoney <[email protected]> Co-authored-by: Stephen L Peters <[email protected]> Co-authored-by: Marcel Wagner <[email protected]> Co-authored-by: Felix-Dev <[email protected]> Co-authored-by: Tony Xia <[email protected]> Co-authored-by: EJ <[email protected]> Co-authored-by: T Paine <[email protected]> Co-authored-by: Jevan Saks <[email protected]> Co-authored-by: Canhua Li <[email protected]> Co-authored-by: Ana Wishnoff <[email protected]> Co-authored-by: Morten Nielsen <[email protected]> Co-authored-by: Thomas Claudius Huber <[email protected]> Co-authored-by: Luke Longley <[email protected]> Co-authored-by: Vsevolod <[email protected]>

* update customtask * update project to use the customtool and support UseVisualStyle * support new flag in api * missing one file change for custombuild task * update to new api and address some comments * fix the -> * script to move master xaml to v2.5 and add them to proj * manually correct the missing items * vcxproj back to UTF8 * standard the name and replace previous with 2dot5 * batch remove last line for project * remove pips and address commentss * trim last line * remove newline at the end of file * fix ##[error]dev\dll\XamlControlsResources.cpp(249,0): Error C26449: gsl::span or std::string_view created from a temporary will be invalid when the temporary is invalidated (gsl.view). * remove return type in lambda * remove Expander_v2.5.xaml, move merge.bat to tools and fix the test failure * fix test

* fix radioButtons colouring bug * changes from comments

* visual update * re-add missing key * add innerthumb size animation * add colour transitions * changes from comments * colour transitions fix

MUXControls.sln

azure-pipelines · 2021-01-05T22:49:51Z

Azure Pipelines successfully started running 1 pipeline(s).

licanhua · 2021-01-06T03:46:33Z

/azp run

azure-pipelines · 2021-01-06T03:46:50Z

Azure Pipelines successfully started running 1 pipeline(s).

* update pfx * update CalendarView.xml master

avoid crash on expander, reveal, NavView and progressbar

licanhua · 2021-01-06T17:37:29Z

/azp run

azure-pipelines · 2021-01-06T17:37:48Z

Azure Pipelines successfully started running 1 pipeline(s).

idl/Microsoft.UI.Xaml.idl

test/MUXControlsTestApp/ThemeResourcesTests.cs

dev/dll/XamlControlsResources.cpp

dev/dll/Microsoft.UI.Xaml.vcxproj

azure-pipelines · 2021-01-07T18:29:29Z

Azure Pipelines successfully started running 1 pipeline(s).

dev/CalendarView/APITests/CalendarViewTests.cs

dev/ComboBox/APITests/ComboBoxTests.cs

dev/CommonStyles/APITests/CommonStylesTests.cs

dev/CalendarView/APITests/CalendarViewTests.cs

kmahone · 2021-01-07T21:13:20Z

            So commenting this check out for now to make the test more resilient.

File an issue on this. #Resolved

Refers to: dev/ImageIcon/APITests/ImageIconTests.cs:41 in 9ba51ea. [](commit_id = 9ba51ea, deletion_comment = False)

licanhua · 2021-01-07T21:31:51Z

/azp run

azure-pipelines · 2021-01-07T21:32:09Z

Azure Pipelines successfully started running 1 pipeline(s).

licanhua · 2021-01-07T23:27:05Z

            So commenting this check out for now to make the test more resilient.

enabled test case

In reply to: 756387707 [](ancestors = 756387707)

Refers to: dev/ImageIcon/APITests/ImageIconTests.cs:41 in 9ba51ea. [](commit_id = 9ba51ea, deletion_comment = False)

ranjeshj · 2021-01-07T23:38:04Z

can you verify that the new styles are getting picked up correctly ?

licanhua · 2021-01-08T01:00:33Z

/azp run

azure-pipelines · 2021-01-08T01:01:20Z

Azure Pipelines successfully started running 1 pipeline(s).

ranjeshj · 2021-01-08T03:21:29Z

can you verify that the new styles are getting picked up correctly ?

I can see this working in the latest iteration.

…e 2.5 (microsoft/microsoft-ui-xaml#3887)

… to master and make default style to use 2.5 (#472)

teaP and others added 10 commits November 2, 2020 14:35

update controls to use design token colors, update styles (#3728)

4d8b97e

add missing PipsPager generatd file (#3755)

a749eaa

Fix RadioButtons colouring bug (#3756)

1f33049

* fix radioButtons colouring bug * changes from comments

Slider Visual Update (#3768)

270ea98

* visual update * re-add missing key * add innerthumb size animation * add colour transitions * changes from comments * colour transitions fix

prepare for merge

4de3147

Merge branch 'master' into merge

29f40b8

ghost added the needs-triage Issue needs to be triaged by the area owners label Jan 5, 2021

licanhua commented Jan 5, 2021

View reviewed changes

MUXControls.sln Outdated Show resolved Hide resolved

licanhua force-pushed the merge branch from aa8ff8e to 77d145f Compare January 5, 2021 22:49

ranjeshj added area-DevInternal Internal build infrastructure, code cleanup, engineering efficiency team-Controls Issue for the Controls team and removed needs-triage Issue needs to be triaged by the area owners labels Jan 6, 2021

kmahone and others added 2 commits January 6, 2021 09:36

Update pfx and cer used for test signing (#3882)

1f7b28b

* update pfx * update CalendarView.xml master

update default setting and codegen update

eed5769

avoid crash on expander, reveal, NavView and progressbar

licanhua force-pushed the merge branch from 4fa91dc to eed5769 Compare January 6, 2021 17:37

ranjeshj requested review from StephenLPeters, YuliKl, jevansaks, kmahone and teaP January 6, 2021 19:47

llongley requested changes Jan 6, 2021

View reviewed changes

microsoft deleted a comment from azure-pipelines bot Jan 7, 2021

kmahone reviewed Jan 7, 2021

View reviewed changes

dev/CalendarView/APITests/CalendarViewTests.cs Outdated Show resolved Hide resolved

kmahone reviewed Jan 7, 2021

View reviewed changes

dev/ComboBox/APITests/ComboBoxTests.cs Outdated Show resolved Hide resolved

kmahone reviewed Jan 7, 2021

View reviewed changes

dev/CommonStyles/APITests/CommonStylesTests.cs Outdated Show resolved Hide resolved

kmahone reviewed Jan 7, 2021

View reviewed changes

dev/CalendarView/APITests/CalendarViewTests.cs Show resolved Hide resolved

licanhua mentioned this pull request Jan 7, 2021

Enable test case which is disabled in feature/token-experiment branch #3906

Closed

licanhua requested a review from llongley January 7, 2021 20:49

enable test

67ed6c2

llongley approved these changes Jan 7, 2021

View reviewed changes

Fix the Latest still using 2.5 styles

bd1825f

licanhua merged commit c464079 into master Jan 8, 2021

licanhua deleted the merge branch January 8, 2021 03:22

Kinnara added a commit to Kinnara/ModernWpf that referenced this pull request Jul 9, 2022

Merge feature/token-experiment to master and make default style to us…

5269d91

…e 2.5 (microsoft/microsoft-ui-xaml#3887)

Kinnara added a commit to Kinnara/ModernWpf that referenced this pull request Jul 9, 2022

Port microsoft/microsoft-ui-xaml#3887: Merge feature/token-experiment…

65b4390

… to master and make default style to use 2.5 (#472)

zadjii-msft mentioned this pull request Aug 31, 2022

Setting a Foreground on a SplitButton does not apply to the dropdown half #7673

Closed

Comments

Conversation

licanhua commented Jan 5, 2021

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 5, 2021

Uh oh!

licanhua commented Jan 6, 2021

Uh oh!

azure-pipelines bot commented Jan 6, 2021

Uh oh!

licanhua commented Jan 6, 2021

Uh oh!

azure-pipelines bot commented Jan 6, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 7, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kmahone commented Jan 7, 2021 • edited by licanhua Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

licanhua commented Jan 7, 2021

Uh oh!

azure-pipelines bot commented Jan 7, 2021

Uh oh!

licanhua commented Jan 7, 2021

Uh oh!

ranjeshj commented Jan 7, 2021

Uh oh!

licanhua commented Jan 8, 2021

Uh oh!

azure-pipelines bot commented Jan 8, 2021

Uh oh!

ranjeshj commented Jan 8, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

kmahone commented Jan 7, 2021 •

edited by licanhua

Loading