Merge for 1.14.0 #10378
Merged
Merge for 1.14.0 #10378
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 IntelliSense localized strings. * Also update msvc versions.
…ormat) (#10177) * Fix selection and formatting for CDD. * Fix multiple edit at the same spot case.
* Update changelog for 1.13.5.
* Change engine logging and add natvis diagnostics This PR adds logging categories to engineLogging and adds in the option for natvisDiagnostics with different categories. * change nls nativisDiagnostics to category
* Check for the file version before formatting after CDD.
* Update changelog for 1.13.6.
* Resolve includePath before sending config notification * Ensure all configuration paths are absolute * Optimize implentation of resolution of arrays * Move the resolving of config paths * Reuse win32 check for all resolvePath's * add explict type to isWin32
* Update changelog for 1.13.9 * Add a couple 1.13.6 debugger fixes.
* Prevent looping between C and C++.
* Update changelog for 1.14.0.
michelleangela
approved these changes
Jan 12, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I couldn't merge directly due to some merge conflicts, all of which I resolved to incoming/main.