Merge 'main' into features/FirstClassSpan #74406
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
…, add more tests.
Fix msbuild issue
Fix style binding failure in Document Outline
…not use expanded non-array `params` collection in Format/Create calls. (dotnet#74274) Fixes dotnet#74163.
…o-main Merge release/dev17.11 to main
… queue to avoid race
…solution-priority * upstream/main: (184 commits) Disable BuildWithNetFrameworkHostedCompiler (dotnet#74299) Avoid using constants for large string literals (dotnet#74305) Adjust lowering of a string interpolation in an expression lambda to not use expanded non-array `params` collection in Format/Create calls. (dotnet#74274) Consolidate test Span sources (dotnet#74281) Allow Document.FilePath to be set to null (dotnet#74290) Update Directory.Build.rsp Remove fallback options from IdeAnalyzerOptions (dotnet#74235) Fix msbuild issue Improve parser recovery around nullable types in patterns (dotnet#72805) Syntax formatting options (dotnet#74223) Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2490585 (dotnet#74287) fix (dotnet#74276) Remove more fix (dotnet#74237) Fix scenario where lightbulbs weren't being displayed Reduce closures allocated during invocation of CapturedSymbolReplacement.Replacement (dotnet#74258) Reduce allocations in SymbolDeclaredCompilationEvent (dotnet#74250) remove type that now serves no purpose Remove uncalled method Remove more unused code ...
* Remove double array allocation in SemanticTokens This code was calling ArrayBuilder.ToArray, which would always allocate a new array as a result. Additionally, the arraybuilder itself would end up being large enough that it wouldn't end up going back into the pool. Thus, two large array were allocated on many calls into this method. There really is no need for this method to use ArrayBuilder, as the code that ends up owning the resultant array doesn't attempt to put it back into a pool. This shows up as about 0.5% of allocation in devenv in the customer profile I'm looking at, half of which should be removed by this change.
…o-release/dev17.11 Merge release/dev17.10 to release/dev17.11
Allow services to use System.Text.Json for OOP comms in Razor
…o-main Merge release/dev17.11 to main
Also moved files needed for testing into a testing folder so we don't get them mixed up
Razor EA changes to allow better tests in Razor
…ickBack Add the ResolveKeySource workround back
…sence of spilling in its either branch (dotnet#74310) Fixes dotnet#74115.
Closes dotnet#73557. Closes dotnet#73555. Closes dotnet#73554.
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
jjonescz
commented
Jul 16, 2024
| case MessageID.IDS_FeatureRefStructInterfaces: | ||
| case MessageID.IDS_FeatureFieldAndValueKeywords: | ||
| case MessageID.IDS_FeatureFirstClassSpan: | ||
| return LanguageVersion.Preview; |
There was a problem hiding this comment.
Moved the feature here to stay in preview.
There was a problem hiding this comment.
Resolved conflicts here to use the best of both branches for the span sources.
| // (13,49): error CS8652: The feature 'params collections' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. | ||
| // public static string Join(string separator, params ReadOnlySpan<string> values) => "span"; | ||
| Diagnostic(ErrorCode.ERR_FeatureInPreview, "params ReadOnlySpan<string> values").WithArguments("params collections").WithLocation(13, 49)); | ||
| Diagnostic(ErrorCode.ERR_AmbigCall, "Join").WithArguments("StringExtensions.Join(string, params string[])", "StringExtensions.Join(string, params System.ReadOnlySpan<string>)").WithLocation(7, 65)); |
There was a problem hiding this comment.
Moved to Regular13, removed the second error, and added a PROTOTYPE comment to move other tests to Regular13 as well in a follow up PR.
333fred
approved these changes
Jul 16, 2024
jjonescz
merged commit cd9cb9d
into
dotnet:features/FirstClassSpan
25 of 28 checks passed
This was referenced Oct 22, 2024
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.
Mostly trivial conflicts and one test fixup. I will comment on them below.
Test plan: #73445