Skip to content

Commit

Permalink
[mono] Bump mono to match android (#7104)
Browse files Browse the repository at this point in the history 
* [mono] Bump mono to match android

mono/mono@4546440...c99adb9

* [tests] Add workaround for xamarin/maccore#1996.
  • Loading branch information
@dalexsoto
dalexsoto authored Sep 26, 2019
1 parent 46fbc83 commit cd59176
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mk/mono.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NEEDED_MONO_VERSION := 4546440471d8817fb89896fa33c3bd2fff1bf000
NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585
NEEDED_MONO_BRANCH := 2019-08

MONO_DIRECTORY := mono
Expand Down
7 changes: 7 additions & 0 deletions tests/common/ProductTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,13 @@ public void MinOSVersion (Profile profile, MachO.LoadCommands load_command, Mach
}
mono_native_compat_version = version;
mono_native_unified_version = new Version (10, 0, 0);

// This condition and everything inside it is a workaround for https://github.com/xamarin/maccore/issues/1996.
if (alternate_version == null || (alternate_version.Major == 7 && version.Major == 7)) {
alternate_version = new Version (6, 0, 0);
if (!slice.IsDynamicLibrary)
mono_native_compat_version = alternate_version;
}
break;
case MachO.LoadCommands.MintvOS:
version = SdkVersions.MinTVOSVersion;
Expand Down

5 comments on commit cd59176

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

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

✅ Device tests passed on iOS on Azure DevOps(iOS): Html Report ✅

🎉 All 113 tests passed 🎉

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

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

❌ Build was (probably) aborted

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Test run, Test run' 🔥

✅ Build succeeded
✅ Packages:

✅ API Diff (from stable)
✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)
🔥 Test run failed 🔥

Test results

1 tests failed, 162 tests passed.

Failed tests

  • introspection/tvOS - simulator/Debug (tvOS 10.2): Failed

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

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

🔥 Device tests completed (Failed) on TvOS on Azure DevOps(TvOS): Html Report 🔥

Test results

2 tests failed, 111 tests passed.

Failed tests

  • [NUnit] Mono BCL tests group 2/tvOS - device/Debug: Failed
  • [xUnit] Mono BCL tests group 4/tvOS - device/AssemblyBuildTarget: SDK framework (debug, profiling): Failed

@mandel-macaque
Copy link
Member

Choose a reason for hiding this comment

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

Setting state to success where context is VSTS: device tests (TvOS).

UDP tests failures are known: https://github.com/xamarin/maccore/issues/869 the introspection tests too: https://github.com/xamarin/maccore/issues/940

@mandel-macaque
Copy link
Member

Choose a reason for hiding this comment

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

Setting state to success where context is continuous-integration/jenkins/branch.

The introspection are known: https://github.com/xamarin/maccore/issues/940

Please sign in to comment.