Merges "release/dev17.13" to "dev17.14" #76953
Merged
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
The changes are copied over from a PR to release/dev17.12 #76431
This needs to auto roll forward into 17.13 as well. @jordi1215 and @phil-allen-msft in relation to branch lock.
… Build ID 2602829
… Build ID 2602829
… Build ID 2602829
… Build ID 2602829
… Build ID 2602829
… Build ID 2602829
… Build ID 2602829
This is an automatically generated pull request from release/dev17.12 into release/dev17.13. 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/roslyn/find/release/dev17.12 - https://github.com/dotnet/roslyn/find/release/dev17.13 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-release/dev17.13 git reset --hard upstream/release/dev17.13 git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-release/dev17.13 --force ```
… Build ID 2602943 (#76454) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
This reverts commit b86d831.
… UTF8 (#76785) * Add feature flag for emitting string literals into data section as UTF8 * Address feedback * Simplify some APIs * Lift well known type member check * Obtain the string type lazily * Consolidate static constructor implementations * Encapsulate IL emit of BytesToStringHelper * Extract NestedTypeDefinition * Share ParameterDefinitionBase * Add more doc comments * Remove unnecessary `using`s * Avoid passing text and data together * Avoid immutable array allocation * Remove ITokenDeferral and SystemStringType passing * Simplify parameter definition * Cache threshold * Simplify code * Re-add Opt suffix * Remove an unnecessary using * Extend tests * Improve tests * Improve code --------- Co-authored-by: Jan Jones <[email protected]>
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
Without this, Microsoft.CodeAnalysis.Workspaces.MSBuild.dll itself is deployed, but will fail to work since it can't find any build hosts deployed alongside the DLL. Fixes #73854
… Build ID 2625567 (#76649) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
… Build ID 2627881
… Build ID 2627881
… Build ID 2627881 (#76923) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
…ich/merge_dev17.13_to_dev17.14
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
dibarbet
approved these changes
Jan 28, 2025
This was referenced Jan 30, 2025
This was referenced Feb 26, 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.
In particular this is to flow localization changes to main.