Snap main to 17.13 P3 #11356
Merged
Snap main to 17.13 P3 #11356
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
* Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2 * Failed to perform coherency update for one or more dependencies. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ence-packages build 20241121.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24561.2 -> To Version 10.0.0-alpha.1.24571.2
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 ```
Got sick of seeing messages about namespaces not matching folder names, so thought I'd suppress it. Then Alex mentioned the formatting rule in standup, and I thought tests deserve the same treatment.
These don't exist in cohosting, so can't be shared
On my machine this caused 0 difference in test time, and XUnit fixtures seem at odds with creating custom test discoverers, which I want to do to add fuse testing to cohosting.
This commit was purely mechanical, no changes to any test inputs or outputs. The old file name differentiation made no sense, and its easier to share a single file.
RazorLSPOptions doesn't make sense in cohosting
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 ```
This makes the test count between the two systems the same, for easy validation that we're doing the right thing
We already know it anyway, and means less specialization in the receiver
…` and friends) (dotnet#11347) Fixes dotnet#9730 Fixes dotnet#10704 Commit at a time might be easier, depending on how well GitHub handlers the diff
This is temporary, and I don't expect anyone else to ever enable it except me, unless you like having 5 tests fail
There was only one slight tweak that needed to be made to on type formatting in order for all of our tests to pass on runtime code-gen, so this is that. Extracted out of the new formatting engine PR.
Now that we have more things that aren't really event handlers, "e" is a bit silly
There is a lot that could be cleaned up in this class, but I limited myself :)
… it turned out the code was dead code anyway
…ence-packages build 20241230.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.562001 -> To Version 10.0.563001
dotnet#11351) 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**: 20241230.1 - **Date Produced**: December 30, 2024 5:57:26 PM UTC - **Commit**: 80f1e84b2077a7208943db050067d86c94ace837 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.562001 to 10.0.563001][1] [1]: dotnet/source-build-reference-packages@44f3339...80f1e84 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
…ence-packages build 20250106.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.563001 -> To Version 10.0.605601
dotnet#11353) 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**: 20250106.1 - **Date Produced**: January 6, 2025 3:57:56 PM UTC - **Commit**: 67bfe60ba059348bfaec48537acd36157cd2be6e - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.563001 to 10.0.605601][1] [1]: dotnet/source-build-reference-packages@80f1e84...67bfe60 [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
Fixes https://github.com/orgs/dotnet/projects/197/views/8?query=is%3Aopen+sort%3Aupdated-desc&pane=issue&itemId=85450324 Review commit and a time is recommended. The second last commit is the only one you need to worry about @dotnet/razor-compiler, it fixes various scenarios around using directives, as previously the code-gen was: ``` using System #line hidden ; ``` but having any `#line hidden` in a using directive means Roslyn won't offer to add them, so this just updates the code-gen to move the semi-colon to: ``` using System ; #line hidden ```
ryzngard
approved these changes
Jan 7, 2025
This was referenced Jan 10, 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.
Summary of the changes
Fixes: