Merge main #11075
Merged
Merge main #11075
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
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.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
…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>
…net#11053) * Avoid ambiguous `object` reference in generic component recovery * Update baselines
… Build ID 2566213
… 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
… 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.
* 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) ...
chsienki
approved these changes
Oct 23, 2024
This was referenced Nov 4, 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.
Merge main into the feature branch. Only trivial merge conflicts and baseline updates were needed.