[net9.0] Update dependencies from dotnet/android (#23694)

* 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 * 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 * Install Android SDK dependencies for API 35 * Suppress API 35 warning in ShapeRenderer It appears `ComputeBounds(Rect)` without `exact` is missing in the C# binding * Update ui-tests-build-sample.yml * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * Bump dotnet/runtime to match dotnet/android --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
dotnet · Jul 26, 2024 · c5edfa5 · c5edfa5
1 parent f44bdc4
commit c5edfa5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>9a028e12b90e6a583b09ccb3008fdfaf85761f19</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24357.2" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24366.18" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
+      <Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.7.346">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.0-preview.7.29">
       <Uri>https://github.com/dotnet/android</Uri>
-      <Sha>06bb1dc6a292ef5618a3bb6ecca3ca869253ff2e</Sha>
+      <Sha>ab412a5629778598f9b33b9b976721898dbacc95</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_17.2" Version="17.2.9714-net9-p6">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -31,9 +31,9 @@
     <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.7.24319.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.7.24365.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>ffe9afdc046cf7a6f82cc7c5796aade54047af64</Sha>
+      <Sha>99ea0c06b84d3084d090da537080dd35d2a193cf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.7.24366.8">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -32,7 +32,7 @@
     <VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.7.24360.5</VSToolsNetCoreSDKResolverPackageVersion>
     <MicrosoftDotnetSdkInternalPackageVersion>$(VSToolsNetCoreSDKResolverPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRefPackageVersion>
     <SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
     <SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
@@ -50,7 +50,7 @@
     <MicrosoftExtensionsLoggingDebugVersion>9.0.0-preview.7.24365.2</MicrosoftExtensionsLoggingDebugVersion>
     <MicrosoftExtensionsPrimitivesVersion>9.0.0-preview.7.24365.2</MicrosoftExtensionsPrimitivesVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>34.99.0-preview.7.346</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>35.0.0-preview.7.29</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftMacCatalystSdknet90_172PackageVersion>17.2.9714-net9-p6</MicrosoftMacCatalystSdknet90_172PackageVersion>
     <MicrosoftmacOSSdknet90_142PackageVersion>14.2.9714-net9-p6</MicrosoftmacOSSdknet90_142PackageVersion>
@@ -59,7 +59,7 @@
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.7.24319.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.7.24365.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
     <MicrosoftWindowsAppSDKPackageVersion>1.5.240627000</MicrosoftWindowsAppSDKPackageVersion>

diff --git 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 }}
 

diff --git 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");
 }
 
 

diff --git 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
@@ -423,7 +423,9 @@ protected void UpdatePathShape()
 					_drawable.Paint.StrokeWidth = 0.01f;
 					_drawable.Paint.SetStyle(Paint.Style.Stroke);
 					_drawable.Paint.GetFillPath(_path, fillPath);
+#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);
+#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