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

Bump external/xamarin-android-tools from ed102fc to a698a33 #1189

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 9, 2024

Bumps external/xamarin-android-tools from ed102fc to a698a33.

Commits
  • a698a33 Merge pull request #227 from xamarin/dev/jestedfa/uses-sdk
  • 8b13954 Added unit tests
  • 84c2911 Only conditionally include <uses-sdk /> in the AndroidManifest.xml when saving
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [external/xamarin-android-tools](https://github.com/xamarin/xamarin-android-tools) from `ed102fc` to `a698a33`.
- [Commits](dotnet/android-tools@ed102fc...a698a33)

---
updated-dependencies:
- dependency-name: external/xamarin-android-tools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Feb 9, 2024
@jonpryor jonpryor merged commit dfcbd67 into main Feb 9, 2024
1 check passed
@jonpryor jonpryor deleted the dependabot/submodules/external/xamarin-android-tools-a698a33 branch February 9, 2024 17:14
jonpryor added a commit to dotnet/android that referenced this pull request Feb 9, 2024
Changes: dotnet/java-interop@7f08b77...dfcbd67

  * dotnet/java-interop@dfcbd670: Bump to xamarin/xamarin-android-tools/main@a698a33 (dotnet/java-interop#1189)
  * dotnet/java-interop@6182baff: [build] Target `net8.0` (dotnet/java-interop#1186)

dotnet/java-interop@6182baff updated Java.Interop to target .NET 8
instead of .NET 7.  This introduced a build break:

	…/xamarin-android/src/Mono.Android/Mono.Android.csproj(402,5):
	  error MSB3030: Could not copy the file
	  "…/xamarin-android/external/Java.Interop/bin/Debug-net7.0/ref/Java.Interop.dll"
	  because it was not found.

Introduce a new `$(JavaInteropTargetFrameworkVersion)` MSBuild
property within `Configuration.props` which contains the .NET version
that Java.Interop is targeting.

Update `Mono.Android.csproj` and `Microsoft.Android.Ref.proj` so that
they use `$(JavaInteropTargetFrameworkVersion)` to locate the
reference `Java.Interop.dll` assembly.
jonpryor added a commit to dotnet/android that referenced this pull request Feb 9, 2024
Changes: dotnet/java-interop@7f08b77...dfcbd67

  * dotnet/java-interop@dfcbd670: Bump to xamarin/xamarin-android-tools/main@a698a33 (dotnet/java-interop#1189)
  * dotnet/java-interop@6182baff: [build] Target `net8.0` (dotnet/java-interop#1186)

dotnet/java-interop@6182baff updated Java.Interop to target .NET 8
instead of .NET 7.  This introduced a build break:

	…/xamarin-android/src/Mono.Android/Mono.Android.csproj(402,5):
	  error MSB3030: Could not copy the file
	  "…/xamarin-android/external/Java.Interop/bin/Debug-net7.0/ref/Java.Interop.dll"
	  because it was not found.

Introduce a new `$(JavaInteropTargetFrameworkVersion)` MSBuild
property within `Configuration.props` which contains the .NET version
that Java.Interop is targeting.

Update `Mono.Android.csproj` and `Microsoft.Android.Ref.proj` so that
they use `$(JavaInteropTargetFrameworkVersion)` to locate the
reference `Java.Interop.dll` assembly.
@github-actions github-actions bot locked and limited conversation to collaborators Apr 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant