Merge master to dev16.1 #6430
Merged
Merge master to dev16.1 #6430
Conversation
This file contains 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
* spacing for commas and colons * code review
consume dotnet arcade sdk
…321.3 (#6366) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.3
* Re-enable ngen for desktop compilers * Go even earlier * Cooler mechanism
* Clear status bar after navigable symbol is resolved * yert
Update vsix links
* update FCS dependencies * update FCS dependencies * fix up build * code review
* Fix portable pdb writing * enable portable pdbs for fsharp.private.compiler.dll * feedback * Release build
#6383 seems to have fixed it.
* Making ILVersionInfo a struct * Fixing tests
Making ILVersionInfo a struct (#6392)
* whitespace cleanup * whitespace cleanup
* Use process dependencies for fsi * default references now have full path * tweak * Desktop does not recurse dependencies * Use existing resolution logic on desktop * build from source, system.private.corelib * ci_part4 * Deal with Dev 15.0 portable pdb symbols
This makes it much easier to install one-off builds for testing.
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 master into dev16.1.
git fetch --all git checkout merges/master-to-dev16.1 git reset --hard upstream/dev16.1 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-dev16.1 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.