Merges/main to features/file scoped namespaces #54687
Merged
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
We fixed the drop path a while ago in other branches but forgot about 16.10, and it's causing OptProf test to break after we inserted a new build from dnceng pipeline recently. Fixed it in this branch too just in case PR in VS that's fixing the drop issue: https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/335189
Fix OptProf drop path in 16.10
…ase/dev16.11 Merge release/dev16.10 to release/dev16.11
…ostics that do not update.
Set prerelease version label for PR val builds
Prevent race in LSP pull diagnostics handling that causes stale diagnostics that do not update.
…ase/dev17.0 Merge release/dev16.11 to release/dev17.0
Merge release/dev17.0 to main
…ase/dev17.0 Merge release/dev16.11 to release/dev17.0
Merge release/dev17.0 to main
…_reporting Add ErrorReporting for CodeAction Apply
Reduce telemetry output from find document in workspace
Handle FAR for global suppressions in a consistent fashion
Ensure we don't try and build an empty table when modifying entries
Further FAR simplifications
Additional cleanup to FAR engine.
Merge release/dev17.0 to main
AdornmentManager Abstraction
… into merges/main-to-features/FileScopedNamespaces
333fred
approved these changes
Jul 8, 2021
| @@ -230,6 +230,7 @@ internal enum MessageID | |||
| IDS_AsyncMethodBuilderOverride = MessageBase + 12805, | |||
| IDS_FeatureImplicitImplementationOfNonPublicMemebers = MessageBase + 12806, | |||
| IDS_FeatureLineSpanDirective = MessageBase + 12807, | |||
| IDS_FeatureFileScopedNamespace = MessageBase + 12808, | |||
There was a problem hiding this comment.
May as well make this 12809. You're going to conflict with me no matter what, but at least the merge will be slightly easier.
RikkiGibson
force-pushed
the
merges/main-to-features/FileScopedNamespaces
branch
from
fd17e98
to
46a9d86
Compare
RikkiGibson
force-pushed
the
merges/main-to-features/FileScopedNamespaces
branch
from
46a9d86
to
73ce00b
Compare
|
CI is performing somewhat poorly right now so I just verified that |
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.