Multi Target UWP to 1809 and 2004

src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/Shadow/PlatformShadowEffect.uwp.cs

@@ -119,7 +119,11 @@ void AppendShadow()
 			UpdateShadow();
 			spriteVisual = compositor.CreateSpriteVisual();
 			spriteVisual.Shadow = shadow;
+#if UWP_18362
 			spriteVisual.Size = View.ActualSize;
+#else
+			spriteVisual.Size = new Vector2(Convert.ToSingle(View.ActualWidth), Convert.ToSingle(View.ActualHeight));
+#endif
 
 			View.SizeChanged += ViewSizeChanged;
 
@@ -200,8 +204,11 @@ void ViewSizeChanged(object sender, SizeChangedEventArgs e)
 		{
 			if (spriteVisual == null || View == null)
 				return;
-
+#if UWP_18362
 			spriteVisual.Size = View.ActualSize;
+#else
+			spriteVisual.Size = new Vector2(Convert.ToSingle(View.ActualWidth), Convert.ToSingle(View.ActualHeight));
+#endif
 
 			UpdateShadowMask();
 		}

src/CommunityToolkit/Xamarin.CommunityToolkit/Views/DrawingView/Service/DrawingViewService.macos.cs

@@ -1,12 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using AppKit;
 using CoreGraphics;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.MacOS;
-
 namespace Xamarin.CommunityToolkit.UI.Views
 {
 	static class DrawingViewService
@@ -19,16 +18,13 @@ public static Stream GetImageStream(IList<Line>? lines,
 			{
 				return Stream.Null;
 			}
-
 			var image = GetImageInternal(lines, backgroundColor);
 			if (image is null)
 			{
 				return Stream.Null;
 			}
-
 			return image.AsTiff()?.AsStream() ?? Stream.Null;
 		}
-
 		/// <summary>
 		/// Get image stream from points
 		/// </summary>
@@ -48,16 +44,13 @@ public static Stream GetImageStream(IList<Point>? points,
 			{
 				return Stream.Null;
 			}
-
 			var image = GetImageInternal(points, lineWidth, strokeColor, backgroundColor);
 			if (image is null)
 			{
 				return Stream.Null;
 			}
-
 			return image.AsTiff()?.AsStream() ?? Stream.Null;
 		}
-
 		static NSImage? GetImageInternal(IList<Point> points,
 			float lineWidth,
 			Color strokeColor,
@@ -72,30 +65,24 @@ public static Stream GetImageStream(IList<Point>? points,
 			{
 				return null;
 			}
-
 			var imageSize = new CGSize(drawingWidth, drawingHeight);
-
 			using var context = new CGBitmapContext(IntPtr.Zero, (nint)drawingWidth, (nint)drawingHeight, 8,
 				(nint)drawingWidth * 4,
 				NSColorSpace.GenericRGBColorSpace.ColorSpace,
 				CGImageAlphaInfo.PremultipliedFirst);
 			context.SetFillColor(backgroundColor.ToCGColor());
 			context.FillRect(new CGRect(CGPoint.Empty, imageSize));
-
 			context.SetStrokeColor(strokeColor.ToCGColor());
 			context.SetLineWidth(lineWidth);
 			context.SetLineCap(CGLineCap.Round);
 			context.SetLineJoin(CGLineJoin.Round);
-
 			context.AddLines(points.Select(p => new CGPoint(p.X - minPointX, p.Y - minPointY)).ToArray());
 			context.StrokePath();
 
 			using var cgImage = context.ToImage() ?? throw new InvalidOperationException("Image Cannot be null");
 			NSImage image = new(cgImage, imageSize);
-
 			return image;
 		}
-
 		static NSImage? GetImageInternal(IList<Line> lines,
 			Color backgroundColor)
 		{
@@ -107,34 +94,28 @@ public static Stream GetImageStream(IList<Point>? points,
 			const int minSize = 1;
 			if (drawingWidth < minSize || drawingHeight < minSize)
 				return null;
-
 			var imageSize = new CGSize(drawingWidth, drawingHeight);
-
 			using var context = new CGBitmapContext(IntPtr.Zero, (nint)drawingWidth, (nint)drawingHeight, 8,
 				(nint)drawingWidth * 4,
 				NSColorSpace.GenericRGBColorSpace.ColorSpace,
 				CGImageAlphaInfo.PremultipliedFirst);
 			context.SetFillColor(backgroundColor.ToCGColor());
 			context.FillRect(new CGRect(CGPoint.Empty, imageSize));
-
 			foreach (var line in lines)
 			{
 				context.SetStrokeColor(line.LineColor.ToCGColor());
 				context.SetLineWidth(line.LineWidth);
 				context.SetLineCap(CGLineCap.Round);
 				context.SetLineJoin(CGLineJoin.Round);
-
 				var startPoint = line.Points.First();
 				context.MoveTo((float)startPoint.X, (float)startPoint.Y);
 				context.AddLines(line.Points.Select(p => new CGPoint(p.X - minPointX, p.Y - minPointY)).ToArray());
 			}
-
 			context.StrokePath();
 
 			using var cgImage = context.ToImage() ?? throw new InvalidOperationException("Image Cannot Be Null");
 			NSImage image = new(cgImage, imageSize);
-
 			return image;
 		}
 	}
-}
+}

src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs

@@ -1,5 +1,7 @@
 using System;
 using System.ComponentModel;
+using System.Reflection;
+using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -175,10 +177,23 @@ void SetColor()
 
 			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BackgroundProperty, Element.Color.ToWindowsColor()));
 
-#if UWP_18362
 			if (Element.Color == Color.Transparent)
+			{
+#if UWP_18362
 				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.IsDefaultShadowEnabledProperty, false));
+#else
+				const string isDefaultShadowEnabledProperty = "IsDefaultShadowEnabledProperty";
+
+				if (ApiInformation.IsPropertyPresent(typeof(FlyoutPresenter).FullName, isDefaultShadowEnabledProperty))
+				{
+					var property = typeof(FlyoutPresenter).GetProperty(isDefaultShadowEnabledProperty, BindingFlags.Static | BindingFlags.Public);
+					if (property?.GetValue(null) is DependencyProperty enabledProperty)
+					{
+						flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(enabledProperty,false));
+					}
+				}
 #endif
+			}
 		}
 
 		void ApplyStyles()
@@ -192,13 +207,13 @@ void Show()
 		{
 			if (Element?.Anchor != null)
 			{
-				var anchor = Platform.GetRenderer(Element.Anchor).ContainerElement;
+				var anchor = Forms.Platform.UWP.Platform.GetRenderer(Element.Anchor).ContainerElement;
 				FlyoutBase.SetAttachedFlyout(anchor, this);
 				FlyoutBase.ShowAttachedFlyout(anchor);
 			}
 			else
 			{
-				var frameworkElement = Platform.GetRenderer(Element?.Parent as VisualElement)?.ContainerElement;
+				var frameworkElement = Forms.Platform.UWP.Platform.GetRenderer(Element?.Parent as VisualElement)?.ContainerElement;
 				FlyoutBase.SetAttachedFlyout(frameworkElement, this);
 				FlyoutBase.ShowAttachedFlyout(frameworkElement);
 			}

src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.1.2">
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;tizen40</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.19041;netcoreapp3.1;net472;net471</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.17763;uap10.0.19041;netcoreapp3.1;net472;net471</TargetFrameworks>
     <AssemblyName>Xamarin.CommunityToolkit</AssemblyName>
     <RootNamespace>Xamarin.CommunityToolkit</RootNamespace>
     <PackageId>Xamarin.CommunityToolkit</PackageId>
@@ -53,11 +53,14 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
     <DefineConstants>$(DefineConstants);UWP_16299;UWP_14393</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.17763' ">
+    <DefineConstants>$(DefineConstants);UWP_17763;UWP_16299;UWP_14393</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.18362' ">
-    <DefineConstants>$(DefineConstants);UWP_18362;UWP_16299;UWP_14393</DefineConstants>
+    <DefineConstants>$(DefineConstants);UWP_18362;UWP_17763;UWP_16299;UWP_14393</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.19041' ">
-    <DefineConstants>$(DefineConstants);UWP_19041;UWP_18362;UWP_16299;UWP_14393</DefineConstants>
+    <DefineConstants>$(DefineConstants);UWP_19041;UWP_18362;UWP_17763;UWP_16299;UWP_14393</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**/*.shared.cs" />