Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Merge release/2.0.0 to master#7254

Merged
nguerrera merged 4 commits intomasterfrom
merges/release/2.0.0-to-master-20170725-070023
Jul 25, 2017
Merged

Merge release/2.0.0 to master#7254
nguerrera merged 4 commits intomasterfrom
merges/release/2.0.0-to-master-20170725-070023

Conversation

@dotnet-bot
Copy link
Copy Markdown

This is an automatically generated pull request from release/2.0.0 into master.

git fetch --all
git checkout merges/release/2.0.0-to-master-20170725-070023
git reset --hard upstream/master
git merge upstream/release/2.0.0
# Fix merge conflicts
git commit
git push merges/release/2.0.0-to-master-20170725-070023 --force

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

livarcocc and others added 4 commits July 21, 2017 15:24
…ackage contains only the Resolver dll. The hostfxr dll will still have to be acquired separately.
Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0
Producing a nupkg for Microsoft.NET.MSBuildResolver.
@nguerrera nguerrera merged commit 4e92948 into master Jul 25, 2017
@nguerrera nguerrera deleted the merges/release/2.0.0-to-master-20170725-070023 branch July 25, 2017 22:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants