-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Conversation
Cherry pick 0a6e5f1 Conflicts: src/XMakeTasks/Microsoft.Build.Tasks.csproj
@nguerrera is it possible to merge instead of cherry-picking? That should reduce headache later. |
@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. |
There was a problem hiding this 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.
Any idea what the failure to restore on OS X is about? |
test OSX Build for CoreCLR please |
@nguerrera I was able to get things to pass by rebasing onto xplat and force pushing. Not sure why it worked... |
@jeffkl These commits are already on top of xplat latest so rebase would be a no-op. |
Is anyone looking in to the root cause here? Anything else I can do to get this in? |
@dotnet-bot test OSX Build for CoreCLR please |
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) |
@cdmihai I will add tests in a follow-up PR. Thanks for the pointer on how. |
@cdmihai @jeffkl @AndyGerlicher @rainersigwald