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

Merges/main to features/generic attributes #54784

Conversation

RikkiGibson
Copy link
Contributor

@RikkiGibson RikkiGibson commented Jul 13, 2021

Just a trivial MessageID conflict resolution.

msftbot[bot] and others added 30 commits February 28, 2021 01:41
…copedNamespaces

Merge master to features/FileScopedNamespaces
…polated-string

Merge master to features/interpolated-string
…pedNamespaces

Merge main to features/FileScopedNamespaces
…lated-string

Merge main to features/interpolated-string
…lated-string

Merge main to features/interpolated-string
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…lated-string

Merge main to features/interpolated-string
* upstream/main: (75 commits)
  Split BoundInterpolatedString into BoundInterpolatedString and BoundUnconvertedInterpolatedString (#52061)
  Combine VB comparers into one, and combine VB and C# comparers together (#51834)
  Use OptimizedVSCompletionList in LSP scenarios.
  F5 Hot Reload (#52101)
  Fix typescript shim
  Add tests for lazy syntax trees coming from the GeneratorDriver
  React to code review feedback.
  Simplify the lazy-initalization pattern used in GetRoot
  Remove an unnecessary override. (#52140)
  Update issue number (#52130)
  Enable CodeActions support for XAML using its own provider and CodeActionCache. The handlers are actually shared with Roslyn as is. (#52129)
  Add RestrictedIVT to dotnet watch to Features (#52087)
  Don't try to highlight operators (#52041)
  Use `null` instead of empty signature helps in LSP
  Use member type for relational pattern even in error cases (#51950)
  Update src/VisualStudio/Xaml/Impl/Implementation/LanguageServer/Extensions/SymbolExtensions.cs
  Use new QuickInfoUtilities helper
  Rebuild API shape (#52079)
  Added position parameter name
  Updated XAML QuickInfo to show more info like C# by using ISymbolDisplayService and adding more documentation parts.
  ...
…lated-string

Merge main to features/interpolated-string
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…lated-string

Merge main to features/interpolated-string
…pedNamespaces

Merge main to features/FileScopedNamespaces
…lated-string

Merge main to features/interpolated-string
…lated-string

Merge main to features/interpolated-string
dotnet-bot and others added 19 commits July 9, 2021 17:02
Fix navigation to file-scoped namespaces
Fix FAR for constructors in file-scoped namespaces
Ensure equivalence key is not null
Switch progression search over to navto search by default.
Add records support to XmlDocCommentCompletion and ChangeSignature
[main] Update dependencies from dotnet/roslyn
…4726)

* Prefer Concat on interpolated strings with 4 or less string parts

Fixes #54702. This does not implement any changes to prefer concat for ReadOnlySpan<char>: doing so will require a deeper change of the local rewriter's handling of string concatenation that we can revisit at a later date if we so choose.
…n into merges/main-to-features/generic-attributes
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

@RikkiGibson RikkiGibson merged commit 9aa300e into features/generic-attributes Jul 13, 2021
@RikkiGibson RikkiGibson deleted the merges/main-to-features/generic-attributes branch July 13, 2021 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.