-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
[9.0.2xx] sln migrate, sln list, sln add #45408
[9.0.2xx] sln migrate, sln list, sln add #45408
Conversation
5f7b4b2
to
6e259bb
Compare
Co-authored-by: kasperk81 <[email protected]> Co-authored-by: Noah Gilson <[email protected]>
3ebffd0
to
979d33f
Compare
@edvilme source-build-ext update for 9.0.2x requires kasperk81@c713864 |
72eaa1d
to
ff11407
Compare
@baronfel we should get this reviewed tomorrow and merge so that it can get into the next VS insertion for preview 3. |
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.
Content-wise, I glanced through the commits, and they looked equivalent to what was merged as I'd expected, but it's essentially a whole new set of commits, which I don't like too much. I would've hoped for at least some of them to not be in need of resolving merge conflicts, especially if you tweak it to look as the next commit would expect in earlier commits...but I probably shouldn't nitpick on that right now. You can make that a little easier too by making sure all your commits are in order, which you mostly did except one that got moved out of place 😉
Since the only failing checks are due to the macOS arm64 leg, let's merge on read and get this in! @marcpopMSFT care to do the honors? |
We can give pointers when he's back in the office as there are some strategies for avoiding merge conflicts especially in our repo (target the live branch and let codeflow take to main as an example). |
We'll get remove in once it passes checks. |
Manual backport of #44419 , #44537 , #44661 #44570, #45130, and #45366 to release/9.0.2xx
Fixes #40913.