Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev16.2 to master #7272

Merged
43 commits merged into from
Jul 25, 2019
Merged

Merge release/dev16.2 to master #7272

43 commits merged into from
Jul 25, 2019

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/dev16.2 into master.
(created from a manual run of the PR generation tool)

git fetch --all
git checkout merges/release/dev16.2-to-master
git reset --hard upstream/master
git merge upstream/release/dev16.2
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.2-to-master --force

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

dotnet-automerge-bot and others added 30 commits April 26, 2019 18:00
dotnet-automerge-bot and others added 12 commits May 25, 2019 15:30
* Fixed uninitialized mutable locals inside loops

* Update ForInDoMutableRegressionTest.fs
* Stop calling GetHierarchy in FSharpProjectOptionsReactor

* Fixing build
* Added shims over document diagnostic analyzers

* Shims over completions and sig help

* Removed content type definitions, putting them in external access

* Added shim over InlineRenameService

* We are now simply using export on the diagnostic analyzers

* Using shim for document highlights service

* GoToDefinition implemented with shims

* NavigableSymbolsService shimmed

* GoToDefinitionService shimmed

* NavigationBarItemService shimmmed

* Shimmed NavigateToSearchService

* Quick cast fix

* Using FSharpGlyphTags

* Removed CommentSelectionService as it is ExternalAccess now

* Shimmed BlockStructureService

* Trying to finish shim

* Removed folder from FSharp.Editor

* Update package

* fixing build

* Trying to fix build

* match roslyn package version
@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 7272 in repo dotnet/fsharp

@brettfo
Copy link
Member

brettfo commented Jul 24, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit 0bd851b into master Jul 25, 2019
@ghost ghost deleted the merges/release/dev16.2-to-master branch July 25, 2019 01:01
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants