Merge main to features/solutionEvents #64386
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
…h/FixStackOverFlowInClassficationService
We can just turn this on for 17.5.
I don't see any reason why we were doing this the other way.
This was detritus left from an earlier refactoring: there used to be a second constructor that set the underlying Lazy to something more interesting, but now it's not needed anymore.
There is a registry key you can use to enable/disable logging to ETW for each kind of event we might fire, but this bypasses that check so it can drown out other analysis.
…assficationService Fix the stack overflow in AbstractEmbeddedLanguageClassificationService.cs
Remove feature flag
Miscellaneous improvements to the ETW logging code
…rs (#64331) Prerequisite to the fixing #63768. I pulled this refactoring into a separate change to make it easier to review. We now always bind constructor initializers for explicit constructors, regardless of whether the initializer was explicitly specified or not. This change is exposed in the public API via IOperation, where constructor initializers are now visible always.
Merge release/dev17.4 to main
Update localization-suggestion.md
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.
This is an automatically generated pull request from main into features/solutionEvents.
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:
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.
git fetch --all git checkout -t upstream/merges/main-to-features/solutionEvents git reset --hard upstream/features/solutionEvents git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/solutionEvents --force