Merge dev15.7.x to dev15.7.x-vs-deps #24598
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This lock is only being used to protect access to an instance which contains internal synchronization.
…into dev/olegtk/FixIntellisenseInImmediate
Roslyn is designed to have the simplest possible contribution story: clone then build. Every pre-req needed is either located on the machine or bootstrapped via NuGet. All the way down to using an xcopy MSBuild if needed. The one case which causes a problem is the VS command prompt. In this case MSBuild is pre-installed on the machine and may or may not be suitable for building Roslyn. Previously when building from a VS command prompt we just used whatever MSBuild was provided. The assumption being a developer command prompt was an explicit statement of whath MSBuild you wanted to use. Based on all of our customer reports though this does not seem to be the assumption that consumers of our repo have. The build gave them no explicit errors about the provided toolset and hence when the build failed they assigned flakiness to our repo. Going forward we are applying the same version validation to MSBuild when provided via a developer command prompt. If it doesn't match we will refuse to build asking the user to upgrade VS or build from a normal command prompt.
Better handle surrounding directives when inlining a local variable.
…s-deps-20180131 Merge dev15.6.x to dev15.6.x-vs-deps
also added RoslynActivityLogger that can be enabled through project-system-tool
Remove duplicate lock DocumentState.s_syntaxTreeToIdMapLock
…0180201-080013 Merge dev15.6.x to dev15.7.x
…-code Cleanup project system code
Omit Default modifier style & code fix
CS1628 error text mentions in parameters; fixes #24584
Small cleanup of completion logic.
…15.7.x-vs-deps-20180201-080016 Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps
Previously we were using xunit.console for desktop tests and dotnet-xunit for our CoreClr tests. This change unifies us on top of xunit.console (now that it has a netcoreapp2.0 version available).
Verify MSBuild version in Developer CMD prompt
Move to xunit.console for CoreClr tests
Reduce allocations in UnboundLambda
Contributor
|
resolved merge conflicts. |
Contributor
|
@agocke @jasonmalinowski can you take a look? fixed merge conflicts. |
agocke
approved these changes
Feb 2, 2018
agocke
deleted the
merges/dev15.7.x-to-dev15.7.x-vs-deps-20180202-080023
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from dev15.7.x into dev15.7.x-vs-deps.
git fetch --all git checkout merges/dev15.7.x-to-dev15.7.x-vs-deps-20180202-080023 git reset --hard upstream/dev15.7.x-vs-deps git merge upstream/dev15.7.x # Fix merge conflicts git commit git push merges/dev15.7.x-to-dev15.7.x-vs-deps-20180202-080023 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.