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

Merge main to main-vs-deps #53741

Merged
merged 8 commits into from
May 28, 2021
Merged

Merge main to main-vs-deps #53741

merged 8 commits into from
May 28, 2021

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from main into main-vs-deps.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout merges/main-to-main-vs-deps
git reset --hard upstream/main-vs-deps
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-main-vs-deps --force

genlu and others added 8 commits May 27, 2021 11:50
Right now we don't get the command line string for options until the
full design time build has completed; however the project system can
still give us the evaluated string which is likely to be close
enough. This allows features that want to get symbol names for source
to have a better chance of having something that they can use and
look up in caches or in the cloud.
Fix optprof config drop path
…embly-name

Add a parameter to pass through the initial assembly name
* Add API Review Process Documentation

We're currently working on making a more formal API review process for Roslyn. This PR adds documentation to the repo on how that process works, and the general expectations for how the process should work. Much of this documentation is copied from dotnet/runtime, and modified to fit the repo. 

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
Co-authored-by: Joseph Musser <me@jnm2.com>
Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@Cosifne Cosifne merged commit b6764ca into main-vs-deps May 28, 2021
@ghost ghost added this to the Next milestone May 28, 2021
@RikkiGibson RikkiGibson modified the milestones: Next, 17.0.P2 Jun 29, 2021
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.

6 participants