From 218dcd4b7a3fdb8ae0c1fd30a9c672c51ae725c7 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Mon, 19 Apr 2021 09:06:12 -0500 Subject: [PATCH] Add Control Gallery to WinUI solution (#737) * WinUI CG * - checkpoint compile 1 * - CG Core * - compatibility tests * - fix namespaces * - compile gallery * - Fix WinUI quirks * - GetForCurrentView * - fix some more MG * - fix up UI tests * - fix winui tests to start up window and then locate top window manually * - Namespaces --- Microsoft.Maui.WinUI.sln | 174 +++++++++++++++++- build.cake | 20 +- ...patibility.ControlGallery.Core-net6.csproj | 165 +++++++++++++++++ .../src/Issues.Shared/TestPages/TestPages.cs | 1 + .../src/UITests.Shared/Queries.cs | 1 - .../Assets/Fonts/Lobster-Regular.ttf | Bin .../Assets/Fonts/OFL.txt | 0 .../Assets/Fonts/fa-solid-900.ttf | Bin .../Assets/Fonts/ionicons.ttf | Bin .../Fonts/materialdesignicons-webfont.ttf | Bin .../Assets/LockScreenLogo.scale-200.png | Bin .../Assets/Logo.png | Bin .../Assets/SmallLogo.png | Bin .../Assets/SplashScreen.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Assets/StoreLogo.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../Assets/WideLogo.scale-100.png | Bin .../Assets/coverassets1.jpg | Bin ...ty.ControlGallery.WinUI (Package).wapproj} | 43 +++-- .../FlowerBuds.jpg | Bin .../Fruits.jpg | Bin .../GifOne.gif | Bin .../GifTwo.gif | Bin .../Legumes.jpg | Bin .../Package.appxmanifest | 6 +- .../Vegetables.jpg | Bin .../WebImages/XamarinLogo.png | Bin .../bank.png | Bin .../build/Microsoft.WinUI.AppX.targets | 0 .../calculator.png | Bin .../cardBackground.png | Bin .../coffee.png | Bin .../cover1.jpg | Bin .../cover1small.jpg | Bin .../crimson.jpg | Bin .../crimsonsmall.jpg | Bin .../default.css | 0 .../invalidimage.jpg | 0 .../menuIcon.png | Bin .../oasis.jpg | Bin .../oasissmall.jpg | Bin .../photo.jpg | Bin .../scale-100/bell.png | Bin .../scale-100/books.png | Bin .../scale-100/booksflyout.png | Bin .../scale-100/film.png | Bin .../scale-100/filmflyout.png | Bin .../scale-100/games.png | Bin .../scale-100/gamesflyout.png | Bin .../scale-100/gear.png | Bin .../scale-100/grid.png | Bin .../scale-100/headphone.png | Bin .../scale-100/headphoneflyout.png | Bin .../scale-100/home.png | Bin .../scale-100/homeflyout.png | Bin .../scale-100/loop.png | Bin .../scale-100/newspaper.png | Bin .../scale-100/newspaperflyout.png | Bin .../scale-100/person.png | Bin .../scale-100/star-flyout.png | Bin .../scale-100/star.png | Bin .../scale-200/bell.png | Bin .../scale-200/books.png | Bin .../scale-200/booksflyout.png | Bin .../scale-200/film.png | Bin .../scale-200/filmflyout.png | Bin .../scale-200/games.png | Bin .../scale-200/gamesflyout.png | Bin .../scale-200/gear.png | Bin .../scale-200/grid.png | Bin .../scale-200/headphone.png | Bin .../scale-200/headphoneflyout.png | Bin .../scale-200/home.png | Bin .../scale-200/homeflyout.png | Bin .../scale-200/loop.png | Bin .../scale-200/newspaper.png | Bin .../scale-200/newspaperflyout.png | Bin .../scale-200/person.png | Bin .../scale-200/star-flyout.png | Bin .../scale-200/star.png | Bin .../seth.png | Bin .../test.jpg | Bin .../toolbar_close.png | Bin .../xamarinlogo.png | Bin .../xamarinstore.jpg | Bin .../App.xaml | 6 +- .../App.xaml.cs | 8 +- .../AttachedStateEffectRenderer.cs | 10 +- .../BorderEffect.cs | 8 +- .../BrokenImageSourceHandler.cs | 10 +- .../BrokenNativeControl.cs | 4 +- .../Compatibility.ControlGallery.WinUI.csproj | 42 +++++ .../CustomRenderers.cs | 20 +- .../CustomSwitchRenderer.cs | 13 +- .../src/WinUI/Directory.Build.props | 8 + .../src/WinUI/Directory.Build.targets | 9 + .../DisposePageRenderer.cs | 8 +- .../FocusEffect.cs | 8 +- .../MainPage.xaml | 4 +- .../MainPage.xaml.cs | 23 +-- .../NavPageOverrideRenderer.cs | 19 +- .../PlatformSpecificCoreGalleryFactory.cs | 8 +- .../src/WinUI/Properties/AssemblyInfo.cs | 11 ++ .../Properties/default.rd.xml | 2 +- .../RegistrarValidationService.cs | 10 +- .../SampleNativeControl.cs | 10 +- .../SecondaryWindowService.cs | 10 +- .../Tests/PlatformTestSettings.cs | 8 +- .../Tests/TestingPlatformService.cs | 8 +- .../_13109IssueHelper.cs | 10 +- .../src/WinUI/_2489CustomRenderer.cs | 20 ++ .../_57114Renderer.cs | 11 +- .../_58406EffectRenderer.cs | 10 +- .../_5886DependencyService.cs | 12 +- .../_60122ImageRenderer.cs | 10 +- .../_9087CustomRenderer.cs | 8 +- .../ControlGallery/src/WinUI/app.manifest | 15 ++ .../local.html | 0 .../Directory.Build.targets | 3 - .../Properties/AssemblyInfo.cs | 11 -- ...rms.ControlGallery.WindowsUniversal.csproj | 39 ---- .../_2489CustomRenderer.cs | 20 -- .../WinDriverApp.cs | 6 +- .../WinQuery.cs | 2 +- .../WinUI.UITests.csproj} | 34 ++-- .../WindowsTestBase.cs | 47 ++++- .../WindowsTestServer.cs | 4 +- .../app.config | 8 +- .../readme.md | 0 .../Core/src/Compatibility-net6.csproj | 9 +- .../Core/src/Properties/AssemblyInfo.cs | 3 + .../src/{Windows => WinUI}/AccessKeyHelper.cs | 0 .../AccessibilityExtensions.cs | 0 .../ActivityIndicatorRenderer.cs | 5 +- .../src/{Windows => WinUI}/AlertDialog.cs | 0 .../{Windows => WinUI}/AlignmentExtensions.cs | 0 .../{Windows => WinUI}/BackgroundTracker.cs | 0 .../BoolToVisibilityConverter.cs | 0 .../src/{Windows => WinUI}/BootstrapHelper.cs | 0 .../BoxViewBorderRenderer.cs | 0 .../src/{Windows => WinUI}/BrushConverter.cs | 0 .../src/{Windows => WinUI}/BrushExtensions.cs | 0 .../src/{Windows => WinUI}/BrushHelpers.cs | 0 .../src/{Windows => WinUI}/ButtonRenderer.cs | 0 .../CarouselPageRenderer.cs | 0 .../src/{Windows => WinUI}/CaseConverter.cs | 0 .../src/{Windows => WinUI}/CellControl.cs | 0 .../{Windows => WinUI}/CheckBoxRenderer.cs | 0 .../CollapseWhenEmptyConverter.cs | 0 .../CollectionView/CarouselViewRenderer.cs | 0 .../CollectionView/CollectionViewRenderer.cs | 0 .../CollectionView/FormsGridView.cs | 0 .../CollectionView/FormsListView.cs | 0 .../GroupFooterItemTemplateContext.cs | 0 .../GroupHeaderStyleSelector.cs | 0 .../CollectionView/GroupTemplateContext.cs | 0 .../GroupableItemsViewRenderer.cs | 0 .../GroupedItemTemplateCollection.cs | 0 .../CollectionView/IEmptyView.cs | 0 .../CollectionView/ItemContentControl.cs | 0 .../CollectionView/ItemTemplateContext.cs | 0 .../ItemTemplateContextEnumerable.cs | 0 .../CollectionView/ItemTemplateContextList.cs | 0 .../CollectionView/ItemsViewRenderer.cs | 0 .../CollectionView/ItemsViewStyles.xaml | 0 .../CollectionView/LoopableCollectionView.cs | 0 .../ObservableItemTemplateCollection.cs | 0 .../CollectionView/ScrollHelpers.cs | 0 .../SelectableItemsViewRenderer.cs | 0 .../StructuredItemsViewRenderer.cs | 0 .../TemplatedItemSourceFactory.cs | 0 .../src/{Windows => WinUI}/ColorConverter.cs | 0 .../src/{Windows => WinUI}/ColorExtensions.cs | 0 .../Compatibility.UAP.csproj | 0 .../{Windows => WinUI}/CompositionHelper.cs | 0 .../{Windows => WinUI}/DatePickerRenderer.cs | 0 .../src/{Windows => WinUI}/DefaultRenderer.cs | 0 .../{Windows => WinUI}/Directory.Build.Props | 0 .../Directory.Build.targets | 0 .../Core/src/{Windows => WinUI}/Dispatcher.cs | 0 .../{Windows => WinUI}/DispatcherProvider.cs | 0 .../DualScreen/IDualScreenService.cs | 0 .../src/{Windows => WinUI}/EditorRenderer.cs | 0 .../{Windows => WinUI}/ElementExtensions.cs | 0 .../{Windows => WinUI}/EmbeddedFontLoader.cs | 0 .../{Windows => WinUI}/EntryCellTextBox.cs | 0 .../src/{Windows => WinUI}/EntryRenderer.cs | 0 .../ExportRendererAttribute.cs | 0 .../Core/src/{Windows => WinUI}/Extensions.cs | 0 .../Extensions/AspectExtensions.cs | 0 .../Extensions/ClipExtensions.cs | 0 .../Extensions/ImageExtensions.cs | 0 .../Extensions/TextBlockExtensions.cs | 0 .../Extensions/TransformExtensions.cs | 0 .../Extensions/WinUIHelpers.cs | 0 .../FileImageSourceHandler.cs | 0 .../Core/src/{Windows => WinUI}/Flags.cs | 0 .../FlowDirectionExtensions.cs | 0 .../{Windows => WinUI}/FlyoutPageControl.cs | 0 .../FlyoutPageControlStyle.xaml | 0 .../{Windows => WinUI}/FlyoutPageRenderer.cs | 0 .../src/{Windows => WinUI}/FontExtensions.cs | 0 .../FontImageSourceHandler.cs | 0 .../Core/src/{Windows => WinUI}/Forms.cs | 7 +- .../FormsAutoSuggestBoxStyle.xaml | 0 .../src/{Windows => WinUI}/FormsButton.cs | 0 .../{Windows => WinUI}/FormsCancelButton.cs | 0 .../src/{Windows => WinUI}/FormsCheckBox.cs | 0 .../FormsCheckBoxStyle.xaml | 0 .../src/{Windows => WinUI}/FormsComboBox.cs | 0 .../src/{Windows => WinUI}/FormsCommandBar.cs | 0 .../FormsCommandBarStyle.xaml | 0 .../FormsEmbeddedPageWrapper.xaml | 0 .../src/{Windows => WinUI}/FormsFlyout.xaml | 0 .../{Windows => WinUI}/FormsFlyout.xaml.cs | 0 .../Core/src/{Windows => WinUI}/FormsPivot.cs | 0 .../src/{Windows => WinUI}/FormsPresenter.cs | 0 .../{Windows => WinUI}/FormsProgressBar.cs | 0 .../FormsProgressBarStyle.xaml | 0 .../{Windows => WinUI}/FormsRadioButton.cs | 0 .../src/{Windows => WinUI}/FormsSlider.cs | 0 .../src/{Windows => WinUI}/FormsTextBox.cs | 0 .../{Windows => WinUI}/FormsTextBoxStyle.xaml | 0 .../Core/src/{Windows => WinUI}/FormsUWP.cs | 0 .../src/{Windows => WinUI}/FrameRenderer.cs | 0 .../FrameworkElementExtensions.cs | 0 .../{Windows => WinUI}/GeometryExtensions.cs | 0 .../HandlerToRendererShim.cs | 0 .../src/{Windows => WinUI}/HeightConverter.cs | 0 .../HorizontalTextAlignmentConverter.cs | 0 .../src/{Windows => WinUI}/ICellRenderer.cs | 0 .../src/{Windows => WinUI}/IDontGetFocus.cs | 0 .../{Windows => WinUI}/IIconElementHandler.cs | 0 .../{Windows => WinUI}/IImageSourceHandler.cs | 0 .../IImageVisualElementRenderer.cs | 0 .../ITabStopOnDescendants.cs | 0 .../{Windows => WinUI}/ITitleIconProvider.cs | 0 .../src/{Windows => WinUI}/ITitleProvider.cs | 0 .../{Windows => WinUI}/ITitleViewProvider.cs | 0 .../ITitleViewRendererController.cs | 0 .../IToolBarForegroundBinder.cs | 0 .../{Windows => WinUI}/IToolbarProvider.cs | 0 .../IVisualElementRenderer.cs | 0 .../IVisualNativeElementRenderer.cs | 0 .../{Windows => WinUI}/ImageButtonRenderer.cs | 0 .../src/{Windows => WinUI}/ImageConverter.cs | 0 .../{Windows => WinUI}/ImageElementManager.cs | 0 .../src/{Windows => WinUI}/ImageRenderer.cs | 0 .../ImageSourceIconElementConverter.cs | 0 .../IndicatorViewRenderer.cs | 0 .../InterceptVisualStateManager.cs | 0 .../{Windows => WinUI}/KeyboardConverter.cs | 0 .../{Windows => WinUI}/KeyboardExtensions.cs | 0 .../src/{Windows => WinUI}/LabelHtmlHelper.cs | 0 .../src/{Windows => WinUI}/LabelRenderer.cs | 0 .../{Windows => WinUI}/LayoutExtensions.cs | 0 .../src/{Windows => WinUI}/LayoutRenderer.cs | 0 .../ListGroupHeaderPresenter.cs | 0 .../ListViewGroupStyleSelector.cs | 0 .../{Windows => WinUI}/ListViewRenderer.cs | 0 .../MasterBackgroundConverter.cs | 0 .../MasterDetailControlStyle.xaml | 0 .../src/{Windows => WinUI}/MenuItemCommand.cs | 0 .../NativeBindingExtensions.cs | 0 .../NativeBindingService.cs | 0 .../{Windows => WinUI}/NativeEventWrapper.cs | 0 .../NativePropertyListener.cs | 0 .../NativeValueConverterService.cs | 0 .../{Windows => WinUI}/NativeViewWrapper.cs | 0 .../NativeViewWrapperRenderer.cs | 0 .../NavigationPageRenderer.cs | 16 +- .../src/{Windows => WinUI}/PageControl.cs | 0 .../{Windows => WinUI}/PageControlStyle.xaml | 0 .../src/{Windows => WinUI}/PageExtensions.cs | 0 .../src/{Windows => WinUI}/PageRenderer.cs | 0 .../PageToRenderedElementConverter.cs | 0 .../src/{Windows => WinUI}/PickerRenderer.cs | 0 .../src/{Windows => WinUI}/PickerStyle.xaml | 0 .../Core/src/{Windows => WinUI}/Platform.cs | 7 +- .../PlatformConfigurationExtensions.cs | 0 .../src/{Windows => WinUI}/PlatformEffect.cs | 0 .../PointCollectionExtensions.cs | 0 .../src/{Windows => WinUI}/PointExtensions.cs | 0 .../{Windows => WinUI}/ProgressBarRenderer.cs | 0 .../src/{Windows => WinUI}/PromptDialog.xaml | 0 .../{Windows => WinUI}/PromptDialog.xaml.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Xamarin.Forms.Platform.UAP.rd.xml | 0 .../PropertyChangedEventArgsExtensions.cs | 0 .../{Windows => WinUI}/RadioButtonRenderer.cs | 0 .../{Windows => WinUI}/RefreshViewRenderer.cs | 0 .../RendererToHandlerShim.cs | 0 .../src/{Windows => WinUI}/Resources.xaml | 2 +- .../{Windows => WinUI}/ScrollViewRenderer.cs | 0 .../{Windows => WinUI}/SearchBarRenderer.cs | 0 .../Shapes/EllipseRenderer.cs | 0 .../{Windows => WinUI}/Shapes/LineRenderer.cs | 0 .../{Windows => WinUI}/Shapes/PathRenderer.cs | 0 .../Shapes/PolygonRenderer.cs | 0 .../Shapes/PolylineRenderer.cs | 0 .../Shapes/RectangleRenderer.cs | 0 .../Shapes/ShapeRenderer.cs | 0 .../Shell/ShellFlyoutItemRenderer.cs | 0 .../Shell/ShellFlyoutSeparator.cs | 0 .../Shell/ShellFlyoutTemplateSelector.cs | 0 .../Shell/ShellFooterRenderer.cs | 0 .../Shell/ShellHeaderRenderer.cs | 0 .../Shell/ShellItemRenderer.cs | 0 .../Shell/ShellPageWrapper.xaml | 0 .../Shell/ShellPageWrapper.xaml.cs | 0 .../{Windows => WinUI}/Shell/ShellRenderer.cs | 18 +- .../Shell/ShellSectionRenderer.cs | 0 .../Shell/ShellSplitView.cs | 0 .../{Windows => WinUI}/Shell/ShellStyles.xaml | 0 .../Shell/ShellToolbarItemRenderer.cs | 0 .../src/{Windows => WinUI}/SliderRenderer.cs | 0 .../src/{Windows => WinUI}/SliderStyle.xaml | 0 .../src/{Windows => WinUI}/StepperControl.cs | 0 .../src/{Windows => WinUI}/StepperRenderer.cs | 0 .../StreamImagesourceHandler.cs | 0 .../{Windows => WinUI}/SwipeViewRenderer.cs | 0 .../src/{Windows => WinUI}/SwitchRenderer.cs | 0 .../{Windows => WinUI}/TabbedPageRenderer.cs | 0 .../{Windows => WinUI}/TabbedPageStyle.xaml | 0 .../{Windows => WinUI}/TableViewRenderer.cs | 0 .../src/{Windows => WinUI}/TaskExtensions.cs | 0 ...AlignmentToHorizontalAlignmentConverter.cs | 0 .../{Windows => WinUI}/TextBlockExtensions.cs | 0 .../{Windows => WinUI}/TextCellRenderer.cs | 0 .../{Windows => WinUI}/TimePickerRenderer.cs | 0 .../{Windows => WinUI}/TitleViewManager.cs | 0 .../ToolbarPlacementHelper.cs | 0 .../UriImageSourceHandler.cs | 0 .../src/{Windows => WinUI}/ViewExtensions.cs | 0 .../src/{Windows => WinUI}/ViewRenderer.cs | 0 .../ViewToRendererConverter.cs | 0 .../VisualElementChangedEventArgs.cs | 0 .../VisualElementExtensions.cs | 0 .../VisualElementPackager.cs | 0 .../VisualElementRenderer.cs | 0 .../VisualElementTracker.cs | 0 .../src/{Windows => WinUI}/WebViewRenderer.cs | 0 .../Win2DNotImplementedException.cs | 0 .../src/{Windows => WinUI}/WindowsBasePage.cs | 0 .../WindowsBasePlatformServices.cs | 0 .../{Windows => WinUI}/WindowsDeviceInfo.cs | 22 ++- .../WindowsExpressionSearch.cs | 0 .../WindowsIsolatedStorage.cs | 0 .../src/{Windows => WinUI}/WindowsPage.cs | 0 .../src/{Windows => WinUI}/WindowsPlatform.cs | 0 .../WindowsPlatformServices.cs | 0 .../WindowsResourcesProvider.cs | 0 .../{Windows => WinUI}/WindowsSerializer.cs | 0 .../src/{Windows => WinUI}/WindowsTicker.cs | 0 .../{UAP => WinUI}/BackgroundColorTests.cs | 5 +- .../Core/tests/{UAP => WinUI}/ColorTests.cs | 7 +- .../Compatibility.Windows.UnitTests.csproj} | 20 +- .../tests/{UAP => WinUI}/EmbeddingTests.cs | 0 .../{UAP => WinUI}/FlowDirectionTests.cs | 0 .../tests/{UAP => WinUI}/IsEnabledTests.cs | 0 .../{UAP => WinUI}/PlatformTestFixture.cs | 0 ...amarin.Forms.Platform.UAP.UnitTests.rd.xml | 0 .../tests/{UAP => WinUI}/RendererTests.cs | 0 .../tests/{UAP => WinUI}/RotationTests.cs | 0 .../Core/tests/{UAP => WinUI}/ScaleTests.cs | 0 .../ScrollBarVisibilityTests.cs | 0 .../Core/tests/{UAP => WinUI}/ShellTests.cs | 0 .../{UAP => WinUI}/TransformationTests.cs | 0 .../Maps/src/Controls.Maps-net6.csproj | 15 ++ .../src/Core/Properties/AssemblyInfo.cs | 2 + src/Core/src/Fonts/FontManager.Windows.cs | 4 +- 375 files changed, 779 insertions(+), 310 deletions(-) create mode 100644 src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Fonts/Lobster-Regular.ttf (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Fonts/OFL.txt (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Fonts/fa-solid-900.ttf (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Fonts/ionicons.ttf (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Fonts/materialdesignicons-webfont.ttf (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/LockScreenLogo.scale-200.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Logo.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/SmallLogo.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/SplashScreen.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/SplashScreen.scale-200.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Square150x150Logo.scale-200.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Square44x44Logo.scale-200.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/StoreLogo.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/Wide310x150Logo.scale-200.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/WideLogo.scale-100.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Assets/coverassets1.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Xamarin.Forms.ControlGallery.WindowsUniversal (Package).wapproj => WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj} (85%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/FlowerBuds.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Fruits.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/GifOne.gif (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/GifTwo.gif (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Legumes.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Package.appxmanifest (86%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/Vegetables.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/WebImages/XamarinLogo.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/bank.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/build/Microsoft.WinUI.AppX.targets (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/calculator.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/cardBackground.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/coffee.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/cover1.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/cover1small.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/crimson.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/crimsonsmall.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/default.css (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/invalidimage.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/menuIcon.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/oasis.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/oasissmall.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/photo.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/bell.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/books.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/booksflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/film.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/filmflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/games.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/gamesflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/gear.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/grid.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/headphone.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/headphoneflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/home.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/homeflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/loop.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/newspaper.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/newspaperflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/person.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/star-flyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-100/star.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/bell.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/books.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/booksflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/film.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/filmflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/games.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/gamesflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/gear.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/grid.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/headphone.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/headphoneflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/home.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/homeflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/loop.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/newspaper.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/newspaperflyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/person.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/star-flyout.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/scale-200/star.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/seth.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/test.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/toolbar_close.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/xamarinlogo.png (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal (Package) => WinUI (Package)}/xamarinstore.jpg (100%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/App.xaml (61%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/App.xaml.cs (92%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/AttachedStateEffectRenderer.cs (62%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/BorderEffect.cs (76%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/BrokenImageSourceHandler.cs (70%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/BrokenNativeControl.cs (92%) create mode 100644 src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/CustomRenderers.cs (90%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/CustomSwitchRenderer.cs (83%) create mode 100644 src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props create mode 100644 src/Compatibility/ControlGallery/src/WinUI/Directory.Build.targets rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/DisposePageRenderer.cs (73%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/FocusEffect.cs (77%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/MainPage.xaml (70%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/MainPage.xaml.cs (90%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/NavPageOverrideRenderer.cs (62%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/PlatformSpecificCoreGalleryFactory.cs (60%) create mode 100644 src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/Properties/default.rd.xml (92%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/RegistrarValidationService.cs (66%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/SampleNativeControl.cs (61%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/SecondaryWindowService.cs (77%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/Tests/PlatformTestSettings.cs (70%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/Tests/TestingPlatformService.cs (57%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_13109IssueHelper.cs (69%) create mode 100644 src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_57114Renderer.cs (71%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_58406EffectRenderer.cs (51%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_5886DependencyService.cs (55%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_60122ImageRenderer.cs (69%) rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/_9087CustomRenderer.cs (57%) create mode 100644 src/Compatibility/ControlGallery/src/WinUI/app.manifest rename src/Compatibility/ControlGallery/src/{Xamarin.Forms.ControlGallery.WindowsUniversal => WinUI}/local.html (100%) delete mode 100644 src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets delete mode 100644 src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs delete mode 100644 src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj delete mode 100644 src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/WinDriverApp.cs (99%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/WinQuery.cs (96%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj => WinUI.UITests/WinUI.UITests.csproj} (76%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/WindowsTestBase.cs (54%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/WindowsTestServer.cs (89%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/app.config (61%) rename src/Compatibility/ControlGallery/test/{Xamarin.Forms.Core.Windows.UITests => WinUI.UITests}/readme.md (100%) create mode 100644 src/Compatibility/Core/src/Properties/AssemblyInfo.cs rename src/Compatibility/Core/src/{Windows => WinUI}/AccessKeyHelper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/AccessibilityExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ActivityIndicatorRenderer.cs (88%) rename src/Compatibility/Core/src/{Windows => WinUI}/AlertDialog.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/AlignmentExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BackgroundTracker.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BoolToVisibilityConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BootstrapHelper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BoxViewBorderRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BrushConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BrushExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/BrushHelpers.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ButtonRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CarouselPageRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CaseConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CellControl.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CheckBoxRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollapseWhenEmptyConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/CarouselViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/CollectionViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/FormsGridView.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/FormsListView.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/GroupFooterItemTemplateContext.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/GroupHeaderStyleSelector.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/GroupTemplateContext.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/GroupableItemsViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/GroupedItemTemplateCollection.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/IEmptyView.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemContentControl.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemTemplateContext.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemTemplateContextEnumerable.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemTemplateContextList.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemsViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ItemsViewStyles.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/LoopableCollectionView.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ObservableItemTemplateCollection.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/ScrollHelpers.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/SelectableItemsViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/StructuredItemsViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CollectionView/TemplatedItemSourceFactory.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ColorConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ColorExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Compatibility.UAP.csproj (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/CompositionHelper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/DatePickerRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/DefaultRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Directory.Build.Props (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Directory.Build.targets (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Dispatcher.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/DispatcherProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/DualScreen/IDualScreenService.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/EditorRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ElementExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/EmbeddedFontLoader.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/EntryCellTextBox.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/EntryRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ExportRendererAttribute.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/AspectExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/ClipExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/ImageExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/TextBlockExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/TransformExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Extensions/WinUIHelpers.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FileImageSourceHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Flags.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FlowDirectionExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FlyoutPageControl.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FlyoutPageControlStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FlyoutPageRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FontExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FontImageSourceHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Forms.cs (97%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsAutoSuggestBoxStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsButton.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsCancelButton.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsCheckBox.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsCheckBoxStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsComboBox.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsCommandBar.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsCommandBarStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsEmbeddedPageWrapper.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsFlyout.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsFlyout.xaml.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsPivot.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsPresenter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsProgressBar.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsProgressBarStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsRadioButton.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsSlider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsTextBox.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsTextBoxStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FormsUWP.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FrameRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/FrameworkElementExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/GeometryExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/HandlerToRendererShim.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/HeightConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/HorizontalTextAlignmentConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ICellRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IDontGetFocus.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IIconElementHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IImageSourceHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IImageVisualElementRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ITabStopOnDescendants.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ITitleIconProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ITitleProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ITitleViewProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ITitleViewRendererController.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IToolBarForegroundBinder.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IToolbarProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IVisualElementRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IVisualNativeElementRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ImageButtonRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ImageConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ImageElementManager.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ImageRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ImageSourceIconElementConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/IndicatorViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/InterceptVisualStateManager.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/KeyboardConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/KeyboardExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/LabelHtmlHelper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/LabelRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/LayoutExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/LayoutRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ListGroupHeaderPresenter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ListViewGroupStyleSelector.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ListViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/MasterBackgroundConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/MasterDetailControlStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/MenuItemCommand.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeBindingExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeBindingService.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeEventWrapper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativePropertyListener.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeValueConverterService.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeViewWrapper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NativeViewWrapperRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/NavigationPageRenderer.cs (97%) rename src/Compatibility/Core/src/{Windows => WinUI}/PageControl.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PageControlStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PageExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PageRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PageToRenderedElementConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PickerRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PickerStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Platform.cs (99%) rename src/Compatibility/Core/src/{Windows => WinUI}/PlatformConfigurationExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PlatformEffect.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PointCollectionExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PointExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ProgressBarRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PromptDialog.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PromptDialog.xaml.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Properties/AssemblyInfo.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Properties/Xamarin.Forms.Platform.UAP.rd.xml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/PropertyChangedEventArgsExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/RadioButtonRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/RefreshViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/RendererToHandlerShim.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Resources.xaml (99%) rename src/Compatibility/Core/src/{Windows => WinUI}/ScrollViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/SearchBarRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/EllipseRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/LineRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/PathRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/PolygonRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/PolylineRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/RectangleRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shapes/ShapeRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellFlyoutItemRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellFlyoutSeparator.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellFlyoutTemplateSelector.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellFooterRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellHeaderRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellItemRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellPageWrapper.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellPageWrapper.xaml.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellRenderer.cs (96%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellSectionRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellSplitView.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellStyles.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Shell/ShellToolbarItemRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/SliderRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/SliderStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/StepperControl.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/StepperRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/StreamImagesourceHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/SwipeViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/SwitchRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TabbedPageRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TabbedPageStyle.xaml (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TableViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TaskExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TextAlignmentToHorizontalAlignmentConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TextBlockExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TextCellRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TimePickerRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/TitleViewManager.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ToolbarPlacementHelper.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/UriImageSourceHandler.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ViewExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/ViewToRendererConverter.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/VisualElementChangedEventArgs.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/VisualElementExtensions.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/VisualElementPackager.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/VisualElementRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/VisualElementTracker.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WebViewRenderer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/Win2DNotImplementedException.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsBasePage.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsBasePlatformServices.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsDeviceInfo.cs (81%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsExpressionSearch.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsIsolatedStorage.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsPage.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsPlatform.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsPlatformServices.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsResourcesProvider.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsSerializer.cs (100%) rename src/Compatibility/Core/src/{Windows => WinUI}/WindowsTicker.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/BackgroundColorTests.cs (94%) rename src/Compatibility/Core/tests/{UAP => WinUI}/ColorTests.cs (71%) rename src/Compatibility/Core/tests/{UAP/Compatibility.UAP.UnitTests.csproj => WinUI/Compatibility.Windows.UnitTests.csproj} (92%) rename src/Compatibility/Core/tests/{UAP => WinUI}/EmbeddingTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/FlowDirectionTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/IsEnabledTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/PlatformTestFixture.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/Properties/Xamarin.Forms.Platform.UAP.UnitTests.rd.xml (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/RendererTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/RotationTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/ScaleTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/ScrollBarVisibilityTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/ShellTests.cs (100%) rename src/Compatibility/Core/tests/{UAP => WinUI}/TransformationTests.cs (100%) create mode 100644 src/Controls/Maps/src/Controls.Maps-net6.csproj diff --git a/Microsoft.Maui.WinUI.sln b/Microsoft.Maui.WinUI.sln index 55d71aa4b44f..99527341ad85 100644 --- a/Microsoft.Maui.WinUI.sln +++ b/Microsoft.Maui.WinUI.sln @@ -50,7 +50,44 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorWebView", "BlazorWebV EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Maui", "src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{BEC57018-9B33-417B-A3A8-F8F154218C61}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Maps-net6", "src\Controls\Maps\src\Controls.Maps-net6.csproj", "{DE354790-6107-468A-B388-E1EFF1416240}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ControlGallery", "ControlGallery", "{802AA31E-051C-482F-9CA2-3F8FB11C251E}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.ControlGallery.Issues.Shared", "src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.shproj", "{AE2513CB-4E5E-4E5C-8237-88954D4C9433}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core-net6", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core-net6.csproj", "{63FFAE7F-72CE-4458-8C28-5D7733804816}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E26E6C2A-F5A2-4FEF-BFDA-57ABA0F77D08}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.CustomAttributes", "src\Controls\tests\CustomAttributes\Controls.CustomAttributes.csproj", "{F918CD6C-0A26-4D04-AB22-AF02C4D615A3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C481AFC-E327-41A7-9FED-395519E6B4AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3E56DEAA-CB3F-4905-BD59-8B3D31D04499}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Windows.UnitTests", "src\Compatibility\Core\tests\WinUI\Compatibility.Windows.UnitTests.csproj", "{ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.WinUI", "src\Compatibility\ControlGallery\src\WinUI\Compatibility.ControlGallery.WinUI.csproj", "{6721124F-9975-4486-9FE7-263184E16061}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Compatibility.ControlGallery.WinUI (Package)", "src\Compatibility\ControlGallery\src\WinUI (Package)\Compatibility.ControlGallery.WinUI (Package).wapproj", "{9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3870B28-291A-4DD8-862A-6ADC632E09D0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{10F4E7CB-E20E-4393-BD88-FD7075AC4525}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.UITests.Shared", "src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.UITests", "src\Compatibility\ControlGallery\test\WinUI.UITests\WinUI.UITests.csproj", "{0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}" +EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 + src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4 + src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{63ffae7f-72ce-4458-8c28-5d7733804816}*SharedItemsImports = 5 + src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13 + src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|arm64 = Debug|arm64 @@ -180,7 +217,8 @@ Global {CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|x64.Build.0 = Release|Any CPU {CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|x86.ActiveCfg = Release|Any CPU {CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|x86.Build.0 = Release|Any CPU - {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|Any CPU.ActiveCfg = Debug|x64 + {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|Any CPU.Build.0 = Debug|x64 {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|arm64.ActiveCfg = Debug|arm64 {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|arm64.Build.0 = Debug|arm64 {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Debug|x64.ActiveCfg = Debug|x64 @@ -194,7 +232,7 @@ Global {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Release|x64.Build.0 = Release|x64 {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Release|x86.ActiveCfg = Release|x86 {B82F17CF-3D08-4D07-BF86-DF48D89E0B53}.Release|x86.Build.0 = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|Any CPU.ActiveCfg = Debug|x64 {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|arm64.ActiveCfg = Debug|arm64 {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|arm64.Build.0 = Debug|arm64 {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -262,6 +300,121 @@ Global {BEC57018-9B33-417B-A3A8-F8F154218C61}.Release|x64.Build.0 = Release|Any CPU {BEC57018-9B33-417B-A3A8-F8F154218C61}.Release|x86.ActiveCfg = Release|Any CPU {BEC57018-9B33-417B-A3A8-F8F154218C61}.Release|x86.Build.0 = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|arm64.ActiveCfg = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|arm64.Build.0 = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|x64.ActiveCfg = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|x64.Build.0 = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|x86.ActiveCfg = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Debug|x86.Build.0 = Debug|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|Any CPU.Build.0 = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|arm64.ActiveCfg = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|arm64.Build.0 = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|x64.ActiveCfg = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|x64.Build.0 = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|x86.ActiveCfg = Release|Any CPU + {DE354790-6107-468A-B388-E1EFF1416240}.Release|x86.Build.0 = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|arm64.ActiveCfg = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|arm64.Build.0 = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|x64.ActiveCfg = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|x64.Build.0 = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|x86.ActiveCfg = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Debug|x86.Build.0 = Debug|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|Any CPU.Build.0 = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|arm64.ActiveCfg = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|arm64.Build.0 = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|x64.ActiveCfg = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|x64.Build.0 = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|x86.ActiveCfg = Release|Any CPU + {63FFAE7F-72CE-4458-8C28-5D7733804816}.Release|x86.Build.0 = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|arm64.ActiveCfg = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|arm64.Build.0 = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|x64.ActiveCfg = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|x64.Build.0 = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|x86.ActiveCfg = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Debug|x86.Build.0 = Debug|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|Any CPU.Build.0 = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|arm64.ActiveCfg = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|arm64.Build.0 = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|x64.ActiveCfg = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|x64.Build.0 = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|x86.ActiveCfg = Release|Any CPU + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3}.Release|x86.Build.0 = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|arm64.ActiveCfg = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|arm64.Build.0 = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|x64.ActiveCfg = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|x64.Build.0 = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|x86.ActiveCfg = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Debug|x86.Build.0 = Debug|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|Any CPU.Build.0 = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|arm64.ActiveCfg = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|arm64.Build.0 = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|x64.ActiveCfg = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|x64.Build.0 = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|x86.ActiveCfg = Release|Any CPU + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB}.Release|x86.Build.0 = Release|Any CPU + {6721124F-9975-4486-9FE7-263184E16061}.Debug|Any CPU.ActiveCfg = Debug|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|Any CPU.Build.0 = Debug|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|arm64.ActiveCfg = Debug|arm64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|arm64.Build.0 = Debug|arm64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|x64.ActiveCfg = Debug|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|x64.Build.0 = Debug|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|x86.ActiveCfg = Debug|x86 + {6721124F-9975-4486-9FE7-263184E16061}.Debug|x86.Build.0 = Debug|x86 + {6721124F-9975-4486-9FE7-263184E16061}.Release|Any CPU.ActiveCfg = Release|x86 + {6721124F-9975-4486-9FE7-263184E16061}.Release|arm64.ActiveCfg = Release|arm64 + {6721124F-9975-4486-9FE7-263184E16061}.Release|arm64.Build.0 = Release|arm64 + {6721124F-9975-4486-9FE7-263184E16061}.Release|x64.ActiveCfg = Release|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Release|x64.Build.0 = Release|x64 + {6721124F-9975-4486-9FE7-263184E16061}.Release|x86.ActiveCfg = Release|x86 + {6721124F-9975-4486-9FE7-263184E16061}.Release|x86.Build.0 = Release|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|Any CPU.ActiveCfg = Debug|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|arm64.ActiveCfg = Debug|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|arm64.Build.0 = Debug|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|arm64.Deploy.0 = Debug|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x64.ActiveCfg = Debug|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x64.Build.0 = Debug|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x64.Deploy.0 = Debug|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x86.ActiveCfg = Debug|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x86.Build.0 = Debug|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Debug|x86.Deploy.0 = Debug|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|Any CPU.ActiveCfg = Release|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|arm64.ActiveCfg = Release|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|arm64.Build.0 = Release|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|arm64.Deploy.0 = Release|arm64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x64.ActiveCfg = Release|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x64.Build.0 = Release|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x64.Deploy.0 = Release|x64 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x86.ActiveCfg = Release|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x86.Build.0 = Release|x86 + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6}.Release|x86.Deploy.0 = Release|x86 + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|arm64.ActiveCfg = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|arm64.Build.0 = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x64.ActiveCfg = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x64.Build.0 = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x86.ActiveCfg = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Debug|x86.Build.0 = Debug|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|Any CPU.Build.0 = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|arm64.ActiveCfg = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|arm64.Build.0 = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x64.ActiveCfg = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x64.Build.0 = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x86.ActiveCfg = Release|Any CPU + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -269,7 +422,7 @@ Global GlobalSection(NestedProjects) = preSolution {95BA42B5-B00E-4986-B9B5-517140378452} = {9F94CF92-5808-45B4-B08B-6E1B65389AD8} {AF64451F-E2BD-41C2-B083-F60C26AE2A9F} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} - {00A11C2F-969F-4964-8557-91ADF4B1523D} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2} + {00A11C2F-969F-4964-8557-91ADF4B1523D} = {3E56DEAA-CB3F-4905-BD59-8B3D31D04499} {E1082E26-D700-4127-9329-66D673FD2D55} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} {B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55} {75C380E0-CE53-4C01-B89F-CF685331DE18} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} @@ -282,6 +435,21 @@ Global {CAD6061F-A1B1-41B3-B906-6C6C0BD850EE} = {44510C11-7CBF-4FE4-9F23-AE1FEE743522} {CB3EEB1E-311B-4BF6-9E1A-9CEF74200448} = {5774C01E-9D4D-47C0-BECD-1564EDE70926} {BEC57018-9B33-417B-A3A8-F8F154218C61} = {17CD1D1D-B4EA-4E7E-ABEF-945AC320936B} + {DE354790-6107-468A-B388-E1EFF1416240} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} + {802AA31E-051C-482F-9CA2-3F8FB11C251E} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2} + {AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {C3870B28-291A-4DD8-862A-6ADC632E09D0} + {63FFAE7F-72CE-4458-8C28-5D7733804816} = {C3870B28-291A-4DD8-862A-6ADC632E09D0} + {E26E6C2A-F5A2-4FEF-BFDA-57ABA0F77D08} = {459BF674-83CB-46F6-881F-A2D2117DBF4D} + {F918CD6C-0A26-4D04-AB22-AF02C4D615A3} = {E26E6C2A-F5A2-4FEF-BFDA-57ABA0F77D08} + {5C481AFC-E327-41A7-9FED-395519E6B4AF} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2} + {3E56DEAA-CB3F-4905-BD59-8B3D31D04499} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2} + {ADAA2498-16D1-4A1E-ADAA-9F46967FADDB} = {5C481AFC-E327-41A7-9FED-395519E6B4AF} + {6721124F-9975-4486-9FE7-263184E16061} = {C3870B28-291A-4DD8-862A-6ADC632E09D0} + {9784DA17-DAEF-455C-8CFB-BA4B4119C1B6} = {C3870B28-291A-4DD8-862A-6ADC632E09D0} + {C3870B28-291A-4DD8-862A-6ADC632E09D0} = {802AA31E-051C-482F-9CA2-3F8FB11C251E} + {10F4E7CB-E20E-4393-BD88-FD7075AC4525} = {802AA31E-051C-482F-9CA2-3F8FB11C251E} + {E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {10F4E7CB-E20E-4393-BD88-FD7075AC4525} + {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF} = {10F4E7CB-E20E-4393-BD88-FD7075AC4525} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50} diff --git a/build.cake b/build.cake index 5fb5488e21e8..6a900f996297 100644 --- a/build.cake +++ b/build.cake @@ -933,6 +933,12 @@ Task("VS") .IsDependentOn("VSMAC") .IsDependentOn("VSWINDOWS"); +Task("VS-CG") + .Description("Builds projects necessary so solution compiles on VS") + .IsDependentOn("Clean") + .IsDependentOn("VSMAC") + .IsDependentOn("VSWINDOWS"); + Task("VSWINDOWS") .Description("Builds projects necessary so solution compiles on VS Windows") @@ -940,11 +946,15 @@ Task("VSWINDOWS") .WithCriteria(IsRunningOnWindows()) .Does(() => { - MSBuild("Microsoft.Maui.sln", + string sln = "Microsoft.Maui.sln"; + if (target == "VS-CG") + sln = "Compatibility.ControlGallery.sln"; + + MSBuild(sln, GetMSBuildSettings() .WithRestore()); - StartVisualStudio(); + StartVisualStudio(sln); }); Task("VSMAC") @@ -953,6 +963,10 @@ Task("VSMAC") .IsDependentOn("BuildTasks") .Does(() => { + + string sln = "Microsoft.Maui.sln"; + if (target == "VS-CG") + sln = "Compatibility.ControlGallery.sln"; MSBuild("src/Core/src/Core.csproj", GetMSBuildSettings() @@ -972,7 +986,7 @@ Task("VSMAC") MSBuild("src/SingleProject/Resizetizer/src/Resizetizer.csproj", GetMSBuildSettings().WithRestore()); - StartVisualStudio(); + StartVisualStudio(sln); }); Task("cg-android") diff --git a/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj new file mode 100644 index 000000000000..b32645ecd9bc --- /dev/null +++ b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj @@ -0,0 +1,165 @@ + + + netstandard2.0 + Microsoft.Maui.Controls.Compatibility.ControlGallery + Microsoft.Maui.Controls.Compatibility.ControlGallery + + + True + + + TRACE;DEBUG;PERF;APP + prompt + 4 + 0114;0108;0109;4014;0649;0169;0472;0414;0168;0219;0429 + + + TRACE;APP + prompt + 4 + 0114;0108;0109;4014;0649;0169;0472;0414;0168;0219;0429 + + + $(DefineConstants);__UWP__ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + ChatExample.xaml + + + RadioButtonGroupGallery.xaml + + + DaysOfWeekView.xaml + + + + + + FlyoutFooter.xaml + + + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + + + + + + + + + + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + + + + + + Code + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs index fab980ffdbeb..82bbc9bc7f5f 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs @@ -5,6 +5,7 @@ using Microsoft.Maui.Controls.CustomAttributes; using NUnit.Framework.Interfaces; using IOPath = System.IO.Path; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; #if UITEST using Microsoft.Maui.Controls.Compatibility.UITests; diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs index 9983105eea5e..019c34a37d77 100644 --- a/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs +++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs @@ -5,7 +5,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; - using Xamarin.UITest; using Xamarin.UITest.Queries; diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/Lobster-Regular.ttf b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/Lobster-Regular.ttf similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/Lobster-Regular.ttf rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/Lobster-Regular.ttf diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/OFL.txt b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/OFL.txt similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/OFL.txt rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/OFL.txt diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/fa-solid-900.ttf b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/fa-solid-900.ttf similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/fa-solid-900.ttf rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/fa-solid-900.ttf diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/ionicons.ttf b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/ionicons.ttf similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/ionicons.ttf rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/ionicons.ttf diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/materialdesignicons-webfont.ttf b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/materialdesignicons-webfont.ttf similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/materialdesignicons-webfont.ttf rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Fonts/materialdesignicons-webfont.ttf diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/LockScreenLogo.scale-200.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/LockScreenLogo.scale-200.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/LockScreenLogo.scale-200.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Logo.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Logo.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Logo.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Logo.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SmallLogo.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SmallLogo.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SmallLogo.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SmallLogo.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SplashScreen.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SplashScreen.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SplashScreen.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SplashScreen.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SplashScreen.scale-200.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SplashScreen.scale-200.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SplashScreen.scale-200.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/SplashScreen.scale-200.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square150x150Logo.scale-200.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square150x150Logo.scale-200.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square150x150Logo.scale-200.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square44x44Logo.scale-200.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square44x44Logo.scale-200.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square44x44Logo.scale-200.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/StoreLogo.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/StoreLogo.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/StoreLogo.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/StoreLogo.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Wide310x150Logo.scale-200.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Wide310x150Logo.scale-200.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/Wide310x150Logo.scale-200.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/WideLogo.scale-100.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/WideLogo.scale-100.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/WideLogo.scale-100.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/WideLogo.scale-100.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/coverassets1.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/coverassets1.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/coverassets1.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Assets/coverassets1.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Xamarin.Forms.ControlGallery.WindowsUniversal (Package).wapproj b/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj similarity index 85% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Xamarin.Forms.ControlGallery.WindowsUniversal (Package).wapproj rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj index fda382c4cc2b..d4b45e30851a 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Xamarin.Forms.ControlGallery.WindowsUniversal (Package).wapproj +++ b/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj @@ -3,6 +3,9 @@ 15.0 + + true + Debug @@ -31,30 +34,43 @@ $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - Xamarin.Forms.ControlGallery.WindowsUniversal\ - 9784da17-daef-455c-8cfb-ba4b4119c1b6 10.0.19041.0 10.0.17763.0 + net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) en-US false - $(MSBuildThisFileDirectory)build\ - ..\Xamarin.Forms.ControlGallery.WindowsUniversal\Xamarin.Forms.ControlGallery.WindowsUniversal.csproj + ..\WinUI\Compatibility.ControlGallery.WinUI.csproj + + + 9784da17-daef-455c-8cfb-ba4b4119c1b6 Designer + + + build + + + build + + + + + True + + - @@ -66,19 +82,6 @@ - - - - - True - - - - - - - - @@ -87,6 +90,7 @@ + @@ -144,8 +148,7 @@ - + - \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/FlowerBuds.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/FlowerBuds.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/FlowerBuds.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/FlowerBuds.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Fruits.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/Fruits.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Fruits.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Fruits.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifOne.gif b/src/Compatibility/ControlGallery/src/WinUI (Package)/GifOne.gif similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifOne.gif rename to src/Compatibility/ControlGallery/src/WinUI (Package)/GifOne.gif diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifTwo.gif b/src/Compatibility/ControlGallery/src/WinUI (Package)/GifTwo.gif similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifTwo.gif rename to src/Compatibility/ControlGallery/src/WinUI (Package)/GifTwo.gif diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Legumes.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/Legumes.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Legumes.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Legumes.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Package.appxmanifest b/src/Compatibility/ControlGallery/src/WinUI (Package)/Package.appxmanifest similarity index 86% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Package.appxmanifest rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Package.appxmanifest index 181f1acb60bc..b0bf2bf09506 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Package.appxmanifest +++ b/src/Compatibility/ControlGallery/src/WinUI (Package)/Package.appxmanifest @@ -12,7 +12,7 @@ Version="1.0.0.0" /> - Xamarin.Forms.ControlGallery.WindowsUniversal (Package) + Compatibility.ControlGallery.WinUI (Package) Microsoft Assets\StoreLogo.png @@ -31,8 +31,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Vegetables.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/Vegetables.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Vegetables.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/Vegetables.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/WebImages/XamarinLogo.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/WebImages/XamarinLogo.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/WebImages/XamarinLogo.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/WebImages/XamarinLogo.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/bank.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/bank.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/bank.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/bank.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/build/Microsoft.WinUI.AppX.targets b/src/Compatibility/ControlGallery/src/WinUI (Package)/build/Microsoft.WinUI.AppX.targets similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/build/Microsoft.WinUI.AppX.targets rename to src/Compatibility/ControlGallery/src/WinUI (Package)/build/Microsoft.WinUI.AppX.targets diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/calculator.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/calculator.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/calculator.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/calculator.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cardBackground.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/cardBackground.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cardBackground.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/cardBackground.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/coffee.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/coffee.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/coffee.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/coffee.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/cover1.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/cover1.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1small.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/cover1small.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1small.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/cover1small.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimson.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/crimson.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimson.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/crimson.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimsonsmall.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/crimsonsmall.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimsonsmall.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/crimsonsmall.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/default.css b/src/Compatibility/ControlGallery/src/WinUI (Package)/default.css similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/default.css rename to src/Compatibility/ControlGallery/src/WinUI (Package)/default.css diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/invalidimage.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/invalidimage.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/invalidimage.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/invalidimage.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/menuIcon.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/menuIcon.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/menuIcon.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/menuIcon.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasis.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/oasis.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasis.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/oasis.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasissmall.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/oasissmall.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasissmall.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/oasissmall.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/photo.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/photo.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/photo.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/photo.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/bell.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/bell.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/bell.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/bell.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/books.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/books.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/books.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/books.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/booksflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/booksflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/booksflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/booksflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/film.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/film.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/film.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/film.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/filmflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/filmflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/filmflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/filmflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/games.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/games.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/games.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/games.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gamesflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/gamesflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gamesflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/gamesflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gear.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/gear.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gear.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/gear.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/grid.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/grid.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/grid.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/grid.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphone.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/headphone.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphone.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/headphone.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphoneflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/headphoneflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphoneflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/headphoneflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/home.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/home.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/home.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/home.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/homeflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/homeflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/homeflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/homeflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/loop.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/loop.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/loop.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/loop.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaper.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/newspaper.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaper.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/newspaper.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaperflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/newspaperflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaperflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/newspaperflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/person.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/person.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/person.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/person.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star-flyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/star-flyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star-flyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/star-flyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/star.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-100/star.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/bell.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/bell.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/bell.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/bell.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/books.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/books.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/books.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/books.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/booksflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/booksflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/booksflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/booksflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/film.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/film.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/film.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/film.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/filmflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/filmflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/filmflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/filmflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/games.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/games.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/games.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/games.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gamesflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/gamesflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gamesflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/gamesflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gear.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/gear.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gear.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/gear.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/grid.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/grid.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/grid.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/grid.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphone.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/headphone.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphone.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/headphone.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphoneflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/headphoneflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphoneflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/headphoneflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/home.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/home.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/home.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/home.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/homeflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/homeflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/homeflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/homeflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/loop.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/loop.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/loop.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/loop.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaper.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/newspaper.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaper.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/newspaper.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaperflyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/newspaperflyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaperflyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/newspaperflyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/person.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/person.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/person.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/person.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star-flyout.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/star-flyout.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star-flyout.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/star-flyout.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/star.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/scale-200/star.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/seth.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/seth.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/seth.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/seth.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/test.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/test.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/test.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/test.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/toolbar_close.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/toolbar_close.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/toolbar_close.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/toolbar_close.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinlogo.png b/src/Compatibility/ControlGallery/src/WinUI (Package)/xamarinlogo.png similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinlogo.png rename to src/Compatibility/ControlGallery/src/WinUI (Package)/xamarinlogo.png diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinstore.jpg b/src/Compatibility/ControlGallery/src/WinUI (Package)/xamarinstore.jpg similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinstore.jpg rename to src/Compatibility/ControlGallery/src/WinUI (Package)/xamarinstore.jpg diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml b/src/Compatibility/ControlGallery/src/WinUI/App.xaml similarity index 61% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml rename to src/Compatibility/ControlGallery/src/WinUI/App.xaml index 8725e13e55b3..71ea354b880d 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml +++ b/src/Compatibility/ControlGallery/src/WinUI/App.xaml @@ -1,5 +1,5 @@  @@ -7,9 +7,9 @@ - + - + diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs b/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs similarity index 92% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs rename to src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs index 8b09c1c49635..0d8013e51fd2 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs @@ -19,7 +19,7 @@ // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409 -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { /// /// Provides application-specific behavior to supplement the default Application class. @@ -35,7 +35,7 @@ sealed partial class App : Microsoft.UI.Xaml.Application public App() { InitializeComponent(); - Suspending += OnSuspending; + //Suspending += OnSuspending; } /// @@ -49,11 +49,11 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e) e.Arguments.Contains("RunningAsUITests")) { RunningAsUITests = true; - Controls.App.PreloadTestCasesIssuesList = false; + ControlGallery.App.PreloadTestCasesIssuesList = false; } m_window = new MainPage(); - Xamarin.Forms.Forms.Init(e, m_window as MainPage); + Maui.Controls.Compatibility.Forms.Init(e, m_window as MainPage); } /// diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs similarity index 62% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs index bc455c27bbab..e7a433a2e342 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs @@ -1,12 +1,12 @@ using System; using System.Linq; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Effects; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Effects; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; [assembly: ExportEffect(typeof(AttachedStateEffectRenderer), AttachedStateEffect.EffectName)] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class AttachedStateEffectRenderer : PlatformEffect { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs b/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs similarity index 76% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs rename to src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs index f4d6df6827bd..cc3296f2de71 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs @@ -1,11 +1,11 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; [assembly: ExportEffect(typeof(BorderEffect), "BorderEffect")] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class BorderEffect : PlatformEffect { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs b/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs similarity index 70% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs rename to src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs index afa0b68df1ca..17d49da71e0b 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs @@ -1,14 +1,14 @@ using System; using System.Threading; using System.Threading.Tasks; -using Xamarin.Forms.Controls.Issues; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; using WImageSource = Microsoft.UI.Xaml.Media.ImageSource; -using Xamarin.Forms.Platform.UWP; -using Xamarin.Forms.ControlGallery.WindowsUniversal; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; [assembly: ExportRenderer(typeof(_51173Image), typeof(_51173CustomImageRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public sealed class BrokenImageSourceHandler : IImageSourceHandler { @@ -28,7 +28,7 @@ protected override async Task TryUpdateSource() } catch (Exception ex) { - await Xamarin.Forms.Application.Current.MainPage.DisplayAlert("Image Error 51173", $"The image failed to load, here's why: {ex.Message}", "OK"); + await Maui.Controls.Application.Current.MainPage.DisplayAlert("Image Error 51173", $"The image failed to load, here's why: {ex.Message}", "OK"); } } } diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs b/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs similarity index 92% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs rename to src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs index 019738e82594..6b607de6b268 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs @@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Media; using Microsoft.UI; -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { internal class BrokenNativeControl : Panel { @@ -53,7 +53,7 @@ protected override Windows.Foundation.Size ArrangeOverride(Windows.Foundation.Si } - protected override Windows.Foundation.Size MeasureOverride (Windows.Foundation.Size availableSize) + protected override global::Windows.Foundation.Size MeasureOverride (Windows.Foundation.Size availableSize) { _textBlock.Measure (availableSize); diff --git a/src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj b/src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj new file mode 100644 index 000000000000..b30dd7db74db --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj @@ -0,0 +1,42 @@ + + + + + WinExe + net6.0-windows10.0.18362.0 + 10.0.17134.0 + Compatibility.ControlGallery.Windows + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + 1701;1702;CS8305;8305;CA1416 + true + false + + + + netstandard2.0 + Xamarin.Forms.ControlGallery.WindowsUniversal + 1701;1702;CS8305;8305 + false + false + false + + + + + + + + + + + + + + + + + + + diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs b/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs similarity index 90% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs rename to src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs index 1072696bded3..923d65d8786b 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs @@ -1,22 +1,24 @@ using System; using System.ComponentModel; using System.Linq; +using Microsoft.Maui; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Shapes; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Issues; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; +using Microsoft.Maui.Graphics; -[assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.Issues.Bugzilla42602.TextBoxView), typeof(Xamarin.Forms.ControlGallery.WindowsUniversal.TextBoxViewRenderer))] +[assembly: ExportRenderer(typeof(Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Bugzilla42602.TextBoxView), typeof(Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.TextBoxViewRenderer))] [assembly: ExportRenderer(typeof(Issue1683.EntryKeyboardFlags), typeof(EntryRendererKeyboardFlags))] [assembly: ExportRenderer(typeof(Issue1683.EditorKeyboardFlags), typeof(EditorRendererKeyboardFlags))] [assembly: ExportRenderer(typeof(Issue3273.SortableListView), typeof(SortableListViewRenderer))] [assembly: ExportRenderer(typeof(Issue2172OldEntry), typeof(Issue2172OldEntryRenderer))] [assembly: ExportRenderer(typeof(Issue2172OldEditor), typeof(Issue2172OldEditorRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class EntryRendererKeyboardFlags : EntryRenderer { @@ -68,19 +70,19 @@ public static void TestKeyboardFlags(this FormsTextBox Control, KeyboardFlags? f { if (!Control.IsSpellCheckEnabled) { - throw new System.Exception("IsSpellCheckEnabled not enabled"); + throw new global::System.Exception("IsSpellCheckEnabled not enabled"); } } else if (flags.Value.HasFlag(KeyboardFlags.CapitalizeWord)) { if (!Control.InputScope.Names.Select(x => x.NameValue).Contains(InputScopeNameValue.NameOrPhoneNumber)) { - throw new System.Exception("Input Scope Not Set to NameOrPhoneNumber"); + throw new global::System.Exception("Input Scope Not Set to NameOrPhoneNumber"); } if (!Control.IsSpellCheckEnabled) { - throw new System.Exception("IsSpellCheckEnabled not enabled"); + throw new global::System.Exception("IsSpellCheckEnabled not enabled"); } } @@ -188,7 +190,7 @@ public override SizeRequest GetDesiredSize(double widthConstraint, double height public class Issue2172OldEditorRenderer : EditorRenderer { static FormsTextBox _copyOfTextBox; - static Windows.Foundation.Size _zeroSize = new Windows.Foundation.Size(0, 0); + static global::Windows.Foundation.Size _zeroSize = new global::Windows.Foundation.Size(0, 0); FormsTextBox CreateTextBox() { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs similarity index 83% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs index fa9f8e634ff1..e79d9fc84e0d 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs @@ -1,11 +1,12 @@ using System.ComponentModel; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Issues; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using WResourceDictionary = Microsoft.UI.Xaml.ResourceDictionary; +using Microsoft.Maui.Graphics; [assembly: ExportRenderer(typeof(CustomSwitch), typeof(CustomSwitchRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { // Used in Issue7253.cs public class CustomSwitchRenderer : SwitchRenderer @@ -50,7 +51,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE protected class CustomSwitchStyle : WResourceDictionary { - public void ToggleSwitchStrokeOn(Windows.UI.Color c) => this["ToggleSwitchStrokeOn"] = c; + public void ToggleSwitchStrokeOn(global::Windows.UI.Color c) => this["ToggleSwitchStrokeOn"] = c; public void ToggleSwitchStrokeOff(Windows.UI.Color c) => this["ToggleSwitchStrokeOff"] = c; public void ToggleSwitchKnobFillOn(Windows.UI.Color c) => this["ToggleSwitchKnobFillOn"] = c; public void ToggleSwitchKnobFillOff(Windows.UI.Color c) => this["ToggleSwitchKnobFillOff"] = c; @@ -65,6 +66,6 @@ protected class CustomSwitchStyle : WResourceDictionary public static class ColorHelper { public static Windows.UI.Color ToUwpColor(this Color xColor) => - Windows.UI.Color.FromArgb((byte)(xColor.A * 255), (byte)(xColor.R * 255), (byte)(xColor.G * 255), (byte)(xColor.B * 255)); + Windows.UI.Color.FromArgb((byte)(xColor.Alpha * 255), (byte)(xColor.Red * 255), (byte)(xColor.Green * 255), (byte)(xColor.Blue * 255)); } } \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props b/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props new file mode 100644 index 000000000000..aaaedc977e5d --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props @@ -0,0 +1,8 @@ + + + true + + + + + \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.targets b/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.targets new file mode 100644 index 000000000000..5bcce6df86f6 --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.targets @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs similarity index 73% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs index c00dbae3266f..8c64b51d16bf 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs @@ -1,11 +1,11 @@ -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; [assembly: ExportRenderer(typeof(DisposePage), typeof(DisposePageRenderer))] [assembly: ExportRenderer(typeof(DisposeLabel), typeof(DisposeLabelRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class DisposePageRenderer : PageRenderer { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs b/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs similarity index 77% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs rename to src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs index 10149e3a373d..5e0a99f1ce23 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs @@ -6,13 +6,13 @@ using System.Threading.Tasks; using Windows.UI; using Microsoft.UI.Xaml.Media; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using Microsoft.UI; [assembly: ExportEffect(typeof(FocusEffect), "FocusEffect")] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class FocusEffect : PlatformEffect { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml similarity index 70% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml rename to src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml index 7a2e97bac504..9596c8b2b670 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml +++ b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml @@ -1,10 +1,10 @@  \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs similarity index 90% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs rename to src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs index 8fc6be06711a..f5ad33f7eed9 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs @@ -10,20 +10,20 @@ using Windows.System; using Windows.UI.Core; using Windows.UI.ViewManagement; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Graphics; - -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { /// /// An empty page that can be used on its own or navigated to within a Frame. /// public sealed partial class MainPage { - Controls.App _app; + ControlGallery.App _app; public MainPage() { @@ -50,7 +50,7 @@ public MainPage() public override Application CreateApplication() { - _app = new Controls.App(); + _app = new ControlGallery.App(); return _app; } @@ -79,7 +79,7 @@ void WireUpKeyDown() }); } - private void _app_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + private void _app_PropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e) { if (e.PropertyName == "MainPage") { @@ -231,10 +231,11 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu return null; } - public static Windows.UI.Color ToWindowsColor(Color color) + public static global::Windows.UI.Color ToWindowsColor(Color color) { - return Windows.UI.Color.FromArgb((byte)(color.A * 255), (byte)(color.R * 255), (byte)(color.G * 255), (byte)(color.B * 255)); + return Windows.UI.Color.FromArgb((byte)(color.Alpha * 255), (byte)(color.Red * 255), (byte)(color.Green * 255), (byte)(color.Blue * 255)); } + public static Color ToColor(Windows.UI.Color color) { return Color.FromRgba(color.R, color.G, color.B, color.A); diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/NavPageOverrideRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs similarity index 62% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/NavPageOverrideRenderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs index 4a7cbb2b1e9c..a771bff79e05 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/NavPageOverrideRenderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs @@ -1,11 +1,12 @@ using Microsoft.UI.Xaml.Media.Animation; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Issues; -using Xamarin.Forms.Internals; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Controls.Internals; [assembly: ExportRenderer(typeof(NavPageOverrideUWP.CustomNavPageForOverride), typeof(NavPageOverrideRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class NavPageOverrideRenderer : NavigationPageRenderer { @@ -14,7 +15,7 @@ protected override void OnElementChanged(VisualElementChangedEventArgs e) base.OnElementChanged(e); if (e.NewElement != null) - System.Diagnostics.Debug.WriteLine($"{e.NewElement.GetType()} is replaced by NavPageOverrideRenderer"); + global::System.Diagnostics.Debug.WriteLine($"{e.NewElement.GetType()} is replaced by NavPageOverrideRenderer"); } protected override void SetupPageTransition(Transition transition, bool isAnimated, bool isPopping) @@ -36,19 +37,19 @@ protected override void SetupPageTransition(Transition transition, bool isAnimat protected override void OnPushRequested(object sender, NavigationRequestedEventArgs e) { base.OnPushRequested(sender, e); - System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPushRequested"); + global::System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPushRequested"); } protected override void OnPopRequested(object sender, NavigationRequestedEventArgs e) { base.OnPopRequested(sender, e); - System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPopRequested"); + global::System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPopRequested"); } protected override void OnPopToRootRequested(object sender, NavigationRequestedEventArgs e) { base.OnPopToRootRequested(sender, e); - System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPopToRootRequested"); + global::System.Diagnostics.Debug.WriteLine($"NavPageOverrideRenderer - OnPopToRootRequested"); } } } diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs b/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs similarity index 60% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs rename to src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs index a5a9b3b35617..56573bd1cd3c 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; [assembly: Dependency(typeof(PlatformSpecificCoreGalleryFactory))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class PlatformSpecificCoreGalleryFactory : IPlatformSpecificCoreGalleryFactory { diff --git a/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs b/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..6fc94401cb88 --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs @@ -0,0 +1,11 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; + +// Deliberately broken image source and handler so we can test handling of image loading errors +[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))] +[assembly: Microsoft.Maui.Controls.ResolutionGroupName (Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Effects.ResolutionGroupName)] \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml b/src/Compatibility/ControlGallery/src/WinUI/Properties/default.rd.xml similarity index 92% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml rename to src/Compatibility/ControlGallery/src/WinUI/Properties/default.rd.xml index f1f6789972c0..16468e1cc4ac 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml +++ b/src/Compatibility/ControlGallery/src/WinUI/Properties/default.rd.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs b/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs similarity index 66% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs rename to src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs index 0fd76b074128..bb7d7bc2efd2 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs @@ -1,10 +1,10 @@ -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; [assembly: Dependency(typeof(RegistrarValidationService))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class RegistrarValidationService : IRegistrarValidationService { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs b/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs similarity index 61% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs rename to src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs index 0e472ebc235f..61085eb91bb4 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs @@ -1,13 +1,13 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Issues.Helpers; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Helpers; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; [assembly: Dependency(typeof(SampleNativeControl))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class SampleNativeControl : ISampleNativeControl { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs b/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs similarity index 77% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs rename to src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs index 404cbf9fa526..63ddaf52d8f3 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs @@ -4,13 +4,13 @@ using Windows.UI.Core; using Windows.UI.ViewManagement; using Microsoft.UI.Xaml; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; [assembly: Dependency(typeof(SecondaryWindowService))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { class SecondaryWindowService : ISecondaryWindowService { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/PlatformTestSettings.cs b/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs similarity index 70% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/PlatformTestSettings.cs rename to src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs index 9b392b335c50..f1827621638b 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/PlatformTestSettings.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Reflection; using NUnit; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal.Tests; -using Xamarin.Forms.Controls.Tests; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Tests; [assembly: Dependency(typeof(PlatformTestSettings))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal.Tests +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests { public class PlatformTestSettings : IPlatformTestSettings { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/TestingPlatformService.cs b/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs similarity index 57% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/TestingPlatformService.cs rename to src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs index 4535ecd6042a..b010de89e6b0 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Tests/TestingPlatformService.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal.Tests; -using Xamarin.Forms.Controls.Tests; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Tests; [assembly: Dependency(typeof(TestingPlatformService))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal.Tests +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests { class TestingPlatformService : ITestingPlatformService { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_13109IssueHelper.cs b/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs similarity index 69% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_13109IssueHelper.cs rename to src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs index 331a80671bce..6f4499553c61 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_13109IssueHelper.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs @@ -1,12 +1,12 @@ using System.Threading.Tasks; -using Xamarin.Forms; -using Xamarin.Forms.Platform.UWP; -using Xamarin.Forms.Controls.Issues; -using Xamarin.Forms.ControlGallery.WindowsUniversal; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; using Bitmap = Microsoft.UI.Xaml.Media.ImageSource; [assembly: Dependency(typeof(_13109IssueHelper))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class _13109IssueHelper : IIssue13109Helper { diff --git a/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs new file mode 100644 index 000000000000..994ccd5979ea --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; + +[assembly: ExportRenderer(typeof(Microsoft.Maui.Controls.Page), typeof(_2489CustomRenderer))] +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI +{ + public class _2489CustomRenderer : PageRenderer + { + protected override void OnElementChanged(ElementChangedEventArgs e) + { + base.OnElementChanged(e); + + if (e.NewElement != null) + global::System.Diagnostics.Debug.WriteLine($"{e.NewElement.GetType()} is replaced by _2489CustomRenderer"); + } + } +} \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs similarity index 71% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs index 913c0d9984c7..fa159f262fb6 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs @@ -1,12 +1,13 @@ using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls.Issues; -using Xamarin.Forms.Platform.UWP; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Graphics; [assembly: ExportRenderer(typeof(Bugzilla57114._57114View), typeof(_57114Renderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class _57114Renderer : VisualElementRenderer { @@ -29,7 +30,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e) { diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_9087CustomRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs similarity index 57% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_9087CustomRenderer.cs rename to src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs index 0bcdb3840c1e..9ae2b122fc22 100644 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_9087CustomRenderer.cs +++ b/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs @@ -1,10 +1,10 @@ using System; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Platform.UWP; -using static Xamarin.Forms.Controls.Issues.Issue9087; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI; +using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using static Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Issue9087; [assembly: ExportRenderer(typeof(_9087Label), typeof(_9087CustomRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI { public class _9087CustomRenderer : LabelRenderer { diff --git a/src/Compatibility/ControlGallery/src/WinUI/app.manifest b/src/Compatibility/ControlGallery/src/WinUI/app.manifest new file mode 100644 index 000000000000..01bb03d82103 --- /dev/null +++ b/src/Compatibility/ControlGallery/src/WinUI/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/local.html b/src/Compatibility/ControlGallery/src/WinUI/local.html similarity index 100% rename from src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/local.html rename to src/Compatibility/ControlGallery/src/WinUI/local.html diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets b/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets deleted file mode 100644 index 6f72129c8858..000000000000 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs b/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs deleted file mode 100644 index e871e81ea782..000000000000 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.UWP; - -// Deliberately broken image source and handler so we can test handling of image loading errors -[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))] -[assembly: Xamarin.Forms.ResolutionGroupName (Xamarin.Forms.Controls.Issues.Effects.ResolutionGroupName)] \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj deleted file mode 100644 index c0f7aa7071b8..000000000000 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - WinExe - net5.0-windows10.0.18362.0 - 10.0.17134.0 - Xamarin.Forms.ControlGallery.WindowsUniversal - app.manifest - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - 1701;1702;CS8305;8305 - - - - netstandard2.0 - Xamarin.Forms.ControlGallery.WindowsUniversal - 1701;1702;CS8305;8305 - false - false - false - - - - - - - - - - - - - - - - - diff --git a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs b/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs deleted file mode 100644 index 3e103ea2bf85..000000000000 --- a/src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using Xamarin.Forms; -using Xamarin.Forms.ControlGallery.WindowsUniversal; -using Xamarin.Forms.Platform.UWP; - -[assembly: ExportRenderer(typeof(Xamarin.Forms.Page), typeof(_2489CustomRenderer))] -namespace Xamarin.Forms.ControlGallery.WindowsUniversal -{ - public class _2489CustomRenderer : PageRenderer - { - protected override void OnElementChanged(ElementChangedEventArgs e) - { - base.OnElementChanged(e); - - if (e.NewElement != null) - System.Diagnostics.Debug.WriteLine($"{e.NewElement.GetType()} is replaced by _2489CustomRenderer"); - } - } -} \ No newline at end of file diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinDriverApp.cs similarity index 99% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs rename to src/Compatibility/ControlGallery/test/WinUI.UITests/WinDriverApp.cs index 5966cf3b9d76..ab94d84457df 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinDriverApp.cs @@ -10,22 +10,22 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; using NUnit.Framework; using NUnit.Framework.Interfaces; using OpenQA.Selenium; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; using OpenQA.Selenium.Remote; -using Xamarin.Forms.Controls.Issues; using Xamarin.UITest; using Xamarin.UITest.Queries; using Xamarin.UITest.Queries.Tokens; -namespace Xamarin.Forms.Core.UITests +namespace Microsoft.Maui.Controls.Compatibility.UITests { public class WinDriverApp : IApp { - public const string AppName = "Xamarin.Forms.ControlGallery.WindowsUniversal"; + public const string AppName = "Compatibility.ControlGallery.WinUI"; public static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(15); readonly Dictionary _controlNameToTag = new Dictionary diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinQuery.cs similarity index 96% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs rename to src/Compatibility/ControlGallery/test/WinUI.UITests/WinQuery.cs index ff34df0b236f..5af6c65d22ae 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinQuery.cs @@ -3,7 +3,7 @@ using System.Text.RegularExpressions; using Xamarin.UITest.Queries; -namespace Xamarin.Forms.Core.UITests +namespace Microsoft.Maui.Controls.Compatibility.UITests { internal class WinQuery { diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj similarity index 76% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj rename to src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj index b72fd9534421..23c9fabcc6fa 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj @@ -7,9 +7,9 @@ {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF} Library Properties - Xamarin.Forms.Core.UITests - Xamarin.Forms.Core.Windows.UITests - v4.7 + WinUI.UITests + WinUI.UITests + v4.8 512 @@ -68,28 +68,28 @@ - - {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} - Xamarin.Forms.Core + + {de354790-6107-468a-b388-e1eff1416240} + Controls.Maps-net6 - - {4dcd0420-1168-4b77-86db-6196ee4bd491} - Xamarin.Forms.CustomAttributes + + {af64451f-e2bd-41c2-b083-f60c26ae2a9f} + Controls.Core-net6 - - {7d13bac2-c6a4-416a-b07e-c169b199e52b} - Xamarin.Forms.Maps + + {d816b818-f58f-4738-93ae-924efab7a07f} + Controls.CustomAttributes - - {D31A6537-ED9C-4EBD-B231-A8D4FE44126A} - Xamarin.Forms.Platform + + {95ba42b5-b00e-4986-b9b5-517140378452} + Core-net6 - - + + diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs similarity index 54% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs rename to src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs index 776809e504da..e97762e51f56 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs @@ -1,14 +1,15 @@ using System; using System.Diagnostics; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; using NUnit.Framework; using OpenQA.Selenium; using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; -using Xamarin.Forms.Controls.Issues; +using OpenQA.Selenium.Remote; using Xamarin.UITest; -namespace Xamarin.Forms.Core.UITests +namespace Microsoft.Maui.Controls.Compatibility.UITests { public class WindowsTestBase { @@ -25,12 +26,52 @@ public static IApp ConfigureApp() return new WinDriverApp(Session); } - public static WindowsDriver CreateWindowsDriver() + + public static void StartupApplication() { AppiumOptions options = new AppiumOptions(); options.AddAdditionalCapability("app", "0d4424f6-1e29-4476-ac00-ba22c3789cb6_ph1m9x8skttmg!App"); + + try + { + Session = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), options); + } + catch { + // This crashes because it can't find the window but it will at least start the application + } + } + + public static WindowsElement GetWindowsElement() + { + AppiumOptions options = new AppiumOptions(); + options.AddAdditionalCapability("app", "Root"); + Session = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), options); + + new Actions(Session) + .SendKeys(Keys.Meta + "s" + Keys.Meta) + .Perform(); + + try + { + return Session.FindElementByName("WinUI Desktop"); + } + catch { } + + StartupApplication(); + return GetWindowsElement(); + } + + public static WindowsDriver CreateWindowsDriver() + { + var topLevelWindowHandle = GetWindowsElement().GetAttribute("NativeWindowHandle"); + topLevelWindowHandle = (int.Parse(topLevelWindowHandle)).ToString("x"); // Convert to Hex + + AppiumOptions options = new AppiumOptions(); + options.AddAdditionalCapability("appTopLevelWindow", topLevelWindowHandle); options.AddAdditionalCapability("appArguments", "RunningAsUITests"); + Session = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), options); + Assert.IsNotNull(Session); Session.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1); Reset(); diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestServer.cs similarity index 89% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs rename to src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestServer.cs index 8306f37b2999..cfe6c154e50b 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestServer.cs @@ -1,9 +1,9 @@ using System; +using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues; using OpenQA.Selenium.Appium.Windows; -using Xamarin.Forms.Controls.Issues; using Xamarin.UITest; -namespace Xamarin.Forms.Core.UITests +namespace Microsoft.Maui.Controls.Compatibility.UITests { internal class WindowsTestServer : ITestServer { diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/app.config b/src/Compatibility/ControlGallery/test/WinUI.UITests/app.config similarity index 61% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/app.config rename to src/Compatibility/ControlGallery/test/WinUI.UITests/app.config index dde2c3cc64e7..a2910a5e8288 100644 --- a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/app.config +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/readme.md b/src/Compatibility/ControlGallery/test/WinUI.UITests/readme.md similarity index 100% rename from src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/readme.md rename to src/Compatibility/ControlGallery/test/WinUI.UITests/readme.md diff --git a/src/Compatibility/Core/src/Compatibility-net6.csproj b/src/Compatibility/Core/src/Compatibility-net6.csproj index 51b9a0556a1a..552c28389a8f 100644 --- a/src/Compatibility/Core/src/Compatibility-net6.csproj +++ b/src/Compatibility/Core/src/Compatibility-net6.csproj @@ -7,7 +7,7 @@ false Android\ iOS\ - Windows\ + WinUI\ Microsoft.Maui.Controls.Compatibility @@ -38,7 +38,7 @@ MSBuild:Compile - + @@ -83,7 +83,8 @@ - + + @@ -98,4 +99,4 @@ - \ No newline at end of file + diff --git a/src/Compatibility/Core/src/Properties/AssemblyInfo.cs b/src/Compatibility/Core/src/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..66dafde9b3e5 --- /dev/null +++ b/src/Compatibility/Core/src/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Compatibility.Windows.UnitTests")] \ No newline at end of file diff --git a/src/Compatibility/Core/src/Windows/AccessKeyHelper.cs b/src/Compatibility/Core/src/WinUI/AccessKeyHelper.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/AccessKeyHelper.cs rename to src/Compatibility/Core/src/WinUI/AccessKeyHelper.cs diff --git a/src/Compatibility/Core/src/Windows/AccessibilityExtensions.cs b/src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/AccessibilityExtensions.cs rename to src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs b/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs similarity index 88% rename from src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs rename to src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs index fd7a6aaf31cc..145c3f2f72db 100644 --- a/src/Compatibility/Core/src/Windows/ActivityIndicatorRenderer.cs +++ b/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs @@ -16,7 +16,10 @@ protected override void OnElementChanged(ElementChangedEventArgs 1 && NavigationPage.GetHasBackButton(_currentPage); - _navManager.AppViewBackButtonVisibility = showBackButton ? AppViewBackButtonVisibility.Visible : AppViewBackButtonVisibility.Collapsed; + //_navManager.AppViewBackButtonVisibility = showBackButton ? AppViewBackButtonVisibility.Visible : AppViewBackButtonVisibility.Collapsed; _container.SetBackButtonTitle(Element); } diff --git a/src/Compatibility/Core/src/Windows/PageControl.cs b/src/Compatibility/Core/src/WinUI/PageControl.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PageControl.cs rename to src/Compatibility/Core/src/WinUI/PageControl.cs diff --git a/src/Compatibility/Core/src/Windows/PageControlStyle.xaml b/src/Compatibility/Core/src/WinUI/PageControlStyle.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/PageControlStyle.xaml rename to src/Compatibility/Core/src/WinUI/PageControlStyle.xaml diff --git a/src/Compatibility/Core/src/Windows/PageExtensions.cs b/src/Compatibility/Core/src/WinUI/PageExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PageExtensions.cs rename to src/Compatibility/Core/src/WinUI/PageExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/PageRenderer.cs b/src/Compatibility/Core/src/WinUI/PageRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PageRenderer.cs rename to src/Compatibility/Core/src/WinUI/PageRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/PageToRenderedElementConverter.cs b/src/Compatibility/Core/src/WinUI/PageToRenderedElementConverter.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PageToRenderedElementConverter.cs rename to src/Compatibility/Core/src/WinUI/PageToRenderedElementConverter.cs diff --git a/src/Compatibility/Core/src/Windows/PickerRenderer.cs b/src/Compatibility/Core/src/WinUI/PickerRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PickerRenderer.cs rename to src/Compatibility/Core/src/WinUI/PickerRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/PickerStyle.xaml b/src/Compatibility/Core/src/WinUI/PickerStyle.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/PickerStyle.xaml rename to src/Compatibility/Core/src/WinUI/PickerStyle.xaml diff --git a/src/Compatibility/Core/src/Windows/Platform.cs b/src/Compatibility/Core/src/WinUI/Platform.cs similarity index 99% rename from src/Compatibility/Core/src/Windows/Platform.cs rename to src/Compatibility/Core/src/WinUI/Platform.cs index fe0c3670048e..774c69f9207a 100644 --- a/src/Compatibility/Core/src/Windows/Platform.cs +++ b/src/Compatibility/Core/src/WinUI/Platform.cs @@ -122,7 +122,7 @@ internal Platform(Microsoft.UI.Xaml.Window page) if (!current.Resources.ContainsKey(ShellRenderer.ShellStyle)) { var myResourceDictionary = new Microsoft.UI.Xaml.ResourceDictionary(); - myResourceDictionary.Source = new Uri("ms-appx:///Microsoft.Maui.Controls.Compatibility/Windows/Shell/ShellStyles.xbf"); + myResourceDictionary.Source = new Uri("ms-appx:///Microsoft.Maui.Controls.Compatibility/WinUI/Shell/ShellStyles.xbf"); Microsoft.UI.Xaml.Application.Current.Resources.MergedDictionaries.Add(myResourceDictionary); } @@ -146,8 +146,9 @@ internal Platform(Microsoft.UI.Xaml.Window page) UpdateBounds(); InitializeStatusBar(); - - SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested; + + // TODO WINUI + //SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested; // TODO WINUI // Microsoft.UI.Xaml.Application.Current.Resuming += OnResumingAsync; diff --git a/src/Compatibility/Core/src/Windows/PlatformConfigurationExtensions.cs b/src/Compatibility/Core/src/WinUI/PlatformConfigurationExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PlatformConfigurationExtensions.cs rename to src/Compatibility/Core/src/WinUI/PlatformConfigurationExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/PlatformEffect.cs b/src/Compatibility/Core/src/WinUI/PlatformEffect.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PlatformEffect.cs rename to src/Compatibility/Core/src/WinUI/PlatformEffect.cs diff --git a/src/Compatibility/Core/src/Windows/PointCollectionExtensions.cs b/src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PointCollectionExtensions.cs rename to src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/PointExtensions.cs b/src/Compatibility/Core/src/WinUI/PointExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PointExtensions.cs rename to src/Compatibility/Core/src/WinUI/PointExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs b/src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ProgressBarRenderer.cs rename to src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/PromptDialog.xaml b/src/Compatibility/Core/src/WinUI/PromptDialog.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/PromptDialog.xaml rename to src/Compatibility/Core/src/WinUI/PromptDialog.xaml diff --git a/src/Compatibility/Core/src/Windows/PromptDialog.xaml.cs b/src/Compatibility/Core/src/WinUI/PromptDialog.xaml.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PromptDialog.xaml.cs rename to src/Compatibility/Core/src/WinUI/PromptDialog.xaml.cs diff --git a/src/Compatibility/Core/src/Windows/Properties/AssemblyInfo.cs b/src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Properties/AssemblyInfo.cs rename to src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs diff --git a/src/Compatibility/Core/src/Windows/Properties/Xamarin.Forms.Platform.UAP.rd.xml b/src/Compatibility/Core/src/WinUI/Properties/Xamarin.Forms.Platform.UAP.rd.xml similarity index 100% rename from src/Compatibility/Core/src/Windows/Properties/Xamarin.Forms.Platform.UAP.rd.xml rename to src/Compatibility/Core/src/WinUI/Properties/Xamarin.Forms.Platform.UAP.rd.xml diff --git a/src/Compatibility/Core/src/Windows/PropertyChangedEventArgsExtensions.cs b/src/Compatibility/Core/src/WinUI/PropertyChangedEventArgsExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/PropertyChangedEventArgsExtensions.cs rename to src/Compatibility/Core/src/WinUI/PropertyChangedEventArgsExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs b/src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/RadioButtonRenderer.cs rename to src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs b/src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/RefreshViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/RendererToHandlerShim.cs b/src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/RendererToHandlerShim.cs rename to src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs diff --git a/src/Compatibility/Core/src/Windows/Resources.xaml b/src/Compatibility/Core/src/WinUI/Resources.xaml similarity index 99% rename from src/Compatibility/Core/src/Windows/Resources.xaml rename to src/Compatibility/Core/src/WinUI/Resources.xaml index f35ad267e28b..021b3a56fda0 100644 --- a/src/Compatibility/Core/src/Windows/Resources.xaml +++ b/src/Compatibility/Core/src/WinUI/Resources.xaml @@ -7,7 +7,7 @@ - + diff --git a/src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs b/src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ScrollViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/SearchBarRenderer.cs b/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/SearchBarRenderer.cs rename to src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/EllipseRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/EllipseRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/LineRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/LineRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/PathRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/PathRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/PolygonRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/PolygonRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/PolylineRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/PolylineRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/RectangleRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/RectangleRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shapes/ShapeRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shapes/ShapeRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellFlyoutItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellFlyoutItemRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellFlyoutSeparator.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutSeparator.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellFlyoutSeparator.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutSeparator.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellFlyoutTemplateSelector.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutTemplateSelector.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellFlyoutTemplateSelector.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutTemplateSelector.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellFooterRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellFooterRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellFooterRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellFooterRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellHeaderRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellHeaderRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellHeaderRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellHeaderRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellItemRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellPageWrapper.xaml b/src/Compatibility/Core/src/WinUI/Shell/ShellPageWrapper.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellPageWrapper.xaml rename to src/Compatibility/Core/src/WinUI/Shell/ShellPageWrapper.xaml diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellPageWrapper.xaml.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellPageWrapper.xaml.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellPageWrapper.xaml.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellPageWrapper.xaml.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs similarity index 96% rename from src/Compatibility/Core/src/Windows/Shell/ShellRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs index 925ca19f8c98..ef0340b92859 100644 --- a/src/Compatibility/Core/src/Windows/Shell/ShellRenderer.cs +++ b/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs @@ -453,11 +453,12 @@ void UpdatePaneButtonColor(string name, bool overrideColor) var toggleButton = GetTemplateChild(name) as Control; if (toggleButton != null) { - var titleBar = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar; - if (overrideColor) - toggleButton.Foreground = new WSolidColorBrush(titleBar.ButtonForegroundColor.Value); - else - toggleButton.ClearValue(Control.ForegroundProperty); + // TODO WINUI + //var titleBar = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar; + //if (overrideColor) + // toggleButton.Foreground = new WSolidColorBrush(titleBar.ButtonForegroundColor.Value); + //else + // toggleButton.ClearValue(Control.ForegroundProperty); } } @@ -480,9 +481,10 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance) _flyoutHeight = appearance.FlyoutHeight; } - var titleBar = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar; - titleBar.BackgroundColor = titleBar.ButtonBackgroundColor = backgroundColor; - titleBar.ForegroundColor = titleBar.ButtonForegroundColor = titleColor; + // TODO WINUI + //var titleBar = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar; + //titleBar.BackgroundColor = titleBar.ButtonBackgroundColor = backgroundColor; + //titleBar.ForegroundColor = titleBar.ButtonForegroundColor = titleColor; UpdatePaneButtonColor(TogglePaneButton, !IsPaneOpen); UpdatePaneButtonColor(NavigationViewBackButton, !IsPaneOpen); UpdateFlyoutBackdrop(); diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellSectionRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellSectionRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellSectionRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellSectionRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellSplitView.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellSplitView.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellStyles.xaml b/src/Compatibility/Core/src/WinUI/Shell/ShellStyles.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellStyles.xaml rename to src/Compatibility/Core/src/WinUI/Shell/ShellStyles.xaml diff --git a/src/Compatibility/Core/src/Windows/Shell/ShellToolbarItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Shell/ShellToolbarItemRenderer.cs rename to src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/SliderRenderer.cs b/src/Compatibility/Core/src/WinUI/SliderRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/SliderRenderer.cs rename to src/Compatibility/Core/src/WinUI/SliderRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/SliderStyle.xaml b/src/Compatibility/Core/src/WinUI/SliderStyle.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/SliderStyle.xaml rename to src/Compatibility/Core/src/WinUI/SliderStyle.xaml diff --git a/src/Compatibility/Core/src/Windows/StepperControl.cs b/src/Compatibility/Core/src/WinUI/StepperControl.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/StepperControl.cs rename to src/Compatibility/Core/src/WinUI/StepperControl.cs diff --git a/src/Compatibility/Core/src/Windows/StepperRenderer.cs b/src/Compatibility/Core/src/WinUI/StepperRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/StepperRenderer.cs rename to src/Compatibility/Core/src/WinUI/StepperRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/StreamImagesourceHandler.cs b/src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/StreamImagesourceHandler.cs rename to src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs diff --git a/src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs b/src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/SwipeViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/SwitchRenderer.cs b/src/Compatibility/Core/src/WinUI/SwitchRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/SwitchRenderer.cs rename to src/Compatibility/Core/src/WinUI/SwitchRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs b/src/Compatibility/Core/src/WinUI/TabbedPageRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs rename to src/Compatibility/Core/src/WinUI/TabbedPageRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/TabbedPageStyle.xaml b/src/Compatibility/Core/src/WinUI/TabbedPageStyle.xaml similarity index 100% rename from src/Compatibility/Core/src/Windows/TabbedPageStyle.xaml rename to src/Compatibility/Core/src/WinUI/TabbedPageStyle.xaml diff --git a/src/Compatibility/Core/src/Windows/TableViewRenderer.cs b/src/Compatibility/Core/src/WinUI/TableViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TableViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/TableViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/TaskExtensions.cs b/src/Compatibility/Core/src/WinUI/TaskExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TaskExtensions.cs rename to src/Compatibility/Core/src/WinUI/TaskExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/TextAlignmentToHorizontalAlignmentConverter.cs b/src/Compatibility/Core/src/WinUI/TextAlignmentToHorizontalAlignmentConverter.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TextAlignmentToHorizontalAlignmentConverter.cs rename to src/Compatibility/Core/src/WinUI/TextAlignmentToHorizontalAlignmentConverter.cs diff --git a/src/Compatibility/Core/src/Windows/TextBlockExtensions.cs b/src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TextBlockExtensions.cs rename to src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/TextCellRenderer.cs b/src/Compatibility/Core/src/WinUI/TextCellRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TextCellRenderer.cs rename to src/Compatibility/Core/src/WinUI/TextCellRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs b/src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TimePickerRenderer.cs rename to src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/TitleViewManager.cs b/src/Compatibility/Core/src/WinUI/TitleViewManager.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/TitleViewManager.cs rename to src/Compatibility/Core/src/WinUI/TitleViewManager.cs diff --git a/src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs b/src/Compatibility/Core/src/WinUI/ToolbarPlacementHelper.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ToolbarPlacementHelper.cs rename to src/Compatibility/Core/src/WinUI/ToolbarPlacementHelper.cs diff --git a/src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs b/src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/UriImageSourceHandler.cs rename to src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs diff --git a/src/Compatibility/Core/src/Windows/ViewExtensions.cs b/src/Compatibility/Core/src/WinUI/ViewExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ViewExtensions.cs rename to src/Compatibility/Core/src/WinUI/ViewExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/ViewRenderer.cs b/src/Compatibility/Core/src/WinUI/ViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/ViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs b/src/Compatibility/Core/src/WinUI/ViewToRendererConverter.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/ViewToRendererConverter.cs rename to src/Compatibility/Core/src/WinUI/ViewToRendererConverter.cs diff --git a/src/Compatibility/Core/src/Windows/VisualElementChangedEventArgs.cs b/src/Compatibility/Core/src/WinUI/VisualElementChangedEventArgs.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/VisualElementChangedEventArgs.cs rename to src/Compatibility/Core/src/WinUI/VisualElementChangedEventArgs.cs diff --git a/src/Compatibility/Core/src/Windows/VisualElementExtensions.cs b/src/Compatibility/Core/src/WinUI/VisualElementExtensions.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/VisualElementExtensions.cs rename to src/Compatibility/Core/src/WinUI/VisualElementExtensions.cs diff --git a/src/Compatibility/Core/src/Windows/VisualElementPackager.cs b/src/Compatibility/Core/src/WinUI/VisualElementPackager.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/VisualElementPackager.cs rename to src/Compatibility/Core/src/WinUI/VisualElementPackager.cs diff --git a/src/Compatibility/Core/src/Windows/VisualElementRenderer.cs b/src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/VisualElementRenderer.cs rename to src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/VisualElementTracker.cs b/src/Compatibility/Core/src/WinUI/VisualElementTracker.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/VisualElementTracker.cs rename to src/Compatibility/Core/src/WinUI/VisualElementTracker.cs diff --git a/src/Compatibility/Core/src/Windows/WebViewRenderer.cs b/src/Compatibility/Core/src/WinUI/WebViewRenderer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WebViewRenderer.cs rename to src/Compatibility/Core/src/WinUI/WebViewRenderer.cs diff --git a/src/Compatibility/Core/src/Windows/Win2DNotImplementedException.cs b/src/Compatibility/Core/src/WinUI/Win2DNotImplementedException.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/Win2DNotImplementedException.cs rename to src/Compatibility/Core/src/WinUI/Win2DNotImplementedException.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsBasePage.cs b/src/Compatibility/Core/src/WinUI/WindowsBasePage.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsBasePage.cs rename to src/Compatibility/Core/src/WinUI/WindowsBasePage.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsBasePlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsBasePlatformServices.cs rename to src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsDeviceInfo.cs b/src/Compatibility/Core/src/WinUI/WindowsDeviceInfo.cs similarity index 81% rename from src/Compatibility/Core/src/Windows/WindowsDeviceInfo.cs rename to src/Compatibility/Core/src/WinUI/WindowsDeviceInfo.cs index 21a5477bb482..e54ffeb83686 100644 --- a/src/Compatibility/Core/src/Windows/WindowsDeviceInfo.cs +++ b/src/Compatibility/Core/src/WinUI/WindowsDeviceInfo.cs @@ -9,16 +9,16 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP { internal class WindowsDeviceInfo : DeviceInfo { - DisplayInformation _information; + //DisplayInformation _information; bool _isDisposed; // DualScreen.IDualScreenService DualScreenService => DependencyService.Get(); public WindowsDeviceInfo() { // TODO: Screen size and DPI can change at any time - _information = DisplayInformation.GetForCurrentView(); - _information.OrientationChanged += OnOrientationChanged; - CurrentOrientation = GetDeviceOrientation(_information.CurrentOrientation); + //_information = DisplayInformation.GetForCurrentView(); + //_information.OrientationChanged += OnOrientationChanged; + //CurrentOrientation = GetDeviceOrientation(_information.CurrentOrientation); } public override Size PixelScreenSize @@ -47,7 +47,9 @@ public override double ScalingFactor { get { - return ((int)_information.ResolutionScale) / 100d; + // TODO WINUI + return 1; + //return ((int)_information.ResolutionScale) / 100d; } } @@ -56,11 +58,11 @@ protected override void Dispose(bool disposing) if (_isDisposed) return; - if (disposing) - { - _information.OrientationChanged -= OnOrientationChanged; - _information = null; - } + //if (disposing) + //{ + // _information.OrientationChanged -= OnOrientationChanged; + // _information = null; + //} _isDisposed = true; diff --git a/src/Compatibility/Core/src/Windows/WindowsExpressionSearch.cs b/src/Compatibility/Core/src/WinUI/WindowsExpressionSearch.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsExpressionSearch.cs rename to src/Compatibility/Core/src/WinUI/WindowsExpressionSearch.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsIsolatedStorage.cs b/src/Compatibility/Core/src/WinUI/WindowsIsolatedStorage.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsIsolatedStorage.cs rename to src/Compatibility/Core/src/WinUI/WindowsIsolatedStorage.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsPage.cs b/src/Compatibility/Core/src/WinUI/WindowsPage.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsPage.cs rename to src/Compatibility/Core/src/WinUI/WindowsPage.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsPlatform.cs b/src/Compatibility/Core/src/WinUI/WindowsPlatform.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsPlatform.cs rename to src/Compatibility/Core/src/WinUI/WindowsPlatform.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsPlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsPlatformServices.cs rename to src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsResourcesProvider.cs b/src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsResourcesProvider.cs rename to src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsSerializer.cs b/src/Compatibility/Core/src/WinUI/WindowsSerializer.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsSerializer.cs rename to src/Compatibility/Core/src/WinUI/WindowsSerializer.cs diff --git a/src/Compatibility/Core/src/Windows/WindowsTicker.cs b/src/Compatibility/Core/src/WinUI/WindowsTicker.cs similarity index 100% rename from src/Compatibility/Core/src/Windows/WindowsTicker.cs rename to src/Compatibility/Core/src/WinUI/WindowsTicker.cs diff --git a/src/Compatibility/Core/tests/UAP/BackgroundColorTests.cs b/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs similarity index 94% rename from src/Compatibility/Core/tests/UAP/BackgroundColorTests.cs rename to src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs index 69e69b248d73..f100e59b7770 100644 --- a/src/Compatibility/Core/tests/UAP/BackgroundColorTests.cs +++ b/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs @@ -7,6 +7,7 @@ using Microsoft.Maui.Controls.Compatibility.Platform.UWP; using WColor = Windows.UI.Color; using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush; +using Microsoft.Maui.Graphics; namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests { @@ -22,7 +23,7 @@ static IEnumerable TestCases .Where(v => !(v is SearchBar)) .Where(v => !(v is Frame))) { - element.BackgroundColor = Color.AliceBlue; + element.BackgroundColor = Colors.AliceBlue; yield return CreateTestCase(element); } } @@ -89,7 +90,7 @@ public async Task BackgroundColorConsistent(View view) [Description("Frame background color should match renderer background color")] public async Task FrameBackgroundColorConsistent() { - var frame = new Frame() { BackgroundColor = Color.Orange }; + var frame = new Frame() { BackgroundColor = Colors.Orange }; var expectedColor = frame.BackgroundColor.ToWindowsColor(); var actualColor = await Device.InvokeOnMainThreadAsync(() => diff --git a/src/Compatibility/Core/tests/UAP/ColorTests.cs b/src/Compatibility/Core/tests/WinUI/ColorTests.cs similarity index 71% rename from src/Compatibility/Core/tests/UAP/ColorTests.cs rename to src/Compatibility/Core/tests/WinUI/ColorTests.cs index 115f93bf4643..24fb1ea9260b 100644 --- a/src/Compatibility/Core/tests/UAP/ColorTests.cs +++ b/src/Compatibility/Core/tests/WinUI/ColorTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using Microsoft.Maui.Controls.Compatibility.Platform.UWP; +using Microsoft.Maui.Graphics; namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests { @@ -11,13 +12,13 @@ public void PrimaryColorConversions() { // 11:15, restate my assumptions... - var windowsRed = Color.Red.ToWindowsColor(); + var windowsRed = Colors.Red.ToWindowsColor(); Assert.That(windowsRed.R, Is.EqualTo(255)); - var windowsBlue = Color.Blue.ToWindowsColor(); + var windowsBlue = Colors.Blue.ToWindowsColor(); Assert.That(windowsBlue.B, Is.EqualTo(255)); - var windowsGreen = Color.Green.ToWindowsColor(); + var windowsGreen = Colors.Green.ToWindowsColor(); Assert.That(windowsGreen.G, Is.EqualTo(128)); } } diff --git a/src/Compatibility/Core/tests/UAP/Compatibility.UAP.UnitTests.csproj b/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj similarity index 92% rename from src/Compatibility/Core/tests/UAP/Compatibility.UAP.UnitTests.csproj rename to src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj index 0d549c86f8f4..7e154921d89c 100644 --- a/src/Compatibility/Core/tests/UAP/Compatibility.UAP.UnitTests.csproj +++ b/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj @@ -1,11 +1,11 @@ - + - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 10.0.17134.0 Microsoft.Maui.Controls.Compatibility.UAP.UnitTests win10-x86;win10-x64;win10-arm64 $(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;UWP_16299 - 1701;1702;CS8305;8305 + 1701;1702;CS8305;8305;CA1416 @@ -17,8 +17,9 @@ - - + + + 3.12.0 @@ -26,9 +27,14 @@ - - + + + + + UAP + +