Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 14 commits into from
Jul 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f2fa83e
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 18, 2024
1e2f637
Android API 35 obsoletions
jonathanpeppers Jul 18, 2024
07f3f30
Install Android SDK dependencies for API 35
jonathanpeppers Jul 18, 2024
c72c0b2
Suppress API 35 warning in ShapeRenderer
jonathanpeppers Jul 18, 2024
49b4be6
Update ui-tests-build-sample.yml
jonathanpeppers Jul 18, 2024
0e91a01
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 19, 2024
5176a32
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 20, 2024
19c408e
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 21, 2024
ff28a66
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 22, 2024
b0c5514
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 23, 2024
ffab343
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 24, 2024
786f547
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 25, 2024
0e6898b
Update dependencies from https://github.com/dotnet/android build 9.0.…
dotnet-maestro[bot] Jul 25, 2024
7ef8b54
Bump dotnet/runtime to match dotnet/android
jonathanpeppers Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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.240607001</MicrosoftWindowsAppSDKPackageVersion>
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/common/ui-tests-build-sample.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
5 changes: 3 additions & 2 deletions eng/provisioning/provisioning.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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");
}


Expand Down
2 changes: 2 additions & 0 deletions src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/Compatibility/Core/src/Android/Shapes/ShapeRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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
Expand Down
Loading