[DO NOT MERGE][net10.0] 20250414 net10.0 ecosytem updates #28997

moljac · 2025-04-15T09:37:15Z

Description of Change

Android Ecosystem updates

Test of new packages for net10.0 and net8.0 from:

https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=11405413&view=results

Nuget feed is needed to replace:

    <add key="android-libraries-20250422-1806" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/android-libraries-20250422-1806/nuget/v3/index.json" />

or:

    <add key="android-libraries-20250422-1806" value="https://dev.azure.com/xamarin/public/_artifacts/feed/androidx-net10/" />

in:

https://github.com/dotnet/maui/pull/28997/files#diff-9c5952957709545aad811b400e7e516eebade1e44fc4fbc23203403ffeb92c34R12

https://github.com/dotnet/maui/pull/28997/files#diff-9043b7cbd46d4c166caa882ee5dcd4df93afa7ae708084e4b87dfd69a8a18332R5

https://github.com/dotnet/maui/pull/28997/files#diff-a3fe4195a9d68f36997476b59feb7397e4fcc8fe0993b7174b2fddad7fd96a8eR8

Copilot

Copilot wasn't able to review any files in this pull request.

Files not reviewed (10)

NuGet.config: Language not supported
eng/AndroidX.targets: Language not supported
eng/Versions.props: Language not supported
eng/common/internal/NuGet.config: Language not supported
eng/common/sdl/NuGet.config: Language not supported
src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj: Language not supported
src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj: Language not supported
src/Controls/Foldable/src/Controls.Foldable.csproj: Language not supported
src/Core/src/Core.csproj: Language not supported
src/Essentials/src/Essentials.csproj: Language not supported

…//github.com/dotnet/maui into dev/moljac/20250414-net10.0-ecosytem-updates

moljac · 2025-04-29T15:21:36Z

/rebase

moljac · 2025-05-12T13:11:18Z

Error to be fixed in metadata:

2025-05-12T10:18:43.9080480Z /Users/builder/azdo/_work/2/s/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs(26,5): error CS0535: 'ShellFlyoutTemplatedContentRenderer' does not implement interface member 'AppBarLayout.IOnOffsetChangedListener.OnOffsetChanged(Object?, int)' [/Users/builder/azdo/_work/2/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=net10.0-android36.0]
2025-05-12T10:18:43.9082940Z /Users/builder/azdo/_work/2/s/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs(26,5): error CS0535: 'ShellFlyoutTemplatedContentRenderer' does not implement interface member 'AppBarLayout.IBaseOnOffsetChangedListener.OnOffsetChanged(Object?, int)' [/Users/builder/azdo/_work/2/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=net10.0-android36.0]

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs(583,15): error RS0036: Symbol 'OnOffsetChanged' is missing nullability annotations in the declared API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt(75,1): error RS0025: The symbol '~Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutTemplatedContentRenderer.OnOffsetChanged(Google.Android.Material.AppBar.AppBarLayout? appBarLayout, int verticalOffset) -> void' appears more than once in the public API files (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs(100,20): error CS8602: Dereference of a possibly null reference.

Context: dotnet/maui#28997 Context: #1148 .NET 10 binding assemblies have changes to generate better code to support trimming and NativeAOT scenarios. We want to ship a copy of .NET 10 assemblies alongside their `net8.0-android` counterparts. To verify API compatibility between the `net8.0-android` and `net10.0-android` assemblies you can run: dotnet tool install --global Microsoft.DotNet.ApiCompat.Tool Get-Item *.nupkg | ForEach-Object { Write-Output "apicompat package $_" ; & apicompat package $_.Name 2>&1 | ForEach-Object { "$_" } } > apidiff.txt At first, we saw ~452 errors, but all appear to be due to changes toward "hiding" internal Kotlin members in .NET 9: * dotnet/java-interop@06214ff General list of changes: * Update `_PackageLevelCustomizations.cshtml` * metadata + Additions cleanup for net10.0 * `nuget.config` from dotnet/android added * <CheckEolWorkloads>false</CheckEolWorkloads> needed to work around some warnings and errors * Create nuget-install.cake * Provision `platforms/android-34` * `Update Metadata.xml` obj/Controls.DeviceTests/Debug/net10.0-android/android/src/mono/androidx/recyclerview/widget/RecyclerView_ItemAnimator_ItemAnimatorListenerImplementor.java(8,57): javac error JAVAC0000: error: ItemAnimatorListener is not public in ItemAnimator; cannot be accessed from outside package * [build] remove `Install extra Android SDK packages` * `$(AndroidManifestType)=GoogleV2` Warning : Dependency `platforms;android-36` should have been installed but could not be resolved. You can attempt to install it with... * Restore BaseOnOffsetChangedListener metadata.xml javac.exe error JAVAC0000: error: BaseOnOffsetChangedListener cannot be inherited with different arguments: <com.google.android.material.appbar.AppBarLayout> and <> * Fix javac error for `ActivityChooserModel` Xamarin.Android.Javac.targets(161,5): error XAJVC0000: C:\a\_work\1\s\artifacts\obj\Benchmarks.Droid\Release\net10.0-android\android-arm64\android\src\mono\androidx\appcompat\widget\ActivityChooserModel_OnChooseActivityListenerImplementor.java:8: error: package androidx.appcompat.widget.ActivityChooserModel does not exist Xamarin.Android.Javac.targets(161,5): error XAJVC0000: androidx.appcompat.widget.ActivityChooserModel.OnChooseActivityListener Xamarin.Android.Javac.targets(161,5): error XAJVC0000: ^ Co-authored-by: Peter Collins <[email protected]> Co-authored-by: Jonathan Peppers <[email protected]>

Based on: #28997 We shipped new dotnet/android-libraries components that multi-target `net8.0-android;net10.0-android`. .NET MAUI should start using them in .NET 10. I also took the time to remove duplicate Android version numbers, like: ```diff --<PackageReference Include="Xamarin.AndroidX.Activity" Version="1.9.3.2" /> --<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.9" /> --<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.2-alpha06" /> --<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.17.0.1" /> ++<PackageReference Include="Xamarin.AndroidX.Activity" /> ++<PackageReference Include="Xamarin.AndroidX.Browser" /> ++<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" /> ++<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" /> ``` These numbers should be tracked in a single location, `AndroidX.targets`, so we don't have to touch as many files in the future. I sorted `AndroidX.targets` to make it easier to read, so here is a diff of the changes: ```diff ++<PackageReference Update="Xamarin.AndroidX.Activity" Version="1.10.1.2" /> --<PackageReference Update="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.6" /> ++<PackageReference Update="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.7" /> --<PackageReference Update="Xamarin.AndroidX.Browser" Version="1.8.0.9" /> ++<PackageReference Update="Xamarin.AndroidX.Browser" Version="1.8.0.10" /> ++<PackageReference Update="Xamarin.AndroidX.DynamicAnimation" Version="1.1.0.2" /> --<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" /> ++<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.4" /> --<PackageReference Update="Xamarin.AndroidX.MediaRouter" Version="1.7.0.9" /> ++<PackageReference Update="Xamarin.AndroidX.MediaRouter" Version="1.7.0.10" /> --<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.8.9.1" /> ++<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.8.9.2" /> --<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.9.1" /> ++<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.9.2" /> --<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.9.1" /> ++<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.9.2" /> --<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.8.9.1" /> ++<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.8.9.2" /> --<PackageReference Update="Xamarin.AndroidX.Palette" Version="1.0.0.32" /> ++<PackageReference Update="Xamarin.AndroidX.Palette" Version="1.0.0.33" /> --<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.4.0.1" /> ++<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.4.0.2" /> ++<PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.4-alpha07" /> --<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.27" /> ++<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.28" /> ++<PackageReference Update="Xamarin.AndroidX.Transition" Version="1.5.1.6" /> --<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.6" /> ++<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.7" /> ++<PackageReference Update="Xamarin.Firebase.AppIndexing" Version="120.0.0.25" /> --<PackageReference Update="Xamarin.Google.Android.Material" Version="1.12.0.3" /> ++<PackageReference Update="Xamarin.Google.Android.Material" Version="1.12.0.4" /> ++<PackageReference Update="Xamarin.Google.Crypto.Tink.Android" Version="1.17.0.2" /> ``` Co-authored-by: moljac <[email protected]>

moljac added 8 commits April 15, 2025 11:34

Update AndroidX.targets

6421e7e

nuget local feed

ca65090

nuget local feed

a129ffd

version bumps

68c4230

Update Compatibility.Maps.Android.csproj

9a69b12

Update Controls.Foldable.csproj

47bf23a

Update Core.csproj

d4ab737

Update Essentials.csproj

3118123

Copilot AI review requested due to automatic review settings April 15, 2025 09:37

moljac requested a review from a team as a code owner April 15, 2025 09:37

moljac requested review from jfversluis and jsuarezruiz April 15, 2025 09:37

Copilot AI reviewed Apr 15, 2025

View reviewed changes

moljac marked this pull request as draft April 15, 2025 09:37

moljac added 7 commits April 24, 2025 16:57

Update AndroidX.targets

43838d3

Update Versions.props

2e2e4b8

private feed added

4285df8

Merge branch 'net10.0' into dev/moljac/20250414-net10.0-ecosytem-updates

ab5aea8

peterc's nuget feed with uploaded packages

244f806

Merge branch 'dev/moljac/20250414-net10.0-ecosytem-updates' of https:…

78f162e

…//github.com/dotnet/maui into dev/moljac/20250414-net10.0-ecosytem-updates

Update Versions.props

c3d008b

moljac added 8 commits May 5, 2025 16:32

nulability fixes

b9510a5

nulability fixes

74ba28e

API shipped after nulability fixes

8f27fad

API shipped after nulability fixes

9c0a87f

nullable fix

945da4c

nuget fixes

c1a5cf9

version bumps

fac133e

version bumps

7775810

shipped/unshipped updates

b7486c8

PureWeen assigned jonathanpeppers May 15, 2025

PureWeen added this to MAUI SDK Ongoing May 15, 2025

github-project-automation bot moved this to Todo in MAUI SDK Ongoing May 15, 2025

PureWeen added this to the .NET 10.0-preview5 milestone May 15, 2025

jonathanpeppers added 3 commits May 15, 2025 11:03

Warning As Error: Detected package downgrade:...

70f1d38

Remove version number duplication

2a943e6

Collapse/sort AndroidX.targets

148bc72

moljac mentioned this pull request May 16, 2025

[.NET10] removal of generator generated code in Additions/ dotnet/android-libraries#1118

Merged

jonathanpeppers added 8 commits May 16, 2025 12:38

Feed with updated packages

8a51b21

Undo some nullable changes

a23ae17

Update ButtonTests.Android.cs

623e24c

src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs(100,20): error CS8602: Dereference of a possibly null reference.

Feed with updated packages

3f9203e

Feed with updated packages

701a835

Merge branch 'net10.0' into dev/moljac/20250414-net10.0-ecosytem-updates

672abc6

PureWeen moved this from Todo to Changes Requested in MAUI SDK Ongoing May 20, 2025

rmarinho closed this May 29, 2025

github-project-automation bot moved this from Changes Requested to Done in MAUI SDK Ongoing May 29, 2025

jonathanpeppers mentioned this pull request Jun 6, 2025

[android] 20250414 net10.0 ecosystem updates #29871

Merged

github-actions bot locked and limited conversation to collaborators Jun 29, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[DO NOT MERGE][net10.0] 20250414 net10.0 ecosytem updates #28997

[DO NOT MERGE][net10.0] 20250414 net10.0 ecosytem updates #28997

Uh oh!

moljac commented Apr 15, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

moljac commented Apr 29, 2025

Uh oh!

moljac commented May 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[DO NOT MERGE][net10.0] 20250414 net10.0 ecosytem updates #28997

[DO NOT MERGE][net10.0] 20250414 net10.0 ecosytem updates #28997

Uh oh!

Conversation

moljac commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of Change

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

moljac commented Apr 29, 2025

Uh oh!

moljac commented May 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

moljac commented Apr 15, 2025 •

edited

Loading