Snap main to 17.14 P3 #11549
Merged
Snap main to 17.14 P3 #11549
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
This provides better debugger strings for the RazorProjectItems that represent default imports.
Some were sealed, some weren't.
This change makes the IImportProjectFeature interface internal. In addition, the SetImportFeature extension method on RazorProjectEngineBuilder has been moved to the common test library, since it's really intended to be used by tests. This is a public API breaking change, but there are no users of these APIs in dotnet/sdk.
Consolidate the three "TestImportProjectFeature" classes and place it in Microsoft.AspNetCore.Razor.Test.Common.
This change introduces a DefaultImportProjectItem that is shared across features that add default imports.
Add a couple of methods to PooledArrayBuilder to produce a reversed ImmutableArray.
This change rewrites RazorProjectFileSystem.FindHierarchicalItems(...) to avoid allocations. It now returns results in reverse order, since every caller in Razor immediately called `Reverse()`. In addition, the access has been reduced to internal since there are no external callers of this method.
FindHierarchicalItem has a "max depth" check to ensure that it returns a maximum of 255 file paths. However, all this method does is perform string manipulation by looking for '/' characters. It does not actually touch the file system. Technically, this could result in a breaking change because this method is used to find applicable Imports files. So, if the user had a Razor project with 256+ nested subdirectories, the compiler would now consider Imports that it might not have considered in the past. However, that seems like a highly unlikely situation and it's even more unlikely that a user would depend on that behavior.
### Summary of the changes - Fixes:
… Build ID 2631041
… Build ID 2631041 (dotnet#11427)
This change represents a lot of clean up and consolidate a lot of code around how imports are provided and queried for in the compiler. There are a couple of API breaking changes here that shouldn't have external impact. In particular, I've made `IImportProjectFeature` internal and changed its API significantly. In addition, I've rewritten `RazorProjectFileSystem.FindHierarchicalItems(...)` to reduce allocations, make it more efficient, and return its results in reversed order (since every caller immediately called `Reverse()`). CI Build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2626377&view=results Test Insertion: https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/605137
The first time that a remote service call is made by RemoteServiceInvoker, it calls into Roslyn OOP to initialize itself. However, the CancellationToken that's passed for initialization is the same one that is passed by the original service caller. If that token is cancelled by the caller during initialization, RemoteServiceInvoker will get stuck and never actually make a remote service call because the initialization task will forever be in a cancelled state. The fix for this issue is to make RemoteServiceInvoker disposable, and add a CancellationTokenSource that is cancelled when the invoker itself is dispose. Then, pass that CancellationTokenSource's token to initialization.
1. Use AsyncLazy<RazorRemoteHostClient> for both the MessagePack and JSON remote clients. This means that RemoteServiceInvoker no longer acquires a RazorRemoteHostClient for every single service call, but shares the same client throughout its lifetime. 2. Call InitializeAsync before retrieving a client. This simplifies some awkward code. 3. Rework initialization for clarity and performance.
I had added this assert in a previous PR, but it turns out that it can be hit in perfectly normal scenarios during solution load.
### Summary of the changes merge after VS snap Fixes:
… Build ID 2632461
Contributes to dotnet/sdk#46829 NuGet added a new feature that automatically prunes package and project references that are provided by the shared framework that is targeted. Resolve the one warning that got emitted when building the repository in non-source-only mode.
… Build ID 2643004 (dotnet#11485)
…ence-packages build 20250212.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.610402 -> To Version 10.0.611203
dotnet#11503) This pull request updates the following dependencies [marker]: <> (Begin:011df26a-fbd1-45b0-94b9-08db3601dcca) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 011df26a-fbd1-45b0-94b9-08db3601dcca - **Build**: 20250212.3 - **Date Produced**: February 12, 2025 8:08:24 PM UTC - **Commit**: 865d72f852fd723028f8996f8ba9f070bbf37360 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.610402 to 10.0.611203][1] [1]: dotnet/source-build-reference-packages@81b4952...865d72f [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
Response to dotnet/roslyn#74597 to pave the way for dotnet#10682 once Web Tools inserts. The break from the Roslyn change is not binary breaking, so no need for dual insertion, and since this change doesn't break anything, we can get this in now, and whenever we happen to bump Roslyn next, there should be no build issues.
Coherency update: Failed to perform coherency update for one or more dependencies. Please review the GitHub checks or run `darc update-dependencies --coherency-only` locally against darc-main-3442f642-8ef6-418b-9c1e-bf8597011ba5 for more information.
* Use different comletion trigger character set for VSCode * PR feedback * Tweak context re-writing code to disallow sending completion request to delegating HTML client if trigger character is not HTML. Doing so causes issues in VS Code client because it will just return bad matches in that case, so we shouldn't even ask. I don't see any side-effects from not sending it to VS client either, seems logical not to send non-HTML trigger character request to HTML language server. * Fixing tests to match product changes * Fix json property name --------- Co-authored-by: David Wengier <david.wengier@microsoft.com>
* Disable existing language server and project system if cohosting is on * Configure source generator when in cohost mode * Save razor documents to host outputs via a dedicated output object * Extract the documents from the razor compiler instead of generating them directly. * Update tests to use generator and skip failing tests --------- Co-authored-by: David Wengier <david.wengier@microsoft.com>
…ence-packages build 20250219.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.611203 -> To Version 10.0.611901
dotnet#11539) This pull request updates the following dependencies [marker]: <> (Begin:011df26a-fbd1-45b0-94b9-08db3601dcca) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 011df26a-fbd1-45b0-94b9-08db3601dcca - **Build**: 20250219.1 - **Date Produced**: February 19, 2025 2:51:56 PM UTC - **Commit**: d794781cc75921b4ebbefe2eabdb0d6cd1713005 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.611203 to 10.0.611901][1] [1]: dotnet/source-build-reference-packages@865d72f...d794781 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
dibarbet
approved these changes
Feb 25, 2025
This was referenced Mar 1, 2025
This was referenced Apr 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.