[Mono.Android] Backport API-34 to .NET 7. #8150
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpobst
force-pushed
the
net7-api-34
branch
3 times, most recently
from
4dc1cdf
to
84e1903
Compare
Context: android/ndk#1299 Context: https://developer.android.com/tools/releases/build-tools Similar to the Android NDK (android/ndk#1299), `aapt2` from the Android SDK build-tools package is also a native binary. `aapt2` from build-tools_r32 only contains an x64 slice: % file aapt2 aapt2: Mach-O 64-bit executable x86_64 `aapt2` in build-tools_r33 and build-tools_r34 contains both x64 and arm64 slices: % file aapt2 aapt2: Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] aapt2 (for architecture x86_64): Mach-O 64-bit executable x86_64 aapt2 (for architecture arm64): Mach-O 64-bit executable arm64 Update `$(XABuildToolsVersion)`=34, so that we redistribute this newer `aapt2` binary. This will remove *a* place that Rosetta 2 is required to use .NET Android. (cherry picked from commit 0698891)
Comment on lines
24
to
34
| "android-34": { | ||
| "description": "Preview support for Android API-34.", | ||
| "packs": [ | ||
| "Microsoft.Android.Ref.34", | ||
| "Microsoft.Android.Runtime.34.android-arm", | ||
| "Microsoft.Android.Runtime.34.android-arm64", | ||
| "Microsoft.Android.Runtime.34.android-x86", | ||
| "Microsoft.Android.Runtime.34.android-x64" | ||
| ], | ||
| "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ], | ||
| "extends" : [ "android" ] |
There was a problem hiding this comment.
I think we might actually not need the android-34 workload at all? We can rely on the .Ref and .Runtime packs to just be restored like NuGet packages.
So, I think we can just remove these lines?
…eate-installers wants some files from it.
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport API-34 to the .NET 7 maintenance branch.
Note that
mainno longer builds Classic Xamarin.Android, but those changes are extensive and will not be ported back to .NET 7. This causes some issues that have been hacked around in this PR.Mono.AndroidAPI-34 would require extra work that we want to avoid (metadatachanges around covariant return types, which .NET supports but Classic does not.)Mono.AndroidAPI-34 causes issues because other build artifacts still rely on it being built.Mono.AndroidAPI-34 that has had all new API stripped out (seemetadata-classic) and some#ifdefto facilitate this.Mono.Androidout of this branch, this is fine.Mono.Android.