Bump mono to 5.4.0.0 #631

luhenry · 2017-06-05T22:53:40Z

jonpryor · 2017-06-06T12:25:57Z

It would seem that the linker code doesn't like you:

19:19:03 	/Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/external/linker/linker/Mono.Linker.Steps/TypeMapStep.cs(211,31): error CS1061: 'MethodReference' does not contain a definition for 'GetParameterType' and no extension method 'GetParameterType' accepting a first argument of type 'MethodReference' could be found (are you missing a using directive or an assembly reference?)

...plus 8 other similar errors.

jonpryor · 2017-06-06T12:29:48Z

This PR also needs to change $(MonoRequiredMinimumVersion) and $(MonoRequiredDarwinMinimumVersion), otherwise we won't install the new MonoFramework-MDK file you specified (because the bot will already have 5.2 installed, which is the currently specified minimum version).

…returns a Dictionary (#152) This is needed as part of [bumping xamarin-android to use mono/2017-06][0], to fix the following compilation error: Tasks/LinkAssemblies.cs(103,41): error CS1503: Argument 1: cannot convert from 'System.Collections.IDictionary' to 'System.Collections.Generic.Dictionary<string, Mono.Cecil.AssemblyDefinition>' [0]: dotnet/android#631

Updated reference to mono Fixed target branch for mono

lewurm · 2017-06-21T15:18:52Z

linux build fails with:

15:08:42 /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/build-tools/scripts/RequiredPrograms.targets: error : Missing dependency detected. For Linux we do not know how to install program mono, version >= 5.4.0.

@jonpryor how would I fix that?

jonpryor · 2017-06-22T19:45:21Z

@lewurm wrote:

linux build fails with:

Talk with @directhex about getting an updated mono for Linux.

jonpryor · 2017-06-23T01:29:29Z

build

jonpryor · 2017-06-23T11:02:41Z

build

directhex · 2017-06-23T14:46:44Z

(working on it, ought to be up by mid weekend)

jonpryor · 2017-07-18T21:02:24Z

FYI, the previously investigated unit test failures/etc. will continue to fail until PR #662 is merged.

lewurm · 2017-07-18T21:26:22Z

as a reference, #662 should (probably?) fix https://bugzilla.xamarin.com/show_bug.cgi?id=57828

@marek-safar

Context: dotnet/android#723 [`corefx` removed ``Dictionary`2.GetValueOrDefault()``][cfx17275] in favor of using extension methods of the same name within `System.Collections.Generic.CollectionExtensions`, and mono/2017-06 is using the updated corefx sources. [cfx17275]: https://github.com/dotnet/corefx/issues/17275#issuecomment-291636863 @marek-safar [deems this as not a breaking change][1]: [1]: dotnet/android#631 (comment) > It breaks at binary compatibility level but not sure we made such strong promise. Update `reference/mscorlib.xml` to be consistent with mono/2017-06. Additionally, synchronize `reference/Mono.Security.xml` with mono/2017-06. We don't consider `Mono.Security.dll` to be part of our stable API.

jonpryor · 2017-08-10T16:06:17Z

I suspect that the current set of unit test failures, e.g.

warning BG850* is NOT expected

is actually due to Bug #56436, as warning BG8C00 will cause warning BG8502: Invalidating Java.Util.IList and all nested types because some of its interfaces were invalid..

As such, these tests may be fixed once PR #732 is merged.

lewurm · 2017-08-11T15:21:58Z

yay:
#732 fixed Bug #57828 🎉

nay:
we have a new failure:

                                                  Expected: null
  But was:  "Well, hello there!"

                                                +++++++++++++++++++
                                                STACK TRACE:
                                                  at Xamarin.Android.LocaleTests.EnvironmentTests.EnvironmentVariablesFromLibraryProjectsAreMerged () [0x0000c] in <0c893f4f155244a9aacf4029c628e013>:0 
  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
  at System.Reflection.MonoMethod.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00032] in <201fd8fdb1f34c919349c733ad7f3910>:0 ```

jonpryor · 2017-08-11T18:26:26Z

@lewurm: The EnvironmentTests.EnvironmentVariablesFromLibraryProjectsAreMerged() error should be addressed by PR #742.

context: https://bugzilla.xamarin.com/show_bug.cgi?id=57828 this commit should be reverted.

Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=57828 The #runtime team is attempting to update xamarin-android to use the [mono/2017-06][0] and [mono/2017-08][1] (and...) branches, and when doing so they are seeing a unit test fail in `Xamarin.Android.Build.Tests.BuildTest.GeneratorValidateMultiMethodEventName()`: no `BG850*` warnings are expected but they are produced. After much analysis, the cause of ght `BG850*` warnings is that the mono/2017-06 branch introduces a non-generic "overload" of `System.Collections.Generic.KeyValuePair`: namespace System.Collections.Generic { // New with mono/2017-06 partial class KeyValuePair { public static KeyValuePair<TKey, TValue> Create<TKey, TValue>(TKey key, TValue value); } // Existing since forever partial struct KeyValuePair<TKey, TValue> { } } Specifically, the above "`KeyValuePair` overload" type runs into a FIXME within `CodeGenerator.cs`: // FIXME: at some stage we want to import generic types. // For now generator fails to load generic types that have conflicting type e.g. // AdapterView`1 and AdapterView cannot co-exist. // It is mostly because generator primarily targets jar (no real generics land). The problem is that the check that is performed is too strict: given a type `AdapterView<T>`, we only check to see if `AdapterView` exists as well. If it does exist, then we *ignore* the `AdapterView<T>` type, and only use the `AdapterView` type for code generation. This check causes us to skip type registration for `KeyValuePair<TKey, TValue>`, which in turn causes us to invalidate e.g. `IDictionary<TKey, TValue>` -- as it implements `ICollection<KeyValuePair<TKey, TValue>>` -- and everything promply falls apart from there: warning BG8C00: For type System.Collections.Generic.IDictionary`2, base interface System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<TKey,TValue>> is invalid. warning BG8C00: For type System.Collections.Generic.IDictionary`2, base interface System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<TKey,TValue>> is invalid. warning BG8502: Invalidating System.Collections.Generic.IDictionary`2 and all nested types because some of its interfaces were invalid. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Collections.Generic.IList`1<System.String>> in method MapEquivalents in managed type Java.Util.Locale.LanguageRange. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Collections.Generic.IList`1<System.String>> in method Parse in managed type Java.Util.Locale.LanguageRange. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Object> in method NewFileSystem in managed type Java.Nio.FileNio.Spi.FileSystemProvider. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Object> in method NewFileSystem in managed type Java.Nio.FileNio.Spi.FileSystemProvider. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.String> in method .ctor in managed type Java.Security.Provider.Service. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.Object,System.Object> in method PutAll in managed type Java.Security.Provider. I still don't fully understand the scenario that the check was attempting to solve, so in lieu of actually fixing the FIXME, make the check *stricter* so that we only ignore "generically overloaded" types if they bind the *same* Java type. Since `KeyValuePair<TKey, TValue>` binds *no* Java type, it will no longer be skipped, thus removing the BG8502 and related warnings. Additionally, a bit of code cleanup for consistency: some parts of the code use `HAVE_CECIL`, and others use `USE_CECIL`. Standardize on `HAVE_CECIL` for consistency and sanity. [0]: dotnet/android#631 [1]: dotnet/android#723

Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=57828 The #runtime team is attempting to update xamarin-android to use the [mono/2017-06][0] and [mono/2017-08][1] (and...) branches, and when doing so they are seeing a unit test fail in `Xamarin.Android.Build.Tests.BuildTest.GeneratorValidateMultiMethodEventName()`: no `BG850*` warnings are expected but they are produced. After much analysis, the cause of ght `BG850*` warnings is that the mono/2017-06 branch introduces a non-generic "overload" of `System.Collections.Generic.KeyValuePair`: namespace System.Collections.Generic { // New with mono/2017-06 partial class KeyValuePair { public static KeyValuePair<TKey, TValue> Create<TKey, TValue>(TKey key, TValue value); } // Existing since forever partial struct KeyValuePair<TKey, TValue> { } } Specifically, the above "`KeyValuePair` overload" type runs into a FIXME within `CodeGenerator.cs`: // FIXME: at some stage we want to import generic types. // For now generator fails to load generic types that have conflicting type e.g. // AdapterView`1 and AdapterView cannot co-exist. // It is mostly because generator primarily targets jar (no real generics land). The *intent* of the check that is that, given a type `AdapterView<T>`, we only check to see if `AdapterView` exists as well. If it does exist, then we *ignore* the `AdapterView<T>` type, and only use the `AdapterView` type for code generation. In the case of `KeyValuePair`, the same "check" is done, which cause us to *skip* type registration for `KeyValuePair<TKey, TValue>`, which in turn causes us to invalidate e.g. `IDictionary<TKey, TValue>` -- as it implements `ICollection<KeyValuePair<TKey, TValue>>` -- and everything promply falls apart from there: warning BG8C00: For type System.Collections.Generic.IDictionary`2, base interface System.Collections.Generic.ICollection`1<System.Collections.Generic.KeyValuePair`2<TKey,TValue>> is invalid. warning BG8C00: For type System.Collections.Generic.IDictionary`2, base interface System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<TKey,TValue>> is invalid. warning BG8502: Invalidating System.Collections.Generic.IDictionary`2 and all nested types because some of its interfaces were invalid. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Collections.Generic.IList`1<System.String>> in method MapEquivalents in managed type Java.Util.Locale.LanguageRange. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Collections.Generic.IList`1<System.String>> in method Parse in managed type Java.Util.Locale.LanguageRange. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Object> in method NewFileSystem in managed type Java.Nio.FileNio.Spi.FileSystemProvider. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.Object> in method NewFileSystem in managed type Java.Nio.FileNio.Spi.FileSystemProvider. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.String,System.String> in method .ctor in managed type Java.Security.Provider.Service. warning BG8801: Invalid parameter type System.Collections.Generic.IDictionary`2<System.Object,System.Object> in method PutAll in managed type Java.Security.Provider. I still don't fully understand the scenario that the check was attempting to solve, so in lieu of actually fixing the FIXME, make the check *stricter* so that we only ignore "generically overloaded" types if they bind the *same* Java type. Since `KeyValuePair<TKey, TValue>` binds *no* Java type, it will no longer be skipped, thus removing the BG8502 and related warnings. Additionally, a bit of code cleanup for consistency: some parts of the code use `HAVE_CECIL`, and others use `USE_CECIL`. Standardize on `HAVE_CECIL` for consistency and sanity. [0]: dotnet/android#631 [1]: dotnet/android#723

hopefully fixes https://bugzilla.xamarin.com/show_bug.cgi?id=57828

lewurm · 2017-08-25T11:19:07Z

build for 52097a1 is green!!! 🙂

jonpryor · 2017-08-25T19:45:47Z

@lewurm: Note: after commit bb02dff you will need to update this PR to change external/xamarin-android-api-compatibility to use xamarin-android-api-compatibility/master.

…mp mono

This reverts commit 460b62a.

Bump mono to 5.4.0.0

76cef03

dnfclas added the cla-already-signed label Jun 5, 2017

lewurm added 2 commits June 6, 2017 14:40

[linker] add new source files to project file

0bf122c

[mono] bump to mono/mono@ac71acf

cc6a7e8

jonpryor added the full-mono-integration-build For PRs; run a full build (~6-10h for mono bumps), not the faster PR subset (~2h for mono bumps) label Jun 6, 2017

lewurm and others added 11 commits June 6, 2017 21:43

bump mono and java.interop

26846b7

bump mono

588aaa1

bump mono

dcc7e47

bump mono

17ae5c2

bump mono

d69494a

Updated submodule references

2868769

Updated reference to mono Fixed target branch for mono

Updated reference to mono

5cf27f9

bump mono

9b74651

bump mono, java.interop and linker

f2e2998

bump mono desktop package

2b92f3a

bump MonoRequiredMinimumVersion

93fd979

lewurm added 2 commits July 18, 2017 22:41

Merge remote-tracking branch 'origin/master' into mono-2017-06

3e8a1fb

bump mono

3559b60

lewurm added 2 commits July 19, 2017 12:52

bump java.interop

690845b

bump libzipsharp

86d7164

bump xamarin-android-api-compatibility

52fbfe8

lewurm added 2 commits August 10, 2017 22:03

Merge remote-tracking branch 'origin/master' into mono-2017-06

cc1fd12

bump mono

83d9b74

lewurm added 2 commits August 11, 2017 22:11

Merge remote-tracking branch 'origin/master' into mono-2017-06

d8ea7b2

[debug] dump build output

460b62a

context: https://bugzilla.xamarin.com/show_bug.cgi?id=57828 this commit should be reverted.

jonpryor mentioned this pull request Aug 21, 2017

[generator] Only skip generic "overloads" of bound types dotnet/java-interop#178

Merged

lewurm added 4 commits August 22, 2017 11:40

Merge remote-tracking branch 'origin/master' into mono-2017-06

3fd6c08

bump java.interop

6bbe4f3

hopefully fixes https://bugzilla.xamarin.com/show_bug.cgi?id=57828

Merge remote-tracking branch 'origin/master' into mono-2017-06

e0f32ff

bump linker

52097a1

lewurm added 9 commits August 27, 2017 09:01

Merge remote-tracking branch 'origin/master' into mono-2017-06

e811134

bump xamarin-android-api-compatibility to master

d89b91f

Merge remote-tracking branch 'origin/master' into mono-2017-06

68dc359

bump mono

d70f3d3

bump mono

0685f18

Merge remote-tracking branch 'origin/master' into mono-2017-06 and bu…

2aaec1f

…mp mono

Revert "[debug] dump build output"

1cb5b91

This reverts commit 460b62a.

minimize diff to master

f6c3e63

.gitmodules: s/d15-4/master/ for xamarin-android-api-compatibility

fbbe725

jonpryor merged commit bd18b36 into master Sep 5, 2017

github-actions bot locked and limited conversation to collaborators Feb 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump mono to 5.4.0.0 #631

Bump mono to 5.4.0.0 #631

luhenry commented Jun 5, 2017

jonpryor commented Jun 6, 2017

jonpryor commented Jun 6, 2017

lewurm commented Jun 21, 2017

jonpryor commented Jun 22, 2017

jonpryor commented Jun 23, 2017

jonpryor commented Jun 23, 2017

directhex commented Jun 23, 2017

jonpryor commented Jul 18, 2017

lewurm commented Jul 18, 2017

jonpryor commented Aug 10, 2017

lewurm commented Aug 11, 2017

jonpryor commented Aug 11, 2017

lewurm commented Aug 25, 2017

jonpryor commented Aug 25, 2017

Bump mono to 5.4.0.0 #631

Bump mono to 5.4.0.0 #631

Conversation

luhenry commented Jun 5, 2017

jonpryor commented Jun 6, 2017

jonpryor commented Jun 6, 2017

lewurm commented Jun 21, 2017

jonpryor commented Jun 22, 2017

jonpryor commented Jun 23, 2017

jonpryor commented Jun 23, 2017

directhex commented Jun 23, 2017

jonpryor commented Jul 18, 2017

lewurm commented Jul 18, 2017

jonpryor commented Aug 10, 2017

lewurm commented Aug 11, 2017

jonpryor commented Aug 11, 2017

lewurm commented Aug 25, 2017

jonpryor commented Aug 25, 2017