[Mono.Android] Bind Android 12L Beta 1. #6601

jpobst · 2022-01-03T21:17:21Z

Context: https://developer.android.com/about/versions/12/12L
Context: https://android-developers.googleblog.com/2021/10/12L-preview-large-screens.html

Android 12L Developer Beta 1 has been released. The Android 12L
Developer Preview Program Overview Timeline and updates section
suggests the following timeline:

October: Developer Preview 1
December: Beta 1 (Final APIs)
January: Beta 2
February: Beta 3
Q1 2022: Final

Enumify API-32, set API-Sv2 as API-32, v12.1, and stable. Bump .NET 6 pack version to 32.0.100.

You should still be able to target `net6.0-android31`, as I hardcoded the version to what is released on NuGet.org: https://www.nuget.org/packages/Microsoft.Android.Ref.31/31.0.101-preview.11.117 With these changes `net6.0-android31` resolves from: ~\.nuget\packages\microsoft.android.ref.31\31.0.101-preview.11.117\ref\net6.0\Mono.Android.dll But with `net6.0-android` (defaults to 32 now), you get: dotnet\packs\Microsoft.Android.Ref.32\*\ref\net6.0\Mono.Android.dll I also removed `%(DefaultRuntimeFrameworkVersion)` from `@(KnownFrameworkReference)` as it is not needed.

jonathanpeppers

Any MSBuild test now fails with the warning:

Xamarin.Android.Aapt2.targets(157,3): warning APT2000: aapt2 W 01-06 00:34:15 13393 106914 LoadedArsc.cpp:657] Unknown chunk type '200'.

And so every test checking there are no warnings fails.

I'll look into bumping build-tools that we use during our build, that looks to be where we get aapt2 from. Hopefully that solves it?

Any app project build was hitting the warning: Xamarin.Android.Aapt2.targets(157,3): warning APT2000: aapt2 W 01-05 23:58:06 8352 43857 LoadedArsc.cpp:657] Unknown chunk type '200'. And so any MSBuild test that asserts no warnings would fail. I think we need to get a new version of `aapt2` to fix this.

jonathanpeppers · 2022-01-06T22:10:26Z

Some of the tests failed with:

error NU1101: Unable to find package Microsoft.Android.Ref.31. No packages exist with this id in source(s): dotnet-eng, dotnet-public, xamarin.android util

I got these packages added to the dotnet-public feed:

We'll see if those tests pass on a rerun now.

jonathanpeppers · 2022-01-06T22:11:42Z

As for this warning:

D8 : warning : An API level of 31 is not supported by this compiler. Please use an API level of 30 or earlier

Hoping #6620 might fix?

jonathanpeppers · 2022-01-07T20:43:14Z

This is now looking "greener".

So the issue now is build-tools 32.0.0 no longer ships with dx.jar:

  COMPILETODALVIK : error : Unable to access jarfile C:\Users\cloudtest\android-toolchain\sdk\build-tools\32.0.0\\lib\dx.jar [C:\a\_work\1\a\TestRelease\01-07_19.50.01\temp\CheckClassesDexIsIncludeddx\UnnamedProject.csproj]

Unsure what to do here if we want to support dx...

Apps with the `AndroidManifest.xml`: <uses-sdk android:minSdkVersion="32" android:targetSdkVersion="32" /> Passes `--min-api 32` to d8/r8. This emits the warning: D8 : warning : An API level of 32 is not supported by this compiler. Please use an API level of 31 or earlier Let's remove this test case for now.

Otherwise, builds using `AndroidDexTool=dx` fail with: COMPILETODALVIK : error : Unable to access jarfile C:\Users\jopepper\android-toolchain\sdk\build-tools\32.0.0\\lib\dx.jar It looks like we have existing logic falling back to older `build-tools` when you install them side-by-side.

* The default `$(TargetPlatformVersion)` is 32.0 * Keep the `Microsoft.Android.Ref.31` packs in our workload, hardcoded to the previous release on NuGet.org. * Import `Microsoft.Android.Sdk.SupportedPlatforms.targets` *before* `Microsoft.Android.Sdk.BundledVersions.targets`

We get an XA1008 when targetSdkVersion="32" and $(TargetPlatformVersion)=31.0 otherwise. This causes various MSBuild tests to fail that assert no warnings.

jonathanpeppers · 2022-01-12T03:45:55Z

Oh, this might not actually be green, there is a merge conflict, lol...

build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs

jonathanpeppers · 2022-01-12T14:58:12Z

Ok this is now only failure 1 set of tests:

platforms/android-32 should be a dependency.

I think I need to make them check for 31 under .NET 6, and then hopefully this will be green.

tests/Mono.Android-Tests/Mono.Android-Tests.csproj

pjcollins · 2022-01-12T17:01:42Z

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

    },
    "Microsoft.Android.Runtime.31.android-x64": {
      "kind": "framework",
-      "version": "@WORKLOAD_VERSION@"
+      "version": "31.0.101-preview.11.117"


It seems the choice to keep API 31 as the .NET default is introducing some new complexity... It looks like we're locking the API 31 ref/runtime pack versions to the latest version available on nuget.org. I think this makes sense as we're now only building the net6.0 version of Mono.Android.dll for API 32.

On the .NET MSBuild testing side we may have a new gap in coverage though. I think the default test project will continue to target net6.0-android31, which will be running against ref/runtime packs that have already been published and not the ones produced by the build. The positive side of this is that we will ensure that any changes to the SDK continue to work with our previously produced API 31 packs. A potential downside is that we may now miss an issue caused by a change in Mono.Android.csproj. I'm not sure what the best solution for this is at the moment and I don't think it necessarily needs to be addressed in this PR, but it's worth further discussion.

On that note we have a few new hardcoded API 31 instances in the tests which might be easy to forget to update in the future. Maybe we should make this a constant somewhere, or add a note for this in some API update checklist or something like that.

Yes, if we end up with 32 as the default in .NET 6, we wouldn't have to put the 31 packs in the workload.

This logic here, allows them to come from NuGet or the workload:

https://github.com/xamarin/xamarin-android/blob/5f66c36fc10ae2f159885fafe15b16b871378bd1/build-tools/create-packs/Microsoft.Android.Sdk.proj#L122-L142

I think we should wait and see what we end up doing.

…tFrameworkVersion> We have to declare this after importing Configuration.props.

jonpryor · 2022-01-13T00:54:39Z

build-tools/create-packs/Microsoft.Android.Sdk.proj

-    <_AndroidRuntimePackId Condition=" '%24(TargetPlatformVersion)' != '$(AndroidLatestUnstableApiLevel).0' ">$(AndroidLatestStableApiLevel)</_AndroidRuntimePackId>
-    <_AndroidRuntimePackId Condition=" '%24(TargetPlatformVersion)' == '$(AndroidLatestUnstableApiLevel).0' ">$(AndroidLatestUnstableApiLevel)</_AndroidRuntimePackId>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '%24(TargetPlatformVersion)' == '31.0' ">


Should this be using $(AndroidTargetDotNetApiLevel) (and possibly other new properties)? Isn't that what $(AndroidTargetDotNetApiLevel) is for?

Related: instead of $(AndroidTargetDotNetApiLevel), should we call it $(AndroidDefaultTargetDotnetApiLevel)? This "emphasizes" the "default" nature of this value.

In some of the other tests here, I'll try to use $(AndroidDefaultTargetDotnetApiLevel) so we don't have to change them again later.

In this case, however, the number 31 needs to remain, it will need to eternally pull this version from NuGet (or our workload):

https://github.com/xamarin/xamarin-android/blob/bedecc25f93a82ecaa8df5cb4e92424aa669125d/build-tools/create-packs/Microsoft.Android.Sdk.proj#L122-L125

I guess that over time, we'll have numbers listed for 32, 33, and so on. We can also update those packs at some point if ever needed (hopefully not ever?), we'd just list a different version number here.

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs

* Renamed `$(AndroidTargetDotNetApiLevel)` -> `$(AndroidDefaultTargetDotnetApiLevel)` * Put this value in `XABuildConfig`, so we can use it in tests * Updated several places to use `XABuildConfig` instead of 31 hardcoded inline

jonpryor · 2022-01-14T01:49:37Z

@jonathanpeppers : in commit 38fddb7 you wrote:

But with net6.0-android (defaults to 32 now), you get:
dotnet\packs\Microsoft.Android.Ref.32\*\ref\net6.0\Mono.Android.dll

is this still the case? I believe we don't want that to be the case; net6.0-android should remain as net6.0-android31.0.

jonpryor · 2022-01-14T01:57:46Z

Proposed commit message:

[Mono.Android] API-32 stabilization

Context: https://developer.android.com/about/versions/12/12L
Context: https://android-developers.googleblog.com/2021/12/beta-1-update-for-12l-feature-drop.html

Android 12L Developer Beta 1 has been released.

  * [API diff vs. API-31][0]
  * [API diff vs. Sv2 DP1][1]

The Android 12L Developer Preview Program Overview
[Timeline and updates][2] section suggests the following timeline
(which differs from ef011213):

  * October:    Developer Preview 1
  * December:   Beta 1; Final APIs (previously expected in Beta 2)
  * January:    Beta 2; Incremental beta update
  * February:   Beta 3; Incremental beta update
  * Q1 2022:    Final release

In particular, Beta 1 has "Final APIs".  We now have API-32!

Enumify API-32, and declare it stable.

As a change from "upstream Google", Classic Xamarin.Android uses
`$(TargetFrameworkVersion)`=v12.1 for API-32, as there is no way to
express "12L" in a `System.Version`.  We have decreed 12.1 as 12L.

.NET SDK for Android uses `$(TargetFramework)`=net6.0-android32.0.

However, we don't want to change the default API level for .NET 6
projects; the default will remain `net6.0-android31.0` (API-31),
using the [31.0.101-preview.11.117 binaries on NuGet.org][3].
This requires various changes to the unit test infrastructure and
.NET SDK workflow package creation.

Additionally, `d8` doesn't appear to support API-32 yet (?!);
building an app with an `AndroidManifest.xml` containing:

	<uses-sdk android:minSdkVersion="32" android:targetSdkVersion="32" />

would use `d8 --min-api 32`, which results in a warning:

	D8 : warning : An API level of 32 is not supported by this compiler.
	Please use an API level of 31 or earlier

Update the `XASdkTests.SupportedOSPlatformVersion()` test so that it
only uses API-31 and not API-32.  This avoids the above warning.

Finally, we had to update xaprepare to install the new
Android SDK Build-tools version 32.0.0, as `aapt` from previous
Build-tools versions would emit a warning when building for API-32:

	Xamarin.Android.Aapt2.targets(157,3): warning APT2000: aapt2 W 01-05 23:58:06  8352 43857 LoadedArsc.cpp:657] Unknown chunk type '200'.

Unfortunately, installing Build-tools 32.0.0 promptly broke unit
tests using `$(AndroidDexTool)`=dx, with:

	COMPILETODALVIK : error : Unable to access jarfile C:\Users\jopepper\android-toolchain\sdk\build-tools\32.0.0\\lib\dx.jar

as Build-tools 31 and later no longer contains `lib/dx.jar`.  Update
xaprepare to install *both* Build-tools 30.0.3 *and* 32.0.0, so that
tests which require `dx.jar` continue to run, and we can get *some*
test coverage against Build-tools 32.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

[0]: https://developer.android.com/sdk/api_diff/32/changes
[1]: https://developer.android.com/sdk/api_diff/32-incr/changes
[2]: https://web.archive.org/web/20220113142518/https://developer.android.com/about/versions/12/12L/overview
[3]: https://www.nuget.org/packages/Microsoft.Android.Ref.31/31.0.101-preview.11.117

jonathanpeppers · 2022-01-14T03:48:47Z

@jonpryor that old commit was true at the time, but should now be:

But with net6.0-android (defaults to 31 now), you get:
dotnet\packs\Microsoft.Android.Ref.31\*\ref\net6.0\Mono.Android.dll

jpobst force-pushed the api-32-beta1 branch 2 times, most recently from a8593f3 to f1f13df Compare January 4, 2022 20:44

[Mono.Android] Bind Android 12L Beta 1.

eb6da19

jpobst force-pushed the api-32-beta1 branch from f1f13df to eb6da19 Compare January 4, 2022 22:14

jonathanpeppers added 2 commits January 5, 2022 16:45

[test] update MauiTargetFramework that asserts unstable 32

44b46d3

jonathanpeppers reviewed Jan 6, 2022

View reviewed changes

jonathanpeppers added 2 commits January 6, 2022 09:37

More test changes for API 32

fa1414c

Merge branch 'main' into api-32-beta1

09bab03

jonathanpeppers added 5 commits January 10, 2022 10:27

[tests] temporarily hardcode targetSdkVersion="31" in .NET tests

0f92ce4

We get an XA1008 when targetSdkVersion="32" and $(TargetPlatformVersion)=31.0 otherwise. This causes various MSBuild tests to fail that assert no warnings.

More test fixes when API 31 is default for .NET 6

2103268

jonathanpeppers marked this pull request as ready for review January 12, 2022 03:45

jonathanpeppers requested review from dellis1972, grendello and jonpryor as code owners January 12, 2022 03:45

Merge branch 'main' into api-32-beta1

bba5393

jonathanpeppers force-pushed the api-32-beta1 branch from 0b66c55 to bba5393 Compare January 12, 2022 03:50

grendello reviewed Jan 12, 2022

View reviewed changes

build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs Outdated Show resolved Hide resolved

jonathanpeppers added 2 commits January 12, 2022 09:01

[xaprepare] check if $(XABuildTools30Version) is blank

cade0cb

Fixes for AndroidDependenciesTests

5f66c36

grendello approved these changes Jan 12, 2022

View reviewed changes

dellis1972 approved these changes Jan 12, 2022

View reviewed changes

pjcollins reviewed Jan 12, 2022

View reviewed changes

tests/Mono.Android-Tests/Mono.Android-Tests.csproj Outdated Show resolved Hide resolved

pjcollins reviewed Jan 12, 2022

View reviewed changes

jonathanpeppers added 2 commits January 12, 2022 13:55

Merge branch 'main' into api-32-beta1

18bffbb

<TargetFrameworkVersion>$(AndroidLatestStableFrameworkVersion)</Targe…

bedecc2

…tFrameworkVersion> We have to declare this after importing Configuration.props.

jonpryor reviewed Jan 13, 2022

View reviewed changes

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs Outdated Show resolved Hide resolved

jonpryor reviewed Jan 13, 2022

View reviewed changes

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs Outdated Show resolved Hide resolved

jonathanpeppers added 2 commits January 12, 2022 21:42

Review feedback

702df8c

* Renamed `$(AndroidTargetDotNetApiLevel)` -> `$(AndroidDefaultTargetDotnetApiLevel)` * Put this value in `XABuildConfig`, so we can use it in tests * Updated several places to use `XABuildConfig` instead of 31 hardcoded inline

Didn't hit build!

f24ea83

jonpryor merged commit 6eb11f1 into main Jan 14, 2022

jonpryor deleted the api-32-beta1 branch January 14, 2022 12:52

github-actions bot locked and limited conversation to collaborators Jan 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Mono.Android] Bind Android 12L Beta 1. #6601

[Mono.Android] Bind Android 12L Beta 1. #6601

jpobst commented Jan 3, 2022 •

edited

Loading

jonathanpeppers left a comment

jonathanpeppers commented Jan 6, 2022

jonathanpeppers commented Jan 6, 2022

jonathanpeppers commented Jan 7, 2022

jonathanpeppers commented Jan 12, 2022

jonathanpeppers commented Jan 12, 2022

pjcollins Jan 12, 2022 •

edited

Loading

jonathanpeppers Jan 12, 2022

jonpryor Jan 13, 2022

jonathanpeppers Jan 13, 2022

jonpryor commented Jan 14, 2022

jonpryor commented Jan 14, 2022

jonathanpeppers commented Jan 14, 2022

[Mono.Android] Bind Android 12L Beta 1. #6601

[Mono.Android] Bind Android 12L Beta 1. #6601

Conversation

jpobst commented Jan 3, 2022 • edited Loading

jonathanpeppers left a comment

Choose a reason for hiding this comment

jonathanpeppers commented Jan 6, 2022

jonathanpeppers commented Jan 6, 2022

jonathanpeppers commented Jan 7, 2022

jonathanpeppers commented Jan 12, 2022

jonathanpeppers commented Jan 12, 2022

pjcollins Jan 12, 2022 • edited Loading

Choose a reason for hiding this comment

jonathanpeppers Jan 12, 2022

Choose a reason for hiding this comment

jonpryor Jan 13, 2022

Choose a reason for hiding this comment

jonathanpeppers Jan 13, 2022

Choose a reason for hiding this comment

jonpryor commented Jan 14, 2022

jonpryor commented Jan 14, 2022

jonathanpeppers commented Jan 14, 2022

jpobst commented Jan 3, 2022 •

edited

Loading

pjcollins Jan 12, 2022 •

edited

Loading