Skip to content

Conversation

@grendello
Copy link
Contributor

Context: #8478
Context: https://github.com/xamarin/monodroid/pull/1393

Merging this no-op change will make it easier to orchestrate
merging of the two PRs above.

It allows us to merge the monodroid one before merging #8478
and prevents breaking of any other builds or PRs in between
merging of the two PRs.

Context: #8478
Context: xamarin/monodroid#1393

Merging this no-op change will make it easier to orchestrate merging
of the two PRs above.  It allows us to merge the `monodroid` one
before merging #8478 and prevents breaking of any other builds or
PRs in between merging of the two PRs.
@dellis1972
Copy link
Contributor

Test failure is related to the CI image it seems. Gonna merge this so we can unblock @grendello

@dellis1972 dellis1972 merged commit 7559d12 into main Feb 22, 2024
@dellis1972 dellis1972 deleted the dev/grendel/buildapk-prep-for-per-id-assemblies branch February 22, 2024 14:06
grendello added a commit that referenced this pull request Feb 22, 2024
* main:
  Add a property required by #8478 (#8749)
grendello added a commit that referenced this pull request Feb 22, 2024
grendello added a commit that referenced this pull request Feb 28, 2024
* main:
  Bump to xamarin/xamarin-android-tools/main@37d79c9 (#8752)
  Bump to dotnet/installer@d070660282 9.0.100-preview.3.24126.2 (#8763)
  Bump to xamarin/java.interop/main@14a9470 (#8766)
  $(AndroidPackVersionSuffix)=preview.3; net9 is 34.99.0.preview.3 (#8765)
  [Mono.Android] Do not dispose request content stream in AndroidMessageHandler (#8764)
  Bump com.android.tools:r8 from 8.2.42 to 8.2.47 (#8761)
  [Mono.Android] fix a set of the "easiest" trimmer warnings (#8731)
  Bump to dotnet/installer@0a73f814e1 9.0.100-preview.2.24122.3 (#8716)
  [ci] Always run the MAUI test job (#8750)
  Add a property required by #8478 (#8749)
  [xamarin-android-tools] import $(LibZipSharpVersion) value (#8738)
  Bump to xamarin/Java.Interop/main@c825dcad (#8701)
  Bump to xamarin/monodroid@cb01503327 (#8742)
  Bump to xamarin/Java.Interop/main@ae65609 (#8744)
  Bring in changes from PR #8478 (#8727)
  [xaprepare] Make 7zip work with "dangerous" symlinks in ZIPs (#8737)
  Bump NDK to r26c (#8732)
  Debugging MSBuild Tasks (#8730)
@github-actions github-actions bot locked and limited conversation to collaborators Mar 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants