[Java.Interop] Bump to xamarin/java.interop@1bab47d #7028
Merged
Conversation
This file contains hidden or 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
jonpryor
pushed a commit
to dotnet/java-interop
that referenced
this pull request
May 31, 2022
Context: dotnet/android#6598 Context: dotnet/android#7028 Update `$(TargetFrameworks)` across the various `.csproj` files to use `$(DotNetTargetFramework)`, as xamarin/xamarin-android does. Additionally, set `$(DotNetTargetFramework)`=net7.0 (.NET 7). Similar to commit e7bacc3, Mono cannot be used to build against .NET 7 reference assemblies: /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/Microsoft.Common.CurrentVersion.targets(1232,5): error MSB3971: The reference assemblies for ".NETFramework,Version=v7.0" were not found. You might be using an older .NET SDK to target .NET 5.0 or higher. Update Visual Studio and/or your .NET SDK. Fix this by updating the **Mac - Mono** CI job to *build* with .NET 7, while Mono-focused unit tests are still run with Mono. Note: dotnet/android#7028 will be required in order to bump Java.Interop within xamarin-android. Co-authored-by: Peter Collins <[email protected]>
pjcollins
changed the title
grendello
approved these changes
May 31, 2022
| <_MSBuildFiles Include="@(_LocalizationLanguages->'$(MSBuildSrcDir)\%(Identity)\Java.Interop.Localization.resources.dll')" /> | ||
| <_MSBuildFiles Include="@(_LocalizationLanguages->'$(MSBuildSrcDir)\%(Identity)\Java.Interop.Localization.resources.dll')" ExcludeFromAndroidNETSdk="true" /> |
There was a problem hiding this comment.
Does this file not exist now?
There was a problem hiding this comment.
I think this change is not strictly necessary, but I figured it would be best to pull these Java.Interop.Localization.resources.dll files from the same location that we take Java.Interop.Localization.dll and other JI tools from for the .NET SDK (e.g. https://github.com/xamarin/xamarin-android/pull/7028/files#diff-0134c03744a69c35881982fb2140cf780816fe186f0b6fac66477a8416d2fca6R82)
|
I guess I missed a JI bump when testing here before that PR was merged... We may need #7038 to land before this. |
|
Commit message: Bump to xamarin/java.interop/main@1bab47d (#7028)
Changes: https://github.com/xamarin/java.interop/compare/1f27ab552d03aeb74cdc6f8985fcffbfdb9a7ddf...1bab47d6eda682de1e38ed289acb56ebda770c38
* xamarin/java.interop@1bab47d6: [build] Target `net7.0` (#988)
Bumps Java.Interop to target `net7.0`.
The `Configuration.Java.Interop.Override.props` file is now partially
generated by `xaprepare`, to avoid having to hard code duplicate
version and path values in it.
The Java.Interop `Prepare` step has been moved out of `xaprepare` and
into a new MSBuild target that will be ran with the .NET 7 preview
SDK that is installed by `xaprepare`.
Extra Java.Interop tests have been removed from the
"Windows Build and Smoke Test" job, as these should already be
running as part of Java Interop CI.
The `dotnet --list-sdks` command was failing on macOS when installing
the latest .NET 7 Preview SDK, and it has been replaced by a step
that runs `dotnet --info`.
Co-authored-by: Peter Collins <[email protected]> |
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.
Bumps Java.Interop to target
net7.0.Changes: dotnet/java-interop@1f27ab5...1bab47d
The
Configuration.Java.Interop.Override.propsfile is now partiallygenerated by xaprepare, to avoid having to hard code duplicate version
and path values in it.
The Java.Interop prepare step has been moved out of xaprepare and into
a new MSBuild target that will be ran with the .NET 7 preview SDK that is
installed by xaprepare.
Extra Java.Interop tests have been removed from the "Windows Build and
Smoke Test" job, as these should already be running as part of Java
Interop CI.
The
dotnet --list-sdkscommand was failing on macOS when installingthe latest .NET 7 Preview SDK, and it has been replaced by a step that
runs
dotnet --info.