Merge branch 'release/dev17.15' => 'main' #77939
Merged
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
I detected changes in the main-vs-deps branch which have not been merged yet to release/dev18.0. I'm a robot and am configured to help you automatically keep release/dev18.0 up to date, so I've opened this PR. This PR merges commits made on main-vs-deps by the following committers: * dotnet-policy-service[bot] * CyrusNajmabadi ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout main-vs-deps git pull --ff-only git checkout release/dev18.0 git pull --ff-only git merge --no-ff main-vs-deps # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-vs-deps-to-release/dev18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull https://github.com/dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull git@github.com:dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
I detected changes in the main-vs-deps branch which have not been merged yet to release/dev18.0. I'm a robot and am configured to help you automatically keep release/dev18.0 up to date, so I've opened this PR. This PR merges commits made on main-vs-deps by the following committers: * dotnet-policy-service[bot] * CyrusNajmabadi ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout main-vs-deps git pull --ff-only git checkout release/dev18.0 git pull --ff-only git merge --no-ff main-vs-deps # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-vs-deps-to-release/dev18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull https://github.com/dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull git@github.com:dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
I detected changes in the main-vs-deps branch which have not been merged yet to release/dev18.0. I'm a robot and am configured to help you automatically keep release/dev18.0 up to date, so I've opened this PR. This PR merges commits made on main-vs-deps by the following committers: * dotnet-policy-service[bot] * arunchndr ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout main-vs-deps git pull --ff-only git checkout release/dev18.0 git pull --ff-only git merge --no-ff main-vs-deps # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-vs-deps-to-release/dev18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull https://github.com/dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull git@github.com:dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
…oGetUpdatedSourceGeneratedDocuments # Conflicts: # src/LanguageServer/Protocol/Handler/CodeActions/CodeActionResolveHelper.cs # src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs # src/Workspaces/Core/Portable/Workspace/Solution/SolutionCompilationState.cs
I detected changes in the main branch which have not been merged yet to release/dev17.15. I'm a robot and am configured to help you automatically keep release/dev17.15 up to date, so I've opened this PR. This PR merges commits made on main by the following committers: * JoeRobich * chsienki * davidwengier * mpidash * tannergooding * 333fred * sharwell * dvoituron * cston * mmitche * Kritner * carlossanlop * Evangelink * JakeYallop * MartyIX * arunchndr * CollinAlpert * DoctorKrolic * raulsntos * MihaZupan * github-actions[bot] * dotnet-bot * mavasani * RenderMichael * gewarren * RikkiGibson * dotnet-maestro[bot] * eriawan * aelij * david-acker * Youssef1313 * reduckted * amiru3f * jaredpar * Spacefish * jozkee * mrahhal * CyrusNajmabadi * ToddGrun * stephentoub * manfred-brands * oleksandr-didyk * steveberdy * Sjoerdsjoerd * Miizukii * peteraritchie * Bouke * jjonescz * Tornhoof * kandicst * jtschuster * Applesauce314 * drewnoakes * fowl2 * wtg-mg8 * buyaa-n * ViktorHofer * jmarolf * WTG-MG8 * geeknoid * sorensenmatias * wzchua * myblindy * jcouv * bcollamore * lbussell * huoyaoyuan * AArnott * chucker * NewellClark * TKharaishvili * Cosifne * jkoritzinsky * TimLovellSmith * twsouthwick * dseefeld * ryzngard * ltrzesniewski * dotpaul * TimHannMSFT * DustinCampbell * mahdiva * MichaelSimons * get-me-power * jeffhandley * kazukazuinaina * RussKie * maryamariyan * JeremyGuinn * MeikTranel * louis-z * marodev * randomnoise * genlu * mayerj * jonfortescue * allisonchou * kingjan1999 * pakdev * cristianosuzuki77 * john-h-k * omajid * YohDeadfall * JarLob * adamralph * agocke * elinor-fung * v-chmart * paulomorgado * madenwala * bartonjs * davkean * jnm2 * lostmsu * tmat * j2jensen * v-zbsail * jodydonetti * LLLXXXCCC * LingxiaChen * goyzhang * maxkoshevoi * tmeschter * nschuessler * ivanbasov * tlupes * dpaoliello * vpereira01 * JohnTortugo * v-mdriml * vslynko * m-akinc * edespong * MattKotsenas * Pilchie * chiragrupani * AmadeusW * chborl * jinujoseph * nguerrera * jamesqo * heejaechang * jasonmalinowski * srivatsn * Anniepoh * balajikris * basoundr * mattwar * morrisjoe * qinxgit * maggiemsft * brettfo * natidea * msJohnHamby * KevinH-MS * amcasey ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout main git pull --ff-only git checkout release/dev17.15 git pull --ff-only git merge --no-ff main # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev17.15 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev17.15 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-release/dev17.15'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/main-to-release/dev17.15 origin/release/dev17.15 git pull https://github.com/dotnet/roslyn merge/main-to-release/dev17.15 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev17.15 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-to-release/dev17.15 origin/release/dev17.15 git pull git@github.com:dotnet/roslyn merge/main-to-release/dev17.15 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev17.15 ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
…77919) * Avoid computations in AnalyzerAssemblyLoader.AddDependencyLocation Currently, this method is calculating some data upfront for the value part of a TryAdd call. Instead, defer calculating that data until after we've determine it's not already in the dictionary. I saw this accounting for 2.3% of CPU during loading Roslyn.sln. With this change, it was about 0.2%.
Part of dotnet/razor#10693 Razor side of this is dotnet/razor#11619 which I think makes us ready to internally dogfood cohosting. This unblocks Razor completion and most of code actions in cohosting. It allows `WithText` and `WithSyntaxRoot` to work on source generated documents, creating a forked solution with frozen source generated documents. Solutions can be continually frozen without issue, and unfreezing puts them back to their original state. This also allows code actions to run on modified source generated documents, but only if they have been frozen. As discussed there aren't any flags for this to only be possible from/for Razor. Still investigating individual code actions that aren't working in Razor, but those will probably be a follow up. Enough of the Razor tests pass now that it proves the system generally works (see comment below).
jjonescz
changed the title
![dotnet-policy-service[bot]](https://avatars.githubusercontent.com/in/285228?s=60&v=4){kind=small}
ghost
added
Area-Infrastructure
untriaged
This was referenced Apr 19, 2025
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.
I detected changes in the release/dev17.15 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/dev17.15 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/dev17.15-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.