Resolve syncing conflicts from FromPrivateLiveToMaster to main by learn-build-service-prod[bot] · Pull Request #5954 · MicrosoftDocs/cpp-docs

learn-build-service-prod · 2026-08-25T17:35:19Z

Pull request opened by Docs to resolve syncing conflicts from FromPrivateLiveToMaster to main.

Add section on Managed C++ limitations with ASan.

Clarify limitations of ASan support for C++/CLI and provide additional notes on potential misleading reports.

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

Tyler's feedback / improve wording for better understanding.

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

Revised the section on ASan support for C++/CLI to clarify limitations and diagnostics.

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

…//github.com/MicrosoftDocs/cpp-docs (branch main) (#6788) * Update Vectorized STL algorithm documentation to reflect the current stae (#5937) Since the last update: * ARM64 and ARM64EC vectorization was added. Mention of x64 and x86 is removed, as vectorization is now supported on any target, except deprecated `/clr:pure` and `/clr:safe` modes. * `includes` is now manually vectorized too * `replace_copy` is now manually vectorized too Also moved `find_end` to `search` / `search_n` group, where it fits better. * Update header-files-cpp.md (#5938) Clarify intent of section * Update documentation on accessing System.String characters (#5940) * Update documentation on accessing System.String characters Added important note about treating interior pointers as const and linked to unsafe code best practices. * Update docs/dotnet/how-to-access-characters-in-a-system-string.md Co-authored-by: Jan Kotas <jkotas@microsoft.com> * Apply suggestions from code review Co-authored-by: Aaron R Robinson <arobins@microsoft.com> * Apply suggestions from code review Co-authored-by: Aaron R Robinson <arobins@microsoft.com> --------- Co-authored-by: Jan Kotas <jkotas@microsoft.com> * Clarify version prefix for Visual Studio Command Prompt (#5946) Updated instructions for starting Visual Studio Command Prompt to reflect changes in version specification. * Add new ARM64 feature arguments to documentation (#5950) Add new extensions `cssc` and `faminmax` to the `/feature` flag arguments documentation * atexit: Clarify DLL behavior is the same as _onexit (#5952) * atexit: Clarify DLL behavior is the same as _onexit - Document that atexit called from within a DLL will register the routine to run when the DLL is unloaded. atexit is a wrapper around _onexit which already documents this behavior. Ref: curl/curl#22383 (comment) Reported-by: Michał Petryka Closes #xxxx * Revise atexit documentation for accuracy Update the date and clarify DLL behavior for atexit. --------- Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> --------- Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com> Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com> Co-authored-by: Alex Guteniev <gutenev@gmail.com> Co-authored-by: veganaiZe <7102064+veganaiZe@users.noreply.github.com> Co-authored-by: Aaron R Robinson <arobins@microsoft.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com> Co-authored-by: Eric Brumer <ericbr@microsoft.com> Co-authored-by: Vít Knobloch <67308900+vitknobloch@users.noreply.github.com> Co-authored-by: Jay Satiro <raysatiro@yahoo.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com>

…(#6769) * UUF Fix. * Remove duplicate customer intent from documentation Removed duplicate customer intent line from the metadata section. * Apply suggestions from code review Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com> * Update per comment. * Apply suggestions from code review Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com> --------- Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com>

minor fixes

Edit asan-known-issues to clarify limitations in /clr applications

Auto Publish – main to live - 2026-08-20 17:30 UTC

Updated the date and clarified the note about VCToolsVersion discovery in the MSVC installation guide.

Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>

…-discovery Document cross-install MSVC toolset discovery

* operator () * add static operator[] * Refine static subscript example * Apply suggestions from code review Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> * Clarify static operator qualifiers --------- Co-authored-by: TylerMSFT <12305055+TylerMSFT@users.noreply.github.com> Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

Change comment from Intel to x64 for /arch (x64) flag description consistency.

Co-authored-by: learn-build-service-prod-10[bot] <274431553+learn-build-service-prod-10[bot]@users.noreply.github.com>

Update SSE and AVX descriptions to x64

Auto Publish – main to live - 2026-08-21 17:30 UTC

Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>

Co-authored-by: TylerMSFT <12305055+TylerMSFT@users.noreply.github.com>

update to clarify that applies to AMD and INTEL

Auto Publish – main to live - 2026-08-25 17:30 UTC

prmerger-automator · 2026-08-25T17:35:32Z

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

prmerger-automator · 2026-08-25T17:35:34Z

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

learn-build-service-prod · 2026-08-25T17:36:06Z

Learn Build status updates of commit 6dfe9e5:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error: CannotMergeCommit] Cannot merge commit 6dfe9e515a1c26f03ca607e3f89131495ffc41ff in branch FromPrivateLiveToMaster of repository https://github.com/MicrosoftDocs/cpp-docs into branch main (commit f0c81b71ff4a4ba61e5c02fa60255278d93913c8). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

…//github.com/MicrosoftDocs/cpp-docs (branch main) (#6797) * Update Vectorized STL algorithm documentation to reflect the current stae (#5937) Since the last update: * ARM64 and ARM64EC vectorization was added. Mention of x64 and x86 is removed, as vectorization is now supported on any target, except deprecated `/clr:pure` and `/clr:safe` modes. * `includes` is now manually vectorized too * `replace_copy` is now manually vectorized too Also moved `find_end` to `search` / `search_n` group, where it fits better. * Update header-files-cpp.md (#5938) Clarify intent of section * Update documentation on accessing System.String characters (#5940) * Update documentation on accessing System.String characters Added important note about treating interior pointers as const and linked to unsafe code best practices. * Update docs/dotnet/how-to-access-characters-in-a-system-string.md Co-authored-by: Jan Kotas <jkotas@microsoft.com> * Apply suggestions from code review Co-authored-by: Aaron R Robinson <arobins@microsoft.com> * Apply suggestions from code review Co-authored-by: Aaron R Robinson <arobins@microsoft.com> --------- Co-authored-by: Jan Kotas <jkotas@microsoft.com> * Clarify version prefix for Visual Studio Command Prompt (#5946) Updated instructions for starting Visual Studio Command Prompt to reflect changes in version specification. * Add new ARM64 feature arguments to documentation (#5950) Add new extensions `cssc` and `faminmax` to the `/feature` flag arguments documentation * atexit: Clarify DLL behavior is the same as _onexit (#5952) * atexit: Clarify DLL behavior is the same as _onexit - Document that atexit called from within a DLL will register the routine to run when the DLL is unloaded. atexit is a wrapper around _onexit which already documents this behavior. Ref: curl/curl#22383 (comment) Reported-by: Michał Petryka Closes #xxxx * Revise atexit documentation for accuracy Update the date and clarify DLL behavior for atexit. --------- Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> * Resolve syncing conflicts from FromPrivateLiveToMaster to main (#5953) --------- Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com> Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com> Co-authored-by: Alex Guteniev <gutenev@gmail.com> Co-authored-by: veganaiZe <7102064+veganaiZe@users.noreply.github.com> Co-authored-by: Aaron R Robinson <arobins@microsoft.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com> Co-authored-by: Eric Brumer <ericbr@microsoft.com> Co-authored-by: Vít Knobloch <67308900+vitknobloch@users.noreply.github.com> Co-authored-by: Jay Satiro <raysatiro@yahoo.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Hector <v-ndat@microsoft.com>

learn-build-service-prod · 2026-08-26T14:23:22Z

Learn Build status updates of commit d464f9e:

✅ Validation status: passed

File	Status	Preview URL	Details
.github/workflows/generate-preview-links.yml	✅Succeeded
docs/build/reference/arch-x64.md	✅Succeeded
docs/build/reference/arch-x86.md	✅Succeeded

For more details, please refer to the build report.

prmerger-automator · 2026-08-26T14:23:28Z

PRMerger Results

Issue	Description
Added File(s)	This PR contains added files. New files require human review.
Yaml File(s)	This PR includes changes to .yml file(s) owned by another author.
Commits Count	This PR contains more than 15 commits.
File Change Percent	This PR contains file(s) with more than 30% file change.

Diana Richards (v-dirichards) · 2026-08-26T14:37:46Z

Tyler Whitney (@TylerMSFT) Can you approve this PR?

Auto Publish – main to live - 2026-08-26 17:30 UTC

learn-build-service-prod · 2026-08-26T17:40:04Z

Learn Build status updates of commit db97526:

✅ Validation status: passed

File	Status	Preview URL	Details
.github/workflows/generate-preview-links.yml	✅Succeeded
docs/build/reference/arch-x64.md	✅Succeeded
docs/build/reference/arch-x86.md	✅Succeeded
docs/build/reference/feature-arm64.md	✅Succeeded
docs/build/walkthrough-creating-and-using-a-static-library-cpp.md	✅Succeeded
docs/c-runtime-library/reference/atexit.md	✅Succeeded
docs/cpp/function-call-cpp.md	✅Succeeded
docs/cpp/static-function-call-operator.md	✅Succeeded
docs/cpp/static-subscript-operator.md	✅Succeeded
docs/cpp/subscripting.md	✅Succeeded
docs/cpp/toc.yml	✅Succeeded
docs/overview/acquire-msvc.md	✅Succeeded
docs/sanitizers/asan-known-issues.md	✅Succeeded

For more details, please refer to the build report.

prmerger-automator · 2026-08-26T17:40:14Z

PRMerger Results

Issue	Description
Added File(s)	This PR contains added files. New files require human review.
Yaml File(s)	This PR includes changes to .yml file(s) owned by another author.
Changed Files	This PR contains more than 10 changed files.
Commits Count	This PR contains more than 15 commits.
File Change Percent	This PR contains file(s) with more than 30% file change.

Tyler Whitney (TylerMSFT) · 2026-08-26T20:21:58Z

Hi Diana Richards (@v-dirichards) , thank you for merging this. Do you have any idea why this keeps happening? There shouldn't ever be merge conflicts from private live to master.

Zack Johnson (zacklj89) and others added 30 commits July 17, 2026 11:26

Document Managed C++ support limitations for ASan

940ba87

Add section on Managed C++ limitations with ASan.

Update ASan known issues for C++/CLI support

5458dc5

Clarify limitations of ASan support for C++/CLI and provide additional notes on potential misleading reports.

Apply suggestions from code review

e3448c0

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

Update ASan known issues for C++/CLI support

52b14ef

Tyler's feedback / improve wording for better understanding.

Apply suggestion from @learn-build-service-prod-02[bot]

5967d88

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

Revise ASan known issues and update documentation date

8a7aa70

Revised the section on ASan support for C++/CLI to clarify limitations and diagnostics.

Update docs/sanitizers/asan-known-issues.md

dd14136

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

minor fixes

9b55438

note msvc version

81a8cad

Document cross-install MSVC toolset discovery

136a5f5

Apply suggestions from code review

aa72bb6

Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com>

Merge pull request #6789 from TylerMSFT/smallfix

99177bb

minor fixes

fix formatting

8dd9d5e

Merge pull request #6775 from zacklj89/patch-2

36b40dc

Edit asan-known-issues to clarify limitations in /clr applications

Merge pull request #6792 from MicrosoftDocs/main

9102f6e

Auto Publish – main to live - 2026-08-20 17:30 UTC

Revise MSVC installation guide for clarity and date

7e440a4

Updated the date and clarified the note about VCToolsVersion discovery in the MSVC installation guide.

Update docs/overview/acquire-msvc.md

783fc81

Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>

Update acquire-msvc.md

868aa47

Merge pull request #6790 from chcomley/users/chcomley/vctools-version…

74325f0

…-discovery Document cross-install MSVC toolset discovery

Update SSE and AVX descriptions to x64

cbcf77b

Change comment from Intel to x64 for /arch (x64) flag description consistency.

Apply suggestions from code review

952d9e6

Co-authored-by: learn-build-service-prod-10[bot] <274431553+learn-build-service-prod-10[bot]@users.noreply.github.com>

Merge pull request #6793 from b-wkl/patch-1

0b5699d

Update SSE and AVX descriptions to x64

Merge pull request #6794 from MicrosoftDocs/main

b23cc78

Auto Publish – main to live - 2026-08-21 17:30 UTC

update to clarify that applies to AMD and INTEL

a1bfa0e

edit

5773f68

Apply suggestions from code review

46b4a78

Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>

add link preview to PRs (#6795)

3674f39

Co-authored-by: TylerMSFT <12305055+TylerMSFT@users.noreply.github.com>

prmerger-automator Bot and others added 2 commits August 25, 2026 00:08

Merge pull request #6796 from TylerMSFT/x64

3af9263

update to clarify that applies to AMD and INTEL

Merge pull request #6798 from MicrosoftDocs/main

6dfe9e5

Auto Publish – main to live - 2026-08-25 17:30 UTC

prmerger-automator Bot added the do-not-merge label Aug 25, 2026

prmerger-automator Bot added Change sent to author tools/subsvc visual-cpp/svc labels Aug 25, 2026

prmerger-automator Bot added the needs-human-review label Aug 26, 2026

Diana Richards (v-dirichards) requested a review from Tyler Whitney (TylerMSFT) August 26, 2026 14:37

Diana Richards (v-dirichards) assigned Tyler Whitney (TylerMSFT) Aug 26, 2026

Diana Richards (v-dirichards) added the aq-pr-triaged Tracking label for the PR review team label Aug 26, 2026

Merge pull request #6801 from MicrosoftDocs/main

db97526

Auto Publish – main to live - 2026-08-26 17:30 UTC

learn-build-service-prod Bot force-pushed the FromPrivateLiveToMaster branch from d464f9e to db97526 Compare August 26, 2026 17:35

learn-build-service-prod Bot merged commit eea8211 into main Aug 26, 2026
1 of 2 checks passed

learn-build-service-prod Bot deleted the FromPrivateLiveToMaster branch August 26, 2026 17:36

Navigation Menu

Uh oh!

Resolve syncing conflicts from FromPrivateLiveToMaster to main - #5954

Resolve syncing conflicts from FromPrivateLiveToMaster to main#5954
learn-build-service-prod[bot] merged 34 commits into
mainfrom
FromPrivateLiveToMaster

learn-build-service-prod Bot commented Aug 25, 2026

Uh oh!

prmerger-automator Bot commented Aug 25, 2026

Uh oh!

prmerger-automator Bot commented Aug 25, 2026

Uh oh!

learn-build-service-prod Bot commented Aug 25, 2026

Uh oh!

learn-build-service-prod Bot commented Aug 26, 2026

Uh oh!

prmerger-automator Bot commented Aug 26, 2026

Uh oh!

Diana Richards (v-dirichards) commented Aug 26, 2026

Uh oh!

Uh oh!

learn-build-service-prod Bot commented Aug 26, 2026

Uh oh!

prmerger-automator Bot commented Aug 26, 2026

Uh oh!

Tyler Whitney (TylerMSFT) commented Aug 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

learn-build-service-prod Bot commented Aug 25, 2026

Uh oh!

prmerger-automator Bot commented Aug 25, 2026

Uh oh!

prmerger-automator Bot commented Aug 25, 2026

Uh oh!

learn-build-service-prod Bot commented Aug 25, 2026

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Aug 26, 2026

✅ Validation status: passed

Uh oh!

prmerger-automator Bot commented Aug 26, 2026

PRMerger Results

Uh oh!

Diana Richards (v-dirichards) commented Aug 26, 2026

Uh oh!

Uh oh!

learn-build-service-prod Bot commented Aug 26, 2026

✅ Validation status: passed

Uh oh!

prmerger-automator Bot commented Aug 26, 2026

PRMerger Results

Uh oh!

Tyler Whitney (TylerMSFT) commented Aug 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants