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>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,6 +33,7 @@ Examples
 [Microsoft.UI.Xaml.2.4.0-prerelease.200506001]
 [Microsoft.WinUI 3.0.0-preview1.200515.3] If you seeing your issue in preview1, please try preview2.
 [Microsoft.WinUI 3.0.0-preview2.200713.0]
+[Microsoft.WinUI 3.0.0-preview3.201113.0]
 -->
 
 <!-- If you are using WinUI 3, please specify for which Windows app type you have encountered the issue. Leave blank if you didn't try that app type. -->

FeatureAreas.props

@@ -210,6 +210,13 @@
   <!-- Dependencies for RadialGradientBrush -->
   <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRadialGradientBrushEnabled) == 'true'">
   </PropertyGroup>
+  <!-- Dependencies for PipsPager -->
+  <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeaturePipsPagerEnabled) == 'true'">
+    <FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
+  </PropertyGroup>
+  <!-- Dependencies for ImageIcon -->
+  <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureImageIconEnabled) == 'true'">
+  </PropertyGroup>
   <!-- Features to include for official build (should be all features) -->
   <PropertyGroup Condition="$(SolutionName) != 'MUXControlsInnerLoop'">
     <FeatureAnimatedVisualPlayerEnabled>true</FeatureAnimatedVisualPlayerEnabled>
@@ -268,6 +275,8 @@
     <FeatureInfoBarEnabled>true</FeatureInfoBarEnabled>
     <FeatureExpanderEnabled>true</FeatureExpanderEnabled>
     <FeaturePagerControlEnabled>true</FeaturePagerControlEnabled>
+    <FeaturePipsPagerEnabled>true</FeaturePipsPagerEnabled>
+    <FeatureImageIconEnabled>true</FeatureImageIconEnabled>
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants Condition="$(FeatureScrollPresenterEnabled) =='true'">$(DefineConstants);FEATURE_SCROLLPRESENTER_ENABLED</DefineConstants>

README.md

@@ -19,13 +19,13 @@ You can watch them online here on YouTube at the [Windows Developer channel](htt
 
 Add the event to your calendar: [ICS calendar file](https://aka.ms/winuicommunitycall)
 
-## WinUI 3.0 Preview 2 (July 2020)
+## WinUI 3.0 Preview 3 (November 2020)
 
 As outlined in the [roadmap](docs/roadmap.md) we're currently working on WinUI 3.0, which will greatly expand the scope of WinUI to include the full native Windows UI platform.
 
-You can now [download an early build of WinUI 3.0 Preview 2](https://docs.microsoft.com/uwp/toolkits/winui3/) to try out - we'd love your feedback!
+You can now [download an early build of WinUI 3.0 Preview 3](https://docs.microsoft.com/uwp/toolkits/winui3/) to try out - we'd love your feedback!
 
-For more info see the [discussion issue #2917](https://github.com/microsoft/microsoft-ui-xaml/issues/2917).
+For more info see the [discussion issue #2917](https://github.com/microsoft/microsoft-ui-xaml/issues/3620).
 
 ## Using WinUI
 You can download and use WinUI packages in your app using the NuGet package manager: see the [Getting Started with the Windows UI Library](https://docs.microsoft.com/uwp/toolkits/winui/getting-started) page for more information.

build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml

@@ -60,6 +60,13 @@ jobs:
         sourceFolder: '$(Build.SourcesDirectory)\Artifacts\drop'
         Contents: '**\Microsoft.UI.Xaml*.appx'
 
+    # Copy the CBS packages into the same location in the artifact drop to be republished at the end of the job.
+    - task: CopyFiles@2
+      inputs:
+        targetFolder: '${{ parameters.nupkgdir }}'
+        sourceFolder: '$(Build.SourcesDirectory)\Artifacts\drop'
+        Contents: '**\CBS*'
+
   - powershell: |
       $prereleaseTag = "${{ parameters.prereleaseVersionTag }}"
       if ("${{ parameters.useReleaseTag}}" -eq [bool]::TrueString) { $prereleaseTag = "" }

build/FrameworkPackage/MakeFrameworkPackage.ps1

@@ -229,10 +229,14 @@ $manifestContents = $manifestContents.Replace('$(ActivatableTypes)', "$Activatab
 $manifestContents = $manifestContents.Replace('$(Version)', "$Version")
 Set-Content -Value $manifestContents $fullOutputPath\PackageContents\AppxManifest.xml
 
+$manifestContents = $manifestContents.Replace("$PackageName", "Microsoft.UI.Xaml.CBS")
+$manifestContents = $manifestContents.Replace('FrameworkPackageDetector', "CBSPackageDetector")
+Set-Content -Value $manifestContents $fullOutputPath\CBSAppxManifest.xml
 
 # Call GetFullPath to clean up the path -- makepri is very picky about double slashes in the path.
 $priConfigPath = [IO.Path]::GetFullPath("$fullOutputPath\priconfig.xml")
 $priOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\resources.pri")
+$priCBSOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\CBSresources.pri")
 $noiseAssetPath = [IO.Path]::GetFullPath("$fullOutputPath\Assets\NoiseAsset_256x256_PNG.png")
 $resourceContents = [IO.Path]::GetFullPath("$fullOutputPath\Resources")
 $pfxPath = [IO.Path]::GetFullPath("..\MSTest.pfx")
@@ -259,6 +263,11 @@ Write-Host $makepriNew
 cmd /c $makepriNew
 if ($LastExitCode -ne 0) { Exit 1 }
 
+$makepriNew = "`"" + (Join-Path $WindowsSdkBinDir "makepri.exe") + "`" new /pr $fullOutputPath /cf $priConfigPath /of $priCBSOutputPath /in Microsoft.UI.Xaml.CBS /o"
+Write-Host $makepriNew
+cmd /c $makepriNew
+if ($LastExitCode -ne 0) { Exit 1 }
+
 $outputAppxFileFullPath = Join-Path $fullOutputPath "$PackageName.appx"
 $outputAppxFileFullPath = [IO.Path]::GetFullPath($outputAppxFileFullPath)
 

build/Localization/Settings/LocConfig.xml

@@ -3,29 +3,50 @@
   <Module
     name="dep.controls"
     tdbuildteamid="104">
-    <File
-      location="PersonPicture"
-      path="%LocRoot%\..\..\dev\PersonPicture\Strings\en-us\Resources.resw"/>
-    <File
-      location="RatingControl"
-      path="%LocRoot%\..\..\dev\RatingControl\Strings\en-us\Resources.resw"/>
     <File
       location="ColorPicker"
       path="%LocRoot%\..\..\dev\ColorPicker\Strings\en-us\Resources.resw"/>
+    <File
+      location="CommandBarFlyout"
+      path="%LocRoot%\..\..\dev\CommandBarFlyout\Strings\en-us\Resources.resw"/>
+    <File
+      location="InfoBar"
+      path="%LocRoot%\..\..\dev\InfoBar\Strings\en-us\Resources.resw"/>
     <File
       location="NavigationView"
       path="%LocRoot%\..\..\dev\NavigationView\Strings\en-us\Resources.resw"/>
     <File
-      location="TreeView"
-      path="%LocRoot%\..\..\dev\TreeView\Strings\en-us\Resources.resw"/>
+      location="NumberBox"
+      path="%LocRoot%\..\..\dev\NumberBox\Strings\en-us\Resources.resw"/>
+    <File
+      location="PagerControl"
+      path="%LocRoot%\..\..\dev\PagerControl\Strings\en-us\Resources.resw"/>
+    <File
+      location="PersonPicture"
+      path="%LocRoot%\..\..\dev\PersonPicture\Strings\en-us\Resources.resw"/>
+    <File
+      location="ProgressBar"
+      path="%LocRoot%\..\..\dev\ProgressBar\Strings\en-us\Resources.resw"/>
+      <File
+      location="ProgressRing"
+      path="%LocRoot%\..\..\dev\ProgressRing\Strings\en-us\Resources.resw"/>
+    <File
+      location="RatingControl"
+      path="%LocRoot%\..\..\dev\RatingControl\Strings\en-us\Resources.resw"/>
     <File
       location="SplitButton"
       path="%LocRoot%\..\..\dev\SplitButton\Strings\en-us\Resources.resw"/>
+    <File
+      location="TabView"
+      path="%LocRoot%\..\..\dev\TabView\Strings\en-us\Resources.resw"/>
     <File
       location="TeachingTip"
       path="%LocRoot%\..\..\dev\TeachingTip\Strings\en-us\Resources.resw"/>
     <File
-      location="TabView"
-      path="%LocRoot%\..\..\dev\TabView\Strings\en-us\Resources.resw"/>
+      location="TreeView"
+      path="%LocRoot%\..\..\dev\TreeView\Strings\en-us\Resources.resw"/>
+    <File
+      location="PipsPager"
+      path="%LocRoot%\..\..\dev\PipsPager\Strings\en-us\Resources.resw"/>
   </Module>
 </Modules>