Mono stable backports #34390
Merged
Mono stable backports #34390
Conversation
This file contains 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
(cherry picked from commit fccc81a)
(cherry picked from commit 391485e)
See NixOS#32386 -- while Mono in general should build correctly with parallel building, it seems the 4.4 branch has broken. Instead, allow parallel build support to be overridden by individual versions, and default to true. Signed-off-by: Austin Seipp <aseipp@pobox.com> (cherry picked from commit 90bcfc7)
See NixOS#32386 mono46: https://hydra.nixos.org/build/65617511 mono48: https://hydra.nixos.org/build/65600645 (cherry picked from commit 0a41fc6)
(cherry picked from commit 7d14f81)
Still trying to figure out how msbuild should fit into the picture... (cherry picked from commit 1a05448)
(cherry picked from commit 7ae8d2b)
copumpkin
force-pushed
the
mono-stable-backports
branch
from
e713db5
to
f2bd78e
Compare
|
Cherry-picking all this junk makes me long for Darcs, since all the diffs depend on earlier diffs and don't apply cleanly unless I bring over all sorts of stuff. |
fpletz
approved these changes
Jan 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport a couple of Mono changes I'd like back to the stable branch.
cc @orivej @globin @jammerful