Remove unsupported targets in Device class

src/Compatibility/Core/src/Windows/WindowsPlatformServices.cs

@@ -101,7 +101,7 @@ public Color GetNamedColor(string name)
 			return ((global::Windows.UI.Color)Microsoft.UI.Xaml.Application.Current?.Resources[name]).ToColor();
 		}
 
-		public string RuntimePlatform => Device.UWP;
+		public string RuntimePlatform => Device.WinUI;
 
 		public void StartTimer(TimeSpan interval, Func<bool> callback)
 		{

src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs

@@ -200,7 +200,7 @@ static string DefaultFontFamily()
 				case Device.iOS:
 					fontFamily = "Ionicons";
 					break;
-				case Device.UWP:
+				case Device.WinUI:
 					fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
 					break;
 				case Device.Android:

src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ExampleTemplates.cs

@@ -552,7 +552,7 @@ static string DefaultFontFamily()
 				case Device.iOS:
 					fontFamily = "Ionicons";
 					break;
-				case Device.UWP:
+				case Device.WinUI:
 					fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
 					break;
 				case Device.Android:

src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ReorderingGalleries/GroupedReorderingGallery.cs

@@ -33,7 +33,7 @@ public GroupedReorderingGallery(IItemsLayout itemsLayout)
 				Text = "Reordering of grouped sources is not supported on Windows!",
 				FontSize = 24,
 				FontAttributes = FontAttributes.Bold,
-				IsVisible = (Device.RuntimePlatform == Device.UWP),
+				IsVisible = (Device.RuntimePlatform == Device.WinUI),
 				BackgroundColor = Colors.Red
 			};
 

src/Controls/samples/Controls.Sample/Pages/Controls/CollectionViewGalleries/ReorderingGalleries/UngroupedReorderingGallery.cs

@@ -77,7 +77,7 @@ async void UpdateItemsSourceType(ItemsSourceGenerator generator, ItemsSourceType
 		{
 			generator.GenerateItems(itemsSourceType);
 
-			if (Device.RuntimePlatform == Device.UWP && !(collectionView.ItemsSource is INotifyCollectionChanged))
+			if (Device.RuntimePlatform == Device.WinUI && !(collectionView.ItemsSource is INotifyCollectionChanged))
 			{
 				await DisplayAlert("Warning!", "Reordering on UWP/WinUI only works with ObservableCollections!", "OK");
 			}

src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/CustomSwipeItemGallery.cs

@@ -18,7 +18,7 @@ public CustomSwipeItemGallery()
 				}
 			};
 
-			if (Device.RuntimePlatform != Device.UWP)
+			if (Device.RuntimePlatform != Device.WinUI)
 			{
 				layout.Children.Add(GalleryBuilder.NavButton("SwipeItemView Gallery", () => new CustomSwipeItemViewGallery(), Navigation));
 				layout.Children.Add(GalleryBuilder.NavButton("CustomSwipeItem Size Gallery", () => new CustomSizeSwipeViewGallery(), Navigation));

src/Controls/samples/Controls.Sample/Pages/Controls/SwipeViewGalleries/SwipeItemIconGallery.cs

@@ -98,7 +98,7 @@ public SwipeItemIconGallery()
 				case Device.iOS:
 					fontFamily = "Ionicons";
 					break;
-				case Device.UWP:
+				case Device.WinUI:
 					fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
 					break;
 				case Device.Android:

src/Controls/samples/Controls.Sample/Pages/Core/DevicePage.xaml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<views:BasePage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Pages.DevicePage"
+    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
+    Title="Device">
+    <ContentPage.Content>
+        <StackLayout 
+            HorizontalOptions="Center">
+            <Label    
+                Text="{OnPlatform Default='Default Platform', Android='Android', iOS='iOS', MacCatalyst='MacCatalyst', Tizen='Tizen', WinUI='WinUI'}" />
+            <Label     
+                Text="{OnIdiom Default='Default Idiom', Phone='Phone', Tablet='Tablet', Desktop='Desktop', TV='TV', Watch='Watch'}" />
+        </StackLayout>
+    </ContentPage.Content>
+</views:BasePage>

src/Controls/samples/Controls.Sample/Pages/Core/DevicePage.xaml.cs

@@ -0,0 +1,10 @@
+namespace Maui.Controls.Sample.Pages
+{
+	public partial class DevicePage
+	{
+		public DevicePage()
+		{
+			InitializeComponent();
+		}
+	}
+}

src/Controls/samples/Controls.Sample/Pages/MainPage.xaml

@@ -51,7 +51,7 @@
     </views:BasePage.Resources>
     <ScrollView>
         <Grid
-            RowDefinitions="150, *, Auto, Auto"
+            RowDefinitions="150, *, Auto"
             RowSpacing="0">
             <!-- HEADER -->
             <Image
@@ -118,14 +118,6 @@
                 Grid.Row="2"
                 Text="Microsoft Corporation © 2021"
                 Style="{StaticResource FooterStyle}" />
-            <StackLayout Orientation="Horizontal" Grid.Row="3" HorizontalOptions="Center">
-                <Label
-                    Text="{OnPlatform Default='Default Platform', Android='Android', iOS='iOS', macOS='macOS', MacCatalyst='MacCatalyst', Tizen='Tizen', UWP='UWP'}"
-                    Style="{StaticResource FooterStyle}" />
-                <Label
-                    Text="{OnIdiom Default='Default Idiom', Phone='Phone', Tablet='Tablet', Desktop='Desktop', TV='TV', Watch='Watch'}"
-                    Style="{StaticResource FooterStyle}" />
-            </StackLayout>
         </Grid>
     </ScrollView>
 </views:BasePage>

src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs

@@ -27,6 +27,9 @@ public class CoreViewModel : BaseGalleryViewModel
 			new SectionModel(typeof(ClipPage), "Clip",
 				"Defines the outline of the contents of an element."),
 
+			new SectionModel(typeof(DevicePage), "Device",
+				"A number of properties and methods to help developers customize layout and functionality on a per-platform basis"),
+
 			new SectionModel(typeof(EffectsPage), "Effects",
 				"Apply Effects to a View."),
 

src/Controls/src/Core/Device.cs

@@ -19,15 +19,16 @@ public static class Device
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='Android']/Docs" />
 		public const string Android = "Android";
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='UWP']/Docs" />
-		public const string UWP = "UWP";
+		internal const string UWP = "UWP";
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='macOS']/Docs" />
-		public const string macOS = "macOS";
+		internal const string macOS = "macOS";
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='GTK']/Docs" />
-		public const string GTK = "GTK";
+		internal const string GTK = "GTK";
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='Tizen']/Docs" />
 		public const string Tizen = "Tizen";
 		/// <include file="../../docs/Microsoft.Maui.Controls/Device.xml" path="//Member[@MemberName='WPF']/Docs" />
-		public const string WPF = "WPF";
+		internal const string WPF = "WPF";
+		public const string WinUI = "WinUI";
 		public const string MacCatalyst = "MacCatalyst";
 		public const string tvOS = "tvOS";
 

src/Controls/src/Xaml/MarkupExtensions/OnPlatformExtension.cs

@@ -12,13 +12,14 @@ public class OnPlatformExtension : IMarkupExtension
 
 		public object Default { get; set; } = s_notset;
 		public object Android { get; set; } = s_notset;
-		public object GTK { get; set; } = s_notset;
+		internal object GTK { get; set; } = s_notset;
 		public object iOS { get; set; } = s_notset;
-		public object macOS { get; set; } = s_notset;
+		internal object macOS { get; set; } = s_notset;
 		public object MacCatalyst { get; set; } = s_notset;
 		public object Tizen { get; set; } = s_notset;
-		public object UWP { get; set; } = s_notset;
-		public object WPF { get; set; } = s_notset;
+		internal object UWP { get; set; } = s_notset;
+		internal object WPF { get; set; } = s_notset;
+		public object WinUI { get; set; } = s_notset;
 
 		public IValueConverter Converter { get; set; }
 
@@ -33,7 +34,8 @@ public object ProvideValue(IServiceProvider serviceProvider)
 				&& MacCatalyst == s_notset
 				&& Tizen == s_notset
 				&& UWP == s_notset
-				&& WPF == s_notset
+				&& WPF == s_notset 
+				&& WinUI == s_notset
 				&& Default == s_notset)
 			{
 				throw new XamlParseException("OnPlatformExtension requires a value to be specified for at least one platform or Default.", serviceProvider);
@@ -147,6 +149,11 @@ bool TryGetValueForPlatform(out object value)
 				value = WPF;
 				return true;
 			}
+			if (Device.RuntimePlatform == Device.WinUI && WinUI != s_notset)
+			{
+				value = WinUI;
+				return true;
+			}
 			value = Default;
 			return value != s_notset;
 		}