Bump to Java.Interop/master/bed29582 #1747
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
Fixes: dotnet#1493 Allows injection of `<dllmap/>` entries into `Java.Runtime.Environment.dll.config`. Use `<fileapi.h>`, not `<FileAPI.h>`, as Linux wants the former. Add `$(CecilSourceDirectory)` support, and use that support so that `Xamarin.Android.Cecil.dll` and `Xamarin.Android.Cecil.Mdb.dll` are built from `external/mono/external/cecil` sources, *not* from `external/Java.Interop/external/cecil` sources.
jonpryor
force-pushed
the
jonp-bump-ji-bed29582
branch
from
373cd98 to
7ea1a81
Compare
This was referenced May 30, 2018
jonathanpeppers
added a commit
to jonathanpeppers/java.interop
that referenced
this pull request
May 30, 2018
…ctory) Context: dotnet/android#1747 Downstream in xamarin-android, I started getting a build failure on Windows such as: xamarin-android\external\Java.Interop\src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.targets(23,5): error MSB3375: The file "..\..\bin\Debug\\Xamarin.Android.Cecil.dll" does not exist. xamarin-android\external\Java.Interop\src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.targets(23,5): error MSB3375: The file "..\..\bin\Debug\\Xamarin.Android.Cecil.Mdb.dll" does not exist. Looking in my `external\Java.Interop\bin\Debug` directory, the `Mono.Cecil` assemblies were named `Mono.Cecil.*` instead of `Xamarin.Android.*`. I think this was an oversight, but I don't know how the builds were green... Looking at `Mono.Cecil.csproj` in `xamarin-android/external/mono/external/cecil` there was no way to override `AssemblyName`. But we can use the `<Move />` task instead. To fix this: - Added a `_MonoCecilAssemblies` to check for any files named `Mono.Cecil.*` - `<Move />` the files to start with `Xamarin.Android.*` instead.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
Fixes: #1493
Allows injection of
<dllmap/>entries intoJava.Runtime.Environment.dll.config.Use
<fileapi.h>, not<FileAPI.h>, as Linux wants the former.Add
$(CecilSourceDirectory)support.