Merge master into release #503
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 checkin merges ce74d98 (Remove myget feed from NuGet.config) from release into master without taking the content of the change. This hopefully makes it so the release-based branches will not used myget while master-based branches will.
* Adding attach process picker. This feature will light up when the required vscode features are available in stable release. * Incorporating code review comments. - Changing the command to csharp.listProcess. - Sorting the process, such that dotnet process are shown at the top.
This adds some corrections/clarifications to debugger.md that I noticed while reviewing it.
Add a link to wikipedia for defining what Docker is.
Merge release into master
* Add logModuleLoadEvents launch option configuration * Add logging launch options group * Default object, not array * Add engine/protocol logging flags
Update package versions
Update linux distros for OmniSharp
Add back imports to project.json for debugger install
Additional tweaks
| <clear /> | ||
| <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> | ||
| <!-- This dependency is not present in the release branch --> | ||
| <add key="coreclrdebug" value="https://www.myget.org/F/coreclr-debug/api/v3/index.json" /> |
There was a problem hiding this comment.
Did this line actually flow back? If so, it shouldn't have.
There was a problem hiding this comment.
It certainly did.
There was a problem hiding this comment.
How do we fix that? I don't want to cherry-pick the world.
There was a problem hiding this comment.
Okay, we will need to back that out then before we make a .vsix.
There was a problem hiding this comment.
I think you can commit this PR as-is and I will fix it once you are done. Alternatively I can fix it in master. Either way is fine with me.
There was a problem hiding this comment.
Merged. Feel free to fix.
|
Otherwise LGTM |
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.
No description provided.