Bump to mono/mono-4.8.0-branch/9e164326 #223
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
|
Mono 4.8 uses Cecil/master, which is ABI-incompatible with Cecil 0.9.6 (what we're currently using): https://gist.github.com/jonpryor/8136c2ba811d9c9383d8f4d4bf411be3 We're going to have to re-work how we build Cecil. We can't use the nuget package. |
|
as a reference, |
|
@marek-safar we're blocked on Cecil from bumping mono |
|
As an added complication, the xamarin-android repo references projects/assemblies from the Java.Interop repo. The Java.Interop repo also uses Mono.Cecil, but has no Thus, take 2:
In other news... ABI BREAKS SUCK. |
|
You can use different versions of cecil (e.g not to change Java.Interop) but for code you are taking from mono 4.8 you need mono 4.8 cecil dependency. This should be quite simple, as all work was done but you need to fix your project(s) to have correct references. |
jonpryor
force-pushed
the
jonp-mono-4.8
branch
3 times, most recently
from
edf9b08 to
049b38b
Compare
Mono 4.8 has new SGEN bridge performance characteristics and semantics, requiring that we bump the SGEN Bridge Version to 5. Additionally, Mono 4.8 is using Cecil/master, which is API INCOMPATIBLE with Cecil 0.9.6, and Mono sources are included in `Xamarin.Android.Build.Tasks.dll`. We could attempt to address the Cecil incompatibility by building Mono's `external/cecil` projects, but that doesn't work because Java.Interop assemblies *also* use Cecil, and `Xamarin.Android.Build.Tasks.dll` uses `Java.Interop.Tools.Cecil.dll`, which uses Cecil via NuGet package, so everything gets very intermixed and confusing if Java.Interop tries to use e.g. Cecil 0.9.6 via nuget while xamarin-android attempts to use Cecil via Mono's source. Skip that problem, and bump to Java.Interop/a1d3ecc8, which in turn uses the Cecil 0.10.0-beta1-v2 *Preview* NuGet package, which is API compoatible with Cecil/master and mono/master. Additionally, update xamarin-android's Cecil 0.9.6 use to likewise use Cecil 0.10.0-beta1-v2. This allows xamarin-android to build while using Mono 4.8 sources. Finally, there's lots of "unrelated noise" in this patch, largely because every time I add a project to the solution via Xamarin Studio, Xamarin Studio decides to modify EVERY PROJECT IN THE REPO. Preserve some of these changes -- and "fix" others -- so that I can reduce the "visual noise" of future Xamarin Studio changes.
jonpryor
force-pushed
the
jonp-mono-4.8
branch
from
049b38b to
f1eec3a
Compare
radical
pushed a commit
that referenced
this pull request
May 8, 2018
Fixes: dotnet/java-interop#168 Java allows public classes to inherit from "package-private" classes, in which case the `public` & `protected` members of the "package-private" class are visible within the public class: // Java /* package */ abstract class SpannableStringInternal { public void getChars(int start, int end, char[] dest, int off); // ... } public class SpannableString extends SpannableStringInternal { // ... } The problem is that `generator` didn't properly support this construct, and *skips* binding of "package-private" types, resulting in generated C# code such as: // C# public partial class SpannableString : SpannableStringInternal { // CS0246: The type or namespace name `SpannableStringInternal` could not be found } This could be worked around via Metadata by making the "package-private" class `public`, but this means that if (when?) the "package-private" class is *removed*, we have an ABI break. Support this construct by updating `generator` to "copy" the members from the "package-private" class into the declaring class: // C# public partial class SpannableString : Java.Lang.Object { public void GetChars(int start, int end, char[] dest, int off); // ... } This allows the generated code to compile without metadata fixup. Specifics in implementing this: - Add a `GenBase.FixupAccessModifiers()` method, later this may need to be further extended for methods - Call `FixupAccessModifiers()` in the "validation" step - Added a setter for `BaseType` so it can be modified - In `FixupAccessModifiers()`, lookup the base class of the current type and check if it is non-`public`. - Skip the package-private types, and replace them with that class's base type - Look for each method on the base type, and copy it to the public type if it does not exist - Added tests for this scenario
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.
Mono 4.8 requires SGEN Bridge Version 5.
Supersedes: #221