Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[d16-6]Bump to mono:2020-02 #8161

Merged
merged 2 commits into from
Mar 20, 2020

Conversation

mandel-macaque
Copy link
Member

Bump mono to 2020-02 head to be in sync with Android.

Co-authored-by: Imran Hameed imhameed@microsoft.com
Co-authored-by: Sebastien Pouliot sebastien.pouliot@microsoft.com
Co-authored-by: Ankit Jain radical@gmail.com
Co-authored-by: Manuel de la Pena mandel@microsoft.com
Co-authored-by: Sebastien Pouliot sebastien.pouliot@gmail.com

Bump mono to 2020-02 head to be in sync with Android.

Co-authored-by: Imran Hameed <imhameed@microsoft.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@gmail.com>
@monojenkins
Copy link
Collaborator

Build failure
Build failed or was aborted

🔥 Build failed 🔥

@@ -125,8 +125,8 @@ void ProcessMethod (MethodDefinition method)
}
}

if (MarkStep.IsPropertyMethod (method)) {
var property = MarkStep.GetProperty (method);
if (method.IsPropertyMethod ()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious - why were these code changes necessary?

Copy link
Contributor

Choose a reason for hiding this comment

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

we use external source from monolinker repo - which is not quite API stable

Copy link
Member Author

Choose a reason for hiding this comment

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

Changes in the API of the linker.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@monojenkins
Copy link
Collaborator

Build failure
Build succeeded
API Diff (from stable)
API Diff (from PR only) (no change)
Generator Diff (no change)
🔥 Test run failed 🔥

Test results

5 tests failed, 166 tests passed.

Failed tests

  • xammac tests/Mac Modern/Debug: Failed (Test run failed.)
  • [NUnit] Mono Mac OS X BCL tests group 2/Mac Full/Debug: Failed (Test run failed.)
  • monotouch-test/iOS Unified 64-bits - simulator/Debug: Failed
  • monotouch-test/tvOS - simulator/Debug (static registrar): Failed
  • monotouch-test/tvOS - simulator/Release (all optimizations): Failed

@mandel-macaque
Copy link
Member Author

@mandel-macaque mandel-macaque merged commit 088c736 into xamarin:d16-6 Mar 20, 2020
@dalexsoto
Copy link
Member

@monojenkins backport d16-6-xcode11.4

@monojenkins
Copy link
Collaborator

@dalexsoto backporting to d16-6-xcode11.4 failed, the patch results in conflicts:

Applying: Bump to mono:2020-02 (#7795)
Using index info to reconstruct a base tree...
M	Make.config
M	tools/mmp/mmp.csproj
M	tools/mtouch/mtouch.csproj
Falling back to patching base and 3-way merge...
Auto-merging tools/mtouch/mtouch.csproj
CONFLICT (content): Merge conflict in tools/mtouch/mtouch.csproj
Auto-merging tools/mmp/mmp.csproj
Auto-merging Make.config
error: Failed to merge in the changes.
Patch failed at 0001 Bump to mono:2020-02 (#7795)

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants