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

Port traversal targets for cross-targeting to xplat branch #1025

Merged
merged 2 commits into from
Sep 14, 2016

Conversation

nguerrera
Copy link
Contributor

@rainersigwald
Copy link
Member

@nguerrera is it possible to merge instead of cherry-picking? That should reduce headache later.

@nguerrera
Copy link
Contributor Author

@rainersigwald I was following #1018 (comment)

Also, if I merge, it will bring in all of master, do you want a full FI? I had made my commits against the merge-base of master and xplat, but the squash-merge requested rebased it to the HEAD of master.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

D'oh, I forgot that it got squashed. Unfortunate! You definitely don't have to do the full FI. :shipit:

@nguerrera
Copy link
Contributor Author

Any idea what the failure to restore on OS X is about?

@nguerrera
Copy link
Contributor Author

test OSX Build for CoreCLR please

@jeffkl
Copy link
Contributor

jeffkl commented Sep 14, 2016

@nguerrera I was able to get things to pass by rebasing onto xplat and force pushing. Not sure why it worked...

#1022

@nguerrera
Copy link
Contributor Author

@jeffkl These commits are already on top of xplat latest so rebase would be a no-op.

@nguerrera
Copy link
Contributor Author

Is anyone looking in to the root cause here? Anything else I can do to get this in?

@rainersigwald
Copy link
Member

@dotnet-bot test OSX Build for CoreCLR please

@cdmihai
Copy link
Contributor

cdmihai commented Sep 14, 2016

Oh, I forgot about this on the master branch, but, if you want, you can also write a unit test or two to assert that the correct transition between the outer and inner build is happening as expected. Totally up to you if you want to do it. @jeffkl did this for the project extension import, you can use his approach: https://github.com/Microsoft/msbuild/pull/994/files#diff-69f36dec75c7dfaca573deb2ee10097f

It's fine if the tests live only on xplat, since xplat will become the new master (at some point)

@nguerrera
Copy link
Contributor Author

@cdmihai I will add tests in a follow-up PR. Thanks for the pointer on how.

@rainersigwald rainersigwald merged commit 2320699 into dotnet:xplat Sep 14, 2016
@nguerrera nguerrera deleted the xplat-cross-targeting branch September 14, 2016 22:35
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.

6 participants