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.

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

[release/8.0.4xx] Bump to dotnet/android-tools@f53106a1 #9579

Merged
merged 5 commits into from
Dec 4, 2024

Conversation

pjcollins
Copy link
Member

@pjcollins pjcollins commented Dec 3, 2024

With dotnet/android-tools#220, we now need to set $(_IncludeMicrosoftBuildPackage) for projects that need a Microsoft.Build reference.

Changes: dotnet/android-tools@d50747c...f53106a

Changes: https://github.com/xamarin/monodroid/compare/b753d75f846b76cabb3b65b52ac12c4a83c07a13...99627fea9cf2ce9ca59fa571ea5640f8eb4a9c59

  • xamarin/monodroid@99627fe: [release/8.0.4xx] Bump android-sdk-installer, androidtools

Changes: dotnet/android-tools@d50747c...f53106a

  * dotnet/android-tools@f53106a: Bump to dotnet/msbuild@10fbfbf2 (#241)
  * dotnet/android-tools@a2e146d: Bump to dotnet/msbuild@33de0b22 (#232)
  * dotnet/android-tools@1818d59: Bump LibZipSharp and Xamarin.Build.AsyncTask (#236)
  * dotnet/android-tools@75f79e7: Bump LibZipSharp to 3.1.1 (#228)
  * dotnet/android-tools@b1f795e: [MSBuildReferences.projitems] Require opt-in to use `Microsoft.Build` (#220)
@pjcollins pjcollins changed the title Bump to dotnet/android-tools@f53106a1 [release/8.0.4xx] Bump to dotnet/android-tools@f53106a1 Dec 3, 2024
@pjcollins
Copy link
Member Author

The failures in CustomDesignerTargetSetupDependenciesForDesigner and TestResolveToolsExists are already present on the branch, I think this should be good to go

@dellis1972
Copy link
Contributor

dellis1972 commented Dec 4, 2024

Do we need to do the old androidtools as well (via monodroid). Looking at the commits we are at xamarin-android-tools@d50747c See https://github.com/xamarin/androidtools/tree/6ba69ad1c817a4d4bd5004339f4440dd9885ee4b/external

@pjcollins
Copy link
Member Author

Do we need to do the old androidtools as well (via monodroid). Looking at the commits we are at xamarin-android-tools@d50747c See https://github.com/xamarin/androidtools/tree/6ba69ad1c817a4d4bd5004339f4440dd9885ee4b/external

Yes sorry good catch! it looks like all of monodroids dependencies are up to date but we were missing a couple of bumps in monodroid. I've set that up here https://github.com/xamarin/monodroid/pull/1559 and we can include once merged.

@pjcollins pjcollins marked this pull request as draft December 4, 2024 16:47
@pjcollins
Copy link
Member Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@pjcollins pjcollins marked this pull request as ready for review December 4, 2024 18:32
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reran some of the failures to see if it can be slightly greener.

We can ignore the CustomDesignerTargetSetupDependenciesForDesigner test for sure.

@pjcollins
Copy link
Member Author

Thanks, we're down to the two failures in CustomDesignerTargetSetupDependenciesForDesigner and TestResolveToolsExists already present on the branch, should be good

@pjcollins pjcollins merged commit a8cd27e into release/8.0.4xx Dec 4, 2024
43 of 47 checks passed
@pjcollins pjcollins deleted the dev/pjc/rel8-at-f531 branch December 4, 2024 23:47
@github-actions github-actions bot locked and limited conversation to collaborators Jan 4, 2025
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.

3 participants