Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Convert UAP Platform Head to use WinUI 3 Desktop #13584

Merged
merged 34 commits into from
Feb 11, 2021
Merged

Convert UAP Platform Head to use WinUI 3 Desktop #13584

merged 34 commits into from
Feb 11, 2021

Conversation

PureWeen
Copy link
Contributor

@PureWeen PureWeen commented Jan 29, 2021 •
edited
Loading

Description of Change

  • This converts over our Platform.UAP project to use WinUI 3 Desktop (better name incoming)
  • FontImageSource doesn't work until Win2D is converted to WinUI 3
  • Maps doesn't work because Maps aren't converted
  • Native Embedding will need to be fixed
  • Multi-window code TryAllDispatchers is currently disabled
  • fixed up the nuspec and the cake script so it will create a nuget

Platforms Affected

  • UWP

Testing Procedure

PR Checklist

  • Targets the correct branch
  • Tests are passing (or failures are unrelated)

PureWeen added 15 commits January 27, 2021 14:53
@PureWeen
WinUI3
2ff6d38
@PureWeen
Merge branch 'main' into maui_winui
2a926f9 
# Conflicts:
#	.nuspec/Xamarin.Forms.nuspec
#	UWP.Build.props
#	Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
#	Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
#	Xamarin.Forms.DualScreen/DualScreenHelper.uwp.cs
#	Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs
#	Xamarin.Forms.Platform.UAP/ButtonRenderer.cs
#	Xamarin.Forms.Platform.UAP/Extensions/TransformExtensions.cs
#	Xamarin.Forms.Platform.UAP/FontImageSourceHandler.cs
#	Xamarin.Forms.Platform.UAP/Forms.cs
#	Xamarin.Forms.Platform.UAP/FormsButton.cs
#	Xamarin.Forms.Platform.UAP/MediaElementRenderer.cs
#	Xamarin.Forms.Platform.UAP/Platform.cs
#	Xamarin.Forms.Platform.UAP/RadioButtonRenderer.cs
#	Xamarin.Forms.Platform.UAP/Shell/ShellFlyoutItemRenderer.cs
#	Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs
#	Xamarin.Forms.Platform.UAP/Shell/ShellSectionRenderer.cs
#	Xamarin.Forms.Platform.UAP/Shell/ShellSplitView.cs
#	Xamarin.Forms.Platform.UAP/WebViewRenderer.cs
#	Xamarin.Forms.Platform.UAP/WindowsBasePlatformServices.cs
#	Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
#	build.cake
@PureWeen
- fix merge errors
214b888
@PureWeen
- Setup Control Gallery
aaf50d1
@PureWeen
- Fix Control Gallery issues
56b7a2c
@PureWeen
- clean up webview2
b0aac92
@PureWeen
- remove comments
29ef035
@PureWeen
- moving images around
9dd3104
@PureWeen
- wireup keydown
9916d13
@PureWeen
- update packageid to match
6d3c1e8
@PureWeen
Merge branch 'main_winui' into main-handler
17abce4 
# Conflicts:
#	UWP.Build.props
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/Lobster-Regular.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/OFL.txt
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/fa-solid-900.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/ionicons.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Fonts/materialdesignicons-webfont.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/Logo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SmallLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/SplashScreen.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/StoreLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/WideLogo.scale-100.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Assets/coverassets1.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/FlowerBuds.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Fruits.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifOne.gif
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/GifTwo.gif
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Legumes.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Vegetables.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/WebImages/XamarinLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/bank.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/calculator.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cardBackground.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/coffee.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/cover1small.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimson.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/crimsonsmall.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/default.css
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/invalidimage.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/menuIcon.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasis.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/oasissmall.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/photo.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/bell.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/books.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/booksflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/film.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/filmflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/games.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gamesflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/gear.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/grid.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphone.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/headphoneflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/home.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/homeflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/loop.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaper.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/newspaperflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/person.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star-flyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-100/star.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/bell.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/books.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/booksflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/film.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/filmflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/games.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gamesflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/gear.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/grid.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphone.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/headphoneflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/home.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/homeflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/loop.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaper.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/newspaperflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/person.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star-flyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/scale-200/star.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/seth.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/test.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/toolbar_close.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinlogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal (Package)/xamarinstore.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/materialdesignicons-webfont.ttf
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/coverassets1.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif
#	Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx
#	Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/cardBackground.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/default.css
#	Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg
#	Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png
#	Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg
#	Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
#	Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
#	Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj
#	Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj
#	Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
#	Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj
#	Xamarin.Forms.sln
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/materialdesignicons-webfont.ttf
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/coverassets1.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/cardBackground.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/default.css
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg
#	src/Platform.Renderers/src/Xamarin.Forms.Platform.UAP/Extensions/WinUIHelpers.cs
#	src/Platform.Renderers/src/Xamarin.Forms.Platform.UAP/StepperControl.xaml
#	src/Platform.Renderers/src/Xamarin.Forms.Platform.UAP/StepperControl.xaml.cs
@PureWeen
- merge fixes
b2a445e
@PureWeen
- fix up extra code
b71d27b
@PureWeen
- remove nuspec changes
f7bb2f1
@PureWeen
- dualscreen
bec263f
jsuarezruiz
jsuarezruiz approved these changes Feb 5, 2021
View reviewed changes
Copy link
Contributor

@jsuarezruiz jsuarezruiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work Shane. After some testing, the basic controls seem to work correctly after the namespace changes. I have left some comments but I think that, although we have to wait in some cases (Maps, Win2D, Multi-Window, etc) and make some changes in others, it is a good starting point especially thinking about being able to start creating WinUI 3 Handlers.

@jsuarezruiz
Copy link
Contributor

@PureWeen Could you rebase to fix the conflict?

@PureWeen
Merge branch 'main-handler' into maui_winui3
b529d4c 
# Conflicts:
#	Xamarin.Forms.sln
@PureWeen
- fix vsmac
e9ac0e7
@PureWeen
- fix vsmac builds
e570652
@PureWeen
- fix build tasks compile
b7fb52a
@PureWeen
- review fixes
b17ee6d
@PureWeen
Merge branch 'main-handler' into maui_winui3
7ea4777 
# Conflicts:
#	src/ControlGallery/src/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
@PureWeen
- remove platform from forms.sln
42ebd91
@rmarinho rmarinho merged commit a01f005 into main-handler Feb 11, 2021
@rmarinho rmarinho deleted the maui_winui3 branch February 11, 2021 18:09
@MartyIX MartyIX mentioned this pull request Jun 13, 2024
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rmarinho rmarinho rmarinho approved these changes

@jsuarezruiz jsuarezruiz jsuarezruiz approved these changes

@mattleibow mattleibow Awaiting requested review from mattleibow

Assignees
No one assigned
Labels
p/UWP
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PureWeen @jsuarezruiz @rmarinho