From 4b4f984ef0d6f67c4587807312f92f898b46d1bc Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Thu, 9 Sep 2021 17:58:40 -0700 Subject: [PATCH 1/7] Set up infra to remove WebView with FeatureProps --- FeatureAreas.props | 3 + build/NuSpecs/MUXControls.nuspec | 1 + .../MUXControlsFrameworkPackage.nuspec | 1 + dev/InfoBadge/InfoBadge.idl | 4 +- dev/NavigationView/NavigationView.idl | 2 +- .../NavigationViewItemPresenter.idl | 2 +- dev/WebView2/WebView2.vcxitems | 1 + .../MainPage.xaml.cpp | 86 +++++++++++++++++++ test/TestAppCX/MainPage.xaml.cpp | 4 + test/TestAppCX/TestAppCX.vcxproj | 8 +- 10 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp diff --git a/FeatureAreas.props b/FeatureAreas.props index 3906cf8904..d2747554f7 100755 --- a/FeatureAreas.props +++ b/FeatureAreas.props @@ -247,7 +247,10 @@ true true true + true + + $(DefineConstants);FEATURE_SCROLLPRESENTER_ENABLED diff --git a/build/NuSpecs/MUXControls.nuspec b/build/NuSpecs/MUXControls.nuspec index b22f80803f..8f5446cc1d 100644 --- a/build/NuSpecs/MUXControls.nuspec +++ b/build/NuSpecs/MUXControls.nuspec @@ -14,6 +14,7 @@ https://github.com/microsoft/microsoft-ui-xaml https://aka.ms/winui_icon + diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec index b897c39a93..82210d4ae9 100644 --- a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec +++ b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec @@ -14,6 +14,7 @@ https://github.com/microsoft/microsoft-ui-xaml https://aka.ms/winui_icon + diff --git a/dev/InfoBadge/InfoBadge.idl b/dev/InfoBadge/InfoBadge.idl index 3077e33d4b..c90005ea17 100644 --- a/dev/InfoBadge/InfoBadge.idl +++ b/dev/InfoBadge/InfoBadge.idl @@ -1,7 +1,7 @@ namespace MU_XC_NAMESPACE { -[MUX_PREVIEW] +[MUX_PUBLIC] [webhosthidden] unsealed runtimeclass InfoBadgeTemplateSettings : Windows.UI.Xaml.DependencyObject { @@ -14,7 +14,7 @@ unsealed runtimeclass InfoBadgeTemplateSettings : Windows.UI.Xaml.DependencyObje static Windows.UI.Xaml.DependencyProperty IconElementProperty{ get; }; } -[MUX_PREVIEW] +[MUX_PUBLIC] [webhosthidden] [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)] [MUX_PROPERTY_CHANGED_CALLBACK_METHODNAME("OnPropertyChanged")] diff --git a/dev/NavigationView/NavigationView.idl b/dev/NavigationView/NavigationView.idl index 50d4290fbe..c0a5bd901d 100644 --- a/dev/NavigationView/NavigationView.idl +++ b/dev/NavigationView/NavigationView.idl @@ -363,7 +363,7 @@ unsealed runtimeclass NavigationViewItem : NavigationViewItemBase static Windows.UI.Xaml.DependencyProperty MenuItemsSourceProperty{ get; }; } - [MUX_PREVIEW] + [MUX_PUBLIC_V2] { [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)] InfoBadge InfoBadge{ get; set; }; diff --git a/dev/NavigationView/NavigationViewItemPresenter.idl b/dev/NavigationView/NavigationViewItemPresenter.idl index 85e88bb566..ec0aeea2b1 100644 --- a/dev/NavigationView/NavigationViewItemPresenter.idl +++ b/dev/NavigationView/NavigationViewItemPresenter.idl @@ -14,7 +14,7 @@ unsealed runtimeclass NavigationViewItemPresenter : Windows.UI.Xaml.Controls.Con static Windows.UI.Xaml.DependencyProperty TemplateSettingsProperty{ get; }; - [MUX_PREVIEW] + [MUX_PUBLIC_V2] { Microsoft.UI.Xaml.Controls.InfoBadge InfoBadge{ get; set; }; static Windows.UI.Xaml.DependencyProperty InfoBadgeProperty{ get; }; diff --git a/dev/WebView2/WebView2.vcxitems b/dev/WebView2/WebView2.vcxitems index 16e76e648b..86946e224b 100644 --- a/dev/WebView2/WebView2.vcxitems +++ b/dev/WebView2/WebView2.vcxitems @@ -8,6 +8,7 @@ %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(XamlPublicHeadersPath);$(LiftedIXPIncludePaths) + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED diff --git a/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp b/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp new file mode 100644 index 0000000000..28c4b6550e --- /dev/null +++ b/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp @@ -0,0 +1,86 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +// +// MainPage.xaml.cpp +// Implementation of the MainPage class. +// + +#include "pch.h" +#include "MainPage.xaml.h" +#include "LeakCycleTestCX.xaml.h" +#include "MenuBarTestPage.xaml.h" +#include "CornerRadiusTestPage.xaml.h" +#include "TreeViewTestPage.xaml.h" +#include "BackdropMaterialTestPage.xaml.h" +#ifndef _ARM_ +#ifdef WEBVIEW2_INCLUDED +#include "WebView2TestPage.xaml.h" +#endif +#endif + +using namespace TestAppCX; + +using namespace Platform; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Interop; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +MainPage::MainPage() +{ + InitializeComponent(); +} + +void MainPage::OnNavigatedTo(NavigationEventArgs^ e) +{ + auto coreTitleBar = Windows::ApplicationModel::Core::CoreApplication::GetCurrentView()->TitleBar; + coreTitleBar->ExtendViewIntoTitleBar = false; +} + +void TestAppCX::MainPage::GoToLeakTestControlPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); + app->RootFrame->Navigate(TypeName(LeakCycleTestCX::typeid), nullptr); + +} + +void TestAppCX::MainPage::GoToMenuBarTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); + app->RootFrame->Navigate(TypeName(MenuBarTestPage::typeid), nullptr); +} + +void TestAppCX::MainPage::GoToCornerRadiusTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); + app->RootFrame->Navigate(TypeName(CornerRadiusTestPage::typeid), nullptr); +} + +void TestAppCX::MainPage::GoToTreeViewTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); + app->RootFrame->Navigate(TypeName(TreeViewTestPage::typeid), nullptr); +} + +void TestAppCX::MainPage::GoToBackdropMaterialTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); + app->RootFrame->Navigate(TypeName(BackdropMaterialTestPage::typeid), nullptr); +} + +void TestAppCX::MainPage::GoToWebView2TestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + auto app = dynamic_cast(Application::Current); +#ifndef _ARM_ +#ifdef WEBVIEW2_INCLUDED + app->RootFrame->Navigate(TypeName(WebView2TestPage::typeid), nullptr); +#endif +#endif +} diff --git a/test/TestAppCX/MainPage.xaml.cpp b/test/TestAppCX/MainPage.xaml.cpp index 715d10a040..28c4b6550e 100644 --- a/test/TestAppCX/MainPage.xaml.cpp +++ b/test/TestAppCX/MainPage.xaml.cpp @@ -14,8 +14,10 @@ #include "TreeViewTestPage.xaml.h" #include "BackdropMaterialTestPage.xaml.h" #ifndef _ARM_ +#ifdef WEBVIEW2_INCLUDED #include "WebView2TestPage.xaml.h" #endif +#endif using namespace TestAppCX; @@ -77,6 +79,8 @@ void TestAppCX::MainPage::GoToWebView2TestPage(Platform::Object^ sender, Windows { auto app = dynamic_cast(Application::Current); #ifndef _ARM_ +#ifdef WEBVIEW2_INCLUDED app->RootFrame->Navigate(TypeName(WebView2TestPage::typeid), nullptr); #endif +#endif } diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj index 7aeb96e867..6f6819a570 100644 --- a/test/TestAppCX/TestAppCX.vcxproj +++ b/test/TestAppCX/TestAppCX.vcxproj @@ -203,7 +203,7 @@ TreeViewTestPage.xaml - + WebView2TestPage.xaml @@ -229,7 +229,7 @@ Designer - + Designer @@ -281,7 +281,7 @@ TreeViewTestPage.xaml - + WebView2TestPage.xaml @@ -292,7 +292,7 @@ - + From c4d72bf526d7de860dad7992c49e48f7a773c7bb Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Thu, 9 Sep 2021 23:09:04 -0700 Subject: [PATCH 2/7] Disable webview2. --- FeatureAreas.props | 4 +- MUXControls.sln | 3 - build/NuSpecs/MUXControls.nuspec | 4 +- .../MUXControlsFrameworkPackage.nuspec | 4 +- .../MainPage.xaml.cpp | 86 ------------------- test/TestAppCX/TestAppCX.vcxproj | 11 ++- 6 files changed, 16 insertions(+), 96 deletions(-) delete mode 100644 enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp diff --git a/FeatureAreas.props b/FeatureAreas.props index d2747554f7..dfe84455db 100755 --- a/FeatureAreas.props +++ b/FeatureAreas.props @@ -248,8 +248,8 @@ true true - true - + + false diff --git a/MUXControls.sln b/MUXControls.sln index ae82e5c825..29f8885cec 100644 --- a/MUXControls.sln +++ b/MUXControls.sln @@ -848,7 +848,6 @@ Global dev\TestHooks\TestHooks.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TreeView\TreeView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TwoPaneView\TwoPaneView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\WebView2\WebView2.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\WebView2\WebView2.vcxitems*{ad144714-93fc-4281-b500-a5c2193dbc60}*SharedItemsImports = 9 dev\RadialGradientBrush\TestUI\RadialGradientBrush_TestUI.projitems*{ae308818-af18-48ba-bf33-89779083d297}*SharedItemsImports = 13 dev\TreeView\InteractionTests\TreeView_InteractionTests.projitems*{ae638a24-2bc6-4d4f-a51e-715d198f01fd}*SharedItemsImports = 13 @@ -970,7 +969,6 @@ Global dev\TreeView\TestUI\TreeView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\WebView2\TestUI\WebView2_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\Materials\Backdrop\InteractionTests\BackdropMaterial_InteractionTests.projitems*{e4e384ef-7a6c-4db4-9e59-2d9b45871544}*SharedItemsImports = 13 @@ -1070,7 +1068,6 @@ Global dev\TreeView\TestUI\TreeView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\WebView2\TestUI\WebView2_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\CommonManaged\CommonManaged.projitems*{fcc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\LayoutPanel\LayoutPanel.vcxitems*{fd3c1a00-0d07-4849-a3b9-646f0ff21d7b}*SharedItemsImports = 9 diff --git a/build/NuSpecs/MUXControls.nuspec b/build/NuSpecs/MUXControls.nuspec index 8f5446cc1d..73ea3cae22 100644 --- a/build/NuSpecs/MUXControls.nuspec +++ b/build/NuSpecs/MUXControls.nuspec @@ -15,9 +15,9 @@ https://aka.ms/winui_icon - + diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec index 82210d4ae9..c5c15726d9 100644 --- a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec +++ b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec @@ -15,9 +15,9 @@ https://aka.ms/winui_icon - + diff --git a/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp b/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp deleted file mode 100644 index 28c4b6550e..0000000000 --- a/enc_temp_folder/27db99d5cbcd18bc1a9a2ff5e5413e42/MainPage.xaml.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -// -// MainPage.xaml.cpp -// Implementation of the MainPage class. -// - -#include "pch.h" -#include "MainPage.xaml.h" -#include "LeakCycleTestCX.xaml.h" -#include "MenuBarTestPage.xaml.h" -#include "CornerRadiusTestPage.xaml.h" -#include "TreeViewTestPage.xaml.h" -#include "BackdropMaterialTestPage.xaml.h" -#ifndef _ARM_ -#ifdef WEBVIEW2_INCLUDED -#include "WebView2TestPage.xaml.h" -#endif -#endif - -using namespace TestAppCX; - -using namespace Platform; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Controls::Primitives; -using namespace Windows::UI::Xaml::Data; -using namespace Windows::UI::Xaml::Input; -using namespace Windows::UI::Xaml::Interop; -using namespace Windows::UI::Xaml::Media; -using namespace Windows::UI::Xaml::Navigation; - -MainPage::MainPage() -{ - InitializeComponent(); -} - -void MainPage::OnNavigatedTo(NavigationEventArgs^ e) -{ - auto coreTitleBar = Windows::ApplicationModel::Core::CoreApplication::GetCurrentView()->TitleBar; - coreTitleBar->ExtendViewIntoTitleBar = false; -} - -void TestAppCX::MainPage::GoToLeakTestControlPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); - app->RootFrame->Navigate(TypeName(LeakCycleTestCX::typeid), nullptr); - -} - -void TestAppCX::MainPage::GoToMenuBarTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); - app->RootFrame->Navigate(TypeName(MenuBarTestPage::typeid), nullptr); -} - -void TestAppCX::MainPage::GoToCornerRadiusTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); - app->RootFrame->Navigate(TypeName(CornerRadiusTestPage::typeid), nullptr); -} - -void TestAppCX::MainPage::GoToTreeViewTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); - app->RootFrame->Navigate(TypeName(TreeViewTestPage::typeid), nullptr); -} - -void TestAppCX::MainPage::GoToBackdropMaterialTestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); - app->RootFrame->Navigate(TypeName(BackdropMaterialTestPage::typeid), nullptr); -} - -void TestAppCX::MainPage::GoToWebView2TestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - auto app = dynamic_cast(Application::Current); -#ifndef _ARM_ -#ifdef WEBVIEW2_INCLUDED - app->RootFrame->Navigate(TypeName(WebView2TestPage::typeid), nullptr); -#endif -#endif -} diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj index 6f6819a570..7456c44b8a 100644 --- a/test/TestAppCX/TestAppCX.vcxproj +++ b/test/TestAppCX/TestAppCX.vcxproj @@ -4,6 +4,7 @@ + {92081f61-98bb-4105-a90f-b6d524b4f5c9} TestAppCX @@ -129,6 +130,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -136,6 +138,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -143,6 +146,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -150,6 +154,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -157,6 +162,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -164,6 +170,7 @@ /bigobj %(AdditionalOptions) 4453;28204;4691 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -171,6 +178,7 @@ /bigobj %(AdditionalOptions) 4453;28204 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -178,6 +186,7 @@ /bigobj %(AdditionalOptions) 4453;28204 true + %(PreprocessorDefinitions);WEBVIEW2_INCLUDED @@ -299,6 +308,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file From dc21a21b610faae672b6ecda844fd7084dc962bf Mon Sep 17 00:00:00 2001 From: Ranjesh Jaganathan <28935693+ranjeshj@users.noreply.github.com> Date: Mon, 13 Sep 2021 11:21:56 -0700 Subject: [PATCH 3/7] Update intellisense files --- .../Intellisense/Microsoft.UI.Xaml.xml | 319 +++++++++++++++--- 1 file changed, 265 insertions(+), 54 deletions(-) diff --git a/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml b/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml index 29dbb13c4d..7a61a87dc7 100644 --- a/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml +++ b/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml @@ -11,11 +11,16 @@ Initializes a new instance of the AnimatedVisualPlayerAutomationPeer class. The AnimatedVisualPlayer control instance to create the peer for. - + + Exposes BreadcrumbBar types to Microsoft UI Automation. + - + Initializes a new instance of the BreadcrumbBarItemAutomationPeer class. + The BreadcrumbBarItem instance to create the peer for. + + + Sends a request to invoke the item associated with the automation peer. - Exposes ColorPickerSlider types to Microsoft UI Automation. @@ -47,13 +52,23 @@ Gets the state, expanded or collapsed, of the DropDownButton. A value of the enumeration. - + + Exposes Expander types to Microsoft UI Automation. + - + Initializes a new instance of the ExpanderAutomationPeer class. + The Expander control instance to create the peer for. + + + Hides the content area of the control. + + + Displays the content area of the control. + + + Gets the value of the Expander.IsExpanded" property and returns whether the Expander is currently expanded or collapsed. + Expanded if the content area of the control is currently shown; Collapsed if the content area is hidden. - - - Exposes InfoBar types to Microsoft UI Automation. @@ -149,6 +164,10 @@ + + + + Exposes RatingControl types to Microsoft UI Automation. @@ -291,6 +310,8 @@ Identifies the FallbackIconSource dependency property. The identifier for the FallbackIconSource dependency property. + + Gets or sets the animated visual shown by the AnimatedIcon object. The animated visual shown by the AnimatedIcon. The default is null. @@ -320,6 +341,8 @@ Identifies the FallbackIconSource dependency property. The identifier for the FallbackIconSource dependency property. + + Gets or sets the animated visual shown by the AnimatedIconSource object. The animated visual shown by the AnimatedIconSource. The default is null. @@ -614,6 +637,26 @@ This parameter is optional. Provides a mapping from marker names to playback positions in the animated visual for an AnimatedIcon. The collection of marker names and values as defined in the JSON file for the animated icon. + + Helper class to apply a backdrop material to the root of the XAML content. + + + Gets the value of the BackdropMaterial.ApplyToRootOrPageBackground XAML attached property for the target element. + The object from which the property value is read. + The BackdropMaterial.ApplyToRootOrPageBackground XAML attached property value of the requested object. + + + Sets the value of the BackdropMaterial.ApplyToRootOrPageBackground XAML attached property for a target element. + The object to which the property value is written. + The value to set. + + + Applies the backdrop material to the root or background of the XAML content. + + + Identifies the BackdropMaterial.ApplyToRootOrPageBackground XAML attached property. + The identifier for the BackdropMaterial.ApplyToRootOrPageBackground XAML attached property. + Represents an icon source that uses a bitmap as its content. @@ -636,18 +679,48 @@ This parameter is optional. Identifies the UriSource dependency property. The identifier for the UriSource dependency property. - - - - - - - - - - - - + + The BreadcrumbBar control provides the direct path of pages or folders to the current location. + + + Occurs when an item is clicked in the BreadcrumbBar. + + + Initializes a new instance of the BreadcrumbBar class. + + + Gets or sets an object source used to generate the content of the BreadcrumbBar. + An object source used to generate the content of the BreadcrumbBar. + + + Identifies the ItemsSource dependency property. + The identifier for the ItemsSource dependency property. + + + Gets or sets the data template for the BreadcrumbBarItem. + The data template that is used to display the content of the BreadcrumbBarItem. + + + Identifies the ItemTemplate dependency property. + The identifer for the ItemTemplate dependency property. + + + Represents an item in a BreadcrumbBar control. + + + Initializes a new instance of the BreadcrumbBarItem class. + + + Provides data for the BreadcrumbBar.ItemClicked" event. + + + Gets the index of the item that was clicked. + The index of the item that was clicked. + + + Gets the Content property value of the BreadcrumbBarItem that is clicked. + The Content property value of the BreadcrumbBarItem that is clicked. + Provides event data for a ColorChanged event (see ColorPicker.ColorChanged" and ColorSpectrum.ColorChanged" ). @@ -812,6 +885,8 @@ This parameter is optional. Identifies the MinValue dependency property. The identifier for the MinValue dependency property. + + Gets or sets the previous color. The previous color. The default is null. @@ -871,7 +946,9 @@ This parameter is optional. Initializes a new instance of the CommandBarFlyout class. - + + Gets or sets a value that indicates whether or not the CommandBarFlyout should always stay in its Expanded state and block the user from entering the Collapsed state. Defaults to false. + Gets the collection of primary command elements for the CommandBarFlyout. The collection of primary command elements for the CommandBarFlyout. The default is an empty collection. @@ -933,129 +1010,188 @@ This parameter is optional. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Defines constants that specify in which direction a control should expand. + + + The content area expands downwards from the header. + + + The content area expands upwards from the header. - - ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Represents a control that displays a header and has a collapsible body that displays content. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Occurs when the content area of the Expander is hidden. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Occurs when the content area of the Expander starts to be shown. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Initializes a new instance of the Expander class. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets or sets a value that indicates the direction in which the content area expands. + A value of the enumeration that indicates the direction in which the content area expands. The default is Down. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Identifies the ExpandDirection dependency property. + The identifier for the ExpandDirection dependency property. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets or sets the XAML content that is displayed in the header of the Expander. + The XAML content that is displayed in the header. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Identifies the Header dependency property. + The identifier for the Header dependency property. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets or sets the data template for the Expander.Header". + The data template that is used to display the header of the Expander. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Identifies the HeaderTemplate dependency property. + The identifier for the HeaderTemplate dependency property. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets or sets a reference to a custom DataTemplateSelector logic class that returns a template to apply to the Header. + A reference to a custom DataTemplateSelector logic class. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Identifies the HeaderTemplateSelector dependency property. + The identifier for the HeaderTemplateSelector dependency property. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets or sets a value that indicates whether the content area of the Expander is shown. + true if the content area is shown; otherwise, false. The default is false. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Identifies the IsExpanded dependency property. + The identifier for the IsExpanded dependency property. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets an object that provides calculated values that can be referenced as TemplatedParent sources when defining templates for an Expander. + An instance of ExpanderTemplateSettings. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Provides data for the Expander.Collapsed" event. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Provides data for the Expander.Expanding" event. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Provides calculated values that can be referenced as TemplatedParent sources when defining templates for an Expander. Not intended for general use. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets the height of the Expander content. + The height of the Expander content. ::: moniker range="winui-3.0-preview" > [!CAUTION] > This API is in development and considered experimental in the WinUI version selected. It might be altered or unavailable in other versions. -::: moniker-end +::: moniker-end + +Gets the height of the Expander content when the expand direction is negative. + The height of the Expander content when the expand direction is negative. Represents an icon source that uses a glyph from the specified font. @@ -1065,7 +1201,7 @@ This parameter is optional. Gets or sets the font used to display the icon glyph. - The font used to display the icon glyph. + The font used to display the icon glyph. The default is the font family defined by the SymbolThemeFontFamily theme resource (see Remarks). Gets the identifier for the FontFamily dependency property. @@ -1189,14 +1325,48 @@ This parameter is optional. The index of the item to get the key for. The unique identifier (key) for the item at the specified _index_. - - - - - - - - + + Represents an icon that uses an Image as its content. + + + Initializes a new instance of the ImageIcon class. + + + Gets or sets the URI of the image file to use as the icon. + The URI of the image file to use as the icon. The default is null. + + + Identifies the Source dependency property. + The identifier for the Source dependency property. + + + Represents an icon source that uses an image type as its content. The image types currently supported are .bmp, .gif, .jpg, .png, .wdp, and .tiff. + + + Initializes a new instance of the ImageIconSource class. + + + Gets or sets the URI of the image file to use as the icon source. + The URI of the image file to use as the icon source. The default is null. + + + Identifies the ImageSource dependency property. + The identifier for the ImageSource dependency property. + + + + + + + + + + + + + + + An InfoBar is an inline notification for essential app-wide messages. The InfoBar will take up space in a layout and will not cover up other content or float on top of it. It supports rich content (including titles, messages, icons, and buttons) and can be configured to be user-dismissable or persistent. @@ -3042,6 +3212,16 @@ MaxVisiblePips should be set to a positive number. If set to 0, no pages will be Gets an object that provides calculated values that can be referenced as {TemplateBinding} markup extension sources when defining templates for a CommandBarFlyoutCommandBar control. An object that provides calculated values for templates. + + + + + + + + + + Provides calculated values that can be referenced as TemplatedParent sources when defining templates for a CommandBarFlyout control. Not intended for general use. @@ -3242,6 +3422,16 @@ MaxVisiblePips should be set to a positive number. If set to 0, no pages will be + + + + + + + + + + Represents a panel that arranges its items horizontally if there is available space, otherwise vertically. @@ -3298,6 +3488,11 @@ MaxVisiblePips should be set to a positive number. If set to 0, no pages will be Gets the identifier for the InfoBar.VerticalOrientationPadding dependency property. The identifier for the InfoBar.VerticalOrientationPadding dependency property. + + + + + @@ -3326,6 +3521,20 @@ MaxVisiblePips should be set to a positive number. If set to 0, no pages will be + + + + + + + + + + + + + + Represents the ListView corresponding to the TabStrip within the TabView. @@ -3565,7 +3774,9 @@ MaxVisiblePips should be set to a positive number. If set to 0, no pages will be - + + Represents whether the MenuFlyoutSubItem has RadioMenuFlyoutItems as children. + Gets or sets the name that specifies which RadioMenuFlyoutItem controls are mutually exclusive. From a0e85634020e3c19cd8d9e435d805d562e2e8d35 Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Wed, 22 Sep 2021 12:16:25 -0700 Subject: [PATCH 4/7] remove not arm requirement for webview in cx test app. --- test/TestAppCX/MainPage.xaml.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/TestAppCX/MainPage.xaml.cpp b/test/TestAppCX/MainPage.xaml.cpp index 28c4b6550e..8f4e5a6fea 100644 --- a/test/TestAppCX/MainPage.xaml.cpp +++ b/test/TestAppCX/MainPage.xaml.cpp @@ -13,11 +13,9 @@ #include "CornerRadiusTestPage.xaml.h" #include "TreeViewTestPage.xaml.h" #include "BackdropMaterialTestPage.xaml.h" -#ifndef _ARM_ #ifdef WEBVIEW2_INCLUDED #include "WebView2TestPage.xaml.h" #endif -#endif using namespace TestAppCX; @@ -78,9 +76,7 @@ void TestAppCX::MainPage::GoToBackdropMaterialTestPage(Platform::Object^ sender, void TestAppCX::MainPage::GoToWebView2TestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) { auto app = dynamic_cast(Application::Current); -#ifndef _ARM_ #ifdef WEBVIEW2_INCLUDED app->RootFrame->Navigate(TypeName(WebView2TestPage::typeid), nullptr); #endif -#endif } From 4f40e6321b0ac2066516ea0ab0954582461eef1a Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Wed, 22 Sep 2021 12:34:49 -0700 Subject: [PATCH 5/7] revert MUXControls.sln --- MUXControls.sln | 76 ++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 54 deletions(-) mode change 100644 => 100755 MUXControls.sln diff --git a/MUXControls.sln b/MUXControls.sln old mode 100644 new mode 100755 index 29f8885cec..6859abcb2a --- a/MUXControls.sln +++ b/MUXControls.sln @@ -649,30 +649,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MonochromaticOverlayPresent EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MonochromaticOverlayPresenter_TestUI", "dev\MonochromaticOverlayPresenter\TestUI\MonochromaticOverlayPresenter_TestUI.shproj", "{52AAA6ED-E5A0-41BB-8858-66249333A8D4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backdrop", "Backdrop", "{5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemBackdropComponent", "dev\Materials\Backdrop\SystemBackdropComponent.vcxitems", "{99AF040E-B77B-487D-9CC8-3334E1F1162A}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BackdropMaterial_TestUI", "dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.shproj", "{B2DBABB6-2CE4-49A4-84E8-4CBC6F4BA8EF}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BackdropMaterial_InteractionTests", "dev\Materials\Backdrop\InteractionTests\BackdropMaterial_InteractionTests.shproj", "{E4E384EF-7A6C-4DB4-9E59-2D9B45871544}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoBadge", "InfoBadge", "{C67BD98D-1228-4154-8EDA-2F8255BBA941}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InfoBadge", "dev\InfoBadge\InfoBadge.vcxitems", "{E7DEA84C-CCCE-4458-8499-5182F67BC7BA}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBadge_APITests", "dev\InfoBadge\APITests\InfoBadge_APITests.shproj", "{D83F60A3-EB44-46F2-8EE7-B28C90004E5F}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBadge_TestUI", "dev\InfoBadge\TestUI\InfoBadge_TestUI.shproj", "{1F30CAC6-7EFB-4CE9-B119-64821C117CB9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebView2", "WebView2", "{1E54C076-7240-463A-A1B1-404187ABCDEB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView2", "dev\WebView2\WebView2.vcxitems", "{AD144714-93FC-4281-B500-A5C2193DBC60}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebView2_TestUI", "dev\WebView2\TestUI\WebView2_TestUI.shproj", "{3E535832-73B4-45B2-B550-34CB14B2C262}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebView2_InteractionTests", "dev\WebView2\InteractionTests\WebView2_InteractionTests.shproj", "{2B05A80E-7C01-449C-8345-7D3B3B2143E5}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution dev\ComboBox\ComboBox.vcxitems*{00523caf-422a-4185-9392-d374b72a019a}*SharedItemsImports = 9 @@ -697,7 +673,6 @@ Global dev\NavigationView\NavigationView.vcxitems*{1b8ef049-a38e-43e4-b88e-f1ebfcef07d2}*SharedItemsImports = 9 dev\TabView\TestUI\TabView_TestUI.projitems*{1d87aac7-1e11-40fc-90a7-b6ce1c4567ae}*SharedItemsImports = 13 dev\Materials\Reveal\InteractionTests\Reveal_InteractionTests\Reveal_InteractionTests.projitems*{1f2872e7-28c9-4c01-88ed-73c43ee1c9a4}*SharedItemsImports = 13 - dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{1f30cac6-7efb-4ce9-b119-64821c117cb9}*SharedItemsImports = 13 dev\ScrollView\TestUI\ScrollView_TestUI.projitems*{20c52fd5-62fd-53b4-a4a0-995c9b5a014d}*SharedItemsImports = 13 dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{225c4174-3141-49b8-ade2-c7d3408d5103}*SharedItemsImports = 13 dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\ScrollViewerIRefreshInfoProviderAdapter.vcxitems*{22a3d1c4-4d1c-4b04-b695-8fec39bfed86}*SharedItemsImports = 9 @@ -706,7 +681,6 @@ Global dev\RatingControl\APITests\RatingControl_APITests.projitems*{274b93f7-cd18-4ed9-b569-0640529d187b}*SharedItemsImports = 13 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{27aae2e5-9687-4120-822f-cdb68b9a65b7}*SharedItemsImports = 13 dev\SplitButton\TestUI\SplitButton_TestUI.projitems*{280c91f4-96b5-4bde-9e02-e573e1def583}*SharedItemsImports = 13 - dev\WebView2\InteractionTests\WebView2_InteractionTests.projitems*{2b05a80e-7c01-449c-8345-7d3b3b2143e5}*SharedItemsImports = 13 dev\Repeater\TestUI\Repeater_TestUI.projitems*{2ed883f5-20db-4445-8c96-517a21e5e657}*SharedItemsImports = 13 dev\TabView\APITests\TabView_APITests.projitems*{2f4e95e9-f729-481c-b9aa-c9bec91ae395}*SharedItemsImports = 13 dev\ParallaxView\ParallaxView.vcxitems*{3095445a-afcd-5154-ac36-9770e6ec1aa5}*SharedItemsImports = 9 @@ -720,7 +694,6 @@ Global dev\CommonStyles\CommonStyles.vcxitems*{3a07fa59-c5c1-4b46-8b31-043f9ca91226}*SharedItemsImports = 9 dev\Materials\Acrylic\AcrylicBrush.vcxitems*{3affd0ce-c682-4e59-a9d4-be8ec3f485da}*SharedItemsImports = 9 dev\ProgressBar\InteractionTests\ProgressBar_InteractionTests.projitems*{3d044ec1-c9d3-4745-b79e-e7bed66e93f8}*SharedItemsImports = 13 - dev\WebView2\TestUI\WebView2_TestUI.projitems*{3e535832-73b4-45b2-b550-34cb14b2c262}*SharedItemsImports = 13 dev\AutoSuggestBox\AutoSuggestBox.vcxitems*{417000d9-2641-4629-99f2-8f6033a6ac52}*SharedItemsImports = 9 dev\TeachingTip\TestUI\TeachingTip_TestUI.projitems*{42a51d3e-f06a-41a0-be4c-f94cddb80678}*SharedItemsImports = 13 dev\RadioButtons\InteractionTests\RadioButtons_InteractionTests.projitems*{42d6e8f9-59fe-4ca5-83eb-69a7622f5742}*SharedItemsImports = 13 @@ -781,7 +754,6 @@ Global dev\DropDownButton\TestUI\DropDownButton_TestUI.projitems*{954d7000-c06f-49eb-a7d2-0df83de6ca35}*SharedItemsImports = 13 dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\APITests\APITests.projitems*{999c289e-5ad6-4700-a44e-e85b696e508a}*SharedItemsImports = 13 dev\Repeater\InteractionTests\Repeater_InteractionTests.projitems*{999e00c9-0e58-402a-8e0e-cbafb0adc7e3}*SharedItemsImports = 13 - dev\Materials\Backdrop\SystemBackdropComponent.vcxitems*{99af040e-b77b-487d-9cc8-3334e1f1162a}*SharedItemsImports = 9 dev\SwipeControl\SwipeControl_InteractionTests\SwipeControl_InteractionTests.projitems*{9a8da438-193c-4950-a046-2952de2d3b0b}*SharedItemsImports = 13 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{9c533ec3-f8fa-4b0e-ba1b-3323932cdfcb}*SharedItemsImports = 13 dev\PipsPager\APITests\PipsPager_APITests.projitems*{9cf0d73a-e435-4c17-a41c-11e9fa3eea2f}*SharedItemsImports = 13 @@ -808,14 +780,12 @@ Global dev\Expander\Expander.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\IconSource\IconSource.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ImageIcon\ImageIcon.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\InfoBadge\InfoBadge.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\InfoBar\InfoBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\ButtonInteraction\ButtonInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\SliderInteraction\SliderInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\LayoutPanel\LayoutPanel.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 - dev\Materials\Backdrop\SystemBackdropComponent.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Reveal\RevealBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\MenuBar\MenuBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\MonochromaticOverlayPresenter\MonochromaticOverlayPresenter.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -840,7 +810,6 @@ Global dev\ScrollPresenter\ScrollPresenter.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ScrollView\ScrollView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SplitButton\SplitButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\SplitView\SplitView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SwipeControl\SwipeControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TabView\TabView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TeachingTip\TeachingTip.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -848,14 +817,12 @@ Global dev\TestHooks\TestHooks.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TreeView\TreeView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TwoPaneView\TwoPaneView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\WebView2\WebView2.vcxitems*{ad144714-93fc-4281-b500-a5c2193dbc60}*SharedItemsImports = 9 dev\RadialGradientBrush\TestUI\RadialGradientBrush_TestUI.projitems*{ae308818-af18-48ba-bf33-89779083d297}*SharedItemsImports = 13 dev\TreeView\InteractionTests\TreeView_InteractionTests.projitems*{ae638a24-2bc6-4d4f-a51e-715d198f01fd}*SharedItemsImports = 13 dev\RatingControl\InteractionTests\RatingControl_InteractionTests.projitems*{afaad014-132c-4d2a-a28e-4ef717d3e647}*SharedItemsImports = 13 dev\PersonPicture\InteractionTests\PersonPicture_InteractionTests.projitems*{b0c15318-1f57-4914-b860-ebf248841511}*SharedItemsImports = 13 dev\PipsPager\InteractionTests\PipsPager_InteractionTests.projitems*{b1d8e6a2-3fe6-4d80-9685-26df2c9f4331}*SharedItemsImports = 13 dev\TreeView\TestUI\TreeView_TestUI.projitems*{b2c714dd-9c6b-400c-9cef-13a2d48378bd}*SharedItemsImports = 13 - dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{b2dbabb6-2ce4-49a4-84e8-4cbc6f4ba8ef}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\AnimatedVisualPlayer.vcxitems*{b39300d2-4510-44ea-aa7b-eda9118f830e}*SharedItemsImports = 9 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{b58ec806-9951-4e5e-af29-a700a088770e}*SharedItemsImports = 13 dev\SwipeControl\SwipeControl_APITests\SwipeControl_APITests.projitems*{b75d5d7e-6986-4500-972e-2c10a9b7cc10}*SharedItemsImports = 13 @@ -882,7 +849,6 @@ Global dev\PipsPager\PipsPager.vcxitems*{d1eb61d8-c689-4ad1-bd61-fdaa50362563}*SharedItemsImports = 9 dev\Expander\InteractionTests\Expander_InteractionTests.projitems*{d6df4ab9-facc-4e51-8c57-6b1f96919365}*SharedItemsImports = 13 dev\IconSource\APITests\IconSource_APITests.projitems*{d73627e9-564c-4a72-a12d-f6c82f17ad0d}*SharedItemsImports = 13 - dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{d83f60a3-eb44-46f2-8ee7-b28c90004e5f}*SharedItemsImports = 13 dev\SplitView\TestUI\SplitView_TestUI.projitems*{d8cea3b7-0012-4f74-b50f-b46e9a93c979}*SharedItemsImports = 13 dev\DropDownButton\InteractionTests\DropDownButton_InteractionTests.projitems*{d9ac3716-5608-40d0-999f-26f4b544be33}*SharedItemsImports = 13 dev\AnimatedIcon\APITests\AnimatedIcon_APITests.projitems*{db15ff28-ab3a-4fed-a1d5-004a095a3fd5}*SharedItemsImports = 13 @@ -913,13 +879,10 @@ Global dev\IconSource\APITests\IconSource_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Reveal\TestUI\Reveal_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\MenuBar\MenuBar_TestUI\MenuBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 @@ -971,11 +934,9 @@ Global dev\TwoPaneView\TestUI\TwoPaneView_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\Materials\Backdrop\InteractionTests\BackdropMaterial_InteractionTests.projitems*{e4e384ef-7a6c-4db4-9e59-2d9b45871544}*SharedItemsImports = 13 dev\CommandBarFlyout\TestUI\CommandBarFlyout_TestUI.projitems*{e63f1c1d-f06d-46a0-b5c2-184184e44f29}*SharedItemsImports = 13 dev\SplitButton\APITests\SplitButton_APITests.projitems*{e687c158-4c66-4ac5-8a1b-d095a82f1549}*SharedItemsImports = 13 dev\RadioButtons\RadioButtons.vcxitems*{e770a6d3-7252-4e8a-bd10-fa8524df8c83}*SharedItemsImports = 9 - dev\InfoBadge\InfoBadge.vcxitems*{e7dea84c-ccce-4458-8499-5182f67bc7ba}*SharedItemsImports = 9 dev\NavigationView\NavigationView_ApiTests\NavigationView_ApiTests.projitems*{e98f3da3-3c00-4f2e-bf3b-2d2ad9d176bc}*SharedItemsImports = 13 dev\ColorPicker\APITests\ColorPicker_APITests.projitems*{e9ac4938-ec2a-46d3-85bf-27316db8cc4d}*SharedItemsImports = 13 test\MUXControls.Test\MUXControls.Test.Shared.projitems*{e9fc52cd-519a-41bb-8092-523ffa9d5617}*SharedItemsImports = 13 @@ -1012,13 +973,10 @@ Global dev\IconSource\APITests\IconSource_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Reveal\TestUI\Reveal_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\MenuBar\MenuBar_TestUI\MenuBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 @@ -1143,6 +1101,8 @@ Global {92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Build.0 = Release|Win32 {92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Deploy.0 = Release|Win32 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.ActiveCfg = Debug_test|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Build.0 = Debug_test|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.ActiveCfg = Debug_test|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1151,6 +1111,8 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Build.0 = Debug_test|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Deploy.0 = Debug_test|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.ActiveCfg = Debug|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Build.0 = Debug|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Deploy.0 = Debug|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|arm64.ActiveCfg = Debug|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.ActiveCfg = Debug|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Build.0 = Debug|x64 @@ -1159,6 +1121,8 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Build.0 = Debug|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Deploy.0 = Debug|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.ActiveCfg = Release|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Build.0 = Release|ARM + {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Deploy.0 = Release|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|arm64.ActiveCfg = Release|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.ActiveCfg = Release|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Build.0 = Release|x64 @@ -1167,6 +1131,8 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Build.0 = Release|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Deploy.0 = Release|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.ActiveCfg = Debug_test|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.Build.0 = Debug_test|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x64.ActiveCfg = Debug_test|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1175,6 +1141,8 @@ Global {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x86.Build.0 = Debug_test|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x86.Deploy.0 = Debug_test|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.ActiveCfg = Debug|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.Build.0 = Debug|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.Deploy.0 = Debug|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|arm64.ActiveCfg = Debug|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x64.ActiveCfg = Debug|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x64.Build.0 = Debug|x64 @@ -1183,6 +1151,8 @@ Global {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x86.Build.0 = Debug|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x86.Deploy.0 = Debug|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.ActiveCfg = Release|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.Build.0 = Release|ARM + {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.Deploy.0 = Release|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|arm64.ActiveCfg = Release|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|x64.ActiveCfg = Release|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|x64.Build.0 = Release|x64 @@ -1265,6 +1235,8 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Build.0 = Debug_test|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Deploy.0 = Debug_test|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.ActiveCfg = Debug|ARM + {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Build.0 = Debug|ARM + {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Deploy.0 = Debug|ARM {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|arm64.ActiveCfg = Debug|arm64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.ActiveCfg = Debug|x64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Build.0 = Debug|x64 @@ -1273,6 +1245,8 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Build.0 = Debug|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Deploy.0 = Debug|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.ActiveCfg = Release|ARM + {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Build.0 = Release|ARM + {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Deploy.0 = Release|ARM {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|arm64.ActiveCfg = Release|arm64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.ActiveCfg = Release|x64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Build.0 = Release|x64 @@ -1281,6 +1255,8 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Build.0 = Release|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Deploy.0 = Release|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.ActiveCfg = Debug_test|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.Build.0 = Debug_test|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x64.ActiveCfg = Debug_test|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1289,6 +1265,8 @@ Global {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x86.Build.0 = Debug_test|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x86.Deploy.0 = Debug_test|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.ActiveCfg = Debug|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.Build.0 = Debug|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.Deploy.0 = Debug|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|arm64.ActiveCfg = Debug|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x64.ActiveCfg = Debug|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x64.Build.0 = Debug|x64 @@ -1297,6 +1275,8 @@ Global {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x86.Build.0 = Debug|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x86.Deploy.0 = Debug|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.ActiveCfg = Release|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.Build.0 = Release|ARM + {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.Deploy.0 = Release|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|arm64.ActiveCfg = Release|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|x64.ActiveCfg = Release|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|x64.Build.0 = Release|x64 @@ -1662,18 +1642,6 @@ Global {7FA40D21-3085-41B3-9C46-6CBC2F56B442} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {D03847C1-7EE7-4423-82FD-3CB31DAF98D1} = {7FA40D21-3085-41B3-9C46-6CBC2F56B442} {52AAA6ED-E5A0-41BB-8858-66249333A8D4} = {7FA40D21-3085-41B3-9C46-6CBC2F56B442} - {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} = {414D2AE4-5B65-43E1-9C11-D94817835B3D} - {99AF040E-B77B-487D-9CC8-3334E1F1162A} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} - {B2DBABB6-2CE4-49A4-84E8-4CBC6F4BA8EF} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} - {E4E384EF-7A6C-4DB4-9E59-2D9B45871544} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} - {C67BD98D-1228-4154-8EDA-2F8255BBA941} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} - {E7DEA84C-CCCE-4458-8499-5182F67BC7BA} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} - {D83F60A3-EB44-46F2-8EE7-B28C90004E5F} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} - {1F30CAC6-7EFB-4CE9-B119-64821C117CB9} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} - {1E54C076-7240-463A-A1B1-404187ABCDEB} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} - {AD144714-93FC-4281-B500-A5C2193DBC60} = {1E54C076-7240-463A-A1B1-404187ABCDEB} - {3E535832-73B4-45B2-B550-34CB14B2C262} = {1E54C076-7240-463A-A1B1-404187ABCDEB} - {2B05A80E-7C01-449C-8345-7D3B3B2143E5} = {1E54C076-7240-463A-A1B1-404187ABCDEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED} From 9884a247975844b63299c4bad96e05c425924aef Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Wed, 22 Sep 2021 12:39:47 -0700 Subject: [PATCH 6/7] pull in MUXControls.sln from main --- MUXControls.sln | 79 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 22 deletions(-) mode change 100755 => 100644 MUXControls.sln diff --git a/MUXControls.sln b/MUXControls.sln old mode 100755 new mode 100644 index 6859abcb2a..ae82e5c825 --- a/MUXControls.sln +++ b/MUXControls.sln @@ -649,6 +649,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MonochromaticOverlayPresent EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MonochromaticOverlayPresenter_TestUI", "dev\MonochromaticOverlayPresenter\TestUI\MonochromaticOverlayPresenter_TestUI.shproj", "{52AAA6ED-E5A0-41BB-8858-66249333A8D4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backdrop", "Backdrop", "{5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemBackdropComponent", "dev\Materials\Backdrop\SystemBackdropComponent.vcxitems", "{99AF040E-B77B-487D-9CC8-3334E1F1162A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BackdropMaterial_TestUI", "dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.shproj", "{B2DBABB6-2CE4-49A4-84E8-4CBC6F4BA8EF}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BackdropMaterial_InteractionTests", "dev\Materials\Backdrop\InteractionTests\BackdropMaterial_InteractionTests.shproj", "{E4E384EF-7A6C-4DB4-9E59-2D9B45871544}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoBadge", "InfoBadge", "{C67BD98D-1228-4154-8EDA-2F8255BBA941}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InfoBadge", "dev\InfoBadge\InfoBadge.vcxitems", "{E7DEA84C-CCCE-4458-8499-5182F67BC7BA}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBadge_APITests", "dev\InfoBadge\APITests\InfoBadge_APITests.shproj", "{D83F60A3-EB44-46F2-8EE7-B28C90004E5F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBadge_TestUI", "dev\InfoBadge\TestUI\InfoBadge_TestUI.shproj", "{1F30CAC6-7EFB-4CE9-B119-64821C117CB9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebView2", "WebView2", "{1E54C076-7240-463A-A1B1-404187ABCDEB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView2", "dev\WebView2\WebView2.vcxitems", "{AD144714-93FC-4281-B500-A5C2193DBC60}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebView2_TestUI", "dev\WebView2\TestUI\WebView2_TestUI.shproj", "{3E535832-73B4-45B2-B550-34CB14B2C262}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebView2_InteractionTests", "dev\WebView2\InteractionTests\WebView2_InteractionTests.shproj", "{2B05A80E-7C01-449C-8345-7D3B3B2143E5}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution dev\ComboBox\ComboBox.vcxitems*{00523caf-422a-4185-9392-d374b72a019a}*SharedItemsImports = 9 @@ -673,6 +697,7 @@ Global dev\NavigationView\NavigationView.vcxitems*{1b8ef049-a38e-43e4-b88e-f1ebfcef07d2}*SharedItemsImports = 9 dev\TabView\TestUI\TabView_TestUI.projitems*{1d87aac7-1e11-40fc-90a7-b6ce1c4567ae}*SharedItemsImports = 13 dev\Materials\Reveal\InteractionTests\Reveal_InteractionTests\Reveal_InteractionTests.projitems*{1f2872e7-28c9-4c01-88ed-73c43ee1c9a4}*SharedItemsImports = 13 + dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{1f30cac6-7efb-4ce9-b119-64821c117cb9}*SharedItemsImports = 13 dev\ScrollView\TestUI\ScrollView_TestUI.projitems*{20c52fd5-62fd-53b4-a4a0-995c9b5a014d}*SharedItemsImports = 13 dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{225c4174-3141-49b8-ade2-c7d3408d5103}*SharedItemsImports = 13 dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\ScrollViewerIRefreshInfoProviderAdapter.vcxitems*{22a3d1c4-4d1c-4b04-b695-8fec39bfed86}*SharedItemsImports = 9 @@ -681,6 +706,7 @@ Global dev\RatingControl\APITests\RatingControl_APITests.projitems*{274b93f7-cd18-4ed9-b569-0640529d187b}*SharedItemsImports = 13 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{27aae2e5-9687-4120-822f-cdb68b9a65b7}*SharedItemsImports = 13 dev\SplitButton\TestUI\SplitButton_TestUI.projitems*{280c91f4-96b5-4bde-9e02-e573e1def583}*SharedItemsImports = 13 + dev\WebView2\InteractionTests\WebView2_InteractionTests.projitems*{2b05a80e-7c01-449c-8345-7d3b3b2143e5}*SharedItemsImports = 13 dev\Repeater\TestUI\Repeater_TestUI.projitems*{2ed883f5-20db-4445-8c96-517a21e5e657}*SharedItemsImports = 13 dev\TabView\APITests\TabView_APITests.projitems*{2f4e95e9-f729-481c-b9aa-c9bec91ae395}*SharedItemsImports = 13 dev\ParallaxView\ParallaxView.vcxitems*{3095445a-afcd-5154-ac36-9770e6ec1aa5}*SharedItemsImports = 9 @@ -694,6 +720,7 @@ Global dev\CommonStyles\CommonStyles.vcxitems*{3a07fa59-c5c1-4b46-8b31-043f9ca91226}*SharedItemsImports = 9 dev\Materials\Acrylic\AcrylicBrush.vcxitems*{3affd0ce-c682-4e59-a9d4-be8ec3f485da}*SharedItemsImports = 9 dev\ProgressBar\InteractionTests\ProgressBar_InteractionTests.projitems*{3d044ec1-c9d3-4745-b79e-e7bed66e93f8}*SharedItemsImports = 13 + dev\WebView2\TestUI\WebView2_TestUI.projitems*{3e535832-73b4-45b2-b550-34cb14b2c262}*SharedItemsImports = 13 dev\AutoSuggestBox\AutoSuggestBox.vcxitems*{417000d9-2641-4629-99f2-8f6033a6ac52}*SharedItemsImports = 9 dev\TeachingTip\TestUI\TeachingTip_TestUI.projitems*{42a51d3e-f06a-41a0-be4c-f94cddb80678}*SharedItemsImports = 13 dev\RadioButtons\InteractionTests\RadioButtons_InteractionTests.projitems*{42d6e8f9-59fe-4ca5-83eb-69a7622f5742}*SharedItemsImports = 13 @@ -754,6 +781,7 @@ Global dev\DropDownButton\TestUI\DropDownButton_TestUI.projitems*{954d7000-c06f-49eb-a7d2-0df83de6ca35}*SharedItemsImports = 13 dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\APITests\APITests.projitems*{999c289e-5ad6-4700-a44e-e85b696e508a}*SharedItemsImports = 13 dev\Repeater\InteractionTests\Repeater_InteractionTests.projitems*{999e00c9-0e58-402a-8e0e-cbafb0adc7e3}*SharedItemsImports = 13 + dev\Materials\Backdrop\SystemBackdropComponent.vcxitems*{99af040e-b77b-487d-9cc8-3334e1f1162a}*SharedItemsImports = 9 dev\SwipeControl\SwipeControl_InteractionTests\SwipeControl_InteractionTests.projitems*{9a8da438-193c-4950-a046-2952de2d3b0b}*SharedItemsImports = 13 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{9c533ec3-f8fa-4b0e-ba1b-3323932cdfcb}*SharedItemsImports = 13 dev\PipsPager\APITests\PipsPager_APITests.projitems*{9cf0d73a-e435-4c17-a41c-11e9fa3eea2f}*SharedItemsImports = 13 @@ -780,12 +808,14 @@ Global dev\Expander\Expander.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\IconSource\IconSource.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ImageIcon\ImageIcon.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\InfoBadge\InfoBadge.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\InfoBar\InfoBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\ButtonInteraction\ButtonInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\SliderInteraction\SliderInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\LayoutPanel\LayoutPanel.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 + dev\Materials\Backdrop\SystemBackdropComponent.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Reveal\RevealBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\MenuBar\MenuBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\MonochromaticOverlayPresenter\MonochromaticOverlayPresenter.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -810,6 +840,7 @@ Global dev\ScrollPresenter\ScrollPresenter.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ScrollView\ScrollView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SplitButton\SplitButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\SplitView\SplitView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SwipeControl\SwipeControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TabView\TabView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TeachingTip\TeachingTip.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -817,12 +848,15 @@ Global dev\TestHooks\TestHooks.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TreeView\TreeView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\TwoPaneView\TwoPaneView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\WebView2\WebView2.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\WebView2\WebView2.vcxitems*{ad144714-93fc-4281-b500-a5c2193dbc60}*SharedItemsImports = 9 dev\RadialGradientBrush\TestUI\RadialGradientBrush_TestUI.projitems*{ae308818-af18-48ba-bf33-89779083d297}*SharedItemsImports = 13 dev\TreeView\InteractionTests\TreeView_InteractionTests.projitems*{ae638a24-2bc6-4d4f-a51e-715d198f01fd}*SharedItemsImports = 13 dev\RatingControl\InteractionTests\RatingControl_InteractionTests.projitems*{afaad014-132c-4d2a-a28e-4ef717d3e647}*SharedItemsImports = 13 dev\PersonPicture\InteractionTests\PersonPicture_InteractionTests.projitems*{b0c15318-1f57-4914-b860-ebf248841511}*SharedItemsImports = 13 dev\PipsPager\InteractionTests\PipsPager_InteractionTests.projitems*{b1d8e6a2-3fe6-4d80-9685-26df2c9f4331}*SharedItemsImports = 13 dev\TreeView\TestUI\TreeView_TestUI.projitems*{b2c714dd-9c6b-400c-9cef-13a2d48378bd}*SharedItemsImports = 13 + dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{b2dbabb6-2ce4-49a4-84e8-4cbc6f4ba8ef}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\AnimatedVisualPlayer.vcxitems*{b39300d2-4510-44ea-aa7b-eda9118f830e}*SharedItemsImports = 9 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{b58ec806-9951-4e5e-af29-a700a088770e}*SharedItemsImports = 13 dev\SwipeControl\SwipeControl_APITests\SwipeControl_APITests.projitems*{b75d5d7e-6986-4500-972e-2c10a9b7cc10}*SharedItemsImports = 13 @@ -849,6 +883,7 @@ Global dev\PipsPager\PipsPager.vcxitems*{d1eb61d8-c689-4ad1-bd61-fdaa50362563}*SharedItemsImports = 9 dev\Expander\InteractionTests\Expander_InteractionTests.projitems*{d6df4ab9-facc-4e51-8c57-6b1f96919365}*SharedItemsImports = 13 dev\IconSource\APITests\IconSource_APITests.projitems*{d73627e9-564c-4a72-a12d-f6c82f17ad0d}*SharedItemsImports = 13 + dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{d83f60a3-eb44-46f2-8ee7-b28c90004e5f}*SharedItemsImports = 13 dev\SplitView\TestUI\SplitView_TestUI.projitems*{d8cea3b7-0012-4f74-b50f-b46e9a93c979}*SharedItemsImports = 13 dev\DropDownButton\InteractionTests\DropDownButton_InteractionTests.projitems*{d9ac3716-5608-40d0-999f-26f4b544be33}*SharedItemsImports = 13 dev\AnimatedIcon\APITests\AnimatedIcon_APITests.projitems*{db15ff28-ab3a-4fed-a1d5-004a095a3fd5}*SharedItemsImports = 13 @@ -879,10 +914,13 @@ Global dev\IconSource\APITests\IconSource_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Reveal\TestUI\Reveal_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\MenuBar\MenuBar_TestUI\MenuBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 @@ -932,11 +970,14 @@ Global dev\TreeView\TestUI\TreeView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\WebView2\TestUI\WebView2_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\Materials\Backdrop\InteractionTests\BackdropMaterial_InteractionTests.projitems*{e4e384ef-7a6c-4db4-9e59-2d9b45871544}*SharedItemsImports = 13 dev\CommandBarFlyout\TestUI\CommandBarFlyout_TestUI.projitems*{e63f1c1d-f06d-46a0-b5c2-184184e44f29}*SharedItemsImports = 13 dev\SplitButton\APITests\SplitButton_APITests.projitems*{e687c158-4c66-4ac5-8a1b-d095a82f1549}*SharedItemsImports = 13 dev\RadioButtons\RadioButtons.vcxitems*{e770a6d3-7252-4e8a-bd10-fa8524df8c83}*SharedItemsImports = 9 + dev\InfoBadge\InfoBadge.vcxitems*{e7dea84c-ccce-4458-8499-5182f67bc7ba}*SharedItemsImports = 9 dev\NavigationView\NavigationView_ApiTests\NavigationView_ApiTests.projitems*{e98f3da3-3c00-4f2e-bf3b-2d2ad9d176bc}*SharedItemsImports = 13 dev\ColorPicker\APITests\ColorPicker_APITests.projitems*{e9ac4938-ec2a-46d3-85bf-27316db8cc4d}*SharedItemsImports = 13 test\MUXControls.Test\MUXControls.Test.Shared.projitems*{e9fc52cd-519a-41bb-8092-523ffa9d5617}*SharedItemsImports = 13 @@ -973,10 +1014,13 @@ Global dev\IconSource\APITests\IconSource_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\InfoBadge\APITests\InfoBadge_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\Materials\Backdrop\TestUI\BackdropMaterial_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Reveal\TestUI\Reveal_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\MenuBar\MenuBar_TestUI\MenuBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 @@ -1026,6 +1070,7 @@ Global dev\TreeView\TestUI\TreeView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\WebView2\TestUI\WebView2_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\CommonManaged\CommonManaged.projitems*{fcc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\LayoutPanel\LayoutPanel.vcxitems*{fd3c1a00-0d07-4849-a3b9-646f0ff21d7b}*SharedItemsImports = 9 @@ -1101,8 +1146,6 @@ Global {92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Build.0 = Release|Win32 {92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Deploy.0 = Release|Win32 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.ActiveCfg = Debug_test|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Build.0 = Debug_test|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.ActiveCfg = Debug_test|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1111,8 +1154,6 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Build.0 = Debug_test|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Deploy.0 = Debug_test|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.ActiveCfg = Debug|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Build.0 = Debug|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Deploy.0 = Debug|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|arm64.ActiveCfg = Debug|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.ActiveCfg = Debug|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Build.0 = Debug|x64 @@ -1121,8 +1162,6 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Build.0 = Debug|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Deploy.0 = Debug|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.ActiveCfg = Release|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Build.0 = Release|ARM - {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Deploy.0 = Release|ARM {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|arm64.ActiveCfg = Release|arm64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.ActiveCfg = Release|x64 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Build.0 = Release|x64 @@ -1131,8 +1170,6 @@ Global {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Build.0 = Release|x86 {FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Deploy.0 = Release|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.ActiveCfg = Debug_test|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.Build.0 = Debug_test|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x64.ActiveCfg = Debug_test|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1141,8 +1178,6 @@ Global {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x86.Build.0 = Debug_test|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug_test|x86.Deploy.0 = Debug_test|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.ActiveCfg = Debug|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.Build.0 = Debug|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|ARM.Deploy.0 = Debug|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|arm64.ActiveCfg = Debug|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x64.ActiveCfg = Debug|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x64.Build.0 = Debug|x64 @@ -1151,8 +1186,6 @@ Global {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x86.Build.0 = Debug|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Debug|x86.Deploy.0 = Debug|x86 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.ActiveCfg = Release|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.Build.0 = Release|ARM - {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|ARM.Deploy.0 = Release|ARM {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|arm64.ActiveCfg = Release|arm64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|x64.ActiveCfg = Release|x64 {DEDC1E4F-CFA5-4443-83EB-E79D425DF7E7}.Release|x64.Build.0 = Release|x64 @@ -1235,8 +1268,6 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Build.0 = Debug_test|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Deploy.0 = Debug_test|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.ActiveCfg = Debug|ARM - {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Build.0 = Debug|ARM - {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM.Deploy.0 = Debug|ARM {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|arm64.ActiveCfg = Debug|arm64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.ActiveCfg = Debug|x64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Build.0 = Debug|x64 @@ -1245,8 +1276,6 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Build.0 = Debug|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Deploy.0 = Debug|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.ActiveCfg = Release|ARM - {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Build.0 = Release|ARM - {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM.Deploy.0 = Release|ARM {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|arm64.ActiveCfg = Release|arm64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.ActiveCfg = Release|x64 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Build.0 = Release|x64 @@ -1255,8 +1284,6 @@ Global {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Build.0 = Release|x86 {FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Deploy.0 = Release|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.ActiveCfg = Debug_test|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.Build.0 = Debug_test|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|ARM.Deploy.0 = Debug_test|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|arm64.ActiveCfg = Debug_test|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x64.ActiveCfg = Debug_test|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x64.Build.0 = Debug_test|x64 @@ -1265,8 +1292,6 @@ Global {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x86.Build.0 = Debug_test|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug_test|x86.Deploy.0 = Debug_test|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.ActiveCfg = Debug|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.Build.0 = Debug|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|ARM.Deploy.0 = Debug|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|arm64.ActiveCfg = Debug|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x64.ActiveCfg = Debug|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x64.Build.0 = Debug|x64 @@ -1275,8 +1300,6 @@ Global {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x86.Build.0 = Debug|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Debug|x86.Deploy.0 = Debug|x86 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.ActiveCfg = Release|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.Build.0 = Release|ARM - {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|ARM.Deploy.0 = Release|ARM {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|arm64.ActiveCfg = Release|arm64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|x64.ActiveCfg = Release|x64 {74F24BC4-794D-4CB2-8420-80FF7FDACFE9}.Release|x64.Build.0 = Release|x64 @@ -1642,6 +1665,18 @@ Global {7FA40D21-3085-41B3-9C46-6CBC2F56B442} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {D03847C1-7EE7-4423-82FD-3CB31DAF98D1} = {7FA40D21-3085-41B3-9C46-6CBC2F56B442} {52AAA6ED-E5A0-41BB-8858-66249333A8D4} = {7FA40D21-3085-41B3-9C46-6CBC2F56B442} + {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} = {414D2AE4-5B65-43E1-9C11-D94817835B3D} + {99AF040E-B77B-487D-9CC8-3334E1F1162A} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} + {B2DBABB6-2CE4-49A4-84E8-4CBC6F4BA8EF} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} + {E4E384EF-7A6C-4DB4-9E59-2D9B45871544} = {5693A4DE-E468-4EB1-86C2-1C3EEE4C75DC} + {C67BD98D-1228-4154-8EDA-2F8255BBA941} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {E7DEA84C-CCCE-4458-8499-5182F67BC7BA} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} + {D83F60A3-EB44-46F2-8EE7-B28C90004E5F} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} + {1F30CAC6-7EFB-4CE9-B119-64821C117CB9} = {C67BD98D-1228-4154-8EDA-2F8255BBA941} + {1E54C076-7240-463A-A1B1-404187ABCDEB} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {AD144714-93FC-4281-B500-A5C2193DBC60} = {1E54C076-7240-463A-A1B1-404187ABCDEB} + {3E535832-73B4-45B2-B550-34CB14B2C262} = {1E54C076-7240-463A-A1B1-404187ABCDEB} + {2B05A80E-7C01-449C-8345-7D3B3B2143E5} = {1E54C076-7240-463A-A1B1-404187ABCDEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED} From 68f734327e6dc6b42f6bb6afb15fbffd7e30b0d8 Mon Sep 17 00:00:00 2001 From: Stephen Peters Date: Wed, 22 Sep 2021 12:41:23 -0700 Subject: [PATCH 7/7] revert unchanged file --- FeatureAreas.props | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 FeatureAreas.props diff --git a/FeatureAreas.props b/FeatureAreas.props old mode 100644 new mode 100755