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

Updating the solution to reflect recent changes #6203

Merged
merged 1 commit into from
Oct 23, 2015

Conversation

davkean
Copy link
Member

@davkean davkean commented Oct 21, 2015

Visual Studio is continually asking me to modify the solution, this because we've
made some changes manually in the solution itself and because configurations
are different between solution and project files.

Sync'ing changes so that we can stop excluding Roslyn.sln from our changes.

@davkean
Copy link
Member Author

davkean commented Oct 21, 2015

Tag @dotnet/roslyn-ide

@jasonmalinowski
Copy link
Member

Hah, this is similar to jasonmalinowski/roslyn@906e289 that I wrote a few hours ago. It looks like you caught the project configuration mismatches that I didn't. Can you retarget this pull request against stabilization? We'll need this there since that's where anybody from the community will be branching off of when they're making pull requests atop Update 1.

I'm also curious how this happened. Is there a bug here somewhere in the VS solution manager? 👍 otherwise.

@davkean
Copy link
Member Author

davkean commented Oct 21, 2015

This happened probably due to two reasons:

  1. Jared probably manually edited the solution file when he split the tests into two projects.
  2. Someone changed a project file without also checking in/updating the solution. We have multiple solutions, so that's probably easy mistake to make.

@davkean
Copy link
Member Author

davkean commented Oct 21, 2015

I assumed master will roll into stabilization once Update 1 ships, no?

@davkean davkean closed this Oct 23, 2015
@davkean davkean reopened this Oct 23, 2015
davkean added a commit that referenced this pull request Oct 23, 2015
Updating the solution to reflect recent changes
@davkean davkean merged commit af1126c into dotnet:master Oct 23, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants