From 2ac584dd8cc27a519a303df69b01b7251bead5fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 22:07:45 -0500 Subject: [PATCH] [main] Update dependencies from xamarin/xamarin-macios (#4056) * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220110.9 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.15 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220111.5 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.19 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220112.10 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.24 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220112.43 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.35 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220113.15 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.39 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220114.33 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.100-preview.13.8 -> To Version 15.2.100-preview.13.54 * Fix API changes from iOS Co-authored-by: dotnet-maestro[bot] Co-authored-by: redth --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 8 ++-- .../Core/src/iOS/VisualElementTracker.cs | 4 +- .../Core/tests/iOS/TransformationTests.cs | 48 +++++++++---------- .../Platform/iOS/CoreAnimationExtensions.cs | 28 +++++------ .../Platform/iOS/TransformationExtensions.cs | 4 +- .../Handlers/HandlerTestBaseOfT.iOS.cs | 16 +++---- .../DeviceTests/AssertionExtensions.iOS.cs | 32 ++++++------- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7e75592e..7df7f6b7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android a533652fa68754c79d80a1e6b62dd62add307c8d - + https://github.com/xamarin/xamarin-macios - b52af4b4f926d80cc8526b558f45ab21c37bf719 + 946f33cfb36434b04a195bf82dcfa386a098908d - + https://github.com/xamarin/xamarin-macios - b52af4b4f926d80cc8526b558f45ab21c37bf719 + 946f33cfb36434b04a195bf82dcfa386a098908d - + https://github.com/xamarin/xamarin-macios - b52af4b4f926d80cc8526b558f45ab21c37bf719 + 946f33cfb36434b04a195bf82dcfa386a098908d - + https://github.com/xamarin/xamarin-macios - b52af4b4f926d80cc8526b558f45ab21c37bf719 + 946f33cfb36434b04a195bf82dcfa386a098908d https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 30b9f68bc..db3c2a77c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,10 +7,10 @@ 31.0.200-preview.13.11 - 15.2.100-preview.13.8 - 15.2.100-preview.13.8 - 12.1.100-preview.13.8 - 15.2.100-preview.13.8 + 15.2.100-preview.13.54 + 15.2.100-preview.13.54 + 12.1.100-preview.13.54 + 15.2.100-preview.13.54 6.0.0 diff --git a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs index e942e89ba..127d259f0 100644 --- a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs +++ b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs @@ -317,9 +317,9 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS if (Math.Abs(translationX) > epsilon || Math.Abs(translationY) > epsilon) transform = transform.Translate(translationX, translationY, 0); - // not just an optimization, iOS will not "pixel align" a view which has m34 set + // not just an optimization, iOS will not "pixel align" a view which has M34 set if (Math.Abs(rotationY % 180) > epsilon || Math.Abs(rotationX % 180) > epsilon) - transform.m34 = 1.0f / -400f; + transform.M34 = 1.0f / -400f; if (Math.Abs(rotationX % 360) > epsilon) transform = transform.Rotate(rotationX * (float)Math.PI / 180.0f, 1.0f, 0.0f, 0.0f); diff --git a/src/Compatibility/Core/tests/iOS/TransformationTests.cs b/src/Compatibility/Core/tests/iOS/TransformationTests.cs index b9df89b78..6602914e9 100644 --- a/src/Compatibility/Core/tests/iOS/TransformationTests.cs +++ b/src/Compatibility/Core/tests/iOS/TransformationTests.cs @@ -30,14 +30,14 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS.UnitTests { var expected = new CATransform3D { - m11 = -1.4984f, - m12 = -3.7087f, - m21 = 1.8544f, - m22 = -0.7492f, - m33 = 2f, - m41 = 10f, - m42 = 30f, - m44 = 1f, + M11 = -1.4984f, + M12 = -3.7087f, + M21 = 1.8544f, + M22 = -0.7492f, + M33 = 2f, + M41 = 10f, + M42 = 30f, + M44 = 1f, }; var actual = await GetRendererProperty(view, r => r.NativeView.Layer.Transform, requiresLayout: true); AssertTransform3DEqual(actual, expected, 0.0001); @@ -45,22 +45,22 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS.UnitTests private static void AssertTransform3DEqual(CATransform3D actual, CATransform3D expected, double delta) { - Assert.That((double)actual.m11, Is.EqualTo((double)expected.m11).Within(delta)); - Assert.That((double)actual.m12, Is.EqualTo((double)expected.m12).Within(delta)); - Assert.That((double)actual.m13, Is.EqualTo((double)expected.m13).Within(delta)); - Assert.That((double)actual.m14, Is.EqualTo((double)expected.m14).Within(delta)); - Assert.That((double)actual.m21, Is.EqualTo((double)expected.m21).Within(delta)); - Assert.That((double)actual.m22, Is.EqualTo((double)expected.m22).Within(delta)); - Assert.That((double)actual.m23, Is.EqualTo((double)expected.m23).Within(delta)); - Assert.That((double)actual.m24, Is.EqualTo((double)expected.m24).Within(delta)); - Assert.That((double)actual.m31, Is.EqualTo((double)expected.m31).Within(delta)); - Assert.That((double)actual.m32, Is.EqualTo((double)expected.m32).Within(delta)); - Assert.That((double)actual.m33, Is.EqualTo((double)expected.m33).Within(delta)); - Assert.That((double)actual.m34, Is.EqualTo((double)expected.m34).Within(delta)); - Assert.That((double)actual.m41, Is.EqualTo((double)expected.m41).Within(delta)); - Assert.That((double)actual.m42, Is.EqualTo((double)expected.m42).Within(delta)); - Assert.That((double)actual.m43, Is.EqualTo((double)expected.m43).Within(delta)); - Assert.That((double)actual.m44, Is.EqualTo((double)expected.m44).Within(delta)); + Assert.That((double)actual.M11, Is.EqualTo((double)expected.M11).Within(delta)); + Assert.That((double)actual.M12, Is.EqualTo((double)expected.M12).Within(delta)); + Assert.That((double)actual.M13, Is.EqualTo((double)expected.M13).Within(delta)); + Assert.That((double)actual.M14, Is.EqualTo((double)expected.M14).Within(delta)); + Assert.That((double)actual.M21, Is.EqualTo((double)expected.M21).Within(delta)); + Assert.That((double)actual.M22, Is.EqualTo((double)expected.M22).Within(delta)); + Assert.That((double)actual.M23, Is.EqualTo((double)expected.M23).Within(delta)); + Assert.That((double)actual.M24, Is.EqualTo((double)expected.M24).Within(delta)); + Assert.That((double)actual.M31, Is.EqualTo((double)expected.M31).Within(delta)); + Assert.That((double)actual.M32, Is.EqualTo((double)expected.M32).Within(delta)); + Assert.That((double)actual.M33, Is.EqualTo((double)expected.M33).Within(delta)); + Assert.That((double)actual.M34, Is.EqualTo((double)expected.M34).Within(delta)); + Assert.That((double)actual.M41, Is.EqualTo((double)expected.M41).Within(delta)); + Assert.That((double)actual.M42, Is.EqualTo((double)expected.M42).Within(delta)); + Assert.That((double)actual.M43, Is.EqualTo((double)expected.M43).Within(delta)); + Assert.That((double)actual.M44, Is.EqualTo((double)expected.M44).Within(delta)); } } } \ No newline at end of file diff --git a/src/Core/src/Platform/iOS/CoreAnimationExtensions.cs b/src/Core/src/Platform/iOS/CoreAnimationExtensions.cs index 01fa930c5..7969a650c 100644 --- a/src/Core/src/Platform/iOS/CoreAnimationExtensions.cs +++ b/src/Core/src/Platform/iOS/CoreAnimationExtensions.cs @@ -16,20 +16,20 @@ namespace Microsoft.Maui internal static Matrix4x4 ToViewTransform(this CATransform3D transform) => new Matrix4x4 { - M11 = (float)transform.m11, - M12 = (float)transform.m12, - M13 = (float)transform.m13, - M14 = (float)transform.m14, - M21 = (float)transform.m21, - M22 = (float)transform.m22, - M23 = (float)transform.m23, - M24 = (float)transform.m24, - M31 = (float)transform.m31, - M32 = (float)transform.m32, - M33 = (float)transform.m33, - M34 = (float)transform.m34, - Translation = new Vector3((float)transform.m41, (float)transform.m42, (float)transform.m43), - M44 = (float)transform.m44 + M11 = (float)transform.M11, + M12 = (float)transform.M12, + M13 = (float)transform.M13, + M14 = (float)transform.M14, + M21 = (float)transform.M21, + M22 = (float)transform.M22, + M23 = (float)transform.M23, + M24 = (float)transform.M24, + M31 = (float)transform.M31, + M32 = (float)transform.M32, + M33 = (float)transform.M33, + M34 = (float)transform.M34, + Translation = new Vector3((float)transform.M41, (float)transform.M42, (float)transform.M43), + M44 = (float)transform.M44 }; internal static Matrix4x4 GetViewTransform(this CALayer layer) diff --git a/src/Core/src/Platform/iOS/TransformationExtensions.cs b/src/Core/src/Platform/iOS/TransformationExtensions.cs index 9b8289af5..7b0b9ce0d 100644 --- a/src/Core/src/Platform/iOS/TransformationExtensions.cs +++ b/src/Core/src/Platform/iOS/TransformationExtensions.cs @@ -61,9 +61,9 @@ namespace Microsoft.Maui.Platform if (Math.Abs(translationX) > epsilon || Math.Abs(translationY) > epsilon) transform = transform.Translate(translationX, translationY, 0); - // Not just an optimization, iOS will not "pixel align" a view which has m34 set + // Not just an optimization, iOS will not "pixel align" a view which has M34 set if (Math.Abs(rotationY % 180) > epsilon || Math.Abs(rotationX % 180) > epsilon) - transform.m34 = 1.0f / -400f; + transform.M34 = 1.0f / -400f; if (Math.Abs(rotationX % 360) > epsilon) transform = transform.Rotate(rotationX * (float)Math.PI / 180.0f, 1.0f, 0.0f, 0.0f); diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBaseOfT.iOS.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBaseOfT.iOS.cs index 19ee49ef8..83f7910c2 100644 --- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBaseOfT.iOS.cs +++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBaseOfT.iOS.cs @@ -44,14 +44,14 @@ namespace Microsoft.Maui.DeviceTests var expected = new CATransform3D { - m11 = -1.4984f, - m12 = -3.7087f, - m21 = 1.8544f, - m22 = -0.7492f, - m33 = 2f, - m41 = 10f, - m42 = 30f, - m44 = 1f, + M11 = -1.4984f, + M12 = -3.7087f, + M21 = 1.8544f, + M22 = -0.7492f, + M33 = 2f, + M41 = 10f, + M42 = 30f, + M44 = 1f, }; expected.AssertEqual(transform); diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs index f6ea9f2f7..14e9b33a4 100644 --- a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs +++ b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs @@ -257,22 +257,22 @@ namespace Microsoft.Maui.DeviceTests public static void AssertEqual(this CATransform3D expected, CATransform3D actual, int precision = 4) { - Assert.Equal((double)expected.m11, (double)actual.m11, precision); - Assert.Equal((double)expected.m12, (double)actual.m12, precision); - Assert.Equal((double)expected.m13, (double)actual.m13, precision); - Assert.Equal((double)expected.m14, (double)actual.m14, precision); - Assert.Equal((double)expected.m21, (double)actual.m21, precision); - Assert.Equal((double)expected.m22, (double)actual.m22, precision); - Assert.Equal((double)expected.m23, (double)actual.m23, precision); - Assert.Equal((double)expected.m24, (double)actual.m24, precision); - Assert.Equal((double)expected.m31, (double)actual.m31, precision); - Assert.Equal((double)expected.m32, (double)actual.m32, precision); - Assert.Equal((double)expected.m33, (double)actual.m33, precision); - Assert.Equal((double)expected.m34, (double)actual.m34, precision); - Assert.Equal((double)expected.m41, (double)actual.m41, precision); - Assert.Equal((double)expected.m42, (double)actual.m42, precision); - Assert.Equal((double)expected.m43, (double)actual.m43, precision); - Assert.Equal((double)expected.m44, (double)actual.m44, precision); + Assert.Equal((double)expected.M11, (double)actual.M11, precision); + Assert.Equal((double)expected.M12, (double)actual.M12, precision); + Assert.Equal((double)expected.M13, (double)actual.M13, precision); + Assert.Equal((double)expected.M14, (double)actual.M14, precision); + Assert.Equal((double)expected.M21, (double)actual.M21, precision); + Assert.Equal((double)expected.M22, (double)actual.M22, precision); + Assert.Equal((double)expected.M23, (double)actual.M23, precision); + Assert.Equal((double)expected.M24, (double)actual.M24, precision); + Assert.Equal((double)expected.M31, (double)actual.M31, precision); + Assert.Equal((double)expected.M32, (double)actual.M32, precision); + Assert.Equal((double)expected.M33, (double)actual.M33, precision); + Assert.Equal((double)expected.M34, (double)actual.M34, precision); + Assert.Equal((double)expected.M41, (double)actual.M41, precision); + Assert.Equal((double)expected.M42, (double)actual.M42, precision); + Assert.Equal((double)expected.M43, (double)actual.M43, precision); + Assert.Equal((double)expected.M44, (double)actual.M44, precision); } } } \ No newline at end of file