Snap 17.13P2 #11251
Merged
Snap 17.13P2 #11251
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
…ence-packages build 20241021.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24515.1 -> To Version 10.0.0-alpha.1.24521.1
… Build ID 2570586
… Build ID 2570586
dotnet#11104) 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**: 20241021.1 - **Date Produced**: October 21, 2024 5:34:14 PM UTC - **Commit**: ccd0927e3823fb178c7151594f5d2eaba81bba81 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24515.1 to 10.0.0-alpha.1.24521.1][1] [1]: dotnet/source-build-reference-packages@4660d88...ccd0927 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
… Build ID 2570728 (dotnet#11106) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
… Build ID 2571381
… Build ID 2571381
… Build ID 2571381 (dotnet#11118)
IHoverService.GetRazorHoverInfoAsync(...) takes a DocumentPositionInfo and an LSP Position, but it only actually needs one of them.
Rather than passing around ClientCapabilities all the time, use a HoverDisplayOptions record with the relevant information.
Change HoverService to pass around LinePositionSpan throughtout and only create an LSP Range when needed in the end.
Rather than accessing the _projectManager instance field in HoverService, just pass an ISolutionQueryOperations instance throughout.
Moving the existing hover tests requires a few test infrastructure changes.
Now that the implementation of GetHoverAsync has moved to Workspaces, HoverService really doesn't need to carry on.
…up (dotnet#11113) * Update Roslyn package references to latest available and do minor fixup * Updating Versions.Details.xml to match Versions.props * PR suggestion * Fixing test failures Roslyn was requesting new IRazorMappingService and our TestRazorDocumentServiceProvider was throwing. Returning null for now per suggestion from Andrew. * Adding TODO comment per code review
This change moves all of the logic that computes a `VSInternalHover` to the Workspaces layer. The file diff shouldn't be too bad, but a lot of code is moved without much additional clean up. So, it might be easier to go commit-by-commit.
Applying suggestion from code-review Co-authored-by: Andrew Hall <[email protected]>
This is an automatically generated pull request from release/dev17.13 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.13 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.13-to-main git reset --hard upstream/main git merge upstream/release/dev17.13 # Fix merge conflicts git commit git push upstream merges/release/dev17.13-to-main --force ```
### Summary of the changes - optimize docs for first-time pull-experience Fixes: Some initial confusion when starting to work with the repo
…his (dotnet#11230) Noticed while working on FAR in cohosting today.
This doesn't appear to be used anywhere.
This is is similar to the GenerateBaselines class. It updates the JSON files in the shared files folder. It is included in MS.ANC.Razor.ProjectEngineHost.Test rather than MS.ANC.Razor.Test.Common.Tooling for a couple of reason: 1. That's where most of the serialization tests live. 2. MS.ANC.Razor.Test.Common.Tooling is not a test project, so while the IDE will discover tests in that project, it won't run them. Note that this change also updates the JSON because I actually ran the test. The JSON formatting is a bit different, which is where there are modifications.
VS Code has a specific LogOutputChannel which allows the user to easily change the logging level on an output window. To support that rzls also needs to allow dynamic logging level changes. This adds an endpoint and a level provider that changes the logging level based on an lsp message coming in.
…ty, after doing some work
Normalize spacing etc around how using directives are categorized. Allows us to compare using aliases and static usings.
…ty (dotnet#11233) I was musing the other day about ETW events possibly being useful in tracking down the Speedometer regression I was looking in to, and then along comes dotnet#11232 which is a great excuse to add some ETW event infrastructure to our lives. The idea here is that RPS/Speedometer tests can wait for Razor to be "ready" by looking for this event, rather than `Thread.Sleep`ing. Anecdotally on my machine, when loading OrchardCore, this event fires once a couple of minutes after solution load, so seems like a reasonable candidate. Once this is in @WardenGnaw will try it out and if it's not good, we'll pop some more events somewhere. Will need to follow up with PR(s?) to add this event source name to the list, but I need to work out where to do that first :)
* Adding a setting to .editorconfig to enforce formatting * Minor change to ```from``` formatting * Removing extra spaces and supressions in flags per CR suggestion
…tReaders_ProjectSystem.cs Co-authored-by: Fred Silberberg <[email protected]>
…#11229) The Razor compiler was carrying an old copy of `TagHelperDescriptorJsonConverter`, though it was only used in benchmarks. Since it doesn't make sense to have two JSON formats for tag helpers, this change updates Microsoft.AspNetCore.Razor.Serialization.JSON so that it can be referenced by the compiler benchmarks and removes `TagHelperDescriptorJsonConverter`. With this done, it will be easier to slim down the `TagHelperDescriptor` API, which I'm planning to do to speed tag helpers up a bit. (Although, that'll still require updates to https://github.com/dotnet/sdk/tree/main/src/RazorSdk/Tool.) I recommend reviewing commit-by-commit.
phil-allen-msft
approved these changes
Nov 25, 2024
phil-allen-msft
merged commit b7557c0
into
dotnet:release/dev17.13
15 of 20 checks passed
This was referenced Dec 11, 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.
No description provided.