DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[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] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: redth <jondick@gmail.com>
This commit is contained in:
dotnet-maestro[bot] 2022-01-15 22:07:45 -05:00 коммит произвёл GitHub
Родитель 23b80100ab
Коммит 2ac584dd8c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 78 добавлений и 78 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
eng/Version.Details.xml
Просмотреть файл

@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>a533652fa68754c79d80a1e6b62dd62add307c8d</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.100-preview.13.8">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.100-preview.13.54">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>b52af4b4f926d80cc8526b558f45ab21c37bf719</Sha>
<Sha>946f33cfb36434b04a195bf82dcfa386a098908d</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="15.2.100-preview.13.8">
<Dependency Name="Microsoft.iOS.Sdk" Version="15.2.100-preview.13.54">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>b52af4b4f926d80cc8526b558f45ab21c37bf719</Sha>
<Sha>946f33cfb36434b04a195bf82dcfa386a098908d</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.2.100-preview.13.8">
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.2.100-preview.13.54">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>b52af4b4f926d80cc8526b558f45ab21c37bf719</Sha>
<Sha>946f33cfb36434b04a195bf82dcfa386a098908d</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.1.100-preview.13.8">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.1.100-preview.13.54">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>b52af4b4f926d80cc8526b558f45ab21c37bf719</Sha>
<Sha>946f33cfb36434b04a195bf82dcfa386a098908d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>

8
eng/Versions.props
Просмотреть файл

@ -7,10 +7,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.13.11</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.2.100-preview.13.8</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.2.100-preview.13.8</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.1.100-preview.13.8</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.2.100-preview.13.8</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.2.100-preview.13.54</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.2.100-preview.13.54</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.1.100-preview.13.54</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.2.100-preview.13.54</MicrosofttvOSSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.0</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
<!-- wasdk -->

4
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);

48
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));
}
}
}

28
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)

4
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);

16
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);

32
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);
}
}
}