diff --git a/MUXControlsInnerLoop.sln b/MUXControlsInnerLoop.sln old mode 100644 new mode 100755 index c5f5717a97..5647b54fae --- a/MUXControlsInnerLoop.sln +++ b/MUXControlsInnerLoop.sln @@ -642,6 +642,7 @@ Global dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{a800e818-7212-4fd7-ae3a-1dcab539db87}*SharedItemsImports = 13 dev\PagerControl\PagerControl.vcxitems*{ab3261a7-9a8d-4a27-aea2-3aac0419c889}*SharedItemsImports = 9 dev\Collections\Collections.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\ComboBox\ComboBox.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\CommonStyles\CommonStyles.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Common\Common.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\DropDownButton\DropDownButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -650,6 +651,8 @@ Global dev\Lights\Lights.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Acrylic\AcrylicBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Reveal\RevealBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\PagerControl\PagerControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\PipsPager\PipsPager.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ResourceHelper\ResourceHelper.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SplitButton\SplitButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Telemetry\Telemetry.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -694,6 +697,13 @@ Global dev\TreeView\APITests\TreeView_APITests.projitems*{de885c66-929c-464e-bac4-3e076ec46483}*SharedItemsImports = 13 dev\Pivot\TestUI\Pivot_TestUI.projitems*{deb3fa60-e4a7-4735-89f2-363c7c56b428}*SharedItemsImports = 13 dev\CommonManaged\CommonManaged.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\NumberBox\APITests\NumberBox_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\NumberBox\TestUI\NumberBox_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PagerControl\APITests\PagerControl_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\SplitButton\InteractionTests\SplitButton_InteractionTests.projitems*{e1c861e2-c4d9-41e1-aed7-5e203451bd4d}*SharedItemsImports = 13 dev\DatePicker\TestUI\DatePicker_TestUI.projitems*{e20f725c-3a53-463b-ada9-ff2088aaca4d}*SharedItemsImports = 13 @@ -712,6 +722,13 @@ Global dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{f601284a-00c1-49f9-99b3-70d45585f784}*SharedItemsImports = 13 dev\SplitButton\SplitButton.vcxitems*{faf114dd-af1f-4d9f-a511-354c19912aad}*SharedItemsImports = 9 dev\CommonManaged\CommonManaged.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\NumberBox\APITests\NumberBox_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\NumberBox\TestUI\NumberBox_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PagerControl\APITests\PagerControl_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Slider\Slider.vcxitems*{fc2178ca-7f72-40f0-916c-a2b3750bbb6c}*SharedItemsImports = 9 dev\LayoutPanel\LayoutPanel.vcxitems*{fd3c1a00-0d07-4849-a3b9-646f0ff21d7b}*SharedItemsImports = 9 diff --git a/build/Helix/PrepareHelixPayload.ps1 b/build/Helix/PrepareHelixPayload.ps1 index 72bc303b95..44b9c7d235 100644 --- a/build/Helix/PrepareHelixPayload.ps1 +++ b/build/Helix/PrepareHelixPayload.ps1 @@ -24,7 +24,7 @@ Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.31.180822002\build\Binaries\$Pla New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\" Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\" Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\" -Copy-Item "$nugetPackagesDir\MUXCustomBuildTasks.1.0.48\tools\$platform\WttLog.dll" $payloadDir +Copy-Item "$nugetPackagesDir\MUXCustomBuildTasks.1.0.70\tools\$platform\WttLog.dll" $payloadDir function Copy-If-Exists { diff --git a/build/Helix/packages.config b/build/Helix/packages.config index 630ce29030..711d9671fd 100644 --- a/build/Helix/packages.config +++ b/build/Helix/packages.config @@ -1,6 +1,6 @@ - + diff --git a/build/ShouldSkipPRBuild.ps1 b/build/ShouldSkipPRBuild.ps1 index 64081fbf5b..8a469b9115 100644 --- a/build/ShouldSkipPRBuild.ps1 +++ b/build/ShouldSkipPRBuild.ps1 @@ -28,7 +28,19 @@ $shouldSkipBuild = $false if($env:BUILD_REASON -eq "PullRequest") { - $targetBranch = "origin/$env:SYSTEM_PULLREQUEST_TARGETBRANCH" + # Azure DevOps sets this variable with refs/heads/ at the beginning. + # This trims it so the $gitCommandLine is formatted properly + if ($env:SYSTEM_PULLREQUEST_TARGETBRANCH.StartsWith("refs/heads/")) + { + $systemPullRequestTargetBranch = $env:SYSTEM_PULLREQUEST_TARGETBRANCH.Substring("11") + + } + else + { + $systemPullRequestTargetBranch = $env:SYSTEM_PULLREQUEST_TARGETBRANCH + } + + $targetBranch = "origin/$systemPullRequestTargetBranch" $gitCommandLine = "git diff $targetBranch --name-only" Write-Host "$gitCommandLine" diff --git a/dev/AutoSuggestBox/AutoSuggestBox.vcxitems b/dev/AutoSuggestBox/AutoSuggestBox.vcxitems index e2ede0b425..eb030912f8 100644 --- a/dev/AutoSuggestBox/AutoSuggestBox.vcxitems +++ b/dev/AutoSuggestBox/AutoSuggestBox.vcxitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -15,6 +15,13 @@ + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml index e02313aec4..d8c6e9d772 100644 --- a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml +++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml @@ -9,9 +9,9 @@ - + - + 12 @@ -24,9 +24,9 @@ - + - + 12 diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources_v2.5.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources_v2.5.xaml new file mode 100644 index 0000000000..e02313aec4 --- /dev/null +++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources_v2.5.xaml @@ -0,0 +1,468 @@ + + + + + + + + + + 12 + + + + + + + 12 + + + + + + + + 12 + + + + 0,0,0,4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/CommonStyles/CommonStyles.vcxitems b/dev/CommonStyles/CommonStyles.vcxitems index 68c75c96e9..580d1edfcd 100644 --- a/dev/CommonStyles/CommonStyles.vcxitems +++ b/dev/CommonStyles/CommonStyles.vcxitems @@ -15,84 +15,209 @@ + Latest RS1 ThemeResources 1 + + V2dot5 + RS1 + ThemeResources + 1 + + + Latest + RS1 + ThemeResources + true + + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources + true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true diff --git a/dev/CommonStyles/Common_themeresources.xaml b/dev/CommonStyles/Common_themeresources.xaml index e85e54f91b..6a978ee582 100644 --- a/dev/CommonStyles/Common_themeresources.xaml +++ b/dev/CommonStyles/Common_themeresources.xaml @@ -8,6 +8,249 @@ --> + + + + #FFFFFF + #C5FFFFFF + #87FFFFFF + #5DFFFFFF + #E4000000 + + #A8E6FF + #A8E6FF + #70C2F1 + #5DFFFFFF + + #FFFFFF + #B3FFFFFF + #5DFFFFFF + + #000000 + #80000000 + #87FFFFFF + + #0FFFFFFF + #15FFFFFF + #0BFFFFFF + #0BFFFFFF + #00FFFFFF + #15FFFFFF + + #87FFFFFF + #3FFFFFFF + + #454545 + + #00FFFFFF + #05FFFFFF + #0BFFFFFF + #0BFFFFFF + + #00FFFFFF + #1A000000 + #0BFFFFFF + #12000000 + #00FFFFFF + + #B31C1C1C + #1A1A1A + #131313 + #131313 + + #0078D4 + #006BC6 + #0084D9 + #0B000000 + + #70C2F1 + #A8E6FF + #389DE2 + #28FFFFFF + + #33000000 + #73000000 + #33000000 + #73000000 + #37000000 + #33000000 + + #1A000000 + #1C1C1C + + #8BFFFFFF + #28FFFFFF + + #15FFFFFF + #33000000 + #0F000000 + + #33000000 + + #FFFFFF + #B3000000 + + #0FFFFFFF + #08FFFFFF + + #33000000 + + #09FFFFFF + #05FFFFFF + #05FFFFFF + + #202020 + #1C1C1C + #242424 + #282828 + + #0070CB + #6CCB5F + #FCE100 + #FF99A4 + #08FFFFFF + #393D1B + #433519 + #442726 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,7 +259,251 @@ 2 10,6,6,5 + + + + + #E4000000 + #93000000 + #72000000 + #5C000000 + #FFFFFF + + #003C8B + #001E66 + #005AAF + #5C000000 + + #FFFFFF + #B3FFFFFF + #5C000000 + + #FFFFFF + #B3FFFFFF + #FFFFFF + + #B3FFFFFF + #80F9F9F9 + #4DF9F9F9 + #4DF9F9F9 + #00FFFFFF + #FFFFFF + + #72000000 + #51000000 + + #FFFFFF + + #00FFFFFF + #06000000 + #0A000000 + #00FFFFFF + + #00FFFFFF + #06000000 + #0F000000 + #18000000 + #00FFFFFF + + #C9FFFFFF + #1A1A1A + #131313 + #131313 + + #0078D4 + #006BC6 + #0084D9 + #11000000 + + #005AAF + #003C8B + #0078D4 + #37000000 + + #0F000000 + #29000000 + #0F000000 + #29000000 + #37000000 + #0F000000 + + #0F000000 + #EBEBEB + + #72000000 + #37000000 + + #0F000000 + #0F000000 + #15FFFFFF + + #14000000 + + #E4000000 + #B3FFFFFF + + #B3FFFFFF + #80F6F6F6 + + #31000000 + + #80FFFFFF + #FFFFFF + #40FFFFFF + + #F3F3F3 + #EEEEEE + #F9F9F9 + #FFFFFF + + #0070CB + #117D11 + #A16100 + #D03728 + #80F6F6F6 + #DFF6DD + #FFF4CE + #FDE7E9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25,7 +512,13 @@ 2 10,6,6,5 + + + + + + @@ -35,7 +528,7 @@ 10,6,6,5 - + 0 diff --git a/dev/CommonStyles/Common_themeresources_v2.5.xaml b/dev/CommonStyles/Common_themeresources_v2.5.xaml new file mode 100644 index 0000000000..e85e54f91b --- /dev/null +++ b/dev/CommonStyles/Common_themeresources_v2.5.xaml @@ -0,0 +1,41 @@ + + + + + + + + + True + 1 + 2 + 10,6,6,5 + + + + + + True + 1 + 2 + 10,6,6,5 + + + + + + True + 1 + 2 + 10,6,6,5 + + + + + 0 + diff --git a/dev/CommonStyles/CornerRadius_themeresources.xaml b/dev/CommonStyles/CornerRadius_themeresources.xaml index 6c57e38567..fedf33d74b 100644 --- a/dev/CommonStyles/CornerRadius_themeresources.xaml +++ b/dev/CommonStyles/CornerRadius_themeresources.xaml @@ -5,16 +5,16 @@ xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"> - 2,2,2,2 - 4,4,4,4 + 4,4,4,4 + 8,8,8,8 - 2,2,2,2 - 4,4,4,4 + 4,4,4,4 + 8,8,8,8 - 2,2,2,2 - 4,4,4,4 + 4,4,4,4 + 8,8,8,8 diff --git a/dev/CommonStyles/CornerRadius_themeresources_v2.5.xaml b/dev/CommonStyles/CornerRadius_themeresources_v2.5.xaml new file mode 100644 index 0000000000..6c57e38567 --- /dev/null +++ b/dev/CommonStyles/CornerRadius_themeresources_v2.5.xaml @@ -0,0 +1,37 @@ + + + + + 2,2,2,2 + 4,4,4,4 + + + 2,2,2,2 + 4,4,4,4 + + + 2,2,2,2 + 4,4,4,4 + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/FlyoutPresenter_themeresources.xaml b/dev/CommonStyles/FlyoutPresenter_themeresources.xaml index 202a83c003..24b93ebba1 100644 --- a/dev/CommonStyles/FlyoutPresenter_themeresources.xaml +++ b/dev/CommonStyles/FlyoutPresenter_themeresources.xaml @@ -9,8 +9,8 @@ - - + + 1 0 @@ -23,8 +23,8 @@ - - + + 1 0 diff --git a/dev/CommonStyles/FlyoutPresenter_themeresources_v2.5.xaml b/dev/CommonStyles/FlyoutPresenter_themeresources_v2.5.xaml new file mode 100644 index 0000000000..202a83c003 --- /dev/null +++ b/dev/CommonStyles/FlyoutPresenter_themeresources_v2.5.xaml @@ -0,0 +1,84 @@ + + + + + + + + + + 1 + 0 + + + + + 1 + 0 + + + + + + + 1 + 0 + + + + + + diff --git a/dev/CommonStyles/HyperlinkButton_themeresources.xaml b/dev/CommonStyles/HyperlinkButton_themeresources.xaml new file mode 100644 index 0000000000..0131352ecb --- /dev/null +++ b/dev/CommonStyles/HyperlinkButton_themeresources.xaml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + diff --git a/dev/CommonStyles/ListBox_themeresources.xaml b/dev/CommonStyles/ListBox_themeresources.xaml index 4859b872f3..9ea70a1b8f 100644 --- a/dev/CommonStyles/ListBox_themeresources.xaml +++ b/dev/CommonStyles/ListBox_themeresources.xaml @@ -6,6 +6,16 @@ 0 + + + + + + + + + + @@ -24,6 +34,16 @@ 2 + + + + + + + + + + @@ -42,6 +62,16 @@ 0 + + + + + + + + + + @@ -97,7 +127,7 @@ - + @@ -106,10 +136,10 @@ - + - + @@ -118,10 +148,10 @@ - + - + @@ -130,10 +160,10 @@ - + - + @@ -141,10 +171,10 @@ - + - + @@ -152,10 +182,10 @@ - + - + @@ -163,10 +193,10 @@ - + - + @@ -195,9 +225,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/ListViewItem_themeresources.xaml b/dev/CommonStyles/ListViewItem_themeresources.xaml index d53d5e4628..25a5fda29a 100644 --- a/dev/CommonStyles/ListViewItem_themeresources.xaml +++ b/dev/CommonStyles/ListViewItem_themeresources.xaml @@ -17,24 +17,30 @@ 88 40 4 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + True Inline @@ -54,6 +60,7 @@ + @@ -62,7 +69,10 @@ + + + @@ -72,6 +82,8 @@ + + True Inline -40.5 @@ -113,24 +125,30 @@ 88 40 4 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + True Inline @@ -215,7 +233,7 @@ - + @@ -259,16 +277,16 @@ Duration="0" To="1" /> - + - + - + - + @@ -282,16 +300,16 @@ Duration="0" To="1" /> - + - + - + - + @@ -309,16 +327,16 @@ Duration="0" To="1" /> - + - + - + - + @@ -336,16 +354,16 @@ Duration="0" To="1" /> - + - + - + - + @@ -363,16 +381,16 @@ Duration="0" To="1" /> - + - + - + - + @@ -633,7 +651,7 @@ @@ -661,7 +679,7 @@ AutomationProperties.AccessibilityView="Raw" /> @@ -695,9 +713,9 @@ Height="20" VerticalAlignment="Center" HorizontalAlignment="Left" - Background="{ThemeResource SystemControlBackgroundAccentBrush}" + Background="{ThemeResource ListViewItemMultiArrangeOverlayTextBackground}" BorderThickness="2" - BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}"> + BorderBrush="{ThemeResource ListViewItemMultiArrangeOverlayTextBorder}"> + + + + -40.5 + 0.55 + 0.80 + 0.80 + 0.50 + 0.95 + 10.0 + 4 + 88 + 40 + 4 + + + + + + + + + + + + + + + + + + + True + Inline + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + Inline + -40.5 + 0.55 + 0.80 + 0.80 + 0.50 + 0.95 + 10.0 + 4 + 88 + 40 + 4 + + + + + + + + + + + + + + + + + + -40.5 + 0.55 + 0.80 + 0.80 + 0.50 + 0.95 + 10.0 + 4 + 88 + 40 + 4 + + + + + + + + + + + + + + + + + + + True + Inline + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/MediaTransportControls_themeresources.xaml b/dev/CommonStyles/MediaTransportControls_themeresources.xaml index 48ce820360..ff2800c976 100644 --- a/dev/CommonStyles/MediaTransportControls_themeresources.xaml +++ b/dev/CommonStyles/MediaTransportControls_themeresources.xaml @@ -8,18 +8,27 @@ 48,0,48,27 - + + + + 48,0,48,27 + + + 48,0,48,27 - + + + + @@ -56,7 +65,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/PasswordBox_themeresources_v2.5.xaml b/dev/CommonStyles/PasswordBox_themeresources_v2.5.xaml new file mode 100644 index 0000000000..1574544d4d --- /dev/null +++ b/dev/CommonStyles/PasswordBox_themeresources_v2.5.xaml @@ -0,0 +1,308 @@ + + + + + + + + + + + + 0,0,0,4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/RadioButton_themeresources.xaml b/dev/CommonStyles/RadioButton_themeresources.xaml index 4fdb325853..c461063fba 100644 --- a/dev/CommonStyles/RadioButton_themeresources.xaml +++ b/dev/CommonStyles/RadioButton_themeresources.xaml @@ -2,46 +2,54 @@ + xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"> 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,6 +80,7 @@ + @@ -96,6 +105,10 @@ + + + + @@ -114,42 +127,49 @@ 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,7 +209,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201,24 +250,32 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -232,24 +289,42 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,24 +338,32 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -290,6 +373,10 @@ + + + + @@ -304,8 +391,19 @@ + - + + + + + + + + + + + @@ -314,4 +412,6 @@ + + + diff --git a/dev/CommonStyles/RepeatButton_themeresources.xaml b/dev/CommonStyles/RepeatButton_themeresources.xaml index 2406441140..6e06103710 100644 --- a/dev/CommonStyles/RepeatButton_themeresources.xaml +++ b/dev/CommonStyles/RepeatButton_themeresources.xaml @@ -8,18 +8,18 @@ 1 - + - - - - - - - - - - + + + + + + + + + + @@ -56,18 +56,18 @@ 1 - + - - - - - - - - - - + + + + + + + + + + diff --git a/dev/CommonStyles/RepeatButton_themeresources_v2.5.xaml b/dev/CommonStyles/RepeatButton_themeresources_v2.5.xaml new file mode 100644 index 0000000000..2406441140 --- /dev/null +++ b/dev/CommonStyles/RepeatButton_themeresources_v2.5.xaml @@ -0,0 +1,166 @@ + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/CommonStyles/RichEditBox_themeresources_v2.5.xaml b/dev/CommonStyles/RichEditBox_themeresources_v2.5.xaml new file mode 100644 index 0000000000..ab21acc769 --- /dev/null +++ b/dev/CommonStyles/RichEditBox_themeresources_v2.5.xaml @@ -0,0 +1,172 @@ + + + + 0,0,0,4 + + + + + + + diff --git a/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems b/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems index 9c027eef0f..38b7bcb6af 100644 --- a/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems +++ b/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems @@ -25,6 +25,11 @@ MSBuild:Compile false + + Designer + MSBuild:Compile + false + @@ -36,6 +41,9 @@ CornerRadiusPage.xaml + + VisualStatesPage.xaml + diff --git a/dev/CommonStyles/TestUI/VisualStatesPage.xaml b/dev/CommonStyles/TestUI/VisualStatesPage.xaml new file mode 100644 index 0000000000..1f0dcf27d2 --- /dev/null +++ b/dev/CommonStyles/TestUI/VisualStatesPage.xaml @@ -0,0 +1,22 @@ + + + + + 80 + + + + + + + + diff --git a/dev/CommonStyles/TestUI/VisualStatesPage.xaml.cs b/dev/CommonStyles/TestUI/VisualStatesPage.xaml.cs new file mode 100644 index 0000000000..7d634f1a7a --- /dev/null +++ b/dev/CommonStyles/TestUI/VisualStatesPage.xaml.cs @@ -0,0 +1,62 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Collections.Generic; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using MUXControlsTestApp.Utilities; + +namespace MUXControlsTestApp +{ + [TopLevelTestPage(Name = "VisualStates")] + public sealed partial class VisualStatesPage : Page + { + private List viewers = new List() + { + new ControlStateViewer(typeof(Button), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled" }), + + new ControlStateViewer(typeof(Button), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled" }, + Application.Current.Resources["AccentButtonStyle"] as Style), + + new ControlStateViewer(typeof(ToggleButton), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled", "Checked", "CheckedPointerOver", "CheckedPressed", "CheckedDisabled", "Indeterminate", "IndeterminatePointerOver", "IndeterminatePressed", "IndeterminateDisabled" }), + + new ControlStateViewer(typeof(Microsoft.UI.Xaml.Controls.DropDownButton), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled" }), + + new ControlStateViewer(typeof(Microsoft.UI.Xaml.Controls.SplitButton), + new List{ "Normal", "FlyoutOpen", "TouchPressed", "PrimaryPointerOver", "PrimaryPressed", "SecondaryPointerOver", "SecondaryPressed" }), + + new ControlStateViewer(typeof(Microsoft.UI.Xaml.Controls.ToggleSplitButton), + new List{ "Checked", "CheckedFlyoutOpen", "CheckedTouchPressed", "CheckedPrimaryPointerOver", "CheckedPrimaryPressed", "CheckedSecondaryPointerOver", "CheckedSecondaryPressed" }), + + new ControlStateViewer(typeof(HyperlinkButton), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled" }), + + new ControlStateViewer(typeof(CheckBox), + new List(){ "UncheckedNormal", "UncheckedPointerOver", "UncheckedPressed", "UncheckedDisabled", "CheckedNormal", "CheckedPointerOver", "CheckedPressed", "CheckedDisabled", "IndeterminateNormal", "IndeterminatePointerOver", "IndeterminatePressed", "IndeterminateDisabled" }), + + new ControlStateViewer(typeof(RadioButton), + new List(){ "Unchecked|Normal", "Unchecked|PointerOver", "Unchecked|Pressed", "Unchecked|Disabled", "Checked|Normal", "Checked|PointerOver", "Checked|Pressed", "Checked|Disabled" }), + + new ControlStateViewer(typeof(ToggleSwitch), + new List(){ "Off|Normal", "Off|PointerOver", "Off|Pressed", "Off|Disabled", "On|Normal", "On|PointerOver", "On|Pressed", "On|Disabled" }), + + new ControlStateViewer(typeof(Slider), + new List(){ "Normal", "PointerOver", "Pressed", "Disabled" }), + }; + + public VisualStatesPage() + { + this.InitializeComponent(); + + foreach (var viewer in viewers) + { + ControlPanel.Children.Add(viewer); + } + } + } +} diff --git a/dev/CommonStyles/TextBox_themeresources.xaml b/dev/CommonStyles/TextBox_themeresources.xaml index 9065a453d4..95ffe11c3d 100644 --- a/dev/CommonStyles/TextBox_themeresources.xaml +++ b/dev/CommonStyles/TextBox_themeresources.xaml @@ -25,12 +25,12 @@ - - - - - - + + + + + + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/dev/CommonStyles/TextBox_themeresources_v2.5.xaml b/dev/CommonStyles/TextBox_themeresources_v2.5.xaml new file mode 100644 index 0000000000..9065a453d4 --- /dev/null +++ b/dev/CommonStyles/TextBox_themeresources_v2.5.xaml @@ -0,0 +1,368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0,0,0,4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/DatePicker/DateTimePickerFlyout_themeresources.xaml b/dev/DatePicker/DateTimePickerFlyout_themeresources.xaml index 4f084c7dcc..b12f4bb141 100644 --- a/dev/DatePicker/DateTimePickerFlyout_themeresources.xaml +++ b/dev/DatePicker/DateTimePickerFlyout_themeresources.xaml @@ -6,14 +6,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - - - - - - + + + + + + + + @@ -26,14 +26,14 @@ - - - - - - - - + + + + + + + + diff --git a/dev/DatePicker/DateTimePickerFlyout_themeresources_v2.5.xaml b/dev/DatePicker/DateTimePickerFlyout_themeresources_v2.5.xaml new file mode 100644 index 0000000000..4f084c7dcc --- /dev/null +++ b/dev/DatePicker/DateTimePickerFlyout_themeresources_v2.5.xaml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/DropDownButton/DropDownButton.vcxitems b/dev/DropDownButton/DropDownButton.vcxitems index 7eeba1b9a5..c55d090d77 100644 --- a/dev/DropDownButton/DropDownButton.vcxitems +++ b/dev/DropDownButton/DropDownButton.vcxitems @@ -23,13 +23,30 @@ + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS2 + DefaultStyle + + + V2dot5 RS2 DefaultStyle + + Latest + RS1 + ThemeResources + diff --git a/dev/DropDownButton/DropDownButton.xaml b/dev/DropDownButton/DropDownButton.xaml index f844202361..beb9d40257 100644 --- a/dev/DropDownButton/DropDownButton.xaml +++ b/dev/DropDownButton/DropDownButton.xaml @@ -20,34 +20,33 @@ + + contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" + contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"> - - - - - - + - + - @@ -56,13 +55,15 @@ - + - + + + @@ -71,7 +72,7 @@ - + @@ -83,40 +84,33 @@ - - - - - - - - - + + + + - - + + diff --git a/dev/DropDownButton/DropDownButton_rs1_v2.5.xaml b/dev/DropDownButton/DropDownButton_rs1_v2.5.xaml new file mode 100644 index 0000000000..bf392939a7 --- /dev/null +++ b/dev/DropDownButton/DropDownButton_rs1_v2.5.xaml @@ -0,0 +1,123 @@ + + + + + + + + + + diff --git a/dev/FlipView/FlipView_themeresources.xaml b/dev/FlipView/FlipView_themeresources.xaml index e03aba092f..5c7ce57e33 100644 --- a/dev/FlipView/FlipView_themeresources.xaml +++ b/dev/FlipView/FlipView_themeresources.xaml @@ -8,17 +8,17 @@ 0 - - - - - - - - - - - + + + + + + + + + + + @@ -54,17 +54,17 @@ 0 - - - - - - - - - - - + + + + + + + + + + + diff --git a/dev/FlipView/FlipView_themeresources_v2.5.xaml b/dev/FlipView/FlipView_themeresources_v2.5.xaml new file mode 100644 index 0000000000..e03aba092f --- /dev/null +++ b/dev/FlipView/FlipView_themeresources_v2.5.xaml @@ -0,0 +1,371 @@ + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/Generated/XamlControlsResources.properties.cpp b/dev/Generated/XamlControlsResources.properties.cpp index 996bfe65cd..1b68c3f675 100644 --- a/dev/Generated/XamlControlsResources.properties.cpp +++ b/dev/Generated/XamlControlsResources.properties.cpp @@ -14,6 +14,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls #include "XamlControlsResources.g.cpp" GlobalDependencyProperty XamlControlsResourcesProperties::s_UseCompactResourcesProperty{ nullptr }; +GlobalDependencyProperty XamlControlsResourcesProperties::s_VersionProperty{ nullptr }; XamlControlsResourcesProperties::XamlControlsResourcesProperties() { @@ -33,11 +34,23 @@ void XamlControlsResourcesProperties::EnsureProperties() ValueHelper::BoxValueIfNecessary(false), winrt::PropertyChangedCallback(&OnUseCompactResourcesPropertyChanged)); } + if (!s_VersionProperty) + { + s_VersionProperty = + InitializeDependencyProperty( + L"Version", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxValueIfNecessary(winrt::StylesVersion::WinUI_2dot5), + winrt::PropertyChangedCallback(&OnVersionPropertyChanged)); + } } void XamlControlsResourcesProperties::ClearProperties() { s_UseCompactResourcesProperty = nullptr; + s_VersionProperty = nullptr; } void XamlControlsResourcesProperties::OnUseCompactResourcesPropertyChanged( @@ -48,6 +61,14 @@ void XamlControlsResourcesProperties::OnUseCompactResourcesPropertyChanged( winrt::get_self(owner)->OnPropertyChanged(args); } +void XamlControlsResourcesProperties::OnVersionPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args) +{ + auto owner = sender.as(); + winrt::get_self(owner)->OnPropertyChanged(args); +} + void XamlControlsResourcesProperties::UseCompactResources(bool value) { [[gsl::suppress(con)]] @@ -60,3 +81,16 @@ bool XamlControlsResourcesProperties::UseCompactResources() { return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_UseCompactResourcesProperty)); } + +void XamlControlsResourcesProperties::Version(winrt::StylesVersion const& value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_VersionProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +winrt::StylesVersion XamlControlsResourcesProperties::Version() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_VersionProperty)); +} diff --git a/dev/Generated/XamlControlsResources.properties.h b/dev/Generated/XamlControlsResources.properties.h index aede13adc6..524b59cfad 100644 --- a/dev/Generated/XamlControlsResources.properties.h +++ b/dev/Generated/XamlControlsResources.properties.h @@ -12,9 +12,14 @@ class XamlControlsResourcesProperties void UseCompactResources(bool value); bool UseCompactResources(); + void Version(winrt::StylesVersion const& value); + winrt::StylesVersion Version(); + static winrt::DependencyProperty UseCompactResourcesProperty() { return s_UseCompactResourcesProperty; } + static winrt::DependencyProperty VersionProperty() { return s_VersionProperty; } static GlobalDependencyProperty s_UseCompactResourcesProperty; + static GlobalDependencyProperty s_VersionProperty; static void EnsureProperties(); static void ClearProperties(); @@ -22,4 +27,8 @@ class XamlControlsResourcesProperties static void OnUseCompactResourcesPropertyChanged( winrt::DependencyObject const& sender, winrt::DependencyPropertyChangedEventArgs const& args); + + static void OnVersionPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args); }; diff --git a/dev/ImageIcon/APITests/ImageIconTests.cs b/dev/ImageIcon/APITests/ImageIconTests.cs index c4393cc3bd..14ece2e821 100644 --- a/dev/ImageIcon/APITests/ImageIconTests.cs +++ b/dev/ImageIcon/APITests/ImageIconTests.cs @@ -33,7 +33,7 @@ public void ImageIconTest() RunOnUIThread.Execute(() => { - imageIcon = new ImageIcon(); + imageIcon = new ImageIcon(); var theme = Application.Current.RequestedTheme; if (theme == ApplicationTheme.Dark) { diff --git a/dev/ImageIcon/ImageIcon.vcxitems b/dev/ImageIcon/ImageIcon.vcxitems index f74f27d02c..565f508d56 100644 --- a/dev/ImageIcon/ImageIcon.vcxitems +++ b/dev/ImageIcon/ImageIcon.vcxitems @@ -23,10 +23,22 @@ + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources diff --git a/dev/ImageIcon/ImageIcon_themeresources_v2.5.xaml b/dev/ImageIcon/ImageIcon_themeresources_v2.5.xaml new file mode 100644 index 0000000000..ceaa145ec4 --- /dev/null +++ b/dev/ImageIcon/ImageIcon_themeresources_v2.5.xaml @@ -0,0 +1,7 @@ + + + + diff --git a/dev/ImageIcon/ImageIcon_v2.5.xaml b/dev/ImageIcon/ImageIcon_v2.5.xaml new file mode 100644 index 0000000000..bdd42aee5f --- /dev/null +++ b/dev/ImageIcon/ImageIcon_v2.5.xaml @@ -0,0 +1,10 @@ + + + + + + diff --git a/dev/InfoBar/InfoBar.vcxitems b/dev/InfoBar/InfoBar.vcxitems index aa25ab29dc..87eceb3cb8 100644 --- a/dev/InfoBar/InfoBar.vcxitems +++ b/dev/InfoBar/InfoBar.vcxitems @@ -35,10 +35,22 @@ + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources diff --git a/dev/InfoBar/InfoBar_themeresources.xaml b/dev/InfoBar/InfoBar_themeresources.xaml index 01595c58f1..ef1db23c5c 100644 --- a/dev/InfoBar/InfoBar_themeresources.xaml +++ b/dev/InfoBar/InfoBar_themeresources.xaml @@ -12,16 +12,16 @@ - - - - + + + + - - - + + + - + 0 @@ -31,16 +31,16 @@ - - - - + + + + - - - + + + - + 0 diff --git a/dev/InfoBar/InfoBar_themeresources_v2.5.xaml b/dev/InfoBar/InfoBar_themeresources_v2.5.xaml new file mode 100644 index 0000000000..01595c58f1 --- /dev/null +++ b/dev/InfoBar/InfoBar_themeresources_v2.5.xaml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + 2 + + + + 14 + SemiBold + + 14 + Normal + + 40 + + 32 + 16 + + + + + + + 12,0,0,0 + + 0,10,10,10 + 20 + + 0,0,12,0 + 0,0,0,0 + 0,10,0,10 + + 0,10,0,0 + 0,10,0,0 + + 8,10,0,0 + 0,4,0,0 + + 12,8,0,0 + 0,12,0,0 + + 96 + 24 + 8,0,8,1 + 2 + + 14 + 24 + 0,0,0,1 + + Cancel + + + + diff --git a/dev/InfoBar/InfoBar_v2.5.xaml b/dev/InfoBar/InfoBar_v2.5.xaml new file mode 100644 index 0000000000..0a5549cd57 --- /dev/null +++ b/dev/InfoBar/InfoBar_v2.5.xaml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/Lights/ApiTests/Lights_ApiTests/LightConfigurationTests.cs b/dev/Lights/ApiTests/Lights_ApiTests/LightConfigurationTests.cs index 37b2fa95f8..8bbbb9c62a 100644 --- a/dev/Lights/ApiTests/Lights_ApiTests/LightConfigurationTests.cs +++ b/dev/Lights/ApiTests/Lights_ApiTests/LightConfigurationTests.cs @@ -77,8 +77,9 @@ public class LightConfigurationTests : ApiTestBase UIElement _popupRoot; UIElement _fullWindowMediaRoot; AutoResetEvent _validationCompleted; - - [TestMethod] + + // Tracked by Task 30789390: Re-enable disabled tests + //[TestMethod] public void VerifyLightsOnMainWindow() { using (var config = new MainWindowLightConfiguration()) diff --git a/dev/Materials/Reveal/RevealBrush.vcxitems b/dev/Materials/Reveal/RevealBrush.vcxitems index d395fdb4da..7a0b84ccc0 100644 --- a/dev/Materials/Reveal/RevealBrush.vcxitems +++ b/dev/Materials/Reveal/RevealBrush.vcxitems @@ -30,34 +30,56 @@ + Latest RS1 ThemeResources 2 + true + Latest RS2 ThemeResources 2 + true + + + V2dot5 + RS1 + ThemeResources + 2 + true + + + V2dot5 + RS2 + ThemeResources + 2 + true RS3 ThemeResources 3 + true RS4 ThemeResources 4 + true RS5 ThemeResources 5 + true 19H1 ThemeResources 6 + true diff --git a/dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml b/dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml index cc62827536..8b82f08fcd 100644 --- a/dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml +++ b/dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml @@ -1,4 +1,4 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -165,11 +165,11 @@ - + - + @@ -177,7 +177,7 @@ - + @@ -185,26 +185,26 @@ - + - + - + - + - + True @@ -301,66 +301,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -369,11 +369,11 @@ - + - + @@ -381,7 +381,7 @@ - + @@ -389,26 +389,26 @@ - + - + - + - + - + True diff --git a/dev/Materials/Reveal/RevealBrush_rs1_themeresources_v2.5.xaml b/dev/Materials/Reveal/RevealBrush_rs1_themeresources_v2.5.xaml new file mode 100644 index 0000000000..cc62827536 --- /dev/null +++ b/dev/Materials/Reveal/RevealBrush_rs1_themeresources_v2.5.xaml @@ -0,0 +1,656 @@ + + + + + + + #F2000000 + #30000000 + #91000000 + #C2000000 + #61000000 + #F2FFFFFF + #30FFFFFF + #91FFFFFF + #C2FFFFFF + #61FFFFFF + #F2F9F9F9 + #F2000000 + #30000000 + #61000000 + #C2000000 + #F2767676 + #F21F1F1F + #F2393939 + #F22B2B2B + #F2FFFFFF + #F2767676 + #18FFFFFF + #30FFFFFF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 11,5,11,7 + 11,11,11,13 + 11,11,11,13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + #E6FFFFFF + #2EFFFFFF + #8AFFFFFF + #B8FFFFFF + #61FFFFFF + #E6000000 + #2E000000 + #8A000000 + #B8000000 + #61000000 + #E6171717 + #E6000000 + #2E000000 + #66000000 + #B8000000 + #E6CCCCCC + #E6F2F2F2 + #E6E6E6E6 + #E6F2F2F2 + #E6FFFFFF + #E6767676 + #17000000 + #2E000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 11,5,11,7 + 11,11,11,13 + 11,11,11,13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + #FF000000 + #33000000 + #99000000 + #CC000000 + #66000000 + #FFFFFFFF + #33FFFFFF + #99FFFFFF + #CCFFFFFF + #66FFFFFF + #FFF9F9F9 + #FF000000 + #33000000 + #66000000 + #CC000000 + #FF767676 + #FF1F1F1F + #FF393939 + #FF2B2B2B + #FFFFFFFF + #FF767676 + #19FFFFFF + #33FFFFFF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 11,5,11,7 + 11,11,11,13 + 11,11,11,13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + 14,19,14,0 + 16 + 56 + 40 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/MenuBar/MenuBar.vcxitems b/dev/MenuBar/MenuBar.vcxitems index 2c3a1c9263..81d106be7d 100644 --- a/dev/MenuBar/MenuBar.vcxitems +++ b/dev/MenuBar/MenuBar.vcxitems @@ -32,14 +32,32 @@ + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources diff --git a/dev/MenuBar/MenuBarItem_v2.5.xaml b/dev/MenuBar/MenuBarItem_v2.5.xaml new file mode 100644 index 0000000000..6da07e7bbc --- /dev/null +++ b/dev/MenuBar/MenuBarItem_v2.5.xaml @@ -0,0 +1,82 @@ + + + + + diff --git a/dev/MenuBar/MenuBar_themeresources.xaml b/dev/MenuBar/MenuBar_themeresources.xaml index 8e94d1aeee..7d74c626bb 100644 --- a/dev/MenuBar/MenuBar_themeresources.xaml +++ b/dev/MenuBar/MenuBar_themeresources.xaml @@ -9,35 +9,35 @@ - + - - - - + + + + 0 - - - - + + + + - + - - - - + + + + 0 - - - - + + + + diff --git a/dev/MenuBar/MenuBar_themeresources_v2.5.xaml b/dev/MenuBar/MenuBar_themeresources_v2.5.xaml new file mode 100644 index 0000000000..8e94d1aeee --- /dev/null +++ b/dev/MenuBar/MenuBar_themeresources_v2.5.xaml @@ -0,0 +1,60 @@ + + + + 40 + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + 2 + + + + + + + + + diff --git a/dev/MenuBar/MenuBar_v2.5.xaml b/dev/MenuBar/MenuBar_v2.5.xaml new file mode 100644 index 0000000000..056d5ba77d --- /dev/null +++ b/dev/MenuBar/MenuBar_v2.5.xaml @@ -0,0 +1,29 @@ + + + + + diff --git a/dev/MenuFlyout/MenuFlyout.vcxitems b/dev/MenuFlyout/MenuFlyout.vcxitems index 5f5becfc1e..d338fb0cf6 100644 --- a/dev/MenuFlyout/MenuFlyout.vcxitems +++ b/dev/MenuFlyout/MenuFlyout.vcxitems @@ -15,6 +15,15 @@ + Latest + RS1 + ThemeResources + 2 + Designer + true + + + V2dot5 RS1 ThemeResources 2 diff --git a/dev/MenuFlyout/MenuFlyout_themeresources.xaml b/dev/MenuFlyout/MenuFlyout_themeresources.xaml index 6eb9bc6494..9b6c2d8022 100644 --- a/dev/MenuFlyout/MenuFlyout_themeresources.xaml +++ b/dev/MenuFlyout/MenuFlyout_themeresources.xaml @@ -15,29 +15,30 @@ 24,0,0,0 28,0,0,0 12,4,12,4 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -48,46 +49,46 @@ 56,0,0,0 - - - - + + + + 11,9,11,10 11,4,11,7 - - + + 1 - - + + - + - - + + - + - - + + - + @@ -115,6 +116,7 @@ + 1 32 0,0 @@ -181,29 +183,30 @@ 24,0,0,0 28,0,0,0 12,4,12,4 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -214,46 +217,46 @@ 56,0,0,0 - - - - + + + + 11,9,11,10 11,4,11,7 - - + + 1 - - + + - + - - + + - + - - + + - + @@ -762,7 +765,7 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dev/NavigationView/NavigationView.vcxitems b/dev/NavigationView/NavigationView.vcxitems index cedc503d63..6ccb35fc83 100644 --- a/dev/NavigationView/NavigationView.vcxitems +++ b/dev/NavigationView/NavigationView.vcxitems @@ -70,25 +70,60 @@ + Latest + RS1 + DefaultStyle + true + + + V2dot5 RS1 DefaultStyle true + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS2 + Designer + ThemeResources + true + + + V2dot5 RS2 Designer ThemeResources + true + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml index 3e345be9a0..39b34a4597 100644 --- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml +++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml @@ -16,70 +16,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87,70 +87,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -790,9 +790,9 @@ - - - + + + diff --git a/dev/NavigationView/NavigationView_rs1_themeresources_v2.5.xaml b/dev/NavigationView/NavigationView_rs1_themeresources_v2.5.xaml new file mode 100644 index 0000000000..3e345be9a0 --- /dev/null +++ b/dev/NavigationView/NavigationView_rs1_themeresources_v2.5.xaml @@ -0,0 +1,1582 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10,0,16,0 + 12,0,12,0 + 40 + 40 + 40 + 40 + 40 + 48 + 48 + 40 + + 40 + 4 + + 1 + 1 + + 1 + 1 + 12,0,12,0 + 10,0,0,0 + 8,5,0,0 + 12,5,0,11 + 8,4,0,0 + 0 + 0 + 16,10 + 16,10 + 10,0 + 0 + 0,0,20,0 + 0,0,0,0 + 8,0,16,0 + 12,0 + -20,0,6,0 + -16,0,0,0 + 0,0,0,0 + -12,0,0,0 + 12,0,20,0 + 16,0,20,0 + -4,0,6,0 + 12,0,12,0 + + + 0,8 + 0,8 + + + 12.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/NavigationView/NavigationView_rs2_themeresources.xaml b/dev/NavigationView/NavigationView_rs2_themeresources.xaml index c0c11458f0..0a08cf8ab0 100644 --- a/dev/NavigationView/NavigationView_rs2_themeresources.xaml +++ b/dev/NavigationView/NavigationView_rs2_themeresources.xaml @@ -27,15 +27,15 @@ - + - + - + @@ -63,15 +63,15 @@ - + - + - + diff --git a/dev/NavigationView/NavigationView_rs2_themeresources_v2.5.xaml b/dev/NavigationView/NavigationView_rs2_themeresources_v2.5.xaml new file mode 100644 index 0000000000..c0c11458f0 --- /dev/null +++ b/dev/NavigationView/NavigationView_rs2_themeresources_v2.5.xaml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/NavigationView/NavigationView_v2.5.xaml b/dev/NavigationView/NavigationView_v2.5.xaml new file mode 100644 index 0000000000..89f38cd7e3 --- /dev/null +++ b/dev/NavigationView/NavigationView_v2.5.xaml @@ -0,0 +1,815 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/SwipeControl/SwipeControl.vcxitems b/dev/SwipeControl/SwipeControl.vcxitems index 1a1263edb1..8f148f64f0 100644 --- a/dev/SwipeControl/SwipeControl.vcxitems +++ b/dev/SwipeControl/SwipeControl.vcxitems @@ -36,14 +36,33 @@ + Latest + RS2 + DefaultStyle + + + V2dot5 RS2 DefaultStyle + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS1 + ThemeResources + Document + + + V2dot5 RS1 ThemeResources Document diff --git a/dev/SwipeControl/SwipeControl_rs1_v2.5.xaml b/dev/SwipeControl/SwipeControl_rs1_v2.5.xaml new file mode 100644 index 0000000000..8f56c19a88 --- /dev/null +++ b/dev/SwipeControl/SwipeControl_rs1_v2.5.xaml @@ -0,0 +1,35 @@ + + + + + + - \ No newline at end of file + diff --git a/dev/SwipeControl/SwipeControl_themeresources_v2.5.xaml b/dev/SwipeControl/SwipeControl_themeresources_v2.5.xaml new file mode 100644 index 0000000000..b0b0028e73 --- /dev/null +++ b/dev/SwipeControl/SwipeControl_themeresources_v2.5.xaml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/SwipeControl/SwipeControl_v2.5.xaml b/dev/SwipeControl/SwipeControl_v2.5.xaml new file mode 100644 index 0000000000..0fdaa52ea8 --- /dev/null +++ b/dev/SwipeControl/SwipeControl_v2.5.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + diff --git a/dev/TeachingTip/InteractionTests/TeachingTipTests.cs b/dev/TeachingTip/InteractionTests/TeachingTipTests.cs index 6f4b15a141..d69b3d421e 100644 --- a/dev/TeachingTip/InteractionTests/TeachingTipTests.cs +++ b/dev/TeachingTip/InteractionTests/TeachingTipTests.cs @@ -23,6 +23,7 @@ using Microsoft.Windows.Apps.Test.Foundation; using static Windows.UI.Xaml.Tests.MUXControls.InteractionTests.TeachingTipTestPageElements; +using System.Drawing; namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests { @@ -812,20 +813,21 @@ public void VerifyTheming() var themingComboBox = elements.GetThemingComboBox(); themingComboBox.SelectItemByName("Light"); - Verify.AreEqual("#FF000000", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText(), "Default button foreground should be black"); - Verify.AreEqual("#FF000000", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText(), "Default content foreground should be black"); + // Substring removes the opacity of the color, as that may vary + Verify.AreEqual("000000", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText().Substring(3), "Default button foreground should be black"); + Verify.AreEqual("000000", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText().Substring(3), "Default content foreground should be black"); // Change to Dark, make sure the font switches to light themingComboBox.SelectItemByName("Dark"); - Verify.AreEqual("#FFFFFFFF", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText(), "Default button foreground should be white"); - Verify.AreEqual("#FFFFFFFF", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText(), "Default content foreground should be white"); + Verify.AreEqual("FFFFFF", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText().Substring(3), "Default button foreground should be white"); + Verify.AreEqual("FFFFFF", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText().Substring(3), "Default content foreground should be white"); // Change to Light, make sure the font switches to dark themingComboBox.SelectItemByName("Light"); - Verify.AreEqual("#FF000000", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText(), "Default button foreground should be black"); - Verify.AreEqual("#FF000000", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText(), "Default content foreground should be black"); + Verify.AreEqual("000000", elements.GetEffectiveForegroundOfTeachingTipButtonTextBlock().GetText().Substring(3), "Default button foreground should be black"); + Verify.AreEqual("000000", elements.GetEffectiveForegroundOfTeachingTipContentTextBlock().GetText().Substring(3), "Default content foreground should be black"); } } } diff --git a/dev/TeachingTip/TeachingTip.vcxitems b/dev/TeachingTip/TeachingTip.vcxitems index 5010fb9b1e..4dfdf4e15c 100644 --- a/dev/TeachingTip/TeachingTip.vcxitems +++ b/dev/TeachingTip/TeachingTip.vcxitems @@ -26,16 +26,37 @@ false + Latest + RS1 + DefaultStyle + + + false + V2dot5 RS1 DefaultStyle false + Latest + RS1 + ThemeResources + + + false + V2dot5 RS1 ThemeResources false + Latest + RS2 + ThemeResources + + + false + V2dot5 RS2 ThemeResources diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml index b5add3aea2..6cf966b312 100644 --- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml +++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml @@ -5,23 +5,23 @@ xmlns:local="using:Microsoft.UI.Xaml.Controls"> - + - + - - + + 0 - + - + - - + + 0 diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources_v2.5.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources_v2.5.xaml new file mode 100644 index 0000000000..b5add3aea2 --- /dev/null +++ b/dev/TeachingTip/TeachingTip_rs1_themeresources_v2.5.xaml @@ -0,0 +1,78 @@ + + + + + + + + + + + + 0 + + + + + + + + + + 0 + + + + + + + + + + 2 + + + + 40 + 520 + 320 + 336 + + 6,12,0,0 + 0,12,6,0 + + 0,12,0,0 + 0,0,0,0 + + 0,0,28,0 + 0,0,0,0 + + 0,0,12,0 + 0,0,0,0 + + 1,1,1,0 + 1,0,1,1 + 1,1,0,1 + 0,1,1,1 + 1,1,1,1 + + 0,-2,0,0 + 0,0,0,-2 + -2,0,0,0 + 0,0,-2,0 + + 8 + 10 + + 40 + 12 + + 12 + + 1 + 1 + 0,1,0,0 + diff --git a/dev/TeachingTip/TeachingTip_rs2_themeresources_v2.5.xaml b/dev/TeachingTip/TeachingTip_rs2_themeresources_v2.5.xaml new file mode 100644 index 0000000000..f9bbd6501f --- /dev/null +++ b/dev/TeachingTip/TeachingTip_rs2_themeresources_v2.5.xaml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/dev/TeachingTip/TeachingTip_v2.5.xaml b/dev/TeachingTip/TeachingTip_v2.5.xaml new file mode 100644 index 0000000000..fd9d17d7fa --- /dev/null +++ b/dev/TeachingTip/TeachingTip_v2.5.xaml @@ -0,0 +1,642 @@ + + + + + diff --git a/dev/TimePicker/TimePicker.vcxitems b/dev/TimePicker/TimePicker.vcxitems index 2a366e2128..fd74f67291 100644 --- a/dev/TimePicker/TimePicker.vcxitems +++ b/dev/TimePicker/TimePicker.vcxitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -15,6 +15,13 @@ + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true diff --git a/dev/TimePicker/TimePicker_themeresources.xaml b/dev/TimePicker/TimePicker_themeresources.xaml index fc95f80708..c11e3561e8 100644 --- a/dev/TimePicker/TimePicker_themeresources.xaml +++ b/dev/TimePicker/TimePicker_themeresources.xaml @@ -14,30 +14,30 @@ 0,0,20,0 20,0,0,0 Normal - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - + + + @@ -86,30 +86,30 @@ 0,0,20,0 20,0,0,0 Normal - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - + + + diff --git a/dev/TimePicker/TimePicker_themeresources_v2.5.xaml b/dev/TimePicker/TimePicker_themeresources_v2.5.xaml new file mode 100644 index 0000000000..fc95f80708 --- /dev/null +++ b/dev/TimePicker/TimePicker_themeresources_v2.5.xaml @@ -0,0 +1,446 @@ + + + + + 80 + 1 + 1 + 0,0,0,4 + 0,0,20,0 + 20,0,0,0 + Normal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 80 + 0,0,0,4 + 1 + 1 + 0,0,20,0 + 20,0,0,0 + Normal + + + + + 80 + 1 + 1 + 0,0,0,4 + 0,0,20,0 + 20,0,0,0 + Normal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0,0,0,4 + 40 + 41 + 242 + 456 + 40 + 0,3,0,6 + + 0,3,0,6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/ToolTip/ToolTip.vcxitems b/dev/ToolTip/ToolTip.vcxitems index d5ed2c20b3..87d1ee5a51 100644 --- a/dev/ToolTip/ToolTip.vcxitems +++ b/dev/ToolTip/ToolTip.vcxitems @@ -15,11 +15,25 @@ + Latest + RS1 + ThemeResources + true + + + V2dot5 RS1 ThemeResources true + Latest + RS5 + ThemeResources + true + + + V2dot5 RS5 ThemeResources true diff --git a/dev/ToolTip/ToolTip_rs1_themeresources.xaml b/dev/ToolTip/ToolTip_rs1_themeresources.xaml index d9c0d24699..f462398cc8 100644 --- a/dev/ToolTip/ToolTip_rs1_themeresources.xaml +++ b/dev/ToolTip/ToolTip_rs1_themeresources.xaml @@ -8,9 +8,9 @@ 12 1 - + - + @@ -31,9 +31,9 @@ 12 1 - + - + diff --git a/dev/ToolTip/ToolTip_rs1_themeresources_v2.5.xaml b/dev/ToolTip/ToolTip_rs1_themeresources_v2.5.xaml new file mode 100644 index 0000000000..d9c0d24699 --- /dev/null +++ b/dev/ToolTip/ToolTip_rs1_themeresources_v2.5.xaml @@ -0,0 +1,90 @@ + + + + + 12 + 1 + + + + + + + + + + + 12 + 1 + + + + + + + + + + 12 + 1 + + + + + + + + + + + + + + diff --git a/dev/ToolTip/ToolTip_rs5_themeresources.xaml b/dev/ToolTip/ToolTip_rs5_themeresources.xaml index 261a41f787..54993282d2 100644 --- a/dev/ToolTip/ToolTip_rs5_themeresources.xaml +++ b/dev/ToolTip/ToolTip_rs5_themeresources.xaml @@ -6,7 +6,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - + 8,5,8,7 @@ -16,7 +16,7 @@ - + 8,5,8,7 diff --git a/dev/ToolTip/ToolTip_rs5_themeresources_v2.5.xaml b/dev/ToolTip/ToolTip_rs5_themeresources_v2.5.xaml new file mode 100644 index 0000000000..261a41f787 --- /dev/null +++ b/dev/ToolTip/ToolTip_rs5_themeresources_v2.5.xaml @@ -0,0 +1,78 @@ + + + + + + 8,5,8,7 + + + + + 8,5,8,7 + + + + + 8,5,8,7 + + + + + + + diff --git a/dev/TreeView/TreeView.vcxitems b/dev/TreeView/TreeView.vcxitems index 4697d83b52..e21e27b1a9 100644 --- a/dev/TreeView/TreeView.vcxitems +++ b/dev/TreeView/TreeView.vcxitems @@ -58,15 +58,34 @@ + Latest + RS1 + DefaultStyle + + + V2dot5 RS1 DefaultStyle + Latest + RS2 + DefaultStyle + true + + + V2dot5 RS2 DefaultStyle true + Latest + RS1 + ThemeResources + + + V2dot5 RS1 ThemeResources diff --git a/dev/TreeView/TreeViewItem_v2.5.xaml b/dev/TreeView/TreeViewItem_v2.5.xaml new file mode 100644 index 0000000000..f16f4c10f5 --- /dev/null +++ b/dev/TreeView/TreeViewItem_v2.5.xaml @@ -0,0 +1,195 @@ + + + + + diff --git a/dev/TreeView/TreeView_themeresources.xaml b/dev/TreeView/TreeView_themeresources.xaml index 5929d930b9..f43a2c2c81 100644 --- a/dev/TreeView/TreeView_themeresources.xaml +++ b/dev/TreeView/TreeView_themeresources.xaml @@ -10,30 +10,30 @@ - + - - - - - - - - - - + + + + + + + + + + - - + + - - - - + + + + 1 32 @@ -41,30 +41,30 @@ - + - - - - - - - - - - + + + + + + + + + + - - + + - - - - + + + + 1 32 diff --git a/dev/TreeView/TreeView_themeresources_v2.5.xaml b/dev/TreeView/TreeView_themeresources_v2.5.xaml new file mode 100644 index 0000000000..5929d930b9 --- /dev/null +++ b/dev/TreeView/TreeView_themeresources_v2.5.xaml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 32 + + + + diff --git a/dev/TreeView/TreeView_v2.5.xaml b/dev/TreeView/TreeView_v2.5.xaml new file mode 100644 index 0000000000..c70fe58dc6 --- /dev/null +++ b/dev/TreeView/TreeView_v2.5.xaml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + +