merge master into feature branch (#3734)

* 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 <28935693+ranjeshj@users.noreply.github.com>

* 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 <jevansa@microsoft.com>

* Update dev/dll/XamlControlsResources.cpp

Co-authored-by: Jevan Saks <jevansa@microsoft.com>

* 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 <jevansa@microsoft.com>

* 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 <28935693+ranjeshj@users.noreply.github.com>

* fix tests

* ImageIcon test fix

Co-authored-by: Keith Mahoney <41657372+kmahone@users.noreply.github.com>
Co-authored-by: Stephen L Peters <stpete@microsoft.com>
Co-authored-by: Marcel Wagner <marcel.alex.wagner@outlook.com>
Co-authored-by: Felix-Dev <FelixDev91@gmail.com>
Co-authored-by: Tony Xia <xia_tony@hotmail.com>
Co-authored-by: EJ <lalotahoma@icloud.com>
Co-authored-by: T Paine <30241445+teaP@users.noreply.github.com>
Co-authored-by: Jevan Saks <jevansa@microsoft.com>
Co-authored-by: Canhua Li <licanhua@live.com>
Co-authored-by: Ana Wishnoff <anawish@microsoft.com>
Co-authored-by: Morten Nielsen <1378165+dotMorten@users.noreply.github.com>
Co-authored-by: Thomas Claudius Huber <thomas@thomasclaudiushuber.com>
Co-authored-by: Luke Longley <18177025+llongley@users.noreply.github.com>
Co-authored-by: Vsevolod <sevkorobot@gmail.com>

Author: 15 people

MUXControls.sln

@@ -1743,10 +1743,6 @@ Global
 		{DB2DBB48-C807-4F7C-943E-385E77DF7BDE} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
 		{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
 		{10183D43-1785-443E-AEB7-C426FDF14964} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C}
-		{84BB4F12-73FD-4E4A-8724-C2C060DF5E82} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82}
-		{50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82}
-		{D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82}
 		{11DC7B03-88FB-4985-BF77-2BB3A13C75A8} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
 		{AB3261A7-9A8D-4A27-AEA2-3AAC0419C889} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8}
 		{225C4174-3141-49B8-ADE2-C7D3408D5103} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8}

MUXControlsInnerLoop.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29009.5
@@ -647,7 +647,6 @@ Global
 		dev\Common\Common.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
 		dev\DropDownButton\DropDownButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
 		dev\Effects\Microsoft.UI.Composition.Effects.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
-		dev\Expander\Expander.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
 		dev\IconSource\IconSource.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
 		dev\Lights\Lights.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
 		dev\Materials\Acrylic\AcrylicBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
@@ -1179,10 +1178,6 @@ Global
 		{990BBC65-1114-435D-B5CC-1EB8AAAD72DD} = {633B8D7A-3207-4BD3-8159-B65710AEA6FF}
 		{128E6F7A-578C-48DC-BD3F-750EC662C268} = {633B8D7A-3207-4BD3-8159-B65710AEA6FF}
 		{6F7831A4-48F8-41E8-A573-C567A1223CB5} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C}
-		{93FAB536-1139-4FD1-B0BF-97C0C6FAB378} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378}
-		{50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378}
-		{D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378}
 		{E7C2104F-770D-4375-8D3A-D173F222273A} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
 		{AB3261A7-9A8D-4A27-AEA2-3AAC0419C889} = {E7C2104F-770D-4375-8D3A-D173F222273A}
 		{225C4174-3141-49B8-ADE2-C7D3408D5103} = {E7C2104F-770D-4375-8D3A-D173F222273A}
@@ -1210,4 +1205,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
 	EndGlobalSection
-EndGlobal
+EndGlobal

dev/Generated/InfoBarPanel.properties.cpp

@@ -73,6 +73,7 @@ void InfoBarPanelProperties::EnsureProperties()
 
 void InfoBarPanelProperties::ClearProperties()
 {
+<<<<<<< HEAD
     s_HorizontalOrientationMarginProperty = nullptr;
     s_HorizontalOrientationPaddingProperty = nullptr;
     s_VerticalOrientationMarginProperty = nullptr;
@@ -83,13 +84,46 @@ void InfoBarPanelProperties::ClearProperties()
 void InfoBarPanelProperties::SetHorizontalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value)
 {
     target.SetValue(s_HorizontalOrientationMarginProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+=======
+    s_PaddingInHorizontalOrientationProperty = nullptr;
+    s_PaddingInVerticalOrientationProperty = nullptr;
+    s_SpacingInHorizontalOrientationProperty = nullptr;
+    s_SpacingInVerticalOrientationProperty = nullptr;
+}
+
+void InfoBarPanelProperties::PaddingInHorizontalOrientation(winrt::Thickness const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::Thickness InfoBarPanelProperties::PaddingInHorizontalOrientation()
+{
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInHorizontalOrientationProperty));
+}
+
+void InfoBarPanelProperties::PaddingInVerticalOrientation(winrt::Thickness const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::Thickness InfoBarPanelProperties::PaddingInVerticalOrientation()
+{
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInVerticalOrientationProperty));
+>>>>>>> merge master into feature branch (#3734)
 }
 
 winrt::Thickness InfoBarPanelProperties::GetHorizontalOrientationMargin(winrt::DependencyObject const& target)
 {
     return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_HorizontalOrientationMarginProperty));
 }
 
+<<<<<<< HEAD
 void InfoBarPanelProperties::HorizontalOrientationPadding(winrt::Thickness const& value)
 {
     [[gsl::suppress(con)]]
@@ -125,4 +159,25 @@ void InfoBarPanelProperties::VerticalOrientationPadding(winrt::Thickness const&
 winrt::Thickness InfoBarPanelProperties::VerticalOrientationPadding()
 {
     return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_VerticalOrientationPaddingProperty));
+=======
+void InfoBarPanelProperties::SetSpacingInHorizontalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)
+{
+    target.SetValue(s_SpacingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+}
+
+winrt::Thickness InfoBarPanelProperties::GetSpacingInHorizontalOrientation(winrt::DependencyObject const& target)
+{
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInHorizontalOrientationProperty));
+}
+
+
+void InfoBarPanelProperties::SetSpacingInVerticalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)
+{
+    target.SetValue(s_SpacingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+}
+
+winrt::Thickness InfoBarPanelProperties::GetSpacingInVerticalOrientation(winrt::DependencyObject const& target)
+{
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInVerticalOrientationProperty));
+>>>>>>> merge master into feature branch (#3734)
 }

dev/PipsPager/TestUI/PipsPager_TestUI.projitems

@@ -27,4 +27,4 @@
       <DependentUpon>PipsPagerPage.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-</Project>
+</Project>

dev/dll/XamlControlsResources.cpp

@@ -219,6 +219,18 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
                     releasePrefix =  L"ms-appx://" MUXCONTROLS_CBS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_";
                 }
             }
+            else if (isInCBSPackage)
+            {
+                if (is19H1OrHigher)
+                {
+                    return L"ms-appx://" MUXCONTROLS_CBS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/19h1_generic.xaml";
+                }
+                else
+                {
+                    MUX_FAIL_FAST_MSG("CBS package doesn't apply to old platforms");
+                    return L"ms-appx://" MUXCONTROLS_CBS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
+                }
+            }
             else
             {
                 if (is19H1OrHigher)