From f2fa83ef69496c1934736edd2d20521f05c81b87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jul 2024 19:37:09 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24366.1+azdo.9890920 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85ecc77be164..5f836e09c2ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b - + https://github.com/dotnet/android - 06bb1dc6a292ef5618a3bb6ecca3ca869253ff2e + b01de22857df1e89b688f41b5c606d67b8dc5033 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index d623ea9d3746..323fa64b8275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 9.0.0-preview.7.24365.2 9.0.0-preview.7.24365.2 - 34.99.0-preview.7.346 + 35.0.0-preview.7.8 17.2.9714-net9-p6 14.2.9714-net9-p6 From 1e2f637cd4d3251b404779b6943de501b4f636c8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 14:50:17 -0500 Subject: [PATCH 02/14] Android API 35 obsoletions These are both on Compatiblity, so we probably can just ignore them or use a different API (if alternative is clear). Ignore warning for `Window.SetStatusBarColor()`: * https://developer.android.com/reference/android/view/Window#setStatusBarColor(int) Stop passing `exact:false` for `Path.ComputeBounds()` as it is ignored: * https://developer.android.com/reference/android/graphics/Path#computeBounds(android.graphics.RectF,%20boolean) * https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/graphics/java/android/graphics/Path.java;l=305 --- .../Core/src/Android/AppCompat/FormsAppCompatActivity.cs | 2 ++ src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs b/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs index 860e452ac261..05317f6d23de 100644 --- a/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs +++ b/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs @@ -102,7 +102,9 @@ public override bool OnOptionsItemSelected(IMenuItem item) public void SetStatusBarColor(AColor color) { +#pragma warning disable CA1422 // Obsolete in API 35 https://developer.android.com/reference/android/view/Window#setStatusBarColor(int) Window.SetStatusBarColor(color); +#pragma warning restore CA1422 // Obsolete in API 35 } static void RegisterHandler(Type target, [DynamicallyAccessedMembers(Internals.HandlerType.TargetMembers)] Type handler, Type filter) diff --git a/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs b/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs index 22e26a639359..04caf20823ee 100644 --- a/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs +++ b/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs @@ -423,7 +423,7 @@ protected void UpdatePathShape() _drawable.Paint.StrokeWidth = 0.01f; _drawable.Paint.SetStyle(Paint.Style.Stroke); _drawable.Paint.GetFillPath(_path, fillPath); - fillPath.ComputeBounds(_pathFillBounds, false); + fillPath.ComputeBounds(_pathFillBounds); _drawable.Paint.StrokeWidth = _strokeWidth; } } @@ -480,7 +480,7 @@ void UpdatePathStrokeBounds() { _drawable.Paint.SetStyle(Paint.Style.Stroke); _drawable.Paint.GetFillPath(_path, strokePath); - strokePath.ComputeBounds(_pathStrokeBounds, false); + strokePath.ComputeBounds(_pathStrokeBounds); } } else From 07f3f30b1cabc490ba4e05c4e358c985c74da365 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 14:53:19 -0500 Subject: [PATCH 03/14] Install Android SDK dependencies for API 35 --- eng/provisioning/provisioning.csx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/provisioning/provisioning.csx b/eng/provisioning/provisioning.csx index 1e753b9fb5aa..b45e4c333668 100644 --- a/eng/provisioning/provisioning.csx +++ b/eng/provisioning/provisioning.csx @@ -34,7 +34,8 @@ if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS) && String.IsNullOrWhiteSpace(SKIP .ApiLevel((AndroidApiLevel)31) .ApiLevel((AndroidApiLevel)32) .ApiLevel((AndroidApiLevel)33) - .ApiLevel((AndroidApiLevel)34); + .ApiLevel((AndroidApiLevel)34) + .ApiLevel((AndroidApiLevel)35); if(string.IsNullOrWhiteSpace(SKIP_ANDROID_API_IMAGES)) { @@ -70,7 +71,7 @@ if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS) && String.IsNullOrWhiteSpace(SKIP } } - AndroidSdk().SdkManagerPackage ("build-tools;33.0.0"); + AndroidSdk().SdkManagerPackage ("build-tools;35.0.0"); } From c72c0b2c406b6acf664b10b9aa8f63688c6b6d65 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 15:05:47 -0500 Subject: [PATCH 04/14] Suppress API 35 warning in ShapeRenderer It appears `ComputeBounds(Rect)` without `exact` is missing in the C# binding --- .../Core/src/Android/Shapes/ShapeRenderer.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs b/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs index 04caf20823ee..5bff243e9df8 100644 --- a/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs +++ b/src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs @@ -423,7 +423,9 @@ protected void UpdatePathShape() _drawable.Paint.StrokeWidth = 0.01f; _drawable.Paint.SetStyle(Paint.Style.Stroke); _drawable.Paint.GetFillPath(_path, fillPath); - fillPath.ComputeBounds(_pathFillBounds); +#pragma warning disable CA1422 // Obsolete in API 35 https://developer.android.com/reference/android/graphics/Path#computeBounds(android.graphics.RectF,%20boolean) + fillPath.ComputeBounds(_pathFillBounds, false); +#pragma warning restore CA1422 _drawable.Paint.StrokeWidth = _strokeWidth; } } @@ -480,7 +482,9 @@ void UpdatePathStrokeBounds() { _drawable.Paint.SetStyle(Paint.Style.Stroke); _drawable.Paint.GetFillPath(_path, strokePath); - strokePath.ComputeBounds(_pathStrokeBounds); +#pragma warning disable CA1422 // Obsolete in API 35 https://developer.android.com/reference/android/graphics/Path#computeBounds(android.graphics.RectF,%20boolean) + strokePath.ComputeBounds(_pathStrokeBounds, false); +#pragma warning restore CA1422 // Obsolete in API 35 } } else From 49b4be6b30389f49ad7dbf5225b1030cde18ceea Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 15:56:00 -0500 Subject: [PATCH 05/14] Update ui-tests-build-sample.yml --- eng/pipelines/common/ui-tests-build-sample.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/ui-tests-build-sample.yml b/eng/pipelines/common/ui-tests-build-sample.yml index 092f62e68308..18480bc46ec1 100644 --- a/eng/pipelines/common/ui-tests-build-sample.yml +++ b/eng/pipelines/common/ui-tests-build-sample.yml @@ -23,7 +23,8 @@ steps: - template: provision.yml parameters: skipProvisioning: ${{ eq(parameters.platform, 'windows') }} - skipAndroidSdks: ${{ ne(parameters.platform, 'android') }} + # FIXME: 'Build the MSBuild Tasks' step fails for net9.0-android35 without API 35 + skipAndroidSdks: false skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }} provisionatorChannel: ${{ parameters.provisionatorChannel }} From 0e91a01c6c6709c34cf1974962cdfda186b31e06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jul 2024 13:26:24 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f836e09c2ad..56d4e660806b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b - + https://github.com/dotnet/android - b01de22857df1e89b688f41b5c606d67b8dc5033 + 45855b8f062ba8bfebf6c3ac746623050960a0be https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 323fa64b8275..829e6964d952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 9.0.0-preview.7.24365.2 9.0.0-preview.7.24365.2 - 35.0.0-preview.7.8 + 35.0.0-preview.7.9 17.2.9714-net9-p6 14.2.9714-net9-p6 From 5176a32af4075d4bc56c9074b75e65617a021bbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jul 2024 13:11:39 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From 19c408eb447ee6bd2a3c39841f2d7df8066f1928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Jul 2024 13:04:35 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From ff28a6635ab68d98d19b6863f002a0ed1df204ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jul 2024 13:05:17 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From b0c551416306048d0d49f3ad976fd36f7eb047ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:31:14 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From ffab3430dbb71a216bd22bbf526858d5e915b187 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 13:16:58 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From 786f54764fb3f7044335cd61a8415d536376f7e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:30:48 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9 From 0e6898beadf9fb8489ee7668ba44b7e6c50bc8ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 16:22:54 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24375.1+azdo.9939534 Microsoft.Android.Sdk.Windows From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.29 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56d4e660806b..4a9213daef4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b - + https://github.com/dotnet/android - 45855b8f062ba8bfebf6c3ac746623050960a0be + ab412a5629778598f9b33b9b976721898dbacc95 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 829e6964d952..a33a80c3b1ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 9.0.0-preview.7.24365.2 9.0.0-preview.7.24365.2 - 35.0.0-preview.7.9 + 35.0.0-preview.7.29 17.2.9714-net9-p6 14.2.9714-net9-p6 From 7ef8b54861e9d0b65507fc70c63be907e1fc051e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 25 Jul 2024 14:54:27 -0500 Subject: [PATCH 14/14] Bump dotnet/runtime to match dotnet/android --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a9213daef4f..efa241f3b071 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/sdk 9a028e12b90e6a583b09ccb3008fdfaf85761f19 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + 1f70f0cc663b5d45f77840e9728386e5fa7944f9 https://github.com/dotnet/android @@ -31,9 +31,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/emsdk - ffe9afdc046cf7a6f82cc7c5796aade54047af64 + 99ea0c06b84d3084d090da537080dd35d2a193cf https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a33a80c3b1ef..e046ce2557d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ 9.0.100-preview.7.24360.5 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24366.18 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) @@ -59,7 +59,7 @@ 8.0.148 - 9.0.0-preview.7.24319.4 + 9.0.0-preview.7.24365.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 1.5.240607001