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 to xamarin/Java.Interop/main@dfcbd670 #8714

Merged
merged 1 commit into from
Feb 9, 2024

Conversation

jonpryor
Copy link
Member

@jonpryor jonpryor commented Feb 9, 2024

Changes: dotnet/java-interop@7f08b77...dfcbd67

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.

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.
@@ -145,6 +145,7 @@
<MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
<SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
<OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
<JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
Copy link
Member

Choose a reason for hiding this comment

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

Should this be:

Suggested change
<JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
<JavaInteropTargetFrameworkVersion>$(DotNetStableTargetFramework)</JavaInteropTargetFrameworkVersion>

Or will we likely bump this independently of moving to .NET 10, for example?

Copy link
Member Author

Choose a reason for hiding this comment

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

$(JavaInteropTargetFrameworkVersion) is reactionary; the Java.Interop repo targets .NET versions on its own ("lazy") schedule, and the entire reason it's on .NET 8 now is because I want to start using NativeAOT things in there (dotnet/java-interop#1153); if not for that, it would still be on .NET 7, with no real need or reason to update it otherwise.

Thus, it should not be $(DotNetStableTargetFramework), because that would require that Java.Interop bump to the latest .NET version far faster than it has historically.

(For comparison, Java.Interop did not target .NET 7 until 2022-May, ~7 months after .NET 7 went stable…)

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.

This looks good to me if CI ends up green. 👍

@jonpryor jonpryor merged commit b812506 into main Feb 9, 2024
47 checks passed
@jonpryor jonpryor deleted the dev/jonp/bump-to-ji-dfcbd6 branch February 9, 2024 20:12
grendello added a commit that referenced this pull request Feb 9, 2024
* main:
  Bump to xamarin/Java.Interop/main@dfcbd670 (#8714)
  [monodroid] C++ tweaks and legacy code cleanup (#8638)
  Bump to xamarin/xamarin-android-tools/main@a698a33 (#8710)
grendello added a commit that referenced this pull request Feb 13, 2024
* main:
  [Xamarin.Android.Build.Tasks] remove `$(AndroidSupportedAbis)` from `build.props` (#8717)
  [Xamarin.Android.Build.Tasks] BannedApiAnalyzers for Resolve() (#8715)
  Bump to xamarin/Java.Interop/main@dfcbd670 (#8714)
  [monodroid] C++ tweaks and legacy code cleanup (#8638)
  Bump to xamarin/xamarin-android-tools/main@a698a33 (#8710)
  [readme] Add `d17-8` download links. (#8709)
  Bump external/Java.Interop from `07c7300` to `7f08b77` (#8702)
  Bump to xamarin/monodroid@848d1277b7 (#8691)
  [Xamarin.Android.Build.Tasks] `FixAbstractMethodsStep` performance (#8650)
  Bump to dotnet/installer@fb7b9a4b9e 9.0.100-preview.2.24106.6 (#8700)
grendello added a commit that referenced this pull request Feb 14, 2024
* main: (116 commits)
  [tmt] Update to work with current `libxamarin-app.so` (#8694)
  [Xamarin.Android.Build.Tasks] remove `$(AndroidSupportedAbis)` from `build.props` (#8717)
  [Xamarin.Android.Build.Tasks] BannedApiAnalyzers for Resolve() (#8715)
  Bump to xamarin/Java.Interop/main@dfcbd670 (#8714)
  [monodroid] C++ tweaks and legacy code cleanup (#8638)
  Bump to xamarin/xamarin-android-tools/main@a698a33 (#8710)
  [readme] Add `d17-8` download links. (#8709)
  Bump external/Java.Interop from `07c7300` to `7f08b77` (#8702)
  Bump to xamarin/monodroid@848d1277b7 (#8691)
  [Xamarin.Android.Build.Tasks] `FixAbstractMethodsStep` performance (#8650)
  Bump to dotnet/installer@fb7b9a4b9e 9.0.100-preview.2.24106.6 (#8700)
  [Mono.Android] Cache `Profiles/api-34.xml` contents (#8679)
  [monodroid] typemaps may need to load assemblies (#8625)
  Bump $(AndroidNetPreviousVersion) to 34.0.79 (#8693)
  Bump to xamarin/java.interop/main@07c73009 (#8681)
  Bump to dotnet/installer@1c496970b7 9.0.100-preview.2.24078.1 (#8685)
  [GetAndroidDependencies] Add Jdk dependency info (#8651)
  [xaprepare] Add support for newer SparkyLinux (#8684)
  Bump to dotnet/installer@5680e93cb2 9.0.100-preview.2.24073.12 (#8666)
  $(AndroidPackVersionSuffix)=preview.2; net9 is 34.99.0.preview.2 (#8678)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Mar 11, 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