Skip to content

Merge for 1.14.0#10378

Merged
michelleangela merged 30 commits intoinsidersfrom
seanmcm/1_14_0_insiders
Jan 12, 2023
Merged

Merge for 1.14.0#10378
michelleangela merged 30 commits intoinsidersfrom
seanmcm/1_14_0_insiders

Conversation

@sean-mcmanus
Copy link
Contributor

@sean-mcmanus sean-mcmanus commented Jan 12, 2023

I couldn't merge directly due to some merge conflicts, all of which I resolved to incoming/main.

sean-mcmanus and others added 30 commits November 17, 2022 10:58
* 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.
@sean-mcmanus sean-mcmanus requested a review from a team January 12, 2023 03:08
@michelleangela michelleangela merged commit b69d17a into insiders Jan 12, 2023
@michelleangela michelleangela deleted the seanmcm/1_14_0_insiders branch January 12, 2023 04:00
@github-actions github-actions bot locked and limited conversation to collaborators Feb 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants