Merge main #11075

This pull request updates the following dependencies [marker]: <> (Begin:0022737c-8efd-4919-ecf2-08dc3decc073) ## From https://github.com/dotnet/arcade - **Subscription**: 0022737c-8efd-4919-ecf2-08dc3decc073 - **Build**: 20240913.3 - **Date Produced**: September 13, 2024 10:27:20 AM UTC - **Commit**: 8c08d889b3c0b3f19398faceaccd74d0f184a3fb - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] [5]: dotnet/arcade@0028fcc...8c08d88 [DependencyUpdate]: <> (End) [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)

dotnet#10910) 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**: 20240917.1 - **Date Produced**: September 17, 2024 2:02:23 PM UTC - **Commit**: 38a050f3b80b4dfdd0e8f6c772a3e9835674d3b4 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24459.1 to 10.0.0-alpha.1.24467.1][1] [1]: dotnet/source-build-reference-packages@08649fe...38a050f [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)

Helps add telemetry for cases like [AB#2255138](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2255138/)

This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.XliffTasks**: from 1.0.0-beta.23426.1 to 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20240913.3 - **Date Produced**: September 13, 2024 10:27:20 AM UTC - **Commit**: 8c08d889b3c0b3f19398faceaccd74d0f184a3fb - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][8] [8]: dotnet/arcade@0028fcc...8c08d88 [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)

…920.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24470.2

…920.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24470.2

This pull request updates the following dependencies [marker]: <> (Begin:0022737c-8efd-4919-ecf2-08dc3decc073) ## From https://github.com/dotnet/arcade - **Subscription**: 0022737c-8efd-4919-ecf2-08dc3decc073 - **Build**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)

This pull request updates the following dependencies [marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2) ## From https://github.com/dotnet/arcade - **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2 - **Build**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)

This pull request updates the following dependencies [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)

* More hardening of the completion test We not wait for a specific item in the actual shown completion UI, and also wait for the correct text in the editor post-commit to account for actions such as OnAutoInsert * Switch the other "commit tag name" test to the new way of waiting for completion * PR feedback

Helps remove AssumeNotNull from the fault parameters and blame something in our code stack instead

…925.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24470.2 -> To Version 8.0.0-beta.24475.3

…lease/dev17.10-to-release/dev17.11

…lease/dev17.12-to-main

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

* Add test * Change how we parse runtime whitespace for using directives * Update added test * Update baselines * Update parsing doc

merge main into release/dev17.12 to update for 17.12 P3. Main is 17.13 P1.

draft until snap time

…925.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24470.2 -> To Version 8.0.0-beta.24475.3

…ease/dev17.8-to-release/dev17.10

This is an automatically generated pull request from release/dev17.8 into release/dev17.10. 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.8 - https://github.com/dotnet/razor/find/release/dev17.10 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.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force ```

…ence-packages build 20240923.1 (dotnet#10942) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24467.1 -> To Version 10.0.0-alpha.1.24473.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

IProjectCollectionResolver was intended to be passed into services that need to enumerate project snapshots to allow them to be used in co-hosting. Instead of encapsulating the state it operates on, a "context" IDocumentSnapshot was passed into IProjectCollectionResolver.EnumerateProjects(...). In co-hosting, the "context" IDocumentSnapshot would be used to extract the Roslyn Solution, while the language server would ignore the parameter entirely. This change introduces IProjectQueryService to replace IProjectCollectionResolver. In the language server, it wraps IProjectSnapshotManager. In co-hosting, a new instance of the service is created for any service call and wraps the Roslyn Solution snapshot.

This pull request updates the following dependencies [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20240925.3 - **Date Produced**: September 25, 2024 4:27:13 PM UTC - **Commit**: 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24470.2 to 8.0.0-beta.24475.3][1] [1]: dotnet/arcade@ff79f81...69abe6b [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)

This is a significant change for co-hosting that redesigns how remote snapshots work. - Introduce RemoteSolutionSnapshot to wrap a solution and a collection of RemoteProjectSnapshots. - Rework RemoteProjectSnapshot to simply wrap a document and a collection of RemoteDocumentSnapshots. - Introduce RemoteSnapshotManager that can retrieve a snapshot for a Solution, Project, or TextDocument. - Enforce that RemoteDocumentSnapshots can *only* be created from razor or cshtml documents. - Reduce to a single CWT that maps Solution -> RemoteSolutionSnapshot. - Add RemoteDocumentContext.ProjectQueryService convenience property.

…e/dev17.10

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

…bug 🤦‍♂️

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

…net#10943) `IProjectCollectionResolver` was intended to be passed into services that need to enumerate project snapshots to allow them to be used in co-hosting. Instead of encapsulating the state, it operates on a "context" `IDocumentSnapshot` passed into `IProjectCollectionResolver.EnumerateProjects(...)`. In co-hosting, this "context" `IDocumentSnapshot` would be used to extract the Roslyn Solution for project enumeration, while the language server would ignore the parameter entirely. This change introduces `ISolutionQueryOperations` and replaces `IProjectCollectionResolver`. A key difference from `IProjectCollectionResolver` is that `ISolutionQueryOperations` is not available via DI or the MEF composition. Instead of importing a singleton interface in the language server, an `ISolutionQueryOperations` can be retrieved by calling `IProjectSnapshotManager.GetSolutionQueryOperations()`. In co-hosting, there is a new `RemoteSolutionSnapshot` class that wraps a Roslyn Solution and implements `ISolutionQueryOperations`. This ensures that co-hosting endpoints that don't have immediate access to the target document (such as `completionitem/resolve`) can still walk projects.

FIxes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2046969 Rather than reporting telemtery, this PR just doesn't. I think we tried in the past to collect cabs for this, and didn't get any, and we haven't had any obvious reports from users of issues this causes. Left the debug assert and the log message, because one of us might get lucky and run into it, or maybe a user will report something.

This is an automatically generated pull request from release/dev17.8 into release/dev17.10. 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.8 - https://github.com/dotnet/razor/find/release/dev17.10 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.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force ```

Recently the editor fixed a bug where they were sending `didOpen` etc. requests for things not explicitly registered: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2003716/ This is great, and I even logged the bug, but we do actually want those messages in cohosting, so now we need to register for them :) Most of the changes are just allowing our registration providers to provide multiple registrations.

…release/dev17.11-to-release/dev17.12

Current code was defining allowed auto-insert scenario too narrowly, with the main issue being that at the moment of the auto-insert the end tag for the newly typed tag is missing and if there is an enclosing/parent tag with the same name, the inner tag ends up "stealing" the end tag from that. We need to walk up the tree looking for the unclosed parent tag with the same name.

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. 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.11 - https://github.com/dotnet/razor/find/release/dev17.12 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.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

Seeing intermittent failures in other completion commit tests. This switches them all to the new commit method where we wait for the specific completion item to be present.

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. 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.11 - https://github.com/dotnet/razor/find/release/dev17.12 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.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

Also reported in https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2268945

We have 9 failing integration tests, seemingly because the test machines are picking up FUSE. This PR skips some (with links to bugs) or works around the issues. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2268945

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2253190 Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2225341

This notifies a client to refresh diagnostics when we experience project snapshot changes (except for document changed). This should help for cases where the project engine is updating but doesn't have all taghelper information yet.

…ence-packages build 20241004.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24473.1 -> To Version 10.0.0-alpha.1.24504.1

There's a fair amount of code in Razor that uses `IProjectSnapshot.GetDocument(...)` to test for the presence of a document with a given file path in a project. However, `GetDocument` has the side effect of creating a document snapshot which ultimately may be thrown away. This change adds an `IProjectSnapshot.ContainsDocument(...)` method that tests for the presence of a document by file path and returns true or false without creating a new document snapshot. In addition, I've cleaned up the `IProjectSnapshot` implementations a bit.

This was only used for a single test and the implementation is trivial to mock.

Move to reporting TSA data for all the tools. The previous configuration was causing us to miss Polichcek, PSScriptAnalyzer, CredScan, etc ...

…otnet#10975) There's a fair amount of code in Razor that uses `IProjectSnapshot.GetDocument(...)` to test for the presence of a document with a given file path in a project. However, `GetDocument` has the side effect of creating a document snapshot which ultimately may be thrown away. This change adds an `IProjectSnapshot.ContainsDocument(...)` method that tests for the presence of a document by file path and returns true or false without creating a new document snapshot. In addition, I've cleaned up the `IProjectSnapshot` implementations a bit.

This was only used for a single test and the implementation is trivial to mock. I noticed this when I saw that `TestDocumentMappingService` still "implemented" `GetLanguageKind`, which no longer exists on `IDocumentMappingService`.

All but one of these values are provided by Roslyn's ClassificationTypeNames. The only classification type name that we need to define ourselves is for "Type".

…Document

Cherry pick of the commit from dotnet#10959 that fixes code actions in FUSE, **and fixing the generate event handler code action which is unrelated to FUSE**, in case we decide we want to take it for 17.12 P3 Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2268945

This was previously using the hash code of the document snapshot, therefore publishing every request. This meant we got publishes for old documents when they were superseded by newer ones.

The things receiving project events on the server side were all batching their work together, so quick remove-then-add sequences for documents would be merged together on the server side. Not doing that on the client side too just made it much harder for things to ever be in sync.

When publishing, we see a project remove for obj/Debug, and move all files to the misc project, then we'd see a new project for obj/Release, and add that. That add would then cause us to go through all of the misc files, and add them to the first project that could possibly have them - in this case, adding them right back to obj/Debug. Generally speaking we shouldn't be guessing at anything with project info, but rather rely on correct input from systems. ie, if they add a project, they presumably will then follow up with telling us which documents are in it.

Now that snapshots are self-versioned, if we don't keep our "previously published data" clean we'll end up re-publishing versions of documents that are new on the client side, but not new on the server.

…project When all documents are removed from a project, if the imports file comes first, it will cause a recompile of all open razor files, even though they will themselves later on be removed. This didn't used to cause any issues during publish, because the generated document would be sent over, and later clobbered with a subsequent change. Now that documents are self-versioned, that subsequent change could be for a version number less than the removed document, and hence be thrown away. Plus it's wasted work.

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

…004.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2

…004.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2

This change decouples the two TagHelperTooltipFactories from the Razor language server and moves them to the Workspaces layer for use in co-hosting. Ultimately, co-hosting will be able to do a better job producing hover and completion item tooltips, but that can come later.

* Emit and map empty csharp tokens - Add test and update baselines * Unskip test

Fixes dotnet#10970 Each commit in this PR essentially hardens the project system a little bit more. Together they fix the publish issue, which is a particularly difficult scenario, as it essentially removes and quickly re-adds a project, but I think the changes are pretty good overall. No one commit fixes the publish issue, and I wouldn't say there is no more work to do, but forward progress is forward progress. Each commit is isolated to a particular service and has a brief description of what the change is and why, but I think it's perfectly understood when looked at as a whole too. Review however you prefer :)

Purely mechanical changes

Mostly these didn't test real scenarios, and one needed changing to test the UpdatedAsync method properly

Updates publishdata after snap

Noticed while working on my previous PR. There were a few methods in RazorProjectService that were only used by tests, and also resulted in some tests validating things that could never happen in the product (like passing `null` for a project file path in an update). This PR removes one unused method, moves one to a test accessor where it rightly should be, and updates the tests that were calling `UpdateProjectAsync` to instead call through `IRazorProjectServiceListener.UpdatedAsync`. I don't love that these tests have to call through that interface, but I didn't change the method to be implicitly implemented because I don't think the name makes sense when written that way. There are, or at least should be, no functionality changes in this PR.

… Build ID 2556780

DocumentSnapshot and ProjectSnapshot had several virtual methods intended to be overridden in test infrastructure. This change removes the override behavior in tests and seals the classes.

Nothing actually calls this property.

* Make base type a token rather than a string * Track inherits source location and emit it when present * Add simple inherits test for components * Add razor page inherits test

… Build ID 2556868 (dotnet#10993)

… Build ID 2557121

…008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1

…008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1

…ence-packages build 20241007.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24504.1 -> To Version 10.0.0-alpha.1.24507.1

…009.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24466.2 -> To Version 9.0.0-beta.24509.3

* Unpin Roslyn Versions Now that we have the analyzer work done in VS, we should be able to unpin the versions of the roslyn compiler that we depend on in razor. * Remove VersionOverrides

… Build ID 2557678

This is some code I had locally and decided it would be good to check in. There should be no observable change. This essentially removes some unneeded bits, hides internal state, tights assumptions, simplifies code, and cleans up test infrastructure. The commit history should be explanatory.

This commit is ginormous because I needed to thread cancellation tokens around everywhere.

… Build ID 2557880 (dotnet#10997)

Using SumType doesn't directly allow CLaSP to correctly do a null check via is null. This fixes it so that places that allow null use Nullable<T> or specificy that the non-value type can be null. Fixes devdiv.visualstudio.com/DevDiv/_workitems/edit/2136054

This pull request updates the following dependencies [marker]: <> (Begin:0022737c-8efd-4919-ecf2-08dc3decc073) ## From https://github.com/dotnet/arcade - **Subscription**: 0022737c-8efd-4919-ecf2-08dc3decc073 - **Build**: 20241008.1 - **Date Produced**: October 8, 2024 6:38:56 PM UTC - **Commit**: e5b13e054339e41d422212a0ecaf24fec20cb5a1 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][3] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][3] [3]: dotnet/arcade@103916c...e5b13e0 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 8.0.110 - Updates tools.dotnet to 8.0.110 [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)

This pull request updates the following dependencies [marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2) ## From https://github.com/dotnet/arcade - **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2 - **Build**: 20241008.1 - **Date Produced**: October 8, 2024 6:38:56 PM UTC - **Commit**: e5b13e054339e41d422212a0ecaf24fec20cb5a1 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][3] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][3] [3]: dotnet/arcade@103916c...e5b13e0 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 8.0.110 - Updates tools.dotnet to 8.0.110 [marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)

This moves GetCSharpSyntaxTree from RazorCodeDocumentExtensions to be a static method on DocumentSnapshot. This should help keep it from being called in co-hosting scenarios.

…009.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24466.2 -> To Version 9.0.0-beta.24509.3

This pull request updates the following dependencies [marker]: <> (Begin:761d0bec-2526-451d-fdf9-08dcc6cdae74) ## From https://github.com/dotnet/arcade - **Subscription**: 761d0bec-2526-451d-fdf9-08dcc6cdae74 - **Build**: 20241009.3 - **Date Produced**: October 9, 2024 10:05:57 PM UTC - **Commit**: 05c72bb3c9b38138276a8029017f2ef905dcc7fa - **Branch**: refs/heads/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24466.2 to 9.0.0-beta.24509.3][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24466.2 to 9.0.0-beta.24509.3][1] [1]: dotnet/arcade@04b9022...05c72bb [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 9.0.100-rc.2.24474.11 - Updates tools.dotnet to 9.0.100-rc.2.24474.11 [marker]: <> (End:761d0bec-2526-451d-fdf9-08dcc6cdae74)

This pull request updates the following dependencies [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20241008.1 - **Date Produced**: October 8, 2024 6:38:56 PM UTC - **Commit**: e5b13e054339e41d422212a0ecaf24fec20cb5a1 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][2] [2]: dotnet/arcade@103916c...e5b13e0 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 8.0.110 - Updates tools.dotnet to 8.0.110 [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)

This pull request updates the following dependencies [marker]: <> (Begin:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) ## From https://github.com/dotnet/arcade - **Subscription**: 2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d - **Build**: 20241009.3 - **Date Produced**: October 9, 2024 10:05:57 PM UTC - **Commit**: 05c72bb3c9b38138276a8029017f2ef905dcc7fa - **Branch**: refs/heads/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24466.2 to 9.0.0-beta.24509.3][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24466.2 to 9.0.0-beta.24509.3][1] [1]: dotnet/arcade@04b9022...05c72bb [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 9.0.100-rc.2.24474.11 - Updates tools.dotnet to 9.0.100-rc.2.24474.11 [marker]: <> (End:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d)

Related to dotnet#10343.

* Add a test * Fix potentially ambiguous System.Object in _Imports.razor * Update baselines

…ence-packages build 20241011.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24507.1 -> To Version 10.0.0-alpha.1.24511.4

…net#11002) This pull request builds on my last one (dotnet#10995), continuing to make improvements to `IDocumentSnapshot`. The key change is that all of the `Task`-returning methods on `IDocumentSnapshot` now return `ValueTask` and take `CancellationTokens`. I've touched a lot of code to thread `CancellationTokens` everywhere, but it's mostly very mechanical. There is almost certainly another pull request coming at some point after this one. Next on my list is to tackle the dreaded `ComputedStateTracker`. I've long suspected that most the complexity in that class can just be deleted, and I intend to dig into that soon.

Clean up some of the extract to component code. Move more work to the resolver, use pooled objects where applicable, and try to make the provider cleaner when creating the ExtractToComponentCodeActionParams

…elease/dev17.8-to-release/dev17.10

…release/dev17.10-to-release/dev17.11 # Conflicts: # eng/Versions.props # global.json

…release/dev17.11-to-release/dev17.12 # Conflicts: # eng/Version.Details.xml # eng/Versions.props # global.json

…release/dev17.12-to-main # Conflicts: # eng/Versions.props

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

This is an automatically generated pull request from release/dev17.8 into release/dev17.10. 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.8 - https://github.com/dotnet/razor/find/release/dev17.10 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.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force ```

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. 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.11 - https://github.com/dotnet/razor/find/release/dev17.12 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.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

dotnet#10973) 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**: 20241011.4 - **Date Produced**: October 11, 2024 11:32:45 PM UTC - **Commit**: 76c417253f5b3890997a3ef4b0613c2eab73d156 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24507.1 to 10.0.0-alpha.1.24511.4][3] [3]: dotnet/source-build-reference-packages@fd609e3...76c4172 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

…tions/Razor/ExtractToComponentCodeActionResolver.cs Co-authored-by: David Wengier <david.wengier@microsoft.com>

…o merge_to_main

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. 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.11 - https://github.com/dotnet/razor/find/release/dev17.12 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.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

This adds the request tracking available for implementation in CLaSP for Razor

…016.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24509.3 -> To Version 9.0.0-beta.24516.2

@model

* Replace baseType token with a dedicated type * Track the generic portion of the baseType in the new type * Update the model portion of the baseType when the @model directive is used * Add tests + update baselines. --------- Co-authored-by: Fred Silberberg <fred@silberberg.xyz>

* Add tests * Add better error for void components * Update baselines

* Make base type a token rather than a string * Track inherits source location and emit it when present * Add simple inherits test for components * Add razor page inherits test

@model

* Replace baseType token with a dedicated type * Track the generic portion of the baseType in the new type * Update the model portion of the baseType when the @model directive is used * Add tests + update baselines. --------- Co-authored-by: Fred Silberberg <fred@silberberg.xyz>

…e/Components/ComponentDocumentClassifierPass.cs Fixup bad merge

@marcarro

New PR because apparently the branch is restricted so I can't handle merge conflicts... Adding work from @marcarro into main 🥳

Cherry pick two fuse fixes back to 17.12

…e/Components/ComponentDocumentClassifierPass.cs

…ence-packages build 20241015.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24511.4 -> To Version 10.0.0-alpha.1.24515.1

dotnet#11052) 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**: 20241015.1 - **Date Produced**: October 15, 2024 7:12:38 PM UTC - **Commit**: 4660d88cf953fbbd14192c787053a20246ce1aeb - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24511.4 to 10.0.0-alpha.1.24515.1][1] [1]: dotnet/source-build-reference-packages@76c4172...4660d88 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

Mirrors dotnet/roslyn#74300 for razor fixes devdiv.visualstudio.com/DevDiv/_workitems/edit/2286513?src=WorkItemMention&src-action=artifact_link

…net#11053) * Avoid ambiguous `object` reference in generic component recovery * Update baselines

… Build ID 2566213

* Handle EditorRequired *Changed parameters * Handle Expression properties

… Build ID 2566213 (dotnet#11058)

…bd-4317-ad5a-ca9ebbcc6e47

… Build ID 2566512

… Build ID 2566512 (dotnet#11060)

This pull request updates the following dependencies [marker]: <> (Begin:761d0bec-2526-451d-fdf9-08dcc6cdae74) ## From https://github.com/dotnet/arcade - **Subscription**: 761d0bec-2526-451d-fdf9-08dcc6cdae74 - **Build**: 20241016.2 - **Date Produced**: October 16, 2024 4:50:11 PM UTC - **Commit**: 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - **Branch**: refs/heads/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24509.3 to 9.0.0-beta.24516.2][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24509.3 to 9.0.0-beta.24516.2][1] [1]: dotnet/arcade@05c72bb...3c393bb [DependencyUpdate]: <> (End) [marker]: <> (End:761d0bec-2526-451d-fdf9-08dcc6cdae74)

Fixes dotnet#11050 Commit by commit will show moving things around to clean up. Decided for now that the extraction should not be offered until we find a need/use case for it.

…release/dev17.12-to-main

This is an automatically generated pull request from release/dev17.12 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.12 - 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.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

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-030810b0-57bd-4317-ad5a-ca9ebbcc6e47 for more information.

Adds a new breaking changes document in the style of roslyn to document breaking changes in the razor compiler.

@inherits

* upstream/main: (290 commits) Add breaking changes document (dotnet#11064) Do not extract component into code block (dotnet#11069) Fix invalid setttings json (dotnet#11062) update MicrosoftSourceBuildIntermediatearcadePackageVersion Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566512 Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566512 Update source-build team references (dotnet#11032) Handle EditorRequired *Changed/*Expression parameters (dotnet#11043) Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566213 Localized file check-in by OneLocBuild Task: Build definition ID 262: Build ID 2566213 Avoid ambiguous `object` reference in generic component recovery (dotnet#11053) Move culture info check (dotnet#11057) Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241015.1 Fix code actions integration tests Add option for format on paste (dotnet#11039) Update src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs Fix merge to 17.12 version Update src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs Ensure model directives are mapped at runtime (dotnet#11007) Fix @inherits mapping for fuse (dotnet#10985) ...

Commits on Oct 20, 2024

Fix code actions integration tests

davidwengier committed Oct 20, 2024

Configuration menu

View commit details

Copy full SHA for 6df5cfb

Browse repository at this point

Copy the full SHA

6df5cfb View commit details

Browse the repository at this point in the history

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main #11075

Merge main #11075

Commits on Sep 23, 2024

Commits on Sep 24, 2024

Commits on Sep 25, 2024

Commits on Sep 26, 2024

Commits on Sep 27, 2024

Commits on Sep 30, 2024

Commits on Oct 1, 2024

Commits on Oct 2, 2024

Commits on Oct 3, 2024

Commits on Oct 4, 2024

Commits on Oct 5, 2024

Commits on Oct 6, 2024

Commits on Oct 7, 2024

Commits on Oct 8, 2024

Commits on Oct 9, 2024

Commits on Oct 10, 2024

Commits on Oct 11, 2024

Commits on Oct 14, 2024

Commits on Oct 15, 2024

Commits on Oct 16, 2024

Commits on Oct 17, 2024

Commits on Oct 18, 2024

Commits on Oct 19, 2024

Commits on Oct 20, 2024

Commits on Oct 21, 2024

Commits on Oct 22, 2024

Commits on Oct 23, 2024