Merge branch 'master' into dev/fast-pass-rendering

Kyaa-dost · web-flow · commit b03c54c2efcc · 2021-03-08T12:48:51.000-08:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs
@@ -23,7 +23,14 @@ public static Task BeginAsync(this Storyboard storyboard)
         {
             TaskCompletionSource<object?> taskCompletionSource = new TaskCompletionSource<object?>();
 
-            storyboard.Completed += (_, _) => taskCompletionSource.SetResult(null);
+            void OnCompleted(object sender, object e)
+            {
+                ((Storyboard)sender).Completed -= OnCompleted;
+
+                taskCompletionSource.SetResult(null);
+            }
+
+            storyboard.Completed += OnCompleted;
 
             storyboard.Begin();
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml
@@ -1,6 +1,7 @@
 ﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.xaml" />
@@ -88,7 +89,7 @@
                                                 Visibility="{Binding TemplateSettings.OverflowButtonVisibility, RelativeSource={RelativeSource Mode=TemplatedParent}}">
                                             <Button.Flyout>
                                                 <Flyout Placement="Bottom"
-                                                        ShouldConstrainToRootBounds="False">
+                                                        Windows10version1903:ShouldConstrainToRootBounds="False">
                                                     <Flyout.FlyoutPresenterStyle>
                                                         <Style TargetType="FlyoutPresenter">
                                                             <Setter Property="Padding" Value="0,8" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs
@@ -173,17 +173,21 @@ private async Task<bool> LoadImageBrushAsync(Uri uri)
                 var loadCompletedSource = new TaskCompletionSource<bool>();
                 _brushVisual = compositor.CreateSurfaceBrush(_imageSurface);
 
-                _imageSurface.LoadCompleted += (s, e) =>
+                void LoadCompleted(LoadedImageSurface sender, LoadedImageSourceLoadCompletedEventArgs args)
                 {
-                    if (e.Status == LoadedImageSourceLoadStatus.Success)
+                    sender.LoadCompleted -= LoadCompleted;
+
+                    if (args.Status == LoadedImageSourceLoadStatus.Success)
                     {
                         loadCompletedSource.SetResult(true);
                     }
                     else
                     {
                         loadCompletedSource.SetException(new ArgumentException("Image loading failed."));
                     }
-                };
+                }
+
+                _imageSurface.LoadCompleted += LoadCompleted;
 
                 await loadCompletedSource.Task;
                 _imageSize = _imageSurface.DecodedPhysicalSize;
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
@@ -13,51 +13,51 @@ public class Test_PointExtensions
     {
         [TestCategory("PointExtensions")]
         [TestMethod]
-        [DataRow(0d, 0d, 0, 0)]
-        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(0d, 0d, 0d, 0d)]
+        [DataRow(0d, 0d, 22d, 6.89d)]
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
-        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
-        public static void Test_PointExtensions_ToRect_FromWidthHeight(double width, double height, int x, int y)
+        [DataRow(double.MaxValue / 2, double.Epsilon, 22d, 0.3248d)]
+        public void Test_PointExtensions_ToRect_FromWidthHeight(double width, double height, double x, double y)
         {
-            Point p = new Point(x, y);
+            Point p = new(x, y);
             Rect
                 a = p.ToRect(width, height),
-                b = new Rect(x, y, width, height);
+                b = new(x, y, width, height);
 
             Assert.AreEqual(a, b);
         }
 
         [TestCategory("SizeExtensions")]
         [TestMethod]
-        [DataRow(0d, 0d, 0, 0)]
-        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(0d, 0d, 0d, 0d)]
+        [DataRow(0d, 0d, 22d, 6.89d)]
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
-        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
-        public static void Test_PointExtensions_ToRect_FromPoint(double width, double height, int x, int y)
+        [DataRow(double.MaxValue / 2, double.Epsilon, 22, 0.3248d)]
+        public void Test_PointExtensions_ToRect_FromPoint(double width, double height, double x, double y)
         {
             Point
-                p1 = new Point(x, y),
-                p2 = new Point(x + width, y + height);
+                p1 = new(x, y),
+                p2 = new(x + width, y + height);
             Rect
                 a = p1.ToRect(p2),
-                b = new Rect(p1, p2);
+                b = new(p1, p2);
 
             Assert.AreEqual(a, b);
         }
 
         [TestCategory("SizeExtensions")]
         [TestMethod]
-        [DataRow(0d, 0d, 0, 0)]
-        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(0d, 0d, 0d, 0d)]
+        [DataRow(0d, 0d, 22d, 6.89d)]
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
-        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
-        public static void Test_PointExtensions_ToRect_FromSize(double width, double height, int x, int y)
+        [DataRow(double.MaxValue / 2, double.Epsilon, 22, 0.3248d)]
+        public void Test_PointExtensions_ToRect_FromSize(double width, double height, double x, double y)
         {
-            Point p = new Point(x, y);
-            Size s = new Size(width, height);
+            Point p = new(x, y);
+            Size s = new(width, height);
             Rect
                 a = p.ToRect(s),
-                b = new Rect(p, s);
+                b = new(p, s);
 
             Assert.AreEqual(a, b);
         }
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_RectExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_RectExtensions.cs
@@ -26,14 +26,15 @@ public class Test_RectExtensions
         [DataRow(0, 0, 2, 2, -2, 2, 2, 2, true)]// Left bottom corner(0, 2) intersection.
         [DataRow(0, 0, 2, 2, 3, 0, 2, 2, false)]// No intersection.
         [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1117:Parameters should be on same line or separate lines", Justification = "Put the parameters of the same rectangle on the same line is clearer.")]
-        public static void Test_RectExtensions_IntersectsWith(
+        public void Test_RectExtensions_IntersectsWith(
             double rect1X, double rect1Y, double rect1Width, double rect1Height,
             double rect2X, double rect2Y, double rect2Width, double rect2Height,
             bool shouldIntersectsWith)
         {
-            var rect1 = new Rect(rect1X, rect1Y, rect1Width, rect1Height);
-            var rect2 = new Rect(rect2X, rect2Y, rect2Width, rect2Height);
-            var isIntersectsWith = rect1.IntersectsWith(rect2);
+            Rect rect1 = new(rect1X, rect1Y, rect1Width, rect1Height);
+            Rect rect2 = new(rect2X, rect2Y, rect2Width, rect2Height);
+            bool isIntersectsWith = rect1.IntersectsWith(rect2);
+
             Assert.IsTrue(isIntersectsWith == shouldIntersectsWith);
         }
     }
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs
@@ -14,47 +14,47 @@ public class Test_SizeExtensions
         [TestCategory("SizeExtensions")]
         [TestMethod]
         [DataRow(0d, 0d)]
-        [DataRow(3.14d, 6.55f)]
-        [DataRow(double.MinValue, double.Epsilon)]
-        public static void Test_SizeExtensions_ToRect_FromSize(double width, double height)
+        [DataRow(3.14d, 6.55d)]
+        [DataRow(double.MaxValue / 2, double.Epsilon)]
+        public void Test_SizeExtensions_ToRect_FromSize(double width, double height)
         {
-            Size s = new Size(width, height);
+            Size s = new(width, height);
             Rect
                 a = s.ToRect(),
-                b = new Rect(0, 0, s.Width, s.Height);
+                b = new(0, 0, s.Width, s.Height);
 
             Assert.AreEqual(a, b);
         }
 
         [TestCategory("SizeExtensions")]
         [TestMethod]
-        [DataRow(0d, 0d, 0, 0)]
-        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(0d, 0d, 0d, 0d)]
+        [DataRow(0d, 0d, 22d, 6.89d)]
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
-        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
-        public static void Test_SizeExtensions_ToRect_FromSizeAndPosition(double width, double height, int x, int y)
+        [DataRow(double.MaxValue / 2, double.Epsilon, 22, 0.3248d)]
+        public void Test_SizeExtensions_ToRect_FromSizeAndPosition(double width, double height, double x, double y)
         {
-            Size s = new Size(width, height);
+            Size s = new(width, height);
             Rect
                 a = s.ToRect(x, y),
-                b = new Rect(x, y, s.Width, s.Height);
+                b = new(x, y, s.Width, s.Height);
 
             Assert.AreEqual(a, b);
         }
 
         [TestCategory("SizeExtensions")]
         [TestMethod]
-        [DataRow(0d, 0d, 0, 0)]
-        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(0d, 0d, 0d, 0d)]
+        [DataRow(0d, 0d, 22d, 6.89d)]
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
-        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
-        public static void Test_SizeExtensions_ToRect_FromSizeAndPoint(double width, double height, int x, int y)
+        [DataRow(double.MaxValue / 2, double.Epsilon, 22d, 0.3248d)]
+        public void Test_SizeExtensions_ToRect_FromSizeAndPoint(double width, double height, double x, double y)
         {
-            Point p = new Point(x, y);
-            Size s = new Size(width, height);
+            Point p = new(x, y);
+            Size s = new(width, height);
             Rect
                 a = s.ToRect(p),
-                b = new Rect(p, s);
+                b = new(p, s);
 
             Assert.AreEqual(a, b);
         }
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -23,7 +23,7 @@ public async Task StringExtensions_GetViewLocalized()
             await App.Dispatcher.EnqueueAsync(() =>
             {
                 var xamlRoot = App.XamlRoot;
-                var str = StringExtensions.GetViewLocalized("abc", xamlRoot.UIContext);
+                var str = "abc".GetViewLocalized(xamlRoot.UIContext);
                 Assert.AreEqual("ABCDEF", str);
             });
         }
@@ -136,4 +136,4 @@ await App.Dispatcher.EnqueueAsync(async () =>
             });
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -173,17 +173,21 @@ private async Task<bool> LoadImageBrushAsync(Uri uri)`
`173`	`173`	`var loadCompletedSource = new TaskCompletionSource<bool>();`
`174`	`174`	`_brushVisual = compositor.CreateSurfaceBrush(_imageSurface);`
`175`	`175`
`176`		`- _imageSurface.LoadCompleted += (s, e) =>`
	`176`	`+ void LoadCompleted(LoadedImageSurface sender, LoadedImageSourceLoadCompletedEventArgs args)`
`177`	`177`	`{`
`178`		`- if (e.Status == LoadedImageSourceLoadStatus.Success)`
	`178`	`+ sender.LoadCompleted -= LoadCompleted;`
	`179`	`+`
	`180`	`+ if (args.Status == LoadedImageSourceLoadStatus.Success)`
`179`	`181`	`{`
`180`	`182`	`loadCompletedSource.SetResult(true);`
`181`	`183`	`}`
`182`	`184`	`else`
`183`	`185`	`{`
`184`	`186`	`loadCompletedSource.SetException(new ArgumentException("Image loading failed."));`
`185`	`187`	`}`
`186`		`- };`
	`188`	`+ }`
	`189`	`+`
	`190`	`+ _imageSurface.LoadCompleted += LoadCompleted;`
`187`	`191`
`188`	`192`	`await loadCompletedSource.Task;`
`189`	`193`	`_imageSize = _imageSurface.DecodedPhysicalSize;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public async Task StringExtensions_GetViewLocalized()`
`23`	`23`	`await App.Dispatcher.EnqueueAsync(() =>`
`24`	`24`	`{`
`25`	`25`	`var xamlRoot = App.XamlRoot;`
`26`		`- var str = StringExtensions.GetViewLocalized("abc", xamlRoot.UIContext);`
	`26`	`+ var str = "abc".GetViewLocalized(xamlRoot.UIContext);`
`27`	`27`	`Assert.AreEqual("ABCDEF", str);`
`28`	`28`	`});`
`29`	`29`	`}`
`@@ -136,4 +136,4 @@ await App.Dispatcher.EnqueueAsync(async () =>`
`136`	`136`	`});`
`137`	`137`	`}`
`138`	`138`	`}`
`139`		`-}`
	`139`	`+}`