Merge master to release/dev16.2 #6982
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
* Don't expose Legacy MSBuildReferenceResolver * Move the files boss hoss * Remove unused opens * Fix tests * Remove IVT dependency for CodeLens and put logging behind a flag * oopsie doopsie * meep morp * blub glub * heepers jeepers * Update fsi.fs * Update service.fs * Update service.fsi * Update FSharpCheckerProvider.fs * Update FSharpLanguageServiceTestable.fs * Update TestLib.LanguageService.fs * Updates for build in release * I'm not touching MSBuildReferenceResolver I'm not touching MSBuildReferenceResolver I'm not touching MSBuildReferenceResolver * Different ignore and adjust ifdefs
…ead code (#6900) * Replace AgedLookup with Dictionary in XML doc generation * Try remove unecessary stuff
…six (#6942) * ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.vsix During a build/deploy in VS the target `BeforeBuild` wasn't getting called on FSharp.Build.fsproj if up-to-date checks passed which meant the .props file wasn't getting added to the @(None) item group. The fix is to make that target depend on `AssignTargetPaths` which is run in both the VS build as well as the command line build. * annotate ambiguous function
* split service.fs * reduce diff * minor cleanup * fix flakey test (?) * use runsettings * same fix for FCS tests2 * fix build * add diagnostics * fix final parallel case * fix build * try again to fix test * update test fixes * add diagnostics * add diagnostics * diagnostics * diagnostics * diagnostics * add diagnostics and possible fix for tp smoke tests * fix build * fix build * merge master * integrate master * integrate master * fix build * Delete FSharp.Compiler.Private.fsproj
I think this document is outdated and duplicating too much information at this point. I also think most people don't read it or know it even exists. In an effort to simplify the amount of documents we either explicitly or implicitly expect people to read, I think this can be removed.
I'm feeling spicy, so I'm doing this with GitHub's web UI.
* Remove IVT to fsi from FSharp.Compiler.Private * Save the out stream * Remove IVT to fsianycpu
* enable preview LSP support Includes plumbing and a stub for `textDocument/hover` (e.g., QuickInfo). * enable easy exclusion of the language server from VS components * Update src/fsharp/FSharp.Compiler.LanguageServer/TextDocument.fs Co-Authored-By: Phillip Carter <[email protected]>
…6980) * fixed map3 misleading error message on different length lists * fixed previous fix bug * added map3 exception message test * fixed map3 exception message test
brettfo
approved these changes
Jun 12, 2019
nosami
pushed a commit
to xamarin/visualfsharp
that referenced
this pull request
Jan 26, 2022
…ev16.2 Merge master to release/dev16.2
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 release/dev16.2.
(created from a manual run of the PR generation tool)
git fetch --all git checkout merges/master-to-release/dev16.2 git reset --hard upstream/release/dev16.2 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.2 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.